From: Florian Eckert <fe@dev.tdt.de>
Date: Mon, 23 Sep 2019 07:04:17 +0000 (+0200)
Subject: Merge pull request #1735 from sumpfralle/olsr-jsoninfo-parser-handle-empty-result
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=cf239f9e1086efea592d5413e3c7f16a3ff06703;hp=7863ff72724bbb84831d595ef60405072713c379;p=oweals%2Fluci.git

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

luci-app-olsr: handle empty result for non-status tables
---

diff --git a/applications/luci-app-adblock/luasrc/controller/adblock.lua b/applications/luci-app-adblock/luasrc/controller/adblock.lua
index d75296275..bee1d1439 100644
--- a/applications/luci-app-adblock/luasrc/controller/adblock.lua
+++ b/applications/luci-app-adblock/luasrc/controller/adblock.lua
@@ -53,12 +53,6 @@ function adb_action(name, ...)
 		luci.sys.call("/etc/init.d/adblock resume >/dev/null 2>&1")
 	elseif name == "do_refresh" then
 		luci.sys.call("/etc/init.d/adblock reload >/dev/null 2>&1")
-		local pid_file = "/var/run/adblock.pid"
-		if nixio.fs.access(pid_file) then
-			repeat
-				nixio.nanosleep(1)
-			until nixio.fs.readfile(pid_file) == ""
-		end
 	elseif name == "do_report" then
 		luci.sys.call("/etc/init.d/adblock report " ..table.concat(report_params, " ").. " >/dev/null 2>&1")
 		local rep_dir  = uci:get("adblock", "extra", "adb_repdir") or "/tmp"
@@ -90,6 +84,14 @@ function adb_action(name, ...)
 			end
 		end
 	end
+	if name == "do_suspend" or name == "do_resume" or name == "do_refresh" then
+		local pid_file = "/var/run/adblock.pid"
+		if nixio.fs.access(pid_file) then
+			repeat
+				nixio.nanosleep(1)
+			until nixio.fs.readfile(pid_file) == ""
+		end
+	end
 	luci.http.prepare_content("text/plain")	
 	luci.http.write("0")
 end
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 8e4395ae6..d6c5ac54c 100644
--- a/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua
+++ b/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua
@@ -28,36 +28,44 @@ o2:value("dnsmasq", "dnsmasq (/tmp)")
 o2:value("unbound", "unbound (/var/lib/unbound)")
 o2:value("named", "named (/var/lib/bind)")
 o2:value("kresd", "kresd (/etc/kresd)")
-o2:value("dnscrypt-proxy","dnscrypt-proxy (/tmp)")
 o2.default = "dnsmasq (/tmp)"
 o2.rmempty = false
 
-o3 = s:option(ListValue, "adb_fetchutil", translate("Download Utility"),
-	translate("List of supported and fully pre-configured download utilities."))
-o3:value("uclient-fetch")
-o3:value("wget")
-o3:value("curl")
-o3:value("aria2c")
-o3:value("wget-nossl", "wget-nossl (noSSL)")
-o3:value("busybox", "wget-busybox (noSSL)")
-o3.default = "uclient-fetch"
+o3 = s:option(ListValue, "adb_dnsvariant", translate("DNS Blocking Variant"),
+	translate("List of supported DNS blocking variants. By default 'nxdomain' will be used for all DNS backends. ")
+	..translate("Dnsmasq also supports 'null' block variants, which may provide better response times."))
+o3:value("nxdomain", "nxdomain, all DNS backends")
+o3:value("null (IPv4)", "null (IPv4), dnsmasq only")
+o3:value("null (IPv4/IPv6)", "null (IPv4/IPv6), dnsmasq only")
+o3.default = "nxdomain, all DNS backends"
 o3.rmempty = false
 
-o4 = s:option(ListValue, "adb_trigger", translate("Startup Trigger"),
+o4 = s:option(ListValue, "adb_fetchutil", translate("Download Utility"),
+	translate("List of supported and fully pre-configured download utilities."))
+o4:value("uclient-fetch")
+o4:value("wget")
+o4:value("curl")
+o4:value("aria2c")
+o4:value("wget-nossl", "wget-nossl (noSSL)")
+o4:value("busybox", "wget-busybox (noSSL)")
+o4.default = "uclient-fetch"
+o4.rmempty = false
+
+o5 = s:option(ListValue, "adb_trigger", translate("Startup Trigger"),
 	translate("List of available network interfaces. Usually the startup will be triggered by the 'wan' interface. ")
 	..translate("Choose 'none' to disable automatic startups, 'timed' to use a classic timeout (default 30 sec.) or select another trigger interface."))
-o4:value("none")
-o4:value("timed")
+o5:value("none")
+o5:value("timed")
 if dump then
 	local i, v
 	for i, v in ipairs(dump.interface) do
 		if v.interface ~= "loopback" then
 			local device = v.l3_device or v.device or "-"
-			o4:value(v.interface, v.interface.. " (" ..device.. ")")
+			o5:value(v.interface, v.interface.. " (" ..device.. ")")
 		end
 	end
 end
-o4.rmempty = false
+o5.rmempty = false
 
 -- Runtime information
 
@@ -106,86 +114,98 @@ 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, apply 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 ports 53, 853 and 5353."))
 e3.rmempty = false
 
-e4 = e:option(Flag, "adb_backup", translate("Enable Blocklist Backup"),
-	translate("Create compressed blocklist backups, they will be used in case of download errors or during startup in backup mode."))
+e4 = e:option(Value, "adb_maxqueue", translate("Max. Download Queue"),
+	translate("Size of the download queue to handle downloads &amp; list processing in parallel (default '4'). ")
+	..translate("For further performance improvements you can raise this value, e.g. '8' or '16' should be safe."))
+e4.default = 4
+e4.datatype = "range(1,32)"
 e4.rmempty = false
 
-e5 = e:option(Value, "adb_backupdir", translate("Backup Directory"),
-	translate("Target directory for adblock backups. Please use only a non-volatile disk, e.g. an external usb stick."))
-e5:depends("adb_backup", 1)
-e5.datatype = "directory"
-e5.default = "/mnt"
-e5.rmempty = true
+e5 = e:option(Flag, "adb_dnsfilereset", translate("DNS File Reset"),
+	translate("Resets the final DNS blockfile 'adb_list.overall' after loading through the DNS backend. ")
+	..translate("This option saves an enormous amount of storage space, but starts a small ubus/adblock monitor in the background."))
+e5.disabled = "false"
+e5.enabled = "true"
+e5.rmempty = false
 
-e6 = e:option(Flag, "adb_backup_mode", translate("Backup Mode"),
-	translate("Do not automatically update blocklists during startup, use blocklist backups instead."))
-e6:depends("adb_backup", 1)
-e6.rmempty = true
-
-e7 = e:option(Value, "adb_maxqueue", translate("Max. Download Queue"),
-	translate("Size of the download queue to handle downloads &amp; list processing in parallel (default '8'). ")
-	..translate("For further performance improvements you can raise this value, e.g. '8' or '16' should be safe."))
-e7.default = 8
-e7.datatype = "range(1,32)"
-e7.rmempty = false
-
-e8 = e:option(Flag, "adb_report", translate("Enable DNS Query Report"),
+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("Please note: this needs manual 'tcpdump-mini' package installation."))
-e8.rmempty = false
-
-e9 = e:option(Value, "adb_repdir", translate("Report Directory"),
-	translate("Target directory for dns related report files. Please use preferably a non-volatile disk, e.g. an external usb stick."))
-e9:depends("adb_report", 1)
-e9.datatype = "directory"
-e9.default = "/tmp"
+e6.rmempty = false
+
+e7 = e:option(Value, "adb_repdir", translate("Report Directory"),
+	translate("Target directory for dns related report files. Default is '/tmp', please use preferably a non-volatile disk if available."))
+e7:depends("adb_report", 1)
+e7.datatype = "directory"
+e7.default = "/tmp"
+e7.rmempty = true
+
+e8 = e:option(Value, "adb_backupdir", translate("Backup Directory"),
+	translate("Target directory for adblock source backups. Default is '/tmp', please use preferably a non-volatile disk if available."))
+e8.datatype = "directory"
+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 &le; 0. ")
+	.. translate("Please note: this needs manual 'msmtp' package installation and setup."))
 e9.rmempty = true
 
-e10 = e:option(Flag, "adb_notify", translate("Email Notification"),
-	translate("Send notification emails in case of a processing error or if domain count is &le; 0. ")
-	.. translate("Please note: this needs manual 'msmtp' package installation and setup."))
+e10 = e:option(Value, "adb_mreceiver", translate("E-Mail Receiver Address"),
+	translate("Receiver address for adblock notification E-Mails."))
+e10:depends("adb_mail", 1)
 e10.rmempty = true
 
 -- Optional Extra Options
 
-e20 = e:option(Flag, "adb_jail", translate("'Jail' Blocklist Creation"),
-	translate("Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all domains except those listed in the whitelist file. ")
-	.. translate("You can use this restrictive blocklist e.g. for guest wifi or kidsafe configurations."))
+e20 = e:option(Value, "adb_dnsdir", translate("DNS Directory"),
+	translate("Target directory for the generated blocklist 'adb_list.overall'."))
+e20.datatype = "directory"
 e20.optional = true
-e20.default = nil
 
-e21 = e:option(Value, "adb_notifycnt", translate("Email Notification Count"),
-	translate("Raise the minimum email notification count, to get emails if the overall count is less or equal to the given limit (default 0), ")
-	.. translate("e.g. to receive an email notification with every adblock update set this value to 150000."))
-e21.default = 0
-e21.datatype = "min(0)"
+e21 = e:option(Value, "adb_blacklist", translate("Blacklist File"),
+	translate("Full path to the blacklist file."))
+e21.datatype = "file"
+e21.default = "/etc/adblock/adblock.blacklist"
 e21.optional = true
 
-e22 = e:option(Value, "adb_dnsdir", translate("DNS Directory"),
-	translate("Target directory for the generated blocklist 'adb_list.overall'."))
-e22.datatype = "directory"
+e22 = e:option(Value, "adb_whitelist", translate("Whitelist File"),
+	translate("Full path to the whitelist file."))
+e22.datatype = "file"
+e22.default = "/etc/adblock/adblock.whitelist"
 e22.optional = true
 
-e23 = e:option(Value, "adb_whitelist", translate("Whitelist File"),
-	translate("Full path to the whitelist file."))
-e23.datatype = "file"
-e23.default = "/etc/adblock/adblock.whitelist"
+e23 = e:option(Value, "adb_triggerdelay", translate("Trigger Delay"),
+	translate("Additional trigger delay in seconds before adblock processing begins."))
+e23.datatype = "range(1,60)"
 e23.optional = true
 
-e24 = e:option(Value, "adb_triggerdelay", translate("Trigger Delay"),
-	translate("Additional trigger delay in seconds before adblock processing begins."))
-e24.datatype = "range(1,60)"
+e24 = e:option(Value, "adb_maxtld", translate("TLD Compression Threshold"),
+	translate("Disable the toplevel domain compression, if the number of blocked domains is greater than this threshold."))
+e24.datatype = "min(0)"
+e24.default = 100000
 e24.optional = true
 
-e25 = e:option(Flag, "adb_dnsflush", translate("Flush DNS Cache"),
-	translate("Flush DNS Cache after adblock processing."))
+e25 = e:option(Value, "adb_portlist", translate("Local FW/DNS Ports"),
+	translate("Space separated list of firewall ports which should be redirected locally."))
+e25.default = "53 853 5353"
 e25.optional = true
-e25.default = nil
 
-e26 = e:option(ListValue, "adb_repiface", translate("Report Interface"),
+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."))
+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."))
+e27.default = nil
+e27.optional = true
+
+e28 = e:option(ListValue, "adb_repiface", translate("Report Interface"),
 	translate("Reporting interface used by tcpdump, set to 'any' for multiple interfaces (default 'br-lan'). ")
 	..translate("This change requires a manual service stop/re-start to take effect."))
 if dump then
@@ -194,32 +214,54 @@ if dump then
 		if v.interface ~= "loopback" then
 			local device = v.device
 			if device then
-				e26:value(device)
+				e28:value(device)
 			end
 		end
 	end
 end
-e26:value("any")
-e26.optional = true
+e28:value("any")
+e28.optional = true
 
-e27 = e:option(Value, "adb_replisten", translate("Report Listen Port(s)"),
+e29 = e:option(Value, "adb_replisten", translate("Report Listen Port(s)"),
 	translate("Space separated list of reporting port(s) used by tcpdump (default: '53'). ")
 	..translate("This change requires a manual service stop/re-start to take effect."))
-e27.default = 53
-e27.optional = true
+e29.default = 53
+e29.optional = true
 
-e28 = e:option(Value, "adb_repchunkcnt", translate("Report Chunk Count"),
+e30 = e:option(Value, "adb_repchunkcnt", translate("Report Chunk Count"),
 	translate("Report chunk count used by tcpdump (default '5'). ")
 	..translate("This change requires a manual service stop/re-start to take effect."))
-e28.datatype = "range(1,10)"
-e28.default = 5
-e28.optional = true
+e30.datatype = "range(1,10)"
+e30.default = 5
+e30.optional = true
 
-e29 = e:option(Value, "adb_repchunksize", translate("Report Chunk Size"),
+e31 = e:option(Value, "adb_repchunksize", translate("Report Chunk Size"),
 	translate("Report chunk size used by tcpdump in MB (default '1'). ")
 	..translate("This change requires a manual service stop/re-start to take effect."))
-e29.datatype = "range(1,10)"
-e29.default = 1
-e29.optional = true
+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.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.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.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.default = 0
+e35.datatype = "min(0)"
+e35.optional = true
 
 return m
diff --git a/applications/luci-app-adblock/luasrc/view/adblock/runtime.htm b/applications/luci-app-adblock/luasrc/view/adblock/runtime.htm
index 72e2b0d36..2cec57334 100644
--- a/applications/luci-app-adblock/luasrc/view/adblock/runtime.htm
+++ b/applications/luci-app-adblock/luasrc/view/adblock/runtime.htm
@@ -1,11 +1,17 @@
 <%#
-Copyright 2017-2018 Dirk Brenken (dev@brenken.org)
+Copyright 2017-2019 Dirk Brenken (dev@brenken.org)
 This is free software, licensed under the Apache License, Version 2.0
 -%>
 
 <%+adblock/adblock_css%>
 <script type="text/javascript">
 //<![CDATA[
+	function format(number)
+	{
+		var string = number.toString().replace(/(\d)(?=(\d{3})+(?!\d))/g, '$1.');
+		return string;
+	}
+
 	function status_update(json)
 	{
 		var btn1         = document.getElementById("btn1");
@@ -50,8 +56,10 @@ This is free software, licensed under the Apache License, Version 2.0
 		document.getElementById("value_2").innerHTML = json.data.adblock_version || "-";
 		document.getElementById("value_3").innerHTML = json.data.fetch_utility || "-";
 		document.getElementById("value_4").innerHTML = json.data.dns_backend || "-";
-		document.getElementById("value_5").innerHTML = json.data.overall_domains || "-";
-		document.getElementById("value_6").innerHTML = json.data.last_rundate || "-";
+		document.getElementById("value_5").innerHTML = json.data.dns_variant || "-";
+		document.getElementById("value_6").innerHTML = json.data.backup_dir || "-";
+		document.getElementById("value_7").innerHTML = format(json.data.overall_domains) || "-";
+		document.getElementById("value_8").innerHTML = json.data.last_rundate || "-";
 	}
 
 	function btn_action(action)
@@ -110,6 +118,8 @@ This is free software, licensed under the Apache License, Version 2.0
 		document.getElementById("value_4").innerHTML = "-";
 		document.getElementById("value_5").innerHTML = "-";
 		document.getElementById("value_6").innerHTML = "-";
+		document.getElementById("value_7").innerHTML = "-";
+		document.getElementById("value_8").innerHTML = "-";
 	}
 
 	XHR.get('<%=luci.dispatcher.build_url("admin", "services", "adblock", "status_update")%>', null,
@@ -156,23 +166,35 @@ This is free software, licensed under the Apache License, Version 2.0
 	</div>
 </div>
 <div class="cbi-value" id="status_4">
-	<label class="cbi-value-title" for="status_4"><%:DNS Backend (DNS Directory)%></label>
+	<label class="cbi-value-title" for="status_4"><%:DNS Backend, DNS Directory%></label>
 	<div class="cbi-value-field">
 		<span class="runtime" id="value_4">-</span>
 	</div>
 </div>
 <div class="cbi-value" id="status_5">
-	<label class="cbi-value-title" for="status_5"><%:Overall Domains%></label>
+	<label class="cbi-value-title" for="status_5"><%:DNS Variant, DNS File Reset%></label>
 	<div class="cbi-value-field">
 		<span class="runtime" id="value_5">-</span>
 	</div>
 </div>
 <div class="cbi-value" id="status_6">
-	<label class="cbi-value-title" for="status_6"><%:Last Run%></label>
+	<label class="cbi-value-title" for="status_6"><%:Backup Directory%></label>
 	<div class="cbi-value-field">
 		<span class="runtime" id="value_6">-</span>
 	</div>
 </div>
+<div class="cbi-value" id="status_7">
+	<label class="cbi-value-title" for="status_7"><%:Overall Domains%></label>
+	<div class="cbi-value-field">
+		<span class="runtime" id="value_7">-</span>
+	</div>
+</div>
+<div class="cbi-value" id="status_8">
+	<label class="cbi-value-title" for="status_8"><%:Last Run%></label>
+	<div class="cbi-value-field">
+		<span class="runtime" id="value_8">-</span>
+	</div>
+</div>
 <hr />
 <div class="cbi-value" id="button_1">
 	<label class="cbi-value-title" for="button_1"><%:Suspend / Resume Adblock%></label>
diff --git a/applications/luci-app-adblock/po/es/adblock.po b/applications/luci-app-adblock/po/es/adblock.po
index 08c8fd03b..a211af6d7 100644
--- a/applications/luci-app-adblock/po/es/adblock.po
+++ b/applications/luci-app-adblock/po/es/adblock.po
@@ -3,20 +3,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Project-Id-Version: \n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
+"PO-Revision-Date: 2019-02-22 16:32-0300\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.2.1\n"
-"Last-Translator: \n"
+"X-Generator: Poedit 2.2.3\n"
+"Last-Translator: Franco Castillo <castillofrancodamian@gmail.com>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Language: es\n"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
-msgid "'Jail' Blocklist Creation"
-msgstr "Creación de listas de bloqueo 'Jail'"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:70
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:78
 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!"
@@ -34,15 +30,15 @@ msgstr "Acción"
 msgid "Adblock"
 msgstr "Adblock"
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:141
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:151
 msgid "Adblock Status"
 msgstr "Estado de Adblock"
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:147
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:157
 msgid "Adblock Version"
 msgstr "Versión de Adblock"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:179
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:182
 msgid "Additional trigger delay in seconds before adblock processing begins."
 msgstr ""
 "Demora adicional del disparador en segundos antes de que comience el "
@@ -57,22 +53,23 @@ msgstr "Avanzado"
 msgid "Answer"
 msgstr "Responder"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:96
 msgid "Archive Categories"
 msgstr "Categorías de archivo"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:146
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:181
 msgid "Backup Directory"
 msgstr "Directorio de respaldo"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:123
-msgid "Backup Mode"
-msgstr "Modo de copia de seguridad"
-
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:106
 msgid "Blacklist"
 msgstr "Lista negra"
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:169
+msgid "Blacklist File"
+msgstr "Archivo de lista negra"
+
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:274
 msgid "Blocked DNS Queries"
 msgstr "Consultas DNS bloqueadas"
@@ -82,7 +79,7 @@ msgstr "Consultas DNS bloqueadas"
 msgid "Blocked Domain"
 msgstr "Dominio bloqueado"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:69
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:77
 msgid "Blocklist Sources"
 msgstr "Fuentes de lista de bloqueo"
 
@@ -90,16 +87,7 @@ msgstr "Fuentes de lista de bloqueo"
 msgid "Blocklist not found!"
 msgstr "Lista de bloqueo no encontrado!"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:155
-msgid ""
-"Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all "
-"domains except those listed in the whitelist file."
-msgstr ""
-"Crea una lista de 'Jail' adicional (/tmp/adb_list.jail) para bloquear el "
-"acceso a todos los dominios, excepto los que figuran en el archivo de la "
-"lista blanca."
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:48
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:56
 msgid ""
 "Choose 'none' to disable automatic startups, 'timed' to use a classic "
 "timeout (default 30 sec.) or select another trigger interface."
@@ -133,44 +121,71 @@ msgstr ""
 msgid "Count"
 msgstr "Contar"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113
-msgid ""
-"Create compressed blocklist backups, they will be used in case of download "
-"errors or during startup in backup mode."
-msgstr ""
-"Crea copias de seguridad de listas de bloqueo comprimidas, se utilizarán en "
-"caso de errores de descarga o durante el inicio en modo de copia de "
-"seguridad."
-
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:24
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:159
 msgid "DNS Backend (DNS Directory)"
 msgstr "DNS Backend (Directorio DNS)"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:167
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:169
+msgid "DNS Backend, DNS Directory"
+msgstr "Servidor DNS, Directorio DNS"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:34
+msgid "DNS Blocking Variant"
+msgstr "Variante de bloqueo de DNS"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:164
 msgid "DNS Directory"
 msgstr "Directorio DNS"
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:127
+msgid "DNS File Reset"
+msgstr "Restablecimiento de archivos DNS"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:197
+msgid "DNS Inotify"
+msgstr "DNS Inotify"
+
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:20
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:134
 msgid "DNS Query Report"
 msgstr "Informe de consulta de DNS"
 
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:175
+msgid "DNS Variant, DNS File Reset"
+msgstr "Variante DNS, Restablecimiento de archivos DNS"
+
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:81
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
 msgid "Date"
 msgstr "Fecha"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
 msgid "Description"
 msgstr "Descripción"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:124
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:198
 msgid ""
-"Do not automatically update blocklists during startup, use blocklist backups "
-"instead."
+"Disable adblock triggered restarts and the 'DNS File Reset' for dns backends "
+"with autoload features."
 msgstr ""
-"No actualice automáticamente las listas de bloqueo durante el inicio, use "
-"copias de seguridad de listas de bloqueo en su lugar."
+"Deshabilite los reinicios activados por adblock y el 'Restablecimiento de "
+"archivos DNS' para back-end dns con funciones de carga automática."
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187
+msgid ""
+"Disable the toplevel domain compression, if the number of blocked domains is "
+"greater than this threshold."
+msgstr ""
+"Deshabilite la compresión de dominio de nivel superior, si el número de "
+"dominios bloqueados es mayor que este umbral."
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
+msgid ""
+"Dnsmasq also supports 'null' block variants, which may provide better "
+"response times."
+msgstr ""
+"Dnsmasq también admite variantes de bloque 'nulo', que pueden proporcionar "
+"mejores tiempos de respuesta."
 
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:28
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:71
@@ -183,14 +198,38 @@ msgstr "Dominio"
 msgid "Domain/Client/Date/Time"
 msgstr "Dominio/Cliente/Fecha/Hora"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:43
 msgid "Download Utility"
 msgstr "Utilidad de descarga"
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:153
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:163
 msgid "Download Utility (SSL Library)"
 msgstr "Utilidad de descarga (Biblioteca SSL)"
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:152
+msgid "E-Mail Notification"
+msgstr "Notificación del E-Mail"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
+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"
+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"
+msgstr "Dirección del remitente del E-Mail"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:250
+msgid "E-Mail Topic"
+msgstr "Tema del E-Mail"
+
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
 msgid "Edit Blacklist"
 msgstr "Editar lista negra"
@@ -203,33 +242,17 @@ msgstr "Editar configuración"
 msgid "Edit Whitelist"
 msgstr "Editar lista blanca"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
-msgid "Email Notification"
-msgstr "Notificación por Email"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160
-msgid "Email Notification Count"
-msgstr "Recuento de notificaciones por Email"
-
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:20
 msgid "Enable Adblock"
 msgstr "Habilitar"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:112
-msgid "Enable Blocklist Backup"
-msgstr "Habilitar copia de seguridad de lista bloqueada"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
-msgid "Enable DNS Query Report"
-msgstr "Habilitar informe de consulta de DNS"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:98
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:106
 msgid "Enable verbose debug logging in case of any processing error."
 msgstr ""
 "Habilita el registro de depuración detallado en caso de cualquier error de "
 "procesamiento."
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:73
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:81
 msgid "Enabled"
 msgstr "Habilitado"
 
@@ -237,7 +260,7 @@ msgstr "Habilitado"
 msgid "End Date"
 msgstr "Fecha final"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
 msgid "Extra Options"
 msgstr "Opciones extra"
 
@@ -253,11 +276,11 @@ msgstr ""
 "Filtrar el conjunto de resultados de la consulta de DNS para un dominio, "
 "cliente o período de tiempo en particular."
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:203
 msgid "Flush DNS Cache"
 msgstr "Vaciar caché de DNS"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:184
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:204
 msgid "Flush DNS Cache after adblock processing."
 msgstr "Vaciar el caché de DNS después del procesamiento de adblock."
 
@@ -269,7 +292,7 @@ msgstr ""
 "Para obtener más información <a href=\"%s\" target=\"_blank\">consulte la "
 "documentación en línea</a>"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:130
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:122
 msgid ""
 "For further performance improvements you can raise this value, e.g. '8' or "
 "'16' should be safe."
@@ -277,15 +300,19 @@ msgstr ""
 "Para otras mejoras de rendimiento, puede aumentar este valor, por ejemplo, "
 "'8' o '16' deben ser seguros."
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:108
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
 msgid "Force Local DNS"
 msgstr "Forzar DNS local"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:173
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:170
+msgid "Full path to the blacklist file."
+msgstr "Ruta completa al archivo de la lista negra."
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:176
 msgid "Full path to the whitelist file."
 msgstr "Ruta completa al archivo de la lista blanca."
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
+#: 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 "
 "on demand."
@@ -299,7 +326,7 @@ msgstr ""
 msgid "Input file not found, please check your configuration."
 msgstr "Archivo de entrada no encontrado, por favor revise su configuración."
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:171
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:193
 msgid "Last Run"
 msgstr "Último inicio"
 
@@ -307,7 +334,7 @@ msgstr "Último inicio"
 msgid "Latest DNS Queries"
 msgstr "Últimas consultas de DNS"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:55
 msgid ""
 "List of available network interfaces. Usually the startup will be triggered "
 "by the 'wan' interface."
@@ -322,26 +349,44 @@ msgstr ""
 "Lista de backends DNS admitidos con su directorio de exportación de lista "
 "predeterminado."
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+msgid ""
+"List of supported DNS blocking variants. By default 'nxdomain' will be used "
+"for all DNS backends."
+msgstr ""
+"Lista de variantes de bloqueo de DNS compatibles. Por defecto, 'nxdomain' se "
+"usará para todos los servidores DNS."
+
+#: 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 utilidades de descarga totalmente preconfiguradas y compatibles."
 
 #: applications/luci-app-adblock/luasrc/view/adblock/query.htm:21
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:221
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:90
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:98
 msgid "Loading"
 msgstr "Cargando"
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:192
+msgid "Local FW/DNS Ports"
+msgstr "Puertos locales FW/DNS"
+
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:22
 msgid "Logfile"
 msgstr "Archivo de registro"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109
 msgid "Low Priority Service"
 msgstr "Servicio con prioridad baja"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:256
+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."
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
 msgid "Max. Download Queue"
 msgstr "Cola máxima de descarga"
 
@@ -350,18 +395,18 @@ msgstr "Cola máxima de descarga"
 msgid "Name / IP-Address"
 msgstr "Nombre / Dirección IP"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:82
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:90
 msgid "No"
 msgstr "No"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:95
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:103
 msgid ""
 "Options for further tweaking in case the defaults are not suitable for you."
 msgstr ""
 "Opciones para ajustes adicionales en caso de que los valores predeterminados "
 "no sean adecuados para usted."
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:165
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:187
 msgid "Overall Domains"
 msgstr "Dominios generales"
 
@@ -385,13 +430,13 @@ msgstr ""
 msgid "Please edit this file directly in a terminal session."
 msgstr "Por favor, edite este archivo directamente en una sesión de terminal."
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:149
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
 msgid "Please note: this needs manual 'msmtp' package installation and setup."
 msgstr ""
 "Tenga en cuenta: esto necesita la instalación y configuración del paquete "
 "'msmtp' manual."
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:137
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
 msgid "Please note: this needs manual 'tcpdump-mini' package installation."
 msgstr ""
 "Tenga en cuenta: esto necesita la instalación manual del paquete 'tcpdump-"
@@ -405,31 +450,34 @@ msgstr "Consulta"
 msgid "Query domains"
 msgstr "Dominios de consulta"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:161
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:261
 msgid ""
-"Raise the minimum email notification count, to get emails if the overall "
-"count is less or equal to the given limit (default 0),"
+"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 por correo electrónico para "
-"obtener correos electrónicos si el recuento general es menor o igual al "
-"límite dado (valor predeterminado 0),"
+"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:109
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
+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, apply to udp "
-"and tcp protocol on ports 53, 853 and 5353."
+"Redirect all DNS queries from 'lan' zone to the local resolver, applies to "
+"udp and tcp protocol on ports 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 5353."
+"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."
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:22
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:33
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:44
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:103
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:28
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:39
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:50
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:111
 msgid "Refresh"
 msgstr "Refrescar"
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:186
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:208
 msgid "Refresh Blocklist Sources"
 msgstr "Actualizar las fuentes de la lista de bloqueo"
 
@@ -437,38 +485,38 @@ msgstr "Actualizar las fuentes de la lista de bloqueo"
 msgid "Refresh Report"
 msgstr "Informe de actualización"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:211
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:231
 msgid "Report Chunk Count"
 msgstr "Informe de recuento de fragmentos"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:218
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:238
 msgid "Report Chunk Size"
 msgstr "Tamaño del fragmento de informe"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:139
 msgid "Report Directory"
 msgstr "Directorio de informes"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:188
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:208
 msgid "Report Interface"
 msgstr "Interfaz de informe"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:205
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:225
 msgid "Report Listen Port(s)"
 msgstr "Informe escuchar puerto(s)"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:212
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:232
 msgid "Report chunk count used by tcpdump (default '5')."
 msgstr ""
 "Informe de recuento de fragmentos utilizado por tcpdump (por defecto '5')."
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:219
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:239
 msgid "Report chunk size used by tcpdump in MB (default '1')."
 msgstr ""
 "Informe el tamaño del fragmento utilizado por tcpdump en MB (valor "
 "predeterminado '1')."
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:189
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:209
 msgid ""
 "Reporting interface used by tcpdump, set to 'any' for multiple interfaces "
 "(default 'br-lan')."
@@ -476,15 +524,23 @@ msgstr ""
 "Interfaz de informes utilizada por tcpdump, establecida en 'any' para "
 "múltiples interfaces (por defecto 'br-lan')."
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:31
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+msgid ""
+"Resets the final DNS blockfile 'adb_list.overall' after loading through the "
+"DNS backend."
+msgstr ""
+"Restablece el archivo de bloque DNS final 'adb_list.overall' después de "
+"cargarlo a través del backend de DNS."
+
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:37
 msgid "Resume"
 msgstr "Reanudar"
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:139
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:149
 msgid "Runtime Information"
 msgstr "Información en tiempo de ejecución"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:76
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84
 msgid "SSL req."
 msgstr "Requerimiento de SSL"
 
@@ -494,15 +550,19 @@ msgstr "Requerimiento de SSL"
 msgid "Save"
 msgstr "Guardar"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:148
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
 msgid ""
-"Send notification emails in case of a processing error or if domain count is "
-"&le; 0."
+"Send notification E-Mails in case of a processing error or if domain count "
+"is &le; 0."
 msgstr ""
-"Envía Emails de notificación en caso de un error de procesamiento o si el "
-"recuento de dominios es &le; 0."
+"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:102
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:246
+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
 msgid ""
 "Set the nice level to 'low priority' and the adblock background processing "
 "will take fewer resources from the system."
@@ -510,15 +570,22 @@ msgstr ""
 "Establezca el nivel agradable en 'prioridad baja' y el procesamiento en "
 "segundo plano de Adblock tomará menos recursos del sistema."
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:129
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:121
 msgid ""
 "Size of the download queue to handle downloads &amp; list processing in "
-"parallel (default '8')."
+"parallel (default '4')."
 msgstr ""
 "Tamaño de la cola de descarga para manejar descargas &amp; procesamiento de "
-"listas en paralelo (por defecto '8')."
+"la lista en paralelo (predeterminado '4')."
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:193
+msgid ""
+"Space separated list of firewall ports which should be redirected locally."
+msgstr ""
+"Lista de puertos de firewall separados por espacios que deben redirigirse "
+"localmente."
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:206
+#: 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 ""
@@ -529,37 +596,43 @@ msgstr ""
 msgid "Start Date"
 msgstr "Fecha de inicio"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:46
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:54
 msgid "Startup Trigger"
 msgstr "Disparador de inicio"
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:20
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:42
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:101
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:26
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:48
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:109
 msgid "Suspend"
 msgstr "Suspender"
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:178
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:200
 msgid "Suspend / Resume Adblock"
 msgstr "Suspender / Reanudar Adblock"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:186
+msgid "TLD Compression Threshold"
+msgstr "Umbral de compresión de TLD"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
 msgid ""
-"Target directory for adblock backups. Please use only a non-volatile disk, e."
-"g. an external usb stick."
+"Target directory for adblock source backups. Default is '/tmp', please use "
+"preferably a non-volatile disk if available."
 msgstr ""
-"Directorio de destino para las copias de seguridad de Adblock. Utilice solo "
-"un disco no volátil, por ejemplo, una memoria usb externa."
+"Directorio de destino para copias de seguridad de origen de adblock. El "
+"valor predeterminado es '/tmp', utilice preferiblemente un disco no volátil "
+"si está disponible."
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:141
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
 msgid ""
-"Target directory for dns related report files. Please use preferably a non-"
-"volatile disk, e.g. an external usb stick."
+"Target directory for dns related report files. Default is '/tmp', please use "
+"preferably a non-volatile disk if available."
 msgstr ""
-"Directorio de destino para los archivos de informes relacionados con DNS. "
-"Utilice preferiblemente un disco no volátil, por ej. una memoria usb externa."
+"Directorio de destino para archivos de informes relacionados con dns. El "
+"valor predeterminado es '/tmp', utilice preferiblemente un disco no volátil "
+"si está disponible."
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:168
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:165
 msgid "Target directory for the generated blocklist 'adb_list.overall'."
 msgstr ""
 "Directorio de destino para la lista de bloqueo generada 'adb_list.overall'."
@@ -577,11 +650,11 @@ msgid "The syslog output, pre-filtered for adblock related messages only."
 msgstr ""
 "La salida de syslog, prefiltrada solo para mensajes relacionados con adblock."
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:103
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:190
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:207
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:213
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:220
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:111
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:210
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:227
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:233
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:240
 msgid "This change requires a manual service stop/re-start to take effect."
 msgstr ""
 "Este cambio requiere una parada/reinicio manual del servicio para que tenga "
@@ -617,6 +690,14 @@ msgstr ""
 "Este formulario le permite consultar listas de bloqueo activas para ciertos "
 "dominios, por ejemplo, para la lista blanca."
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:129
+msgid ""
+"This option saves an enormous amount of storage space, but starts a small "
+"ubus/adblock monitor in the background."
+msgstr ""
+"Esta opción ahorra una enorme cantidad de espacio de almacenamiento, pero "
+"inicia un pequeño monitor ubus/adblock en segundo plano."
+
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:82
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
 msgid "Time"
@@ -634,15 +715,19 @@ msgstr ""
 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."
+msgstr "Tema para la notificación de bloqueos de E-Mails."
+
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
 msgid "Total DNS Queries"
 msgstr "Total de consultas de DNS"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:178
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:181
 msgid "Trigger Delay"
 msgstr "Retraso de disparo"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:97
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:105
 msgid "Verbose Debug Logging"
 msgstr "Registro de depuración detallado"
 
@@ -654,26 +739,118 @@ msgstr "Esperando que el comando se complete..."
 msgid "Whitelist"
 msgstr "Lista blanca"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:175
 msgid "Whitelist File"
 msgstr "Archivo de lista blanca"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
 msgid "Yes"
 msgstr "Si"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:156
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:262
 msgid ""
-"You can use this restrictive blocklist e.g. for guest wifi or kidsafe "
-"configurations."
-msgstr ""
-"Puede utilizar esta lista de bloqueo restrictiva, por ejemplo, para "
-"configuraciones de wifi de invitados o para niños."
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:162
-msgid ""
-"e.g. to receive an email notification with every adblock update set this "
-"value to 150000."
-msgstr ""
-"P.ej. para recibir una notificación por email con cada actualización de "
-"Adblock, establezca este valor en 150000."
+"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 "
+"de anuncios, establezca este valor en 200000."
+
+#~ msgid "'Jail' Blocklist Creation"
+#~ msgstr "Creación de listas de bloqueo 'Jail'"
+
+#~ msgid "Backup Mode"
+#~ msgstr "Modo de copia de seguridad"
+
+#~ msgid ""
+#~ "Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to "
+#~ "all domains except those listed in the whitelist file."
+#~ msgstr ""
+#~ "Crea una lista de 'Jail' adicional (/tmp/adb_list.jail) para bloquear el "
+#~ "acceso a todos los dominios, excepto los que figuran en el archivo de la "
+#~ "lista blanca."
+
+#~ msgid ""
+#~ "Create compressed blocklist backups, they will be used in case of "
+#~ "download errors or during startup in backup mode."
+#~ msgstr ""
+#~ "Crea copias de seguridad de listas de bloqueo comprimidas, se utilizarán "
+#~ "en caso de errores de descarga o durante el inicio en modo de copia de "
+#~ "seguridad."
+
+#~ msgid ""
+#~ "Do not automatically update blocklists during startup, use blocklist "
+#~ "backups instead."
+#~ msgstr ""
+#~ "No actualice automáticamente las listas de bloqueo durante el inicio, use "
+#~ "copias de seguridad de listas de bloqueo en su lugar."
+
+#~ msgid "Email Notification"
+#~ msgstr "Notificación por Email"
+
+#~ msgid "Email Notification Count"
+#~ msgstr "Recuento de notificaciones por Email"
+
+#~ msgid "Enable Blocklist Backup"
+#~ msgstr "Habilitar copia de seguridad de lista bloqueada"
+
+#~ msgid "Enable DNS Query Report"
+#~ msgstr "Habilitar informe de consulta de DNS"
+
+#~ msgid ""
+#~ "Raise the minimum email notification count, to get emails if the overall "
+#~ "count is less or equal to the given limit (default 0),"
+#~ msgstr ""
+#~ "Aumente el recuento mínimo de notificaciones por correo electrónico para "
+#~ "obtener correos electrónicos si el recuento general es menor o igual al "
+#~ "límite dado (valor predeterminado 0),"
+
+#~ msgid ""
+#~ "Redirect all DNS queries from 'lan' zone to the local resolver, apply to "
+#~ "udp and tcp protocol on ports 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 "
+#~ "5353."
+
+#~ msgid ""
+#~ "Send notification emails in case of a processing error or if domain count "
+#~ "is &le; 0."
+#~ msgstr ""
+#~ "Envía Emails de notificación en caso de un error de procesamiento o si el "
+#~ "recuento de dominios es &le; 0."
+
+#~ msgid ""
+#~ "Size of the download queue to handle downloads &amp; list processing in "
+#~ "parallel (default '8')."
+#~ msgstr ""
+#~ "Tamaño de la cola de descarga para manejar descargas &amp; procesamiento "
+#~ "de listas en paralelo (por defecto '8')."
+
+#~ msgid ""
+#~ "Target directory for adblock backups. Please use only a non-volatile "
+#~ "disk, e.g. an external usb stick."
+#~ msgstr ""
+#~ "Directorio de destino para las copias de seguridad de Adblock. Utilice "
+#~ "solo un disco no volátil, por ejemplo, una memoria usb externa."
+
+#~ msgid ""
+#~ "Target directory for dns related report files. Please use preferably a "
+#~ "non-volatile disk, e.g. an external usb stick."
+#~ msgstr ""
+#~ "Directorio de destino para los archivos de informes relacionados con DNS. "
+#~ "Utilice preferiblemente un disco no volátil, por ej. una memoria usb "
+#~ "externa."
+
+#~ msgid ""
+#~ "You can use this restrictive blocklist e.g. for guest wifi or kidsafe "
+#~ "configurations."
+#~ msgstr ""
+#~ "Puede utilizar esta lista de bloqueo restrictiva, por ejemplo, para "
+#~ "configuraciones de wifi de invitados o para niños."
+
+#~ msgid ""
+#~ "e.g. to receive an email notification with every adblock update set this "
+#~ "value to 150000."
+#~ msgstr ""
+#~ "P.ej. para recibir una notificación por email con cada actualización de "
+#~ "Adblock, establezca este valor en 150000."
diff --git a/applications/luci-app-adblock/po/it/adblock.po b/applications/luci-app-adblock/po/it/adblock.po
index 9ea78f2c0..f9c267638 100644
--- a/applications/luci-app-adblock/po/it/adblock.po
+++ b/applications/luci-app-adblock/po/it/adblock.po
@@ -11,11 +11,7 @@ msgstr ""
 "X-Generator: Poedit 2.0.3\n"
 "Language: it\n"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
-msgid "'Jail' Blocklist Creation"
-msgstr ""
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:70
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:78
 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!"
@@ -31,15 +27,15 @@ msgstr ""
 msgid "Adblock"
 msgstr "Adblock"
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:141
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:151
 msgid "Adblock Status"
 msgstr "Status Adblock"
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:147
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:157
 msgid "Adblock Version"
 msgstr "Versione Adblock"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:179
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:182
 msgid "Additional trigger delay in seconds before adblock processing begins."
 msgstr "Tempo addizionale in secondi di attesa prima che adblock si avvii."
 
@@ -52,22 +48,23 @@ msgstr "Avanzato"
 msgid "Answer"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:96
 msgid "Archive Categories"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:146
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:181
 msgid "Backup Directory"
 msgstr "Directory del Backup"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:123
-msgid "Backup Mode"
-msgstr ""
-
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:106
 msgid "Blacklist"
 msgstr ""
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:169
+msgid "Blacklist File"
+msgstr ""
+
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:274
 msgid "Blocked DNS Queries"
 msgstr ""
@@ -77,7 +74,7 @@ msgstr ""
 msgid "Blocked Domain"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:69
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:77
 msgid "Blocklist Sources"
 msgstr "Fonti lista di Blocco"
 
@@ -85,13 +82,7 @@ msgstr "Fonti lista di Blocco"
 msgid "Blocklist not found!"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:155
-msgid ""
-"Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all "
-"domains except those listed in the whitelist file."
-msgstr ""
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:48
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:56
 msgid ""
 "Choose 'none' to disable automatic startups, 'timed' to use a classic "
 "timeout (default 30 sec.) or select another trigger interface."
@@ -124,41 +115,65 @@ msgstr ""
 msgid "Count"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113
-msgid ""
-"Create compressed blocklist backups, they will be used in case of download "
-"errors or during startup in backup mode."
-msgstr ""
-
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:24
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:159
 msgid "DNS Backend (DNS Directory)"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:167
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:169
+msgid "DNS Backend, DNS Directory"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:34
+msgid "DNS Blocking Variant"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:164
 msgid "DNS Directory"
 msgstr "Directory DNS"
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:127
+msgid "DNS File Reset"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:197
+msgid "DNS Inotify"
+msgstr ""
+
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:20
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:134
 msgid "DNS Query Report"
 msgstr ""
 
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:175
+msgid "DNS Variant, DNS File Reset"
+msgstr ""
+
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:81
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
 msgid "Date"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
 msgid "Description"
 msgstr "Descrizione"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:124
+#: 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 "
+"with autoload features."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187
 msgid ""
-"Do not automatically update blocklists during startup, use blocklist backups "
-"instead."
+"Disable the toplevel domain compression, if the number of blocked domains is "
+"greater than this threshold."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
+msgid ""
+"Dnsmasq also supports 'null' block variants, which may provide better "
+"response times."
 msgstr ""
-"Non aggiornare automaticamente le liste durante l'avvio, usa invece i backup "
-"della lista di blocco."
 
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:28
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:71
@@ -171,14 +186,38 @@ msgstr ""
 msgid "Domain/Client/Date/Time"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:43
 msgid "Download Utility"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:153
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:163
 msgid "Download Utility (SSL Library)"
 msgstr ""
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:152
+msgid "E-Mail Notification"
+msgstr ""
+
+#: 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:255
+msgid "E-Mail Profile"
+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:245
+msgid "E-Mail Sender Address"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:250
+msgid "E-Mail Topic"
+msgstr ""
+
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
 msgid "Edit Blacklist"
 msgstr "Modifica Lista Nera"
@@ -191,32 +230,16 @@ msgstr "Modifica Configurazione"
 msgid "Edit Whitelist"
 msgstr "Modifica Lista Bianca"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
-msgid "Email Notification"
-msgstr ""
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160
-msgid "Email Notification Count"
-msgstr ""
-
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:20
 msgid "Enable Adblock"
 msgstr "Attiva Adblock"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:112
-msgid "Enable Blocklist Backup"
-msgstr "Attiva Backup Lista di Blocco"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
-msgid "Enable DNS Query Report"
-msgstr ""
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:98
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:106
 msgid "Enable verbose debug logging in case of any processing error."
 msgstr ""
 "Abilita il registro dettagliato in caso di qualsiasi errore di processo."
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:73
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:81
 msgid "Enabled"
 msgstr "Abilitato"
 
@@ -224,7 +247,7 @@ msgstr "Abilitato"
 msgid "End Date"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
 msgid "Extra Options"
 msgstr "Opzioni Extra"
 
@@ -238,11 +261,11 @@ msgid ""
 "frame."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:203
 msgid "Flush DNS Cache"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:184
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:204
 msgid "Flush DNS Cache after adblock processing."
 msgstr ""
 
@@ -252,21 +275,25 @@ msgid ""
 "documentation</a>"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:130
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:122
 msgid ""
 "For further performance improvements you can raise this value, e.g. '8' or "
 "'16' should be safe."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:108
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
 msgid "Force Local DNS"
 msgstr "Forza DNS Locale"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:173
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:170
+msgid "Full path to the blacklist file."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:176
 msgid "Full path to the whitelist file."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
+#: 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 "
 "on demand."
@@ -278,7 +305,7 @@ msgstr ""
 msgid "Input file not found, please check your configuration."
 msgstr "File di input non trovato, per favore controlla la tua configurazione."
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:171
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:193
 msgid "Last Run"
 msgstr "Ultimo Avvio"
 
@@ -286,7 +313,7 @@ msgstr "Ultimo Avvio"
 msgid "Latest DNS Queries"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:55
 msgid ""
 "List of available network interfaces. Usually the startup will be triggered "
 "by the 'wan' interface."
@@ -297,25 +324,39 @@ msgid ""
 "List of supported DNS backends with their default list export directory."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+msgid ""
+"List of supported DNS blocking variants. By default 'nxdomain' will be used "
+"for all DNS backends."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:44
 msgid "List of supported and fully pre-configured download utilities."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/view/adblock/query.htm:21
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:221
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:90
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:98
 msgid "Loading"
 msgstr "Caricando"
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:192
+msgid "Local FW/DNS Ports"
+msgstr ""
+
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:22
 msgid "Logfile"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109
 msgid "Low Priority Service"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:256
+msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
 msgid "Max. Download Queue"
 msgstr ""
 
@@ -324,18 +365,18 @@ msgstr ""
 msgid "Name / IP-Address"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:82
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:90
 msgid "No"
 msgstr "No"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:95
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:103
 msgid ""
 "Options for further tweaking in case the defaults are not suitable for you."
 msgstr ""
 "Opzioni per ulteriori modifiche in caso che quelle di default non ti sono "
 "adatte."
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:165
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:187
 msgid "Overall Domains"
 msgstr ""
 
@@ -359,11 +400,11 @@ msgid "Please edit this file directly in a terminal session."
 msgstr ""
 "Per favore modifica questo file direttamente in una sessione al terminale."
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:149
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
 msgid "Please note: this needs manual 'msmtp' package installation and setup."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:137
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
 msgid "Please note: this needs manual 'tcpdump-mini' package installation."
 msgstr ""
 
@@ -375,26 +416,30 @@ msgstr "Interrogazione"
 msgid "Query domains"
 msgstr "Interrogazione domini"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:161
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:261
 msgid ""
-"Raise the minimum email notification count, to get emails if the overall "
-"count is less or equal to the given limit (default 0),"
+"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:109
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
+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, apply to udp "
-"and tcp protocol on ports 53, 853 and 5353."
+"Redirect all DNS queries from 'lan' zone to the local resolver, applies to "
+"udp and tcp protocol on ports 53, 853 and 5353."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:22
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:33
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:44
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:103
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:28
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:39
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:50
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:111
 msgid "Refresh"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:186
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:208
 msgid "Refresh Blocklist Sources"
 msgstr ""
 
@@ -402,49 +447,55 @@ msgstr ""
 msgid "Refresh Report"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:211
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:231
 msgid "Report Chunk Count"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:218
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:238
 msgid "Report Chunk Size"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:139
 msgid "Report Directory"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:188
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:208
 msgid "Report Interface"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:205
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:225
 msgid "Report Listen Port(s)"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:212
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:232
 msgid "Report chunk count used by tcpdump (default '5')."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:219
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:239
 msgid "Report chunk size used by tcpdump in MB (default '1')."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:189
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:209
 msgid ""
 "Reporting interface used by tcpdump, set to 'any' for multiple interfaces "
 "(default 'br-lan')."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:31
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+msgid ""
+"Resets the final DNS blockfile 'adb_list.overall' after loading through the "
+"DNS backend."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:37
 msgid "Resume"
 msgstr "Riprendi"
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:139
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:149
 msgid "Runtime Information"
 msgstr "Informazione di Runtime"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:76
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84
 msgid "SSL req."
 msgstr "Ric. SSL"
 
@@ -454,25 +505,34 @@ msgstr "Ric. SSL"
 msgid "Save"
 msgstr "Salva"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:148
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
 msgid ""
-"Send notification emails in case of a processing error or if domain count is "
-"&le; 0."
+"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:102
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:246
+msgid "Sender address for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:110
 msgid ""
 "Set the nice level to 'low priority' and the adblock background processing "
 "will take fewer resources from the system."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:129
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:121
 msgid ""
 "Size of the download queue to handle downloads &amp; list processing in "
-"parallel (default '8')."
+"parallel (default '4')."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:193
+msgid ""
+"Space separated list of firewall ports which should be redirected locally."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:206
+#: 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 ""
@@ -481,33 +541,37 @@ msgstr ""
 msgid "Start Date"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:46
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:54
 msgid "Startup Trigger"
 msgstr "Innesco d'Avvio"
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:20
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:42
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:101
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:26
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:48
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:109
 msgid "Suspend"
 msgstr "Sospendi"
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:178
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:200
 msgid "Suspend / Resume Adblock"
 msgstr "Sospendi / Riprendi Adblock"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:186
+msgid "TLD Compression Threshold"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
 msgid ""
-"Target directory for adblock backups. Please use only a non-volatile disk, e."
-"g. an external usb stick."
+"Target directory for adblock source backups. Default is '/tmp', please use "
+"preferably a non-volatile disk if available."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:141
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
 msgid ""
-"Target directory for dns related report files. Please use preferably a non-"
-"volatile disk, e.g. an external usb stick."
+"Target directory for dns related report files. Default is '/tmp', please use "
+"preferably a non-volatile disk if available."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:168
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:165
 msgid "Target directory for the generated blocklist 'adb_list.overall'."
 msgstr "Directory per la lista di blocco generata 'adb_list.overall'."
 
@@ -521,11 +585,11 @@ msgstr ""
 msgid "The syslog output, pre-filtered for adblock related messages only."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:103
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:190
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:207
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:213
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:220
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:111
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:210
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:227
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:233
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:240
 msgid "This change requires a manual service stop/re-start to take effect."
 msgstr ""
 
@@ -555,6 +619,12 @@ msgstr ""
 "Questo form ti consente di interrogare le liste di blocco attive per "
 "determinati domini, p.e. per metterli nella lista bianca."
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:129
+msgid ""
+"This option saves an enormous amount of storage space, but starts a small "
+"ubus/adblock monitor in the background."
+msgstr ""
+
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:82
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
 msgid "Time"
@@ -572,15 +642,19 @@ msgstr ""
 msgid "Top 10 Reporting"
 msgstr ""
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:251
+msgid "Topic for adblock notification E-Mails."
+msgstr ""
+
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
 msgid "Total DNS Queries"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:178
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:181
 msgid "Trigger Delay"
 msgstr "Ritardo Innesco"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:97
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:105
 msgid "Verbose Debug Logging"
 msgstr "Registro di Debug Dettagliato"
 
@@ -592,25 +666,29 @@ msgstr "Aspettando che il comando venga completato..."
 msgid "Whitelist"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:175
 msgid "Whitelist File"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
 msgid "Yes"
 msgstr "Sì"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:156
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:262
 msgid ""
-"You can use this restrictive blocklist e.g. for guest wifi or kidsafe "
-"configurations."
+"e.g. to receive an E-Mail notification with every adblock run set this value "
+"to 200000."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:162
-msgid ""
-"e.g. to receive an email notification with every adblock update set this "
-"value to 150000."
-msgstr ""
+#~ msgid ""
+#~ "Do not automatically update blocklists during startup, use blocklist "
+#~ "backups instead."
+#~ msgstr ""
+#~ "Non aggiornare automaticamente le liste durante l'avvio, usa invece i "
+#~ "backup della lista di blocco."
+
+#~ msgid "Enable Blocklist Backup"
+#~ msgstr "Attiva Backup Lista di Blocco"
 
 #~ msgid "Force Overall Sort"
 #~ msgstr "Forza Ordinamento Globale"
diff --git a/applications/luci-app-adblock/po/ja/adblock.po b/applications/luci-app-adblock/po/ja/adblock.po
index 74efb52df..dd8c8af14 100644
--- a/applications/luci-app-adblock/po/ja/adblock.po
+++ b/applications/luci-app-adblock/po/ja/adblock.po
@@ -8,14 +8,10 @@ msgstr ""
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.2.1\n"
+"X-Generator: Poedit 2.2.3\n"
 "Language: ja\n"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
-msgid "'Jail' Blocklist Creation"
-msgstr "'Jail' ブロックリストの作成"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:70
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:78
 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!"
@@ -33,15 +29,15 @@ msgstr "アクション"
 msgid "Adblock"
 msgstr "Adblock"
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:141
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:151
 msgid "Adblock Status"
 msgstr "Adblock ステータス"
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:147
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:157
 msgid "Adblock Version"
 msgstr "Adblock バージョン"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:179
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:182
 msgid "Additional trigger delay in seconds before adblock processing begins."
 msgstr "Adblock の処理が開始されるまでの、追加の遅延時間（秒）です。"
 
@@ -54,22 +50,23 @@ msgstr "詳細設定"
 msgid "Answer"
 msgstr "回答"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:96
 msgid "Archive Categories"
 msgstr "アーカイブ カテゴリ"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:146
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:181
 msgid "Backup Directory"
 msgstr "バックアップ先 ディレクトリ"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:123
-msgid "Backup Mode"
-msgstr "バックアップ モード"
-
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:106
 msgid "Blacklist"
 msgstr "ブラックリスト"
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:169
+msgid "Blacklist File"
+msgstr "ブラックリスト ファイル"
+
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:274
 msgid "Blocked DNS Queries"
 msgstr "ブロックされた DNS クエリ"
@@ -79,7 +76,7 @@ msgstr "ブロックされた DNS クエリ"
 msgid "Blocked Domain"
 msgstr "ブロックされたドメイン"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:69
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:77
 msgid "Blocklist Sources"
 msgstr "ブロックリスト提供元"
 
@@ -87,15 +84,7 @@ msgstr "ブロックリスト提供元"
 msgid "Blocklist not found!"
 msgstr "ブロックリストが見つかりません！"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:155
-msgid ""
-"Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all "
-"domains except those listed in the whitelist file."
-msgstr ""
-"ホワイトリストに列挙されたものを除く全てのドメインをブロックする、追加の "
-"'Jail' リスト (/tmp/adb_list.jail) を作成します。"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:48
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:56
 msgid ""
 "Choose 'none' to disable automatic startups, 'timed' to use a classic "
 "timeout (default 30 sec.) or select another trigger interface."
@@ -129,44 +118,70 @@ msgstr ""
 msgid "Count"
 msgstr "カウント"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113
-msgid ""
-"Create compressed blocklist backups, they will be used in case of download "
-"errors or during startup in backup mode."
-msgstr ""
-"圧縮されたブロックリストのバックアップを作成します。これは、リストのダウン"
-"ロードがエラーの場合、またはバックアップ モードでサービスを起動した場合に使用"
-"されます。"
-
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:24
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:159
 msgid "DNS Backend (DNS Directory)"
 msgstr "DNS バックエンド（DNS ディレクトリ）"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:167
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:169
+msgid "DNS Backend, DNS Directory"
+msgstr "DNS バックエンド, DNS ディレクトリ"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:34
+msgid "DNS Blocking Variant"
+msgstr "DNS ブロック種別"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:164
 msgid "DNS Directory"
 msgstr "DNS ディレクトリ"
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:127
+msgid "DNS File Reset"
+msgstr "DNS ファイル リセット"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:197
+msgid "DNS Inotify"
+msgstr "DNS Inotify"
+
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:20
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:134
 msgid "DNS Query Report"
 msgstr "DNS クエリ レポート"
 
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:175
+msgid "DNS Variant, DNS File Reset"
+msgstr "DNS 種別, DNS ファイル リセット"
+
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:81
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
 msgid "Date"
 msgstr "日付"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
 msgid "Description"
 msgstr "説明"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:124
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:198
 msgid ""
-"Do not automatically update blocklists during startup, use blocklist backups "
-"instead."
+"Disable adblock triggered restarts and the 'DNS File Reset' for dns backends "
+"with autoload features."
 msgstr ""
-"サービス起動時にブロックリストを自動的に更新せず、代わりにバックアップされた"
-"ブロックリストを使用します。"
+"自動読み込み機能を持つ DNS バックエンドのため、adblockが引き起こす再起動と "
+"'DNS ファイル リセット' を無効にします。"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187
+msgid ""
+"Disable the toplevel domain compression, if the number of blocked domains is "
+"greater than this threshold."
+msgstr ""
+"ブロックされたドメイン数がこの閾値を超える場合、トップレベル ドメインの圧縮を"
+"無効にします。"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
+msgid ""
+"Dnsmasq also supports 'null' block variants, which may provide better "
+"response times."
+msgstr ""
+"Dnsmasq は、より応答時間に優れることがあるブロック種別 'null' も提供します。"
 
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:28
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:71
@@ -179,14 +194,38 @@ msgstr "ドメイン"
 msgid "Domain/Client/Date/Time"
 msgstr "ドメイン / クライアント / 日付 / 時刻"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:43
 msgid "Download Utility"
 msgstr "ダウンロード ユーティリティ"
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:153
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:163
 msgid "Download Utility (SSL Library)"
 msgstr "ダウンロード ユーティリティ（SSL ライブラリ）"
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:152
+msgid "E-Mail Notification"
+msgstr "Eメール通知"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
+msgid "E-Mail Notification Count"
+msgstr "Eメール通知カウント"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
+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"
+msgstr "Eメール送信アドレス"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:250
+msgid "E-Mail Topic"
+msgstr "Eメール題名"
+
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
 msgid "Edit Blacklist"
 msgstr "ブラックリストの編集"
@@ -199,32 +238,16 @@ msgstr "設定の編集"
 msgid "Edit Whitelist"
 msgstr "ホワイトリストの編集"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
-msgid "Email Notification"
-msgstr "メール通知"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160
-msgid "Email Notification Count"
-msgstr "メール通知カウント"
-
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:20
 msgid "Enable Adblock"
 msgstr "Adblock の有効化"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:112
-msgid "Enable Blocklist Backup"
-msgstr "ブロックリスト バックアップの有効化"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
-msgid "Enable DNS Query Report"
-msgstr "DNS クエリ レポートの有効化"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:98
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:106
 msgid "Enable verbose debug logging in case of any processing error."
 msgstr ""
 "何らかの処理エラーが発生した場合に、詳細なデバッグ ログを有効にします。"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:73
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:81
 msgid "Enabled"
 msgstr "有効"
 
@@ -232,7 +255,7 @@ msgstr "有効"
 msgid "End Date"
 msgstr "終了日"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
 msgid "Extra Options"
 msgstr "拡張オプション"
 
@@ -248,11 +271,11 @@ msgstr ""
 "DNS クエリの結果セットを、指定したドメインやクライアント、日時によってフィル"
 "タします。"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:203
 msgid "Flush DNS Cache"
 msgstr "DNS キャッシュのクリア"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:184
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:204
 msgid "Flush DNS Cache after adblock processing."
 msgstr "Adblock 処理の後に DNS キャッシュをクリアします。"
 
@@ -264,7 +287,7 @@ msgstr ""
 "詳細な情報は <a href=\"%s\" target=\"_blank\">オンライン ドキュメント</a> を"
 "確認してください。"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:130
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:122
 msgid ""
 "For further performance improvements you can raise this value, e.g. '8' or "
 "'16' should be safe."
@@ -272,15 +295,19 @@ msgstr ""
 "パフォーマンスの更なる改善のため、安全と思われる '8' や '16' などの値に引き上"
 "げることができます。"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:108
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
 msgid "Force Local DNS"
 msgstr "ローカル DNS の強制"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:173
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:170
+msgid "Full path to the blacklist file."
+msgstr "ブラックリスト ファイルへのフルパスです。"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:176
 msgid "Full path to the whitelist file."
 msgstr "ホワイトリスト ファイルへのフルパスです。"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
+#: 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 "
 "on demand."
@@ -294,7 +321,7 @@ msgstr ""
 msgid "Input file not found, please check your configuration."
 msgstr "入力ファイルが見つかりません。設定を確認してください。"
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:171
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:193
 msgid "Last Run"
 msgstr "最終実行"
 
@@ -302,7 +329,7 @@ msgstr "最終実行"
 msgid "Latest DNS Queries"
 msgstr "最新の DNS クエリ"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:55
 msgid ""
 "List of available network interfaces. Usually the startup will be triggered "
 "by the 'wan' interface."
@@ -317,25 +344,42 @@ msgstr ""
 "サポートされる DNS バックエンドと、それぞれのデフォルトのリスト出力先の一覧で"
 "す。"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+msgid ""
+"List of supported DNS blocking variants. By default 'nxdomain' will be used "
+"for all DNS backends."
+msgstr ""
+"DNS ブロック種別の一覧です。デフォルトの 'nxdomain' は全ての DNS バックエンド"
+"に使用されます。"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:44
 msgid "List of supported and fully pre-configured download utilities."
 msgstr "サポートされ、かつ設定済のダウンロード ユーティリティの一覧です。"
 
 #: applications/luci-app-adblock/luasrc/view/adblock/query.htm:21
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:221
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:90
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:98
 msgid "Loading"
 msgstr "読込中"
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:192
+msgid "Local FW/DNS Ports"
+msgstr "ローカル FW/DNS ポート"
+
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:22
 msgid "Logfile"
 msgstr "ログファイル"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109
 msgid "Low Priority Service"
 msgstr "低優先度サービス"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:256
+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
 msgid "Max. Download Queue"
 msgstr "ダウンロード キューの上限"
 
@@ -344,16 +388,16 @@ msgstr "ダウンロード キューの上限"
 msgid "Name / IP-Address"
 msgstr "名前 / IP アドレス"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:82
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:90
 msgid "No"
 msgstr "いいえ"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:95
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:103
 msgid ""
 "Options for further tweaking in case the defaults are not suitable for you."
 msgstr "デフォルト設定が適切でない場合、追加で設定するためのオプションです。"
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:165
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:187
 msgid "Overall Domains"
 msgstr "全体のドメイン"
 
@@ -377,13 +421,13 @@ msgstr ""
 msgid "Please edit this file directly in a terminal session."
 msgstr "ターミナル セッションで直接このファイルを編集してください。"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:149
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
 msgid "Please note: this needs manual 'msmtp' package installation and setup."
 msgstr ""
 "注意: これは手動での 'msmtp' パッケージのインストールとセットアップを必要とし"
 "ます。"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:137
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
 msgid "Please note: this needs manual 'tcpdump-mini' package installation."
 msgstr ""
 "注意: これは手動での 'tcpdump-mini' パッケージのインストールを必要とします。"
@@ -396,30 +440,34 @@ msgstr "検索"
 msgid "Query domains"
 msgstr "ドメインの検索"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:161
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:261
 msgid ""
-"Raise the minimum email notification count, to get emails if the overall "
-"count is less or equal to the given limit (default 0),"
+"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）。"
+"メール通知を行うメール通知カウントを設定します。全体カウントが指定された値以"
+"下の場合、メールを受け取ります。（規定値: 0）"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
+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, apply to udp "
-"and tcp protocol on ports 53, 853 and 5353."
+"Redirect all DNS queries from 'lan' zone to the local resolver, applies to "
+"udp and tcp protocol on ports 53, 853 and 5353."
 msgstr ""
 "'lan' ゾーンからの全 DNS クエリをローカル リゾルバにリダイレクトします。これ"
 "は、53, 853, 5353 の各ポートにおける UDP, TCP プロトコルに適用されます。"
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:22
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:33
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:44
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:103
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:28
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:39
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:50
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:111
 msgid "Refresh"
 msgstr "リフレッシュ"
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:186
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:208
 msgid "Refresh Blocklist Sources"
 msgstr "ブロックリスト提供元のリフレッシュ"
 
@@ -427,35 +475,35 @@ msgstr "ブロックリスト提供元のリフレッシュ"
 msgid "Refresh Report"
 msgstr "レポートをリフレッシュ"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:211
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:231
 msgid "Report Chunk Count"
 msgstr "レポート チャンクカウント"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:218
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:238
 msgid "Report Chunk Size"
 msgstr "レポート チャンクサイズ"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:139
 msgid "Report Directory"
 msgstr "レポート ディレクトリ"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:188
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:208
 msgid "Report Interface"
 msgstr "レポート インターフェース"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:205
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:225
 msgid "Report Listen Port(s)"
 msgstr "レポート待ち受けポート"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:212
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:232
 msgid "Report chunk count used by tcpdump (default '5')."
 msgstr "tcpdump により使用される、レポートチャンク数です。（規定値: '5'）"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:219
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:239
 msgid "Report chunk size used by tcpdump in MB (default '1')."
 msgstr "tcpdump により使用される、レポート チャンクサイズです。（規定値: '1'）"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:189
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:209
 msgid ""
 "Reporting interface used by tcpdump, set to 'any' for multiple interfaces "
 "(default 'br-lan')."
@@ -463,15 +511,23 @@ msgstr ""
 "tcpdump により使用される、レポートを行うインターフェースです。複数のインター"
 "フェースを使用するには、 'any' を設定してください。（規定値: 'br-lan'）"
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:31
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+msgid ""
+"Resets the final DNS blockfile 'adb_list.overall' after loading through the "
+"DNS backend."
+msgstr ""
+"最終的な DNS ブロックファイル 'adb_list.overall' を、DNS バックエンドを通して"
+"読み込み後にリセットします。"
+
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:37
 msgid "Resume"
 msgstr "再開"
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:139
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:149
 msgid "Runtime Information"
-msgstr "実行情報"
+msgstr "ランタイム情報"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:76
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84
 msgid "SSL req."
 msgstr "SSL 必須"
 
@@ -481,14 +537,18 @@ msgstr "SSL 必須"
 msgid "Save"
 msgstr "保存"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:148
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
 msgid ""
-"Send notification emails in case of a processing error or if domain count is "
-"&le; 0."
+"Send notification E-Mails in case of a processing error or if domain count "
+"is &le; 0."
 msgstr ""
 "処理エラーまたはドメイン カウントが 0 以下の場合、通知メールを送信します。"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:246
+msgid "Sender address for adblock notification E-Mails."
+msgstr "adblock 通知メールの送信アドレスです。"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:110
 msgid ""
 "Set the nice level to 'low priority' and the adblock background processing "
 "will take fewer resources from the system."
@@ -496,15 +556,22 @@ msgstr ""
 "nice値（優先度）を '低優先度' に設定し、adblock バックグラウンド処理のシステ"
 "ムリソース使用量を抑制します。"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:129
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:121
 msgid ""
 "Size of the download queue to handle downloads &amp; list processing in "
-"parallel (default '8')."
+"parallel (default '4')."
 msgstr ""
 "ダウンロードの制御とリストの処理を同時並行的に行う、ダウンロードキューのサイ"
-"ズです。（規定値: '8'）"
+"ズです。（規定値: '4'）"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:193
+msgid ""
+"Space separated list of firewall ports which should be redirected locally."
+msgstr ""
+"スペースで区切られた、ローカルにリダイレクトされるファイアウォール ポートのリ"
+"ストです。"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:206
+#: 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 ""
@@ -515,37 +582,41 @@ msgstr ""
 msgid "Start Date"
 msgstr "開始日"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:46
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:54
 msgid "Startup Trigger"
 msgstr "スタートアップ トリガ"
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:20
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:42
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:101
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:26
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:48
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:109
 msgid "Suspend"
 msgstr "一時停止"
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:178
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:200
 msgid "Suspend / Resume Adblock"
 msgstr "Adblock の一時停止 / 再開"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:186
+msgid "TLD Compression Threshold"
+msgstr "TLD 圧縮閾値"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
 msgid ""
-"Target directory for adblock backups. Please use only a non-volatile disk, e."
-"g. an external usb stick."
+"Target directory for adblock source backups. Default is '/tmp', please use "
+"preferably a non-volatile disk if available."
 msgstr ""
-"adblock バックアップの保存先ディレクトリです。不揮発性ディスクのみを使用して"
-"ください。（例: 外部 USB スティック）"
+"adblock ソースをバックアップする対象ディレクトリです。デフォルトは '/tmp' で"
+"すが、可能であれば不揮発性ディスクを使用して下さい。"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:141
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
 msgid ""
-"Target directory for dns related report files. Please use preferably a non-"
-"volatile disk, e.g. an external usb stick."
+"Target directory for dns related report files. Default is '/tmp', please use "
+"preferably a non-volatile disk if available."
 msgstr ""
-"DNS 関連レポートファイルの保存先ディレクトリです。可能であれば不揮発性ディス"
-"クを使用してください。（例: 外部 USB スティック）"
+"DNS 関連レポート ファイルの保存先ディレクトリです。デフォルトは '/tmp' です"
+"が、可能であれば不揮発性ディスクを使用してください。"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:168
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:165
 msgid "Target directory for the generated blocklist 'adb_list.overall'."
 msgstr "生成されたブロックリスト 'adb_list.overall' の保存先ディレクトリです。"
 
@@ -561,11 +632,11 @@ msgstr ""
 msgid "The syslog output, pre-filtered for adblock related messages only."
 msgstr "Adblock に関連するメッセージのみが抽出された、システムログ出力です。"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:103
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:190
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:207
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:213
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:220
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:111
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:210
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:227
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:233
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:240
 msgid "This change requires a manual service stop/re-start to take effect."
 msgstr "この変更の反映には、手動でのサービスの停止 / 再起動が必要です。"
 
@@ -599,6 +670,14 @@ msgstr ""
 "このフォームでは、現在有効なリスト内で特定のドメインを検索することができま"
 "す。例: ホワイトリスト内"
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:129
+msgid ""
+"This option saves an enormous amount of storage space, but starts a small "
+"ubus/adblock monitor in the background."
+msgstr ""
+"このオプションはストレージ容量の大きな節約となりますが、バックグラウンドで小"
+"さな ubus/adblock モニターを開始します。"
+
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:82
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
 msgid "Time"
@@ -616,15 +695,19 @@ msgstr ""
 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."
+msgstr "adblock 通知メールの題名です。"
+
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
 msgid "Total DNS Queries"
 msgstr "総 DNS クエリ"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:178
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:181
 msgid "Trigger Delay"
 msgstr "トリガ遅延"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:97
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:105
 msgid "Verbose Debug Logging"
 msgstr "詳細なデバッグ ログ"
 
@@ -636,25 +719,18 @@ msgstr "コマンド実行中です..."
 msgid "Whitelist"
 msgstr "ホワイトリスト"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:175
 msgid "Whitelist File"
 msgstr "ホワイトリスト ファイル"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
 msgid "Yes"
 msgstr "はい"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:156
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:262
 msgid ""
-"You can use this restrictive blocklist e.g. for guest wifi or kidsafe "
-"configurations."
+"e.g. to receive an E-Mail notification with every adblock run set this value "
+"to 200000."
 msgstr ""
-"この制約の厳しいブロックリストを、ゲスト WiFi や子供の安全を守る設定などに手"
-"動で利用することができます。"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:162
-msgid ""
-"e.g. to receive an email notification with every adblock update set this "
-"value to 150000."
-msgstr ""
-"例: Adblock のアップデート毎にメールを受け取るには、150000 に設定します。"
+"例: adblock の実行ごとに Eメール通知を受け取るには、値を 200000 に設定しま"
+"す。"
diff --git a/applications/luci-app-adblock/po/pt-br/adblock.po b/applications/luci-app-adblock/po/pt-br/adblock.po
index e0d2d790f..e524951c1 100644
--- a/applications/luci-app-adblock/po/pt-br/adblock.po
+++ b/applications/luci-app-adblock/po/pt-br/adblock.po
@@ -12,11 +12,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "Language: pt_BR\n"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
-msgid "'Jail' Blocklist Creation"
-msgstr "'Enjaule' Criação de Lista Negra"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:70
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:78
 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!"
@@ -34,15 +30,15 @@ msgstr ""
 msgid "Adblock"
 msgstr "Adblock"
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:141
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:151
 msgid "Adblock Status"
 msgstr "Estado do Adblock"
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:147
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:157
 msgid "Adblock Version"
 msgstr "Versão do Adblock"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:179
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:182
 msgid "Additional trigger delay in seconds before adblock processing begins."
 msgstr ""
 "Atraso de gatilho adicional em segundos antes do processamento do adblock "
@@ -57,22 +53,23 @@ msgstr "Avançado"
 msgid "Answer"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:96
 msgid "Archive Categories"
 msgstr "Categorias Arquivadas"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:146
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:181
 msgid "Backup Directory"
 msgstr "Diretório da cópia de segurança"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:123
-msgid "Backup Mode"
-msgstr "Modo de Backup"
-
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:106
 msgid "Blacklist"
 msgstr ""
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:169
+msgid "Blacklist File"
+msgstr ""
+
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:274
 msgid "Blocked DNS Queries"
 msgstr ""
@@ -82,7 +79,7 @@ msgstr ""
 msgid "Blocked Domain"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:69
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:77
 msgid "Blocklist Sources"
 msgstr "Fontes de listas de bloqueio"
 
@@ -90,15 +87,7 @@ msgstr "Fontes de listas de bloqueio"
 msgid "Blocklist not found!"
 msgstr "Lista preta não encontrada!"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:155
-msgid ""
-"Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all "
-"domains except those listed in the whitelist file."
-msgstr ""
-"Cria uma lista adicional (/tmp/adb_list.jail) para bloquear o acesso a todos "
-"os domínios exceto aqueles listados na lista branca."
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:48
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:56
 msgid ""
 "Choose 'none' to disable automatic startups, 'timed' to use a classic "
 "timeout (default 30 sec.) or select another trigger interface."
@@ -132,44 +121,65 @@ msgstr ""
 msgid "Count"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113
-msgid ""
-"Create compressed blocklist backups, they will be used in case of download "
-"errors or during startup in backup mode."
-msgstr ""
-"Cria cópias de segurança comprimidas das listas de bloqueios. Elas serão "
-"usadas em caso de falha ao baixar novas listas ou ao iniciar em modo de "
-"backup."
-
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:24
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:159
 msgid "DNS Backend (DNS Directory)"
 msgstr "Serviço DNS (Diretório DNS)"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:167
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:169
+msgid "DNS Backend, DNS Directory"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:34
+msgid "DNS Blocking Variant"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:164
 msgid "DNS Directory"
 msgstr "Diretório DNS"
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:127
+msgid "DNS File Reset"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:197
+msgid "DNS Inotify"
+msgstr ""
+
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:20
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:134
 msgid "DNS Query Report"
 msgstr ""
 
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:175
+msgid "DNS Variant, DNS File Reset"
+msgstr ""
+
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:81
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
 msgid "Date"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
 msgid "Description"
 msgstr "Descrição"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:124
+#: 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 "
+"with autoload features."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187
+msgid ""
+"Disable the toplevel domain compression, if the number of blocked domains is "
+"greater than this threshold."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
 msgid ""
-"Do not automatically update blocklists during startup, use blocklist backups "
-"instead."
+"Dnsmasq also supports 'null' block variants, which may provide better "
+"response times."
 msgstr ""
-"Não atualize as listas de bloqueio automaticamente durante o início, use o "
-"backup das listas como alternativa."
 
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:28
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:71
@@ -182,14 +192,38 @@ msgstr ""
 msgid "Domain/Client/Date/Time"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:43
 msgid "Download Utility"
 msgstr "Ferramenta para Baixar"
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:153
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:163
 msgid "Download Utility (SSL Library)"
 msgstr "Utilitário de Download (Biblioteca SSL)"
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:152
+msgid "E-Mail Notification"
+msgstr ""
+
+#: 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:255
+msgid "E-Mail Profile"
+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:245
+msgid "E-Mail Sender Address"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:250
+msgid "E-Mail Topic"
+msgstr ""
+
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
 msgid "Edit Blacklist"
 msgstr "Editar Lista de Bloqueio"
@@ -202,33 +236,17 @@ msgstr "Editar Configuração"
 msgid "Edit Whitelist"
 msgstr "Editar Lista Permitida"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
-msgid "Email Notification"
-msgstr "Notificação por Email"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160
-msgid "Email Notification Count"
-msgstr "Quantidade para Notificação por Email"
-
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:20
 msgid "Enable Adblock"
 msgstr "Habilitar adblock"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:112
-msgid "Enable Blocklist Backup"
-msgstr "Habilitar cópia de segurança da lista de bloqueio"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
-msgid "Enable DNS Query Report"
-msgstr ""
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:98
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:106
 msgid "Enable verbose debug logging in case of any processing error."
 msgstr ""
 "Habilita os registros de depuração detalhados em caso de qualquer erro de "
 "processamento."
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:73
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:81
 msgid "Enabled"
 msgstr "Habilitado"
 
@@ -236,7 +254,7 @@ msgstr "Habilitado"
 msgid "End Date"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
 msgid "Extra Options"
 msgstr "Opções adicionais"
 
@@ -250,11 +268,11 @@ msgid ""
 "frame."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:203
 msgid "Flush DNS Cache"
 msgstr "Limpar cache DNS"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:184
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:204
 msgid "Flush DNS Cache after adblock processing."
 msgstr "Limpar cache DNS depois do processamento do adblock."
 
@@ -266,7 +284,7 @@ msgstr ""
 "Para mais informações <a href=\"%s\" target=\"_blank\">veja a documentação "
 "externa</a>"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:130
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:122
 msgid ""
 "For further performance improvements you can raise this value, e.g. '8' or "
 "'16' should be safe."
@@ -274,15 +292,19 @@ msgstr ""
 "Para melhoramentos no desempenho, você pode aumentar este valor (ex: '8' ou "
 "'16' deve ser seguro)."
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:108
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
 msgid "Force Local DNS"
 msgstr "Force o DNS local"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:173
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:170
+msgid "Full path to the blacklist file."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:176
 msgid "Full path to the whitelist file."
 msgstr "Caminho completo para a lista branca."
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
+#: 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 "
 "on demand."
@@ -294,7 +316,7 @@ msgstr ""
 msgid "Input file not found, please check your configuration."
 msgstr "Arquivo de entrada não encontrado, por favor cheque sua configuração."
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:171
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:193
 msgid "Last Run"
 msgstr "Última Execução"
 
@@ -302,7 +324,7 @@ msgstr "Última Execução"
 msgid "Latest DNS Queries"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:55
 msgid ""
 "List of available network interfaces. Usually the startup will be triggered "
 "by the 'wan' interface."
@@ -317,25 +339,39 @@ msgstr ""
 "Lista dos serviços DNS suportados com seu diretório padrão de exportação de "
 "lista."
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+msgid ""
+"List of supported DNS blocking variants. By default 'nxdomain' will be used "
+"for all DNS backends."
+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 suportadas para baixar listas."
 
 #: applications/luci-app-adblock/luasrc/view/adblock/query.htm:21
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:221
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:90
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:98
 msgid "Loading"
 msgstr "Carregando"
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:192
+msgid "Local FW/DNS Ports"
+msgstr ""
+
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:22
 msgid "Logfile"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109
 msgid "Low Priority Service"
 msgstr "Serviço de Baixa Prioridade"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:256
+msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
 msgid "Max. Download Queue"
 msgstr "Tamanho Máximo da Fila"
 
@@ -344,18 +380,18 @@ msgstr "Tamanho Máximo da Fila"
 msgid "Name / IP-Address"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:82
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:90
 msgid "No"
 msgstr "Não"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:95
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:103
 msgid ""
 "Options for further tweaking in case the defaults are not suitable for you."
 msgstr ""
 "Opções para aprimoramentos adicionais caso as opções padrão não sejam "
 "suficientes para você."
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:165
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:187
 msgid "Overall Domains"
 msgstr "Domínios Globais"
 
@@ -379,11 +415,11 @@ msgstr ""
 msgid "Please edit this file directly in a terminal session."
 msgstr "Por favor edite esse arquivo direto em uma sessão de terminal."
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:149
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
 msgid "Please note: this needs manual 'msmtp' package installation and setup."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:137
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
 msgid "Please note: this needs manual 'tcpdump-mini' package installation."
 msgstr ""
 
@@ -395,30 +431,30 @@ msgstr "Consulta"
 msgid "Query domains"
 msgstr "Consulta de domínios"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:161
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:261
 msgid ""
-"Raise the minimum email notification count, to get emails if the overall "
-"count is less or equal to the given limit (default 0),"
+"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 quantidade mínima para notificar por email para receber mensagens "
-"se a contagem total for menos ou igual a este limite (padrão 0)."
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
+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, apply to udp "
-"and tcp protocol on ports 53, 853 and 5353."
+"Redirect all DNS queries from 'lan' zone to the local resolver, applies to "
+"udp and tcp protocol on ports 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."
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:22
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:33
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:44
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:103
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:28
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:39
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:50
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:111
 msgid "Refresh"
 msgstr "Atualizar"
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:186
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:208
 msgid "Refresh Blocklist Sources"
 msgstr "Atualizar as Fontes de Lista Negra"
 
@@ -426,49 +462,55 @@ msgstr "Atualizar as Fontes de Lista Negra"
 msgid "Refresh Report"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:211
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:231
 msgid "Report Chunk Count"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:218
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:238
 msgid "Report Chunk Size"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:139
 msgid "Report Directory"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:188
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:208
 msgid "Report Interface"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:205
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:225
 msgid "Report Listen Port(s)"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:212
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:232
 msgid "Report chunk count used by tcpdump (default '5')."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:219
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:239
 msgid "Report chunk size used by tcpdump in MB (default '1')."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:189
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:209
 msgid ""
 "Reporting interface used by tcpdump, set to 'any' for multiple interfaces "
 "(default 'br-lan')."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:31
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+msgid ""
+"Resets the final DNS blockfile 'adb_list.overall' after loading through the "
+"DNS backend."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:37
 msgid "Resume"
 msgstr "Continuar"
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:139
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:149
 msgid "Runtime Information"
 msgstr "Informação de execução"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:76
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84
 msgid "SSL req."
 msgstr "Req. de SSL"
 
@@ -478,15 +520,17 @@ msgstr "Req. de SSL"
 msgid "Save"
 msgstr "Salvar"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:148
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
 msgid ""
-"Send notification emails in case of a processing error or if domain count is "
-"&le; 0."
+"Send notification E-Mails in case of a processing error or if domain count "
+"is &le; 0."
 msgstr ""
-"Enviar notificações por email se ocorrer um erro de processamento ou se a "
-"contagem por domínio for menor que 0."
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:246
+msgid "Sender address for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:110
 msgid ""
 "Set the nice level to 'low priority' and the adblock background processing "
 "will take fewer resources from the system."
@@ -494,13 +538,20 @@ msgstr ""
 "Define o nível de prioridade para 'baixa', reduzindo o impacto do "
 "processamento em segundo plano do adblock no seu sistema."
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:129
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:121
 msgid ""
 "Size of the download queue to handle downloads &amp; list processing in "
-"parallel (default '8')."
+"parallel (default '4')."
+msgstr ""
+"Tamanho da fila responsável por baixar e processamento em paralelo (padrão "
+"'4')."
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:193
+msgid ""
+"Space separated list of firewall ports which should be redirected locally."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:206
+#: 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 ""
@@ -509,33 +560,37 @@ msgstr ""
 msgid "Start Date"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:46
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:54
 msgid "Startup Trigger"
 msgstr "Gatilho de Iniciação"
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:20
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:42
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:101
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:26
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:48
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:109
 msgid "Suspend"
 msgstr "Suspender"
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:178
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:200
 msgid "Suspend / Resume Adblock"
 msgstr "Suspender / Resumir adblock"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:186
+msgid "TLD Compression Threshold"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
 msgid ""
-"Target directory for adblock backups. Please use only a non-volatile disk, e."
-"g. an external usb stick."
+"Target directory for adblock source backups. Default is '/tmp', please use "
+"preferably a non-volatile disk if available."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:141
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
 msgid ""
-"Target directory for dns related report files. Please use preferably a non-"
-"volatile disk, e.g. an external usb stick."
+"Target directory for dns related report files. Default is '/tmp', please use "
+"preferably a non-volatile disk if available."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:168
+#: 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 para a lista nega gerada 'adb_list.overall'."
 
@@ -550,11 +605,11 @@ msgstr ""
 msgid "The syslog output, pre-filtered for adblock related messages only."
 msgstr "Mensagens do syslog relacionadas ao adblock."
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:103
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:190
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:207
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:213
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:220
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:111
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:210
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:227
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:233
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:240
 msgid "This change requires a manual service stop/re-start to take effect."
 msgstr "Esta mudança requer um reinício manual do serviço para ser efetivada."
 
@@ -584,6 +639,12 @@ msgstr ""
 "Esse formulário permite que você consulte listas de blocos ativos para "
 "certos domínios, e.x. para listas de permissão."
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:129
+msgid ""
+"This option saves an enormous amount of storage space, but starts a small "
+"ubus/adblock monitor in the background."
+msgstr ""
+
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:82
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
 msgid "Time"
@@ -601,15 +662,19 @@ msgstr ""
 msgid "Top 10 Reporting"
 msgstr ""
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:251
+msgid "Topic for adblock notification E-Mails."
+msgstr ""
+
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
 msgid "Total DNS Queries"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:178
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:181
 msgid "Trigger Delay"
 msgstr "Atraso no gatilho"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:97
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:105
 msgid "Verbose Debug Logging"
 msgstr "Registros de Depuração Detalhados"
 
@@ -621,27 +686,84 @@ msgstr "Aguardando por comando para completar..."
 msgid "Whitelist"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:175
 msgid "Whitelist File"
 msgstr "Lista Branca"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
 msgid "Yes"
 msgstr "Sim"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:156
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:262
 msgid ""
-"You can use this restrictive blocklist e.g. for guest wifi or kidsafe "
-"configurations."
+"e.g. to receive an E-Mail notification with every adblock run set this value "
+"to 200000."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:162
-msgid ""
-"e.g. to receive an email notification with every adblock update set this "
-"value to 150000."
-msgstr ""
-"ex: para receber notificação por email a cada atualização do adblock, ajuste "
-"este valor para 150000."
+#~ msgid "'Jail' Blocklist Creation"
+#~ msgstr "'Enjaule' Criação de Lista Negra"
+
+#~ msgid "Backup Mode"
+#~ msgstr "Modo de Backup"
+
+#~ msgid ""
+#~ "Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to "
+#~ "all domains except those listed in the whitelist file."
+#~ msgstr ""
+#~ "Cria uma lista adicional (/tmp/adb_list.jail) para bloquear o acesso a "
+#~ "todos os domínios exceto aqueles listados na lista branca."
+
+#~ msgid ""
+#~ "Create compressed blocklist backups, they will be used in case of "
+#~ "download errors or during startup in backup mode."
+#~ msgstr ""
+#~ "Cria cópias de segurança comprimidas das listas de bloqueios. Elas serão "
+#~ "usadas em caso de falha ao baixar novas listas ou ao iniciar em modo de "
+#~ "backup."
+
+#~ msgid ""
+#~ "Do not automatically update blocklists during startup, use blocklist "
+#~ "backups instead."
+#~ msgstr ""
+#~ "Não atualize as listas de bloqueio automaticamente durante o início, use "
+#~ "o backup das listas como alternativa."
+
+#~ msgid "Email Notification"
+#~ msgstr "Notificação por Email"
+
+#~ msgid "Email Notification Count"
+#~ msgstr "Quantidade para Notificação por Email"
+
+#~ msgid "Enable Blocklist Backup"
+#~ msgstr "Habilitar cópia de segurança da lista de bloqueio"
+
+#~ msgid ""
+#~ "Raise the minimum email notification count, to get emails if the overall "
+#~ "count is less or equal to the given limit (default 0),"
+#~ msgstr ""
+#~ "Aumente a quantidade mínima para notificar por email para receber "
+#~ "mensagens se a contagem total for menos ou igual a este limite (padrão 0)."
+
+#~ msgid ""
+#~ "Redirect all DNS queries from 'lan' zone to the local resolver, apply to "
+#~ "udp and tcp protocol on ports 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."
+
+#~ msgid ""
+#~ "Send notification emails in case of a processing error or if domain count "
+#~ "is &le; 0."
+#~ msgstr ""
+#~ "Enviar notificações por email se ocorrer um erro de processamento ou se a "
+#~ "contagem por domínio for menor que 0."
+
+#~ msgid ""
+#~ "e.g. to receive an email notification with every adblock update set this "
+#~ "value to 150000."
+#~ msgstr ""
+#~ "ex: para receber notificação por email a cada atualização do adblock, "
+#~ "ajuste este valor para 150000."
 
 #~ msgid ""
 #~ "Enable memory intense overall sort / duplicate removal on low memory "
@@ -657,13 +779,6 @@ msgstr ""
 #~ "Please note: this needs additional 'msmtp' package installation and setup."
 #~ msgstr "Nota: isto exige a instalação e configuração do pacote 'msmtp'."
 
-#~ msgid ""
-#~ "Size of the download queue to handle downloads &amp; list processing in "
-#~ "parallel (default '4')."
-#~ msgstr ""
-#~ "Tamanho da fila responsável por baixar e processamento em paralelo "
-#~ "(padrão '4')."
-
 #~ msgid ""
 #~ "Target directory for adblock backups. Please use only non-volatile disks, "
 #~ "e.g. an external usb stick."
diff --git a/applications/luci-app-adblock/po/ru/adblock.po b/applications/luci-app-adblock/po/ru/adblock.po
index a1ac817ba..4218abc69 100644
--- a/applications/luci-app-adblock/po/ru/adblock.po
+++ b/applications/luci-app-adblock/po/ru/adblock.po
@@ -15,11 +15,7 @@ msgstr ""
 "Project-Info: Это технический перевод, не дословный. Главное-удобный русский "
 "интерфейс, все проверялось в графическом режиме, совместим с другими apps\n"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
-msgid "'Jail' Blocklist Creation"
-msgstr "Создание Черного<br />списка 'Jail'"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:70
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:78
 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!"
@@ -37,15 +33,15 @@ msgstr ""
 msgid "Adblock"
 msgstr "AdBlock"
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:141
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:151
 msgid "Adblock Status"
 msgstr "Состояние Adblock"
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:147
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:157
 msgid "Adblock Version"
 msgstr "Версия Adblock"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:179
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:182
 msgid "Additional trigger delay in seconds before adblock processing begins."
 msgstr "Дополнительная задержка в секундах до начала работы Adblock."
 
@@ -58,22 +54,23 @@ msgstr "Дополнительно"
 msgid "Answer"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:96
 msgid "Archive Categories"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:146
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:181
 msgid "Backup Directory"
 msgstr "Папка для бэкапа"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:123
-msgid "Backup Mode"
-msgstr "Режим сохранения бекапа"
-
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:106
 msgid "Blacklist"
 msgstr ""
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:169
+msgid "Blacklist File"
+msgstr ""
+
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:274
 msgid "Blocked DNS Queries"
 msgstr ""
@@ -83,7 +80,7 @@ msgstr ""
 msgid "Blocked Domain"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:69
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:77
 msgid "Blocklist Sources"
 msgstr "Источники списков блокировок"
 
@@ -91,13 +88,7 @@ msgstr "Источники списков блокировок"
 msgid "Blocklist not found!"
 msgstr "Список блокировок не найден!"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:155
-msgid ""
-"Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all "
-"domains except those listed in the whitelist file."
-msgstr ""
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:48
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:56
 msgid ""
 "Choose 'none' to disable automatic startups, 'timed' to use a classic "
 "timeout (default 30 sec.) or select another trigger interface."
@@ -131,43 +122,65 @@ msgstr ""
 msgid "Count"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113
-msgid ""
-"Create compressed blocklist backups, they will be used in case of download "
-"errors or during startup in backup mode."
-msgstr ""
-"Создание сжатых резервных копий списков блокировок, они будут использоваться "
-"в случае ошибок загрузки или при запуске в ручном режиме."
-
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:24
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:159
 msgid "DNS Backend (DNS Directory)"
 msgstr "DNS бэкенд (папка DNS)"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:167
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:169
+msgid "DNS Backend, DNS Directory"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:34
+msgid "DNS Blocking Variant"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:164
 msgid "DNS Directory"
 msgstr "Папка DNS"
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:127
+msgid "DNS File Reset"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:197
+msgid "DNS Inotify"
+msgstr ""
+
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:20
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:134
 msgid "DNS Query Report"
 msgstr ""
 
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:175
+msgid "DNS Variant, DNS File Reset"
+msgstr ""
+
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:81
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
 msgid "Date"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
 msgid "Description"
 msgstr "Описание"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:124
+#: 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 "
+"with autoload features."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187
+msgid ""
+"Disable the toplevel domain compression, if the number of blocked domains is "
+"greater than this threshold."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
 msgid ""
-"Do not automatically update blocklists during startup, use blocklist backups "
-"instead."
+"Dnsmasq also supports 'null' block variants, which may provide better "
+"response times."
 msgstr ""
-"Не обновлять списки блокировок автоматически во время запуска, вместо этого "
-"использовать резервные копии списков блокировок."
 
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:28
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:71
@@ -180,14 +193,38 @@ msgstr ""
 msgid "Domain/Client/Date/Time"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:43
 msgid "Download Utility"
 msgstr "Утилита для скачивания"
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:153
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:163
 msgid "Download Utility (SSL Library)"
 msgstr "Утилита для скачивания (с библиотекой SSL)"
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:152
+msgid "E-Mail Notification"
+msgstr ""
+
+#: 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:255
+msgid "E-Mail Profile"
+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:245
+msgid "E-Mail Sender Address"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:250
+msgid "E-Mail Topic"
+msgstr ""
+
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
 msgid "Edit Blacklist"
 msgstr "Редактировать Черный список"
@@ -200,31 +237,15 @@ msgstr "Редактировать config файл"
 msgid "Edit Whitelist"
 msgstr "Редактировать Белый список"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
-msgid "Email Notification"
-msgstr "Email уведомления"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160
-msgid "Email Notification Count"
-msgstr "Кол-во email уведомлений"
-
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:20
 msgid "Enable Adblock"
 msgstr "Включить Adblock"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:112
-msgid "Enable Blocklist Backup"
-msgstr "Бэкап списка блокировок"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
-msgid "Enable DNS Query Report"
-msgstr ""
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:98
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:106
 msgid "Enable verbose debug logging in case of any processing error."
 msgstr "Включить подробное ведение журнала отладки в случае ошибок обработки."
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:73
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:81
 msgid "Enabled"
 msgstr "Включено"
 
@@ -232,7 +253,7 @@ msgstr "Включено"
 msgid "End Date"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
 msgid "Extra Options"
 msgstr "Дополнительные настройки"
 
@@ -246,11 +267,11 @@ msgid ""
 "frame."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:203
 msgid "Flush DNS Cache"
 msgstr "Очистка кэша DNS"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:184
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:204
 msgid "Flush DNS Cache after adblock processing."
 msgstr "Очистка DNS-кэша после обработки Adblock-ом."
 
@@ -262,7 +283,7 @@ msgstr ""
 "<br />Для получения дополнительной информации <a href=\"%s\" target=\"_blank"
 "\"> смотрите онлайн документацию</a>."
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:130
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:122
 msgid ""
 "For further performance improvements you can raise this value, e.g. '8' or "
 "'16' should be safe."
@@ -270,15 +291,19 @@ msgstr ""
 "Для дополнительного повышения производительности вы можете увеличить это "
 "значение, например значения '8' или '16' должны быть безопасными."
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:108
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
 msgid "Force Local DNS"
 msgstr "Локальный DNS"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:173
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:170
+msgid "Full path to the blacklist file."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:176
 msgid "Full path to the whitelist file."
 msgstr "Полный путь к файлу Белого списка."
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
+#: 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 "
 "on demand."
@@ -290,7 +315,7 @@ msgstr ""
 msgid "Input file not found, please check your configuration."
 msgstr "Config файл не найден, настройте config файл."
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:171
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:193
 msgid "Last Run"
 msgstr "Последний запуск"
 
@@ -298,7 +323,7 @@ msgstr "Последний запуск"
 msgid "Latest DNS Queries"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:55
 msgid ""
 "List of available network interfaces. Usually the startup will be triggered "
 "by the 'wan' interface."
@@ -309,7 +334,13 @@ msgid ""
 "List of supported DNS backends with their default list export directory."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+msgid ""
+"List of supported DNS blocking variants. By default 'nxdomain' will be used "
+"for all DNS backends."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:44
 msgid "List of supported and fully pre-configured download utilities."
 msgstr ""
 "Список поддерживаемых и полностью предварительно настроенных утилит для "
@@ -317,19 +348,27 @@ msgstr ""
 
 #: applications/luci-app-adblock/luasrc/view/adblock/query.htm:21
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:221
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:90
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:98
 msgid "Loading"
 msgstr "Загрузка"
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:192
+msgid "Local FW/DNS Ports"
+msgstr ""
+
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:22
 msgid "Logfile"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109
 msgid "Low Priority Service"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:256
+msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
 msgid "Max. Download Queue"
 msgstr "Максимальная очередь загрузки"
 
@@ -338,18 +377,18 @@ msgstr "Максимальная очередь загрузки"
 msgid "Name / IP-Address"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:82
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:90
 msgid "No"
 msgstr "Нет"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:95
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:103
 msgid ""
 "Options for further tweaking in case the defaults are not suitable for you."
 msgstr ""
 "Возможные варианты детальной настройки, если значения по умолчанию не "
 "подходят для вас."
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:165
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:187
 msgid "Overall Domains"
 msgstr "Всего доменов"
 
@@ -372,11 +411,11 @@ msgstr ""
 msgid "Please edit this file directly in a terminal session."
 msgstr "Редактируйте данный файл только в терминале."
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:149
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
 msgid "Please note: this needs manual 'msmtp' package installation and setup."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:137
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
 msgid "Please note: this needs manual 'tcpdump-mini' package installation."
 msgstr ""
 
@@ -388,26 +427,30 @@ msgstr "Запрос"
 msgid "Query domains"
 msgstr "Запрос доменов"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:161
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:261
 msgid ""
-"Raise the minimum email notification count, to get emails if the overall "
-"count is less or equal to the given limit (default 0),"
+"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:109
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
+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, apply to udp "
-"and tcp protocol on ports 53, 853 and 5353."
+"Redirect all DNS queries from 'lan' zone to the local resolver, applies to "
+"udp and tcp protocol on ports 53, 853 and 5353."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:22
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:33
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:44
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:103
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:28
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:39
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:50
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:111
 msgid "Refresh"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:186
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:208
 msgid "Refresh Blocklist Sources"
 msgstr ""
 
@@ -415,49 +458,55 @@ msgstr ""
 msgid "Refresh Report"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:211
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:231
 msgid "Report Chunk Count"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:218
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:238
 msgid "Report Chunk Size"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:139
 msgid "Report Directory"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:188
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:208
 msgid "Report Interface"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:205
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:225
 msgid "Report Listen Port(s)"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:212
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:232
 msgid "Report chunk count used by tcpdump (default '5')."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:219
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:239
 msgid "Report chunk size used by tcpdump in MB (default '1')."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:189
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:209
 msgid ""
 "Reporting interface used by tcpdump, set to 'any' for multiple interfaces "
 "(default 'br-lan')."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:31
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+msgid ""
+"Resets the final DNS blockfile 'adb_list.overall' after loading through the "
+"DNS backend."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:37
 msgid "Resume"
 msgstr "Возобновить"
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:139
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:149
 msgid "Runtime Information"
 msgstr "Информация о состоянии"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:76
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84
 msgid "SSL req."
 msgstr "Запрос SSL"
 
@@ -467,25 +516,34 @@ msgstr "Запрос SSL"
 msgid "Save"
 msgstr "Сохранить"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:148
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
 msgid ""
-"Send notification emails in case of a processing error or if domain count is "
-"&le; 0."
+"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:102
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:246
+msgid "Sender address for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:110
 msgid ""
 "Set the nice level to 'low priority' and the adblock background processing "
 "will take fewer resources from the system."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:129
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:121
 msgid ""
 "Size of the download queue to handle downloads &amp; list processing in "
-"parallel (default '8')."
+"parallel (default '4')."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:193
+msgid ""
+"Space separated list of firewall ports which should be redirected locally."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:206
+#: 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 ""
@@ -494,33 +552,37 @@ msgstr ""
 msgid "Start Date"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:46
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:54
 msgid "Startup Trigger"
 msgstr "Триггер запуска"
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:20
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:42
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:101
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:26
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:48
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:109
 msgid "Suspend"
 msgstr "Приостановить"
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:178
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:200
 msgid "Suspend / Resume Adblock"
 msgstr "Приостановить / Возобновить Adblock"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:186
+msgid "TLD Compression Threshold"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
 msgid ""
-"Target directory for adblock backups. Please use only a non-volatile disk, e."
-"g. an external usb stick."
+"Target directory for adblock source backups. Default is '/tmp', please use "
+"preferably a non-volatile disk if available."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:141
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
 msgid ""
-"Target directory for dns related report files. Please use preferably a non-"
-"volatile disk, e.g. an external usb stick."
+"Target directory for dns related report files. Default is '/tmp', please use "
+"preferably a non-volatile disk if available."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:168
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:165
 msgid "Target directory for the generated blocklist 'adb_list.overall'."
 msgstr "Папка для созданного списка блокировки 'adb_list.overall'."
 
@@ -536,11 +598,11 @@ msgstr ""
 msgid "The syslog output, pre-filtered for adblock related messages only."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:103
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:190
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:207
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:213
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:220
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:111
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:210
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:227
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:233
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:240
 msgid "This change requires a manual service stop/re-start to take effect."
 msgstr ""
 
@@ -570,6 +632,12 @@ msgstr ""
 "Данное поле позволяет запросить домены для конкретных списков, например для "
 "Белого списка."
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:129
+msgid ""
+"This option saves an enormous amount of storage space, but starts a small "
+"ubus/adblock monitor in the background."
+msgstr ""
+
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:82
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
 msgid "Time"
@@ -587,15 +655,19 @@ msgstr ""
 msgid "Top 10 Reporting"
 msgstr ""
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:251
+msgid "Topic for adblock notification E-Mails."
+msgstr ""
+
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
 msgid "Total DNS Queries"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:178
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:181
 msgid "Trigger Delay"
 msgstr "Задержка запуска"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:97
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:105
 msgid "Verbose Debug Logging"
 msgstr "Подробный журнал отладки"
 
@@ -607,27 +679,55 @@ msgstr "Ожидание завершения выполнения команд
 msgid "Whitelist"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:175
 msgid "Whitelist File"
 msgstr "Файл Белого списка"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
 msgid "Yes"
 msgstr "Да"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:156
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:262
 msgid ""
-"You can use this restrictive blocklist e.g. for guest wifi or kidsafe "
-"configurations."
+"e.g. to receive an E-Mail notification with every adblock run set this value "
+"to 200000."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:162
-msgid ""
-"e.g. to receive an email notification with every adblock update set this "
-"value to 150000."
-msgstr ""
-"например, чтобы получать email уведомления при каждом обновлении Adblock-а "
-"установите значение 150000."
+#~ msgid "'Jail' Blocklist Creation"
+#~ msgstr "Создание Черного<br />списка 'Jail'"
+
+#~ msgid "Backup Mode"
+#~ msgstr "Режим сохранения бекапа"
+
+#~ msgid ""
+#~ "Create compressed blocklist backups, they will be used in case of "
+#~ "download errors or during startup in backup mode."
+#~ msgstr ""
+#~ "Создание сжатых резервных копий списков блокировок, они будут "
+#~ "использоваться в случае ошибок загрузки или при запуске в ручном режиме."
+
+#~ msgid ""
+#~ "Do not automatically update blocklists during startup, use blocklist "
+#~ "backups instead."
+#~ msgstr ""
+#~ "Не обновлять списки блокировок автоматически во время запуска, вместо "
+#~ "этого использовать резервные копии списков блокировок."
+
+#~ msgid "Email Notification"
+#~ msgstr "Email уведомления"
+
+#~ msgid "Email Notification Count"
+#~ msgstr "Кол-во email уведомлений"
+
+#~ msgid "Enable Blocklist Backup"
+#~ msgstr "Бэкап списка блокировок"
+
+#~ msgid ""
+#~ "e.g. to receive an email notification with every adblock update set this "
+#~ "value to 150000."
+#~ msgstr ""
+#~ "например, чтобы получать email уведомления при каждом обновлении Adblock-"
+#~ "а установите значение 150000."
 
 #~ msgid ""
 #~ "Enable memory intense overall sort / duplicate removal on low memory "
diff --git a/applications/luci-app-adblock/po/sv/adblock.po b/applications/luci-app-adblock/po/sv/adblock.po
index 31ce45ba1..5d6ea6577 100644
--- a/applications/luci-app-adblock/po/sv/adblock.po
+++ b/applications/luci-app-adblock/po/sv/adblock.po
@@ -1,11 +1,7 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=UTF-8\n"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
-msgid "'Jail' Blocklist Creation"
-msgstr ""
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:70
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:78
 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!"
@@ -21,15 +17,15 @@ msgstr ""
 msgid "Adblock"
 msgstr "Adblock"
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:141
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:151
 msgid "Adblock Status"
 msgstr "Status för Adblock"
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:147
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:157
 msgid "Adblock Version"
 msgstr "Version av Adblock"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:179
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:182
 msgid "Additional trigger delay in seconds before adblock processing begins."
 msgstr ""
 
@@ -42,22 +38,23 @@ msgstr "Avancerat"
 msgid "Answer"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:96
 msgid "Archive Categories"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:146
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:181
 msgid "Backup Directory"
 msgstr "Säkerhetskopiera mapp"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:123
-msgid "Backup Mode"
-msgstr ""
-
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:106
 msgid "Blacklist"
 msgstr ""
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:169
+msgid "Blacklist File"
+msgstr ""
+
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:274
 msgid "Blocked DNS Queries"
 msgstr ""
@@ -67,7 +64,7 @@ msgstr ""
 msgid "Blocked Domain"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:69
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:77
 msgid "Blocklist Sources"
 msgstr "Källor för blockeringslistor"
 
@@ -75,13 +72,7 @@ msgstr "Källor för blockeringslistor"
 msgid "Blocklist not found!"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:155
-msgid ""
-"Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all "
-"domains except those listed in the whitelist file."
-msgstr ""
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:48
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:56
 msgid ""
 "Choose 'none' to disable automatic startups, 'timed' to use a classic "
 "timeout (default 30 sec.) or select another trigger interface."
@@ -115,41 +106,65 @@ msgstr ""
 msgid "Count"
 msgstr "Räkna"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113
-msgid ""
-"Create compressed blocklist backups, they will be used in case of download "
-"errors or during startup in backup mode."
-msgstr ""
-
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:24
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:159
 msgid "DNS Backend (DNS Directory)"
 msgstr "DNS-bakände (DNS-mapp)"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:167
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:169
+msgid "DNS Backend, DNS Directory"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:34
+msgid "DNS Blocking Variant"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:164
 msgid "DNS Directory"
 msgstr "DNS-mapp"
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:127
+msgid "DNS File Reset"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:197
+msgid "DNS Inotify"
+msgstr ""
+
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:20
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:134
 msgid "DNS Query Report"
 msgstr ""
 
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:175
+msgid "DNS Variant, DNS File Reset"
+msgstr ""
+
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:81
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
 msgid "Date"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
 msgid "Description"
 msgstr "Beskrivning"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:124
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:198
 msgid ""
-"Do not automatically update blocklists during startup, use blocklist backups "
-"instead."
+"Disable adblock triggered restarts and the 'DNS File Reset' for dns backends "
+"with autoload features."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187
+msgid ""
+"Disable the toplevel domain compression, if the number of blocked domains is "
+"greater than this threshold."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
+msgid ""
+"Dnsmasq also supports 'null' block variants, which may provide better "
+"response times."
 msgstr ""
-"Uppdatera inte automatiskt blockeringlistor vid uppstarten, använd "
-"säkerhetskopierade blockeringslistor istället."
 
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:28
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:71
@@ -162,14 +177,38 @@ msgstr ""
 msgid "Domain/Client/Date/Time"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:43
 msgid "Download Utility"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:153
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:163
 msgid "Download Utility (SSL Library)"
 msgstr "Nerladdningsprogram (SSL-bibliotek)"
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:152
+msgid "E-Mail Notification"
+msgstr ""
+
+#: 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:255
+msgid "E-Mail Profile"
+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:245
+msgid "E-Mail Sender Address"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:250
+msgid "E-Mail Topic"
+msgstr ""
+
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
 msgid "Edit Blacklist"
 msgstr "Redigera svartlista"
@@ -182,31 +221,15 @@ msgstr "Redigerar konfigurationen"
 msgid "Edit Whitelist"
 msgstr "Redigera vitlista"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
-msgid "Email Notification"
-msgstr ""
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160
-msgid "Email Notification Count"
-msgstr ""
-
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:20
 msgid "Enable Adblock"
 msgstr "Aktivera adblock"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:112
-msgid "Enable Blocklist Backup"
-msgstr "Aktivera säkerhetskopiering av blockeringslistan"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
-msgid "Enable DNS Query Report"
-msgstr ""
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:98
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:106
 msgid "Enable verbose debug logging in case of any processing error."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:73
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:81
 msgid "Enabled"
 msgstr "Aktiverad"
 
@@ -214,7 +237,7 @@ msgstr "Aktiverad"
 msgid "End Date"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
 msgid "Extra Options"
 msgstr "Extra alternativ"
 
@@ -228,11 +251,11 @@ msgid ""
 "frame."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:203
 msgid "Flush DNS Cache"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:184
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:204
 msgid "Flush DNS Cache after adblock processing."
 msgstr ""
 
@@ -242,21 +265,25 @@ msgid ""
 "documentation</a>"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:130
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:122
 msgid ""
 "For further performance improvements you can raise this value, e.g. '8' or "
 "'16' should be safe."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:108
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
 msgid "Force Local DNS"
 msgstr "Tvinga lokal DNS"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:173
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:170
+msgid "Full path to the blacklist file."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:176
 msgid "Full path to the whitelist file."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
+#: 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 "
 "on demand."
@@ -269,7 +296,7 @@ msgid "Input file not found, please check your configuration."
 msgstr ""
 "Inmatningsfilen kunde inte hittas, var vänlig kontrollera din konfiguration."
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:171
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:193
 msgid "Last Run"
 msgstr "Kördes senast"
 
@@ -277,7 +304,7 @@ msgstr "Kördes senast"
 msgid "Latest DNS Queries"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:55
 msgid ""
 "List of available network interfaces. Usually the startup will be triggered "
 "by the 'wan' interface."
@@ -288,25 +315,39 @@ msgid ""
 "List of supported DNS backends with their default list export directory."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+msgid ""
+"List of supported DNS blocking variants. By default 'nxdomain' will be used "
+"for all DNS backends."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:44
 msgid "List of supported and fully pre-configured download utilities."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/view/adblock/query.htm:21
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:221
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:90
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:98
 msgid "Loading"
 msgstr "Laddar"
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:192
+msgid "Local FW/DNS Ports"
+msgstr ""
+
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:22
 msgid "Logfile"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109
 msgid "Low Priority Service"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:256
+msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
 msgid "Max. Download Queue"
 msgstr ""
 
@@ -315,16 +356,16 @@ msgstr ""
 msgid "Name / IP-Address"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:82
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:90
 msgid "No"
 msgstr "Nej"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:95
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:103
 msgid ""
 "Options for further tweaking in case the defaults are not suitable for you."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:165
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:187
 msgid "Overall Domains"
 msgstr ""
 
@@ -345,11 +386,11 @@ msgstr ""
 msgid "Please edit this file directly in a terminal session."
 msgstr "Vänligen redigera den här filen direkt i en terminal-session."
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:149
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
 msgid "Please note: this needs manual 'msmtp' package installation and setup."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:137
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
 msgid "Please note: this needs manual 'tcpdump-mini' package installation."
 msgstr ""
 
@@ -361,26 +402,30 @@ msgstr "Fråga"
 msgid "Query domains"
 msgstr "Fråga efter domäner"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:161
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:261
 msgid ""
-"Raise the minimum email notification count, to get emails if the overall "
-"count is less or equal to the given limit (default 0),"
+"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:109
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
+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, apply to udp "
-"and tcp protocol on ports 53, 853 and 5353."
+"Redirect all DNS queries from 'lan' zone to the local resolver, applies to "
+"udp and tcp protocol on ports 53, 853 and 5353."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:22
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:33
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:44
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:103
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:28
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:39
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:50
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:111
 msgid "Refresh"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:186
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:208
 msgid "Refresh Blocklist Sources"
 msgstr ""
 
@@ -388,49 +433,55 @@ msgstr ""
 msgid "Refresh Report"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:211
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:231
 msgid "Report Chunk Count"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:218
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:238
 msgid "Report Chunk Size"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:139
 msgid "Report Directory"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:188
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:208
 msgid "Report Interface"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:205
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:225
 msgid "Report Listen Port(s)"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:212
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:232
 msgid "Report chunk count used by tcpdump (default '5')."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:219
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:239
 msgid "Report chunk size used by tcpdump in MB (default '1')."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:189
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:209
 msgid ""
 "Reporting interface used by tcpdump, set to 'any' for multiple interfaces "
 "(default 'br-lan')."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:31
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+msgid ""
+"Resets the final DNS blockfile 'adb_list.overall' after loading through the "
+"DNS backend."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:37
 msgid "Resume"
 msgstr "Återuppta"
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:139
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:149
 msgid "Runtime Information"
 msgstr "Information om körtid"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:76
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84
 msgid "SSL req."
 msgstr "SSL-rek."
 
@@ -440,25 +491,34 @@ msgstr "SSL-rek."
 msgid "Save"
 msgstr "Spara"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:148
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
 msgid ""
-"Send notification emails in case of a processing error or if domain count is "
-"&le; 0."
+"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:102
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:246
+msgid "Sender address for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:110
 msgid ""
 "Set the nice level to 'low priority' and the adblock background processing "
 "will take fewer resources from the system."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:129
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:121
 msgid ""
 "Size of the download queue to handle downloads &amp; list processing in "
-"parallel (default '8')."
+"parallel (default '4')."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:193
+msgid ""
+"Space separated list of firewall ports which should be redirected locally."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:206
+#: 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 ""
@@ -467,33 +527,37 @@ msgstr ""
 msgid "Start Date"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:46
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:54
 msgid "Startup Trigger"
 msgstr "Uppstartslösare"
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:20
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:42
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:101
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:26
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:48
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:109
 msgid "Suspend"
 msgstr "Stäng av"
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:178
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:200
 msgid "Suspend / Resume Adblock"
 msgstr "Upphäv / Återuppta adblock"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:186
+msgid "TLD Compression Threshold"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
 msgid ""
-"Target directory for adblock backups. Please use only a non-volatile disk, e."
-"g. an external usb stick."
+"Target directory for adblock source backups. Default is '/tmp', please use "
+"preferably a non-volatile disk if available."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:141
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
 msgid ""
-"Target directory for dns related report files. Please use preferably a non-"
-"volatile disk, e.g. an external usb stick."
+"Target directory for dns related report files. Default is '/tmp', please use "
+"preferably a non-volatile disk if available."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:168
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:165
 msgid "Target directory for the generated blocklist 'adb_list.overall'."
 msgstr ""
 
@@ -507,11 +571,11 @@ msgstr ""
 msgid "The syslog output, pre-filtered for adblock related messages only."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:103
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:190
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:207
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:213
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:220
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:111
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:210
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:227
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:233
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:240
 msgid "This change requires a manual service stop/re-start to take effect."
 msgstr ""
 
@@ -539,6 +603,12 @@ msgid ""
 "for whitelisting."
 msgstr ""
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:129
+msgid ""
+"This option saves an enormous amount of storage space, but starts a small "
+"ubus/adblock monitor in the background."
+msgstr ""
+
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:82
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
 msgid "Time"
@@ -554,15 +624,19 @@ msgstr ""
 msgid "Top 10 Reporting"
 msgstr ""
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:251
+msgid "Topic for adblock notification E-Mails."
+msgstr ""
+
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
 msgid "Total DNS Queries"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:178
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:181
 msgid "Trigger Delay"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:97
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:105
 msgid "Verbose Debug Logging"
 msgstr ""
 
@@ -574,25 +648,29 @@ msgstr "Väntar på att kommandot ska slutföras..."
 msgid "Whitelist"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:175
 msgid "Whitelist File"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
 msgid "Yes"
 msgstr "Ja"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:156
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:262
 msgid ""
-"You can use this restrictive blocklist e.g. for guest wifi or kidsafe "
-"configurations."
+"e.g. to receive an E-Mail notification with every adblock run set this value "
+"to 200000."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:162
-msgid ""
-"e.g. to receive an email notification with every adblock update set this "
-"value to 150000."
-msgstr ""
+#~ msgid ""
+#~ "Do not automatically update blocklists during startup, use blocklist "
+#~ "backups instead."
+#~ msgstr ""
+#~ "Uppdatera inte automatiskt blockeringlistor vid uppstarten, använd "
+#~ "säkerhetskopierade blockeringslistor istället."
+
+#~ msgid "Enable Blocklist Backup"
+#~ msgstr "Aktivera säkerhetskopiering av blockeringslistan"
 
 #~ msgid "View Logfile"
 #~ msgstr "Visa loggfil"
diff --git a/applications/luci-app-adblock/po/templates/adblock.pot b/applications/luci-app-adblock/po/templates/adblock.pot
index f6ef16821..6f8466332 100644
--- a/applications/luci-app-adblock/po/templates/adblock.pot
+++ b/applications/luci-app-adblock/po/templates/adblock.pot
@@ -1,11 +1,7 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=UTF-8"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
-msgid "'Jail' Blocklist Creation"
-msgstr ""
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:70
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:78
 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!"
@@ -21,15 +17,15 @@ msgstr ""
 msgid "Adblock"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:141
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:151
 msgid "Adblock Status"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:147
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:157
 msgid "Adblock Version"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:179
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:182
 msgid "Additional trigger delay in seconds before adblock processing begins."
 msgstr ""
 
@@ -42,22 +38,23 @@ msgstr ""
 msgid "Answer"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:96
 msgid "Archive Categories"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:146
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:181
 msgid "Backup Directory"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:123
-msgid "Backup Mode"
-msgstr ""
-
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:106
 msgid "Blacklist"
 msgstr ""
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:169
+msgid "Blacklist File"
+msgstr ""
+
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:274
 msgid "Blocked DNS Queries"
 msgstr ""
@@ -67,7 +64,7 @@ msgstr ""
 msgid "Blocked Domain"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:69
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:77
 msgid "Blocklist Sources"
 msgstr ""
 
@@ -75,13 +72,7 @@ msgstr ""
 msgid "Blocklist not found!"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:155
-msgid ""
-"Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all "
-"domains except those listed in the whitelist file."
-msgstr ""
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:48
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:56
 msgid ""
 "Choose 'none' to disable automatic startups, 'timed' to use a classic "
 "timeout (default 30 sec.) or select another trigger interface."
@@ -110,38 +101,64 @@ msgstr ""
 msgid "Count"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113
-msgid ""
-"Create compressed blocklist backups, they will be used in case of download "
-"errors or during startup in backup mode."
-msgstr ""
-
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:24
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:159
 msgid "DNS Backend (DNS Directory)"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:167
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:169
+msgid "DNS Backend, DNS Directory"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:34
+msgid "DNS Blocking Variant"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:164
 msgid "DNS Directory"
 msgstr ""
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:127
+msgid "DNS File Reset"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:197
+msgid "DNS Inotify"
+msgstr ""
+
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:20
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:134
 msgid "DNS Query Report"
 msgstr ""
 
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:175
+msgid "DNS Variant, DNS File Reset"
+msgstr ""
+
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:81
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
 msgid "Date"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
 msgid "Description"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:124
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:198
 msgid ""
-"Do not automatically update blocklists during startup, use blocklist backups "
-"instead."
+"Disable adblock triggered restarts and the 'DNS File Reset' for dns backends "
+"with autoload features."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187
+msgid ""
+"Disable the toplevel domain compression, if the number of blocked domains is "
+"greater than this threshold."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
+msgid ""
+"Dnsmasq also supports 'null' block variants, which may provide better "
+"response times."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:28
@@ -155,51 +172,59 @@ msgstr ""
 msgid "Domain/Client/Date/Time"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:43
 msgid "Download Utility"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:153
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:163
 msgid "Download Utility (SSL Library)"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
-msgid "Edit Blacklist"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:152
+msgid "E-Mail Notification"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/controller/adblock.lua:26
-msgid "Edit Configuration"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
+msgid "E-Mail Notification Count"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/controller/adblock.lua:25
-msgid "Edit Whitelist"
+#: 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:147
-msgid "Email Notification"
+#: 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:160
-msgid "Email Notification Count"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
+msgid "E-Mail Sender Address"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:20
-msgid "Enable Adblock"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:250
+msgid "E-Mail Topic"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:112
-msgid "Enable Blocklist Backup"
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
+msgid "Edit Blacklist"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
-msgid "Enable DNS Query Report"
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:26
+msgid "Edit Configuration"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:98
+#: applications/luci-app-adblock/luasrc/controller/adblock.lua:25
+msgid "Edit Whitelist"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:20
+msgid "Enable Adblock"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:106
 msgid "Enable verbose debug logging in case of any processing error."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:73
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:81
 msgid "Enabled"
 msgstr ""
 
@@ -207,7 +232,7 @@ msgstr ""
 msgid "End Date"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
 msgid "Extra Options"
 msgstr ""
 
@@ -221,11 +246,11 @@ msgid ""
 "frame."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:203
 msgid "Flush DNS Cache"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:184
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:204
 msgid "Flush DNS Cache after adblock processing."
 msgstr ""
 
@@ -235,21 +260,25 @@ msgid ""
 "documentation</a>"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:130
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:122
 msgid ""
 "For further performance improvements you can raise this value, e.g. '8' or "
 "'16' should be safe."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:108
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
 msgid "Force Local DNS"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:173
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:170
+msgid "Full path to the blacklist file."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:176
 msgid "Full path to the whitelist file."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
+#: 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 "
 "on demand."
@@ -261,7 +290,7 @@ msgstr ""
 msgid "Input file not found, please check your configuration."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:171
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:193
 msgid "Last Run"
 msgstr ""
 
@@ -269,7 +298,7 @@ msgstr ""
 msgid "Latest DNS Queries"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:55
 msgid ""
 "List of available network interfaces. Usually the startup will be triggered "
 "by the 'wan' interface."
@@ -280,25 +309,39 @@ msgid ""
 "List of supported DNS backends with their default list export directory."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+msgid ""
+"List of supported DNS blocking variants. By default 'nxdomain' will be used "
+"for all DNS backends."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:44
 msgid "List of supported and fully pre-configured download utilities."
 msgstr ""
 
 #: applications/luci-app-adblock/luasrc/view/adblock/query.htm:21
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:221
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:90
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:98
 msgid "Loading"
 msgstr ""
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:192
+msgid "Local FW/DNS Ports"
+msgstr ""
+
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:22
 msgid "Logfile"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109
 msgid "Low Priority Service"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:256
+msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
 msgid "Max. Download Queue"
 msgstr ""
 
@@ -307,16 +350,16 @@ msgstr ""
 msgid "Name / IP-Address"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:82
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:90
 msgid "No"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:95
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:103
 msgid ""
 "Options for further tweaking in case the defaults are not suitable for you."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:165
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:187
 msgid "Overall Domains"
 msgstr ""
 
@@ -337,11 +380,11 @@ msgstr ""
 msgid "Please edit this file directly in a terminal session."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:149
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
 msgid "Please note: this needs manual 'msmtp' package installation and setup."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:137
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
 msgid "Please note: this needs manual 'tcpdump-mini' package installation."
 msgstr ""
 
@@ -353,26 +396,30 @@ msgstr ""
 msgid "Query domains"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:161
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:261
 msgid ""
-"Raise the minimum email notification count, to get emails if the overall "
-"count is less or equal to the given limit (default 0),"
+"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:109
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
+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, apply to udp "
-"and tcp protocol on ports 53, 853 and 5353."
+"Redirect all DNS queries from 'lan' zone to the local resolver, applies to "
+"udp and tcp protocol on ports 53, 853 and 5353."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:22
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:33
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:44
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:103
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:28
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:39
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:50
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:111
 msgid "Refresh"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:186
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:208
 msgid "Refresh Blocklist Sources"
 msgstr ""
 
@@ -380,49 +427,55 @@ msgstr ""
 msgid "Refresh Report"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:211
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:231
 msgid "Report Chunk Count"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:218
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:238
 msgid "Report Chunk Size"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:139
 msgid "Report Directory"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:188
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:208
 msgid "Report Interface"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:205
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:225
 msgid "Report Listen Port(s)"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:212
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:232
 msgid "Report chunk count used by tcpdump (default '5')."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:219
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:239
 msgid "Report chunk size used by tcpdump in MB (default '1')."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:189
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:209
 msgid ""
 "Reporting interface used by tcpdump, set to 'any' for multiple interfaces "
 "(default 'br-lan')."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:31
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+msgid ""
+"Resets the final DNS blockfile 'adb_list.overall' after loading through the "
+"DNS backend."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:37
 msgid "Resume"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:139
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:149
 msgid "Runtime Information"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:76
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84
 msgid "SSL req."
 msgstr ""
 
@@ -432,25 +485,34 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:148
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
 msgid ""
-"Send notification emails in case of a processing error or if domain count is "
-"&le; 0."
+"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:102
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:246
+msgid "Sender address for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:110
 msgid ""
 "Set the nice level to 'low priority' and the adblock background processing "
 "will take fewer resources from the system."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:129
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:121
 msgid ""
 "Size of the download queue to handle downloads &amp; list processing in "
-"parallel (default '8')."
+"parallel (default '4')."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:193
+msgid ""
+"Space separated list of firewall ports which should be redirected locally."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:206
+#: 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 ""
@@ -459,33 +521,37 @@ msgstr ""
 msgid "Start Date"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:46
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:54
 msgid "Startup Trigger"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:20
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:42
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:101
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:26
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:48
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:109
 msgid "Suspend"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:178
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:200
 msgid "Suspend / Resume Adblock"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:186
+msgid "TLD Compression Threshold"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
 msgid ""
-"Target directory for adblock backups. Please use only a non-volatile disk, e."
-"g. an external usb stick."
+"Target directory for adblock source backups. Default is '/tmp', please use "
+"preferably a non-volatile disk if available."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:141
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
 msgid ""
-"Target directory for dns related report files. Please use preferably a non-"
-"volatile disk, e.g. an external usb stick."
+"Target directory for dns related report files. Default is '/tmp', please use "
+"preferably a non-volatile disk if available."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:168
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:165
 msgid "Target directory for the generated blocklist 'adb_list.overall'."
 msgstr ""
 
@@ -499,11 +565,11 @@ msgstr ""
 msgid "The syslog output, pre-filtered for adblock related messages only."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:103
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:190
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:207
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:213
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:220
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:111
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:210
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:227
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:233
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:240
 msgid "This change requires a manual service stop/re-start to take effect."
 msgstr ""
 
@@ -529,6 +595,12 @@ msgid ""
 "for whitelisting."
 msgstr ""
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:129
+msgid ""
+"This option saves an enormous amount of storage space, but starts a small "
+"ubus/adblock monitor in the background."
+msgstr ""
+
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:82
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
 msgid "Time"
@@ -544,15 +616,19 @@ msgstr ""
 msgid "Top 10 Reporting"
 msgstr ""
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:251
+msgid "Topic for adblock notification E-Mails."
+msgstr ""
+
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
 msgid "Total DNS Queries"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:178
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:181
 msgid "Trigger Delay"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:97
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:105
 msgid "Verbose Debug Logging"
 msgstr ""
 
@@ -564,22 +640,16 @@ msgstr ""
 msgid "Whitelist"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:175
 msgid "Whitelist File"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
 msgid "Yes"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:156
-msgid ""
-"You can use this restrictive blocklist e.g. for guest wifi or kidsafe "
-"configurations."
-msgstr ""
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:162
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:262
 msgid ""
-"e.g. to receive an email notification with every adblock update set this "
-"value to 150000."
+"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/zh-cn/adblock.po b/applications/luci-app-adblock/po/zh-cn/adblock.po
index 9d189215e..31b1dba65 100644
--- a/applications/luci-app-adblock/po/zh-cn/adblock.po
+++ b/applications/luci-app-adblock/po/zh-cn/adblock.po
@@ -15,11 +15,7 @@ msgstr ""
 "X-Generator: Gtranslator 3.30.1\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
-msgid "'Jail' Blocklist Creation"
-msgstr "“Jail”拦截列表创建"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:70
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:78
 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!"
@@ -37,15 +33,15 @@ msgstr "动作"
 msgid "Adblock"
 msgstr "Adblock"
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:141
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:151
 msgid "Adblock Status"
 msgstr "Adblock 状态"
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:147
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:157
 msgid "Adblock Version"
 msgstr "Adblock 版本"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:179
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:182
 msgid "Additional trigger delay in seconds before adblock processing begins."
 msgstr "触发 Adblock 开始处理前的额外延迟（秒）。"
 
@@ -58,22 +54,23 @@ msgstr "高级"
 msgid "Answer"
 msgstr "回答"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:96
 msgid "Archive Categories"
 msgstr "存档类别"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:146
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:181
 msgid "Backup Directory"
 msgstr "备份目录"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:123
-msgid "Backup Mode"
-msgstr "备份模式"
-
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:106
 msgid "Blacklist"
 msgstr "黑名单"
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:169
+msgid "Blacklist File"
+msgstr ""
+
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:274
 msgid "Blocked DNS Queries"
 msgstr "已拦截的 DNS 请求"
@@ -83,7 +80,7 @@ msgstr "已拦截的 DNS 请求"
 msgid "Blocked Domain"
 msgstr "已拦截的域名"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:69
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:77
 msgid "Blocklist Sources"
 msgstr "拦截列表来源"
 
@@ -91,15 +88,7 @@ msgstr "拦截列表来源"
 msgid "Blocklist not found!"
 msgstr "拦截列表未找到！"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:155
-msgid ""
-"Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all "
-"domains except those listed in the whitelist file."
-msgstr ""
-"构建一个额外的“Jail”列表（/tmp/adb_list.jail），除白名单文件中列出的域名外，"
-"阻止访问其他所有的域名。"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:48
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:56
 msgid ""
 "Choose 'none' to disable automatic startups, 'timed' to use a classic "
 "timeout (default 30 sec.) or select another trigger interface."
@@ -130,39 +119,65 @@ msgstr "Adblock 配置工具，通过 DNS 来拦截广告和阻止域名。"
 msgid "Count"
 msgstr "计数"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113
-msgid ""
-"Create compressed blocklist backups, they will be used in case of download "
-"errors or during startup in backup mode."
-msgstr "创建压缩的拦截列表备份，它们将在下载错误或备份模式启动期间使用。"
-
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:24
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:159
 msgid "DNS Backend (DNS Directory)"
 msgstr "DNS 后端（DNS 目录）"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:167
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:169
+msgid "DNS Backend, DNS Directory"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:34
+msgid "DNS Blocking Variant"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:164
 msgid "DNS Directory"
 msgstr "DNS 目录"
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:127
+msgid "DNS File Reset"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:197
+msgid "DNS Inotify"
+msgstr ""
+
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:20
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:134
 msgid "DNS Query Report"
 msgstr "DNS 查询报告"
 
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:175
+msgid "DNS Variant, DNS File Reset"
+msgstr ""
+
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:81
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
 msgid "Date"
 msgstr "日期"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
 msgid "Description"
 msgstr "描述"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:124
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:198
 msgid ""
-"Do not automatically update blocklists during startup, use blocklist backups "
-"instead."
-msgstr "启动期间不要自动更新 blocklists，改用 blocklists 的备份。"
+"Disable adblock triggered restarts and the 'DNS File Reset' for dns backends "
+"with autoload features."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187
+msgid ""
+"Disable the toplevel domain compression, if the number of blocked domains is "
+"greater than this threshold."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
+msgid ""
+"Dnsmasq also supports 'null' block variants, which may provide better "
+"response times."
+msgstr ""
 
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:28
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:71
@@ -175,14 +190,38 @@ msgstr "域名"
 msgid "Domain/Client/Date/Time"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:43
 msgid "Download Utility"
 msgstr "下载工具"
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:153
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:163
 msgid "Download Utility (SSL Library)"
 msgstr "下载实用程序（SSL 库）"
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:152
+msgid "E-Mail Notification"
+msgstr ""
+
+#: 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:255
+msgid "E-Mail Profile"
+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:245
+msgid "E-Mail Sender Address"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:250
+msgid "E-Mail Topic"
+msgstr ""
+
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
 msgid "Edit Blacklist"
 msgstr "编辑黑名单"
@@ -195,31 +234,15 @@ msgstr "编辑设置"
 msgid "Edit Whitelist"
 msgstr "编辑白名单"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
-msgid "Email Notification"
-msgstr "Email 提醒"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160
-msgid "Email Notification Count"
-msgstr "Email 提醒计数"
-
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:20
 msgid "Enable Adblock"
 msgstr "启用 Adblock"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:112
-msgid "Enable Blocklist Backup"
-msgstr "启用 Blocklist 备份"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
-msgid "Enable DNS Query Report"
-msgstr "启用 DNS 查询报告"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:98
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:106
 msgid "Enable verbose debug logging in case of any processing error."
 msgstr "在出现任何处理错误的情况下启用详细调试日志记录。"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:73
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:81
 msgid "Enabled"
 msgstr "已启用"
 
@@ -227,7 +250,7 @@ msgstr "已启用"
 msgid "End Date"
 msgstr "结束日期"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
 msgid "Extra Options"
 msgstr "额外选项"
 
@@ -241,11 +264,11 @@ msgid ""
 "frame."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:203
 msgid "Flush DNS Cache"
 msgstr "清空 DNS 缓存"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:184
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:204
 msgid "Flush DNS Cache after adblock processing."
 msgstr "在 adblock 进程启动后清空 DNS 缓存。"
 
@@ -255,21 +278,25 @@ msgid ""
 "documentation</a>"
 msgstr "进一步信息<a href=\"%s\" target=\"_blank\">请访问在线文档</a>"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:130
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:122
 msgid ""
 "For further performance improvements you can raise this value, e.g. '8' or "
 "'16' should be safe."
 msgstr "为了进一步提高性能，您可以提高此值，例如：8 或 16 应该是安全的。"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:108
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
 msgid "Force Local DNS"
 msgstr "强制本地 DNS"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:173
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:170
+msgid "Full path to the blacklist file."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:176
 msgid "Full path to the whitelist file."
 msgstr "白名单文件的全路径。"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
+#: 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 "
 "on demand."
@@ -281,7 +308,7 @@ msgstr "通过 tcpdump 收集 dns 有关的网络流量，以按需提供 DNS 
 msgid "Input file not found, please check your configuration."
 msgstr "输入文件未找到，请检查您的配置。"
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:171
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:193
 msgid "Last Run"
 msgstr "最后运行"
 
@@ -289,7 +316,7 @@ msgstr "最后运行"
 msgid "Latest DNS Queries"
 msgstr "最新的 DNS 查询"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:55
 msgid ""
 "List of available network interfaces. Usually the startup will be triggered "
 "by the 'wan' interface."
@@ -300,25 +327,39 @@ msgid ""
 "List of supported DNS backends with their default list export directory."
 msgstr "支持的 DNS 后端列表及其默认列表导出目录。"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+msgid ""
+"List of supported DNS blocking variants. By default 'nxdomain' will be used "
+"for all DNS backends."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:44
 msgid "List of supported and fully pre-configured download utilities."
 msgstr "支持和完全预配置的下载工具列表。"
 
 #: applications/luci-app-adblock/luasrc/view/adblock/query.htm:21
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:221
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:90
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:98
 msgid "Loading"
 msgstr "加载中"
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:192
+msgid "Local FW/DNS Ports"
+msgstr ""
+
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:22
 msgid "Logfile"
 msgstr "日志文件"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109
 msgid "Low Priority Service"
 msgstr "低优先级服务"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:256
+msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
 msgid "Max. Download Queue"
 msgstr "最大下载队列"
 
@@ -327,16 +368,16 @@ msgstr "最大下载队列"
 msgid "Name / IP-Address"
 msgstr "名称 / IP 地址"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:82
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:90
 msgid "No"
 msgstr "否"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:95
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:103
 msgid ""
 "Options for further tweaking in case the defaults are not suitable for you."
 msgstr "在默认设置并不适合您时的额外选项。"
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:165
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:187
 msgid "Overall Domains"
 msgstr "域名总览"
 
@@ -359,11 +400,11 @@ msgstr ""
 msgid "Please edit this file directly in a terminal session."
 msgstr "请在终端会话中直接编辑此文件。"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:149
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
 msgid "Please note: this needs manual 'msmtp' package installation and setup."
 msgstr "请注意：这需要手动安装和设置“msmtp”软件包。"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:137
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
 msgid "Please note: this needs manual 'tcpdump-mini' package installation."
 msgstr "请注意：这需要手动安装和设置“tcpdump-mini”软件包。"
 
@@ -375,30 +416,30 @@ msgstr "查询"
 msgid "Query domains"
 msgstr "查询域"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:161
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:261
 msgid ""
-"Raise the minimum email notification count, to get emails if the overall "
-"count is less or equal to the given limit (default 0),"
+"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:109
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
+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, apply to udp "
-"and tcp protocol on ports 53, 853 and 5353."
+"Redirect all DNS queries from 'lan' zone to the local resolver, applies to "
+"udp and tcp protocol on ports 53, 853 and 5353."
 msgstr ""
-"将所有 DNS 查询从“lan”区域重定向到本地解析器，适用于端口53、853和5353上的 "
-"udp 和 tcp 协议。"
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:22
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:33
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:44
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:103
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:28
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:39
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:50
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:111
 msgid "Refresh"
 msgstr "刷新"
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:186
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:208
 msgid "Refresh Blocklist Sources"
 msgstr "刷新拦截列表源"
 
@@ -406,49 +447,55 @@ msgstr "刷新拦截列表源"
 msgid "Refresh Report"
 msgstr "刷新报告"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:211
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:231
 msgid "Report Chunk Count"
 msgstr "报告区块计数"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:218
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:238
 msgid "Report Chunk Size"
 msgstr "报告区块大小"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:139
 msgid "Report Directory"
 msgstr "报告目录"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:188
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:208
 msgid "Report Interface"
 msgstr "报告接口"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:205
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:225
 msgid "Report Listen Port(s)"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:212
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:232
 msgid "Report chunk count used by tcpdump (default '5')."
 msgstr "tcpdump 将使用的报告区块计数（默认为“5”）。"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:219
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:239
 msgid "Report chunk size used by tcpdump in MB (default '1')."
 msgstr "tcpdump 将使用的报告区块大小（MB）（默认为“1”）。"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:189
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:209
 msgid ""
 "Reporting interface used by tcpdump, set to 'any' for multiple interfaces "
 "(default 'br-lan')."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:31
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+msgid ""
+"Resets the final DNS blockfile 'adb_list.overall' after loading through the "
+"DNS backend."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:37
 msgid "Resume"
 msgstr "恢复"
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:139
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:149
 msgid "Runtime Information"
 msgstr "运行信息"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:76
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84
 msgid "SSL req."
 msgstr "SSL 要求"
 
@@ -458,25 +505,34 @@ msgstr "SSL 要求"
 msgid "Save"
 msgstr "保存"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:148
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
 msgid ""
-"Send notification emails in case of a processing error or if domain count is "
-"&le; 0."
-msgstr "如果发生错误或域计数 &le; 0，发送通知电子邮件。"
+"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:102
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:246
+msgid "Sender address for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:110
 msgid ""
 "Set the nice level to 'low priority' and the adblock background processing "
 "will take fewer resources from the system."
 msgstr "设置 nice 级别为“低优先级”，adblock 后台进程将从系统中获取更少的资源。"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:129
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:121
 msgid ""
 "Size of the download queue to handle downloads &amp; list processing in "
-"parallel (default '8')."
-msgstr "处理下载队列的大小及并行处理列表（默认为“8”）。"
+"parallel (default '4')."
+msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:206
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:193
+msgid ""
+"Space separated list of firewall ports which should be redirected locally."
+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 ""
@@ -485,34 +541,37 @@ msgstr ""
 msgid "Start Date"
 msgstr "开始日期"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:46
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:54
 msgid "Startup Trigger"
 msgstr "启动触发器"
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:20
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:42
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:101
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:26
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:48
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:109
 msgid "Suspend"
 msgstr "暂停"
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:178
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:200
 msgid "Suspend / Resume Adblock"
 msgstr "暂停/恢复 Adblock"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:186
+msgid "TLD Compression Threshold"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
 msgid ""
-"Target directory for adblock backups. Please use only a non-volatile disk, e."
-"g. an external usb stick."
-msgstr "adblock 备份的目标目录。请仅使用非易失性磁盘，例如：一个外置 U 盘。"
+"Target directory for adblock source backups. Default is '/tmp', please use "
+"preferably a non-volatile disk if available."
+msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:141
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
 msgid ""
-"Target directory for dns related report files. Please use preferably a non-"
-"volatile disk, e.g. an external usb stick."
+"Target directory for dns related report files. Default is '/tmp', please use "
+"preferably a non-volatile disk if available."
 msgstr ""
-"dns 相关报告文件的目标目录。请优先使用非易失性磁盘，例如：一个外置 U 盘。"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:168
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:165
 msgid "Target directory for the generated blocklist 'adb_list.overall'."
 msgstr "生成拦截列表“adb_list.overall”的目标目录。"
 
@@ -526,11 +585,11 @@ msgstr "文件过大，无法使用 LuCI 的在线编辑（&ge; 100 KB）。"
 msgid "The syslog output, pre-filtered for adblock related messages only."
 msgstr "系统日志输出，仅针对 adblock 相关的消息进行了预筛选。"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:103
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:190
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:207
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:213
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:220
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:111
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:210
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:227
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:233
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:240
 msgid "This change requires a manual service stop/re-start to take effect."
 msgstr "此更改需要手动停止/重启服务才能生效。"
 
@@ -556,6 +615,12 @@ msgid ""
 "for whitelisting."
 msgstr "此表单允许您查询某些域的活动块列表，例如用于列出白名单。"
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:129
+msgid ""
+"This option saves an enormous amount of storage space, but starts a small "
+"ubus/adblock monitor in the background."
+msgstr ""
+
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:82
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
 msgid "Time"
@@ -571,15 +636,19 @@ msgstr "要覆盖默认路径，请使用下面额外部分中的“DNS 目录
 msgid "Top 10 Reporting"
 msgstr "前十报告"
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:251
+msgid "Topic for adblock notification E-Mails."
+msgstr ""
+
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
 msgid "Total DNS Queries"
 msgstr "DNS 查询总数"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:178
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:181
 msgid "Trigger Delay"
 msgstr "触发延迟"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:97
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:105
 msgid "Verbose Debug Logging"
 msgstr "详细的调试记录"
 
@@ -591,25 +660,99 @@ msgstr "正在等待命令完成…"
 msgid "Whitelist"
 msgstr "白名单"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:175
 msgid "Whitelist File"
 msgstr "白名单文件"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
 msgid "Yes"
 msgstr "是"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:156
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:262
 msgid ""
-"You can use this restrictive blocklist e.g. for guest wifi or kidsafe "
-"configurations."
-msgstr "您可以使用此限制性拦截列表，例如访客 wifi 或家长模式。"
+"e.g. to receive an E-Mail notification with every adblock run set this value "
+"to 200000."
+msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:162
-msgid ""
-"e.g. to receive an email notification with every adblock update set this "
-"value to 150000."
-msgstr "例如：要接收每个 adblock 更新的电子邮件通知时将此值设置为 150000。"
+#~ msgid "'Jail' Blocklist Creation"
+#~ msgstr "“Jail”拦截列表创建"
+
+#~ msgid "Backup Mode"
+#~ msgstr "备份模式"
+
+#~ msgid ""
+#~ "Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to "
+#~ "all domains except those listed in the whitelist file."
+#~ msgstr ""
+#~ "构建一个额外的“Jail”列表（/tmp/adb_list.jail），除白名单文件中列出的域名"
+#~ "外，阻止访问其他所有的域名。"
+
+#~ msgid ""
+#~ "Create compressed blocklist backups, they will be used in case of "
+#~ "download errors or during startup in backup mode."
+#~ msgstr "创建压缩的拦截列表备份，它们将在下载错误或备份模式启动期间使用。"
+
+#~ msgid ""
+#~ "Do not automatically update blocklists during startup, use blocklist "
+#~ "backups instead."
+#~ msgstr "启动期间不要自动更新 blocklists，改用 blocklists 的备份。"
+
+#~ msgid "Email Notification"
+#~ msgstr "Email 提醒"
+
+#~ msgid "Email Notification Count"
+#~ msgstr "Email 提醒计数"
+
+#~ msgid "Enable Blocklist Backup"
+#~ msgstr "启用 Blocklist 备份"
+
+#~ msgid "Enable DNS Query Report"
+#~ msgstr "启用 DNS 查询报告"
+
+#~ msgid ""
+#~ "Raise the minimum email notification count, to get emails if the overall "
+#~ "count is less or equal to the given limit (default 0),"
+#~ msgstr ""
+#~ "如果总数小于或等于给定限制（默认为 0），请提高最小电子邮件通知数，以获取电"
+#~ "子邮件。"
+
+#~ msgid ""
+#~ "Redirect all DNS queries from 'lan' zone to the local resolver, apply to "
+#~ "udp and tcp protocol on ports 53, 853 and 5353."
+#~ msgstr ""
+#~ "将所有 DNS 查询从“lan”区域重定向到本地解析器，适用于端口53、853和5353上的 "
+#~ "udp 和 tcp 协议。"
+
+#~ msgid ""
+#~ "Send notification emails in case of a processing error or if domain count "
+#~ "is &le; 0."
+#~ msgstr "如果发生错误或域计数 &le; 0，发送通知电子邮件。"
+
+#~ msgid ""
+#~ "Size of the download queue to handle downloads &amp; list processing in "
+#~ "parallel (default '8')."
+#~ msgstr "处理下载队列的大小及并行处理列表（默认为“8”）。"
+
+#~ msgid ""
+#~ "Target directory for adblock backups. Please use only a non-volatile "
+#~ "disk, e.g. an external usb stick."
+#~ msgstr "adblock 备份的目标目录。请仅使用非易失性磁盘，例如：一个外置 U 盘。"
+
+#~ msgid ""
+#~ "Target directory for dns related report files. Please use preferably a "
+#~ "non-volatile disk, e.g. an external usb stick."
+#~ msgstr ""
+#~ "dns 相关报告文件的目标目录。请优先使用非易失性磁盘，例如：一个外置 U 盘。"
+
+#~ msgid ""
+#~ "You can use this restrictive blocklist e.g. for guest wifi or kidsafe "
+#~ "configurations."
+#~ msgstr "您可以使用此限制性拦截列表，例如访客 wifi 或家长模式。"
+
+#~ msgid ""
+#~ "e.g. to receive an email notification with every adblock update set this "
+#~ "value to 150000."
+#~ msgstr "例如：要接收每个 adblock 更新的电子邮件通知时将此值设置为 150000。"
 
 #~ msgid ""
 #~ "Enable memory intense overall sort / duplicate removal on low memory "
diff --git a/applications/luci-app-adblock/po/zh-tw/adblock.po b/applications/luci-app-adblock/po/zh-tw/adblock.po
index ddcb76a1e..3940343e9 100644
--- a/applications/luci-app-adblock/po/zh-tw/adblock.po
+++ b/applications/luci-app-adblock/po/zh-tw/adblock.po
@@ -15,11 +15,7 @@ msgstr ""
 "X-Generator: Gtranslator 3.30.1\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
-msgid "'Jail' Blocklist Creation"
-msgstr "“Jail”攔截列表建立"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:70
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:78
 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!"
@@ -37,15 +33,15 @@ msgstr "動作"
 msgid "Adblock"
 msgstr "Adblock"
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:141
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:151
 msgid "Adblock Status"
 msgstr "Adblock 狀態"
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:147
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:157
 msgid "Adblock Version"
 msgstr "Adblock 版本"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:179
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:182
 msgid "Additional trigger delay in seconds before adblock processing begins."
 msgstr "觸發 Adblock 開始處理前的額外延遲（秒）。"
 
@@ -58,22 +54,23 @@ msgstr "高階"
 msgid "Answer"
 msgstr "回答"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:96
 msgid "Archive Categories"
 msgstr "存檔類別"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:146
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:181
 msgid "Backup Directory"
 msgstr "備份目錄"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:123
-msgid "Backup Mode"
-msgstr "備份模式"
-
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:106
 msgid "Blacklist"
 msgstr "黑名單"
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:169
+msgid "Blacklist File"
+msgstr ""
+
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:274
 msgid "Blocked DNS Queries"
 msgstr "已攔截的 DNS 請求"
@@ -83,7 +80,7 @@ msgstr "已攔截的 DNS 請求"
 msgid "Blocked Domain"
 msgstr "已攔截的域名"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:69
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:77
 msgid "Blocklist Sources"
 msgstr "攔截列表來源"
 
@@ -91,15 +88,7 @@ msgstr "攔截列表來源"
 msgid "Blocklist not found!"
 msgstr "攔截列表未找到！"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:155
-msgid ""
-"Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all "
-"domains except those listed in the whitelist file."
-msgstr ""
-"構建一個額外的“Jail”列表（/tmp/adb_list.jail），除白名單檔案中列出的域名外，"
-"阻止訪問其他所有的域名。"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:48
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:56
 msgid ""
 "Choose 'none' to disable automatic startups, 'timed' to use a classic "
 "timeout (default 30 sec.) or select another trigger interface."
@@ -130,39 +119,65 @@ msgstr "Adblock 配置工具，通過 DNS 來攔截廣告和阻止域名。"
 msgid "Count"
 msgstr "計數"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113
-msgid ""
-"Create compressed blocklist backups, they will be used in case of download "
-"errors or during startup in backup mode."
-msgstr "建立壓縮的攔截列表備份，它們將在下載錯誤或備份模式啟動期間使用。"
-
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:24
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:159
 msgid "DNS Backend (DNS Directory)"
 msgstr "DNS 後端（DNS 目錄）"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:167
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:169
+msgid "DNS Backend, DNS Directory"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:34
+msgid "DNS Blocking Variant"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:164
 msgid "DNS Directory"
 msgstr "DNS 目錄"
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:127
+msgid "DNS File Reset"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:197
+msgid "DNS Inotify"
+msgstr ""
+
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:20
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:134
 msgid "DNS Query Report"
 msgstr "DNS 查詢報告"
 
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:175
+msgid "DNS Variant, DNS File Reset"
+msgstr ""
+
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:81
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
 msgid "Date"
 msgstr "日期"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
 msgid "Description"
 msgstr "描述"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:124
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:198
 msgid ""
-"Do not automatically update blocklists during startup, use blocklist backups "
-"instead."
-msgstr "啟動期間不要自動更新 blocklists，改用 blocklists 的備份。"
+"Disable adblock triggered restarts and the 'DNS File Reset' for dns backends "
+"with autoload features."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187
+msgid ""
+"Disable the toplevel domain compression, if the number of blocked domains is "
+"greater than this threshold."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
+msgid ""
+"Dnsmasq also supports 'null' block variants, which may provide better "
+"response times."
+msgstr ""
 
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:28
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:71
@@ -175,14 +190,38 @@ msgstr "域名"
 msgid "Domain/Client/Date/Time"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:43
 msgid "Download Utility"
 msgstr "下載工具"
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:153
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:163
 msgid "Download Utility (SSL Library)"
 msgstr "下載實用程式（SSL 庫）"
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:152
+msgid "E-Mail Notification"
+msgstr ""
+
+#: 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:255
+msgid "E-Mail Profile"
+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:245
+msgid "E-Mail Sender Address"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:250
+msgid "E-Mail Topic"
+msgstr ""
+
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
 msgid "Edit Blacklist"
 msgstr "編輯黑名單"
@@ -195,31 +234,15 @@ msgstr "編輯設定"
 msgid "Edit Whitelist"
 msgstr "編輯白名單"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
-msgid "Email Notification"
-msgstr "Email 提醒"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160
-msgid "Email Notification Count"
-msgstr "Email 提醒計數"
-
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:20
 msgid "Enable Adblock"
 msgstr "啟用 Adblock"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:112
-msgid "Enable Blocklist Backup"
-msgstr "啟用 Blocklist 備份"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
-msgid "Enable DNS Query Report"
-msgstr "啟用 DNS 查詢報告"
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:98
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:106
 msgid "Enable verbose debug logging in case of any processing error."
 msgstr "在出現任何處理錯誤的情況下啟用詳細除錯日誌記錄。"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:73
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:81
 msgid "Enabled"
 msgstr "已啟用"
 
@@ -227,7 +250,7 @@ msgstr "已啟用"
 msgid "End Date"
 msgstr "結束日期"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
 msgid "Extra Options"
 msgstr "額外選項"
 
@@ -241,11 +264,11 @@ msgid ""
 "frame."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:203
 msgid "Flush DNS Cache"
 msgstr "清空 DNS 快取"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:184
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:204
 msgid "Flush DNS Cache after adblock processing."
 msgstr "在 adblock 程序啟動後清空 DNS 快取。"
 
@@ -255,21 +278,25 @@ msgid ""
 "documentation</a>"
 msgstr "進一步資訊<a href=\"%s\" target=\"_blank\">請訪問線上文檔</a>"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:130
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:122
 msgid ""
 "For further performance improvements you can raise this value, e.g. '8' or "
 "'16' should be safe."
 msgstr "為了進一步提高效能，您可以提高此值，例如：8 或 16 應該是安全的。"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:108
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
 msgid "Force Local DNS"
 msgstr "強制本地 DNS"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:173
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:170
+msgid "Full path to the blacklist file."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:176
 msgid "Full path to the whitelist file."
 msgstr "白名單檔案的全路徑。"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
+#: 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 "
 "on demand."
@@ -281,7 +308,7 @@ msgstr "通過 tcpdump 收集 dns 有關的網路流量，以按需提供 DNS 
 msgid "Input file not found, please check your configuration."
 msgstr "輸入檔案未找到，請檢查您的配置。"
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:171
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:193
 msgid "Last Run"
 msgstr "最後執行"
 
@@ -289,7 +316,7 @@ msgstr "最後執行"
 msgid "Latest DNS Queries"
 msgstr "最新的 DNS 查詢"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:55
 msgid ""
 "List of available network interfaces. Usually the startup will be triggered "
 "by the 'wan' interface."
@@ -300,25 +327,39 @@ msgid ""
 "List of supported DNS backends with their default list export directory."
 msgstr "支援的 DNS 後端列表及其預設列表匯出目錄。"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
+msgid ""
+"List of supported DNS blocking variants. By default 'nxdomain' will be used "
+"for all DNS backends."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:44
 msgid "List of supported and fully pre-configured download utilities."
 msgstr "支援和完全預配置的下載工具列表。"
 
 #: applications/luci-app-adblock/luasrc/view/adblock/query.htm:21
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:221
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:90
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:98
 msgid "Loading"
 msgstr "載入中"
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:192
+msgid "Local FW/DNS Ports"
+msgstr ""
+
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:22
 msgid "Logfile"
 msgstr "日誌檔案"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109
 msgid "Low Priority Service"
 msgstr "低優先順序服務"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:256
+msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
 msgid "Max. Download Queue"
 msgstr "最大下載佇列"
 
@@ -327,16 +368,16 @@ msgstr "最大下載佇列"
 msgid "Name / IP-Address"
 msgstr "名稱 / IP 地址"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:82
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:90
 msgid "No"
 msgstr "否"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:95
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:103
 msgid ""
 "Options for further tweaking in case the defaults are not suitable for you."
 msgstr "在預設設定並不適合您時的額外選項。"
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:165
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:187
 msgid "Overall Domains"
 msgstr "域名總覽"
 
@@ -359,11 +400,11 @@ msgstr ""
 msgid "Please edit this file directly in a terminal session."
 msgstr "請在終端會話中直接編輯此檔案。"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:149
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
 msgid "Please note: this needs manual 'msmtp' package installation and setup."
 msgstr "請注意：這需要手動安裝和設定“msmtp”軟體包。"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:137
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
 msgid "Please note: this needs manual 'tcpdump-mini' package installation."
 msgstr "請注意：這需要手動安裝和設定“tcpdump-mini”軟體包。"
 
@@ -375,30 +416,30 @@ msgstr "查詢"
 msgid "Query domains"
 msgstr "查詢域"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:161
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:261
 msgid ""
-"Raise the minimum email notification count, to get emails if the overall "
-"count is less or equal to the given limit (default 0),"
+"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:109
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
+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, apply to udp "
-"and tcp protocol on ports 53, 853 and 5353."
+"Redirect all DNS queries from 'lan' zone to the local resolver, applies to "
+"udp and tcp protocol on ports 53, 853 and 5353."
 msgstr ""
-"將所有 DNS 查詢從“lan”區域重定向到本地解析器，適用於埠53、853和5353上的 udp "
-"和 tcp 協議。"
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:22
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:33
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:44
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:103
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:28
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:39
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:50
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:111
 msgid "Refresh"
 msgstr "重新整理"
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:186
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:208
 msgid "Refresh Blocklist Sources"
 msgstr "重新整理攔截列表源"
 
@@ -406,49 +447,55 @@ msgstr "重新整理攔截列表源"
 msgid "Refresh Report"
 msgstr "重新整理報告"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:211
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:231
 msgid "Report Chunk Count"
 msgstr "報告區塊計數"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:218
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:238
 msgid "Report Chunk Size"
 msgstr "報告區塊大小"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:139
 msgid "Report Directory"
 msgstr "報告目錄"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:188
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:208
 msgid "Report Interface"
 msgstr "報告介面"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:205
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:225
 msgid "Report Listen Port(s)"
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:212
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:232
 msgid "Report chunk count used by tcpdump (default '5')."
 msgstr "tcpdump 將使用的報告區塊計數（預設為“5”）。"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:219
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:239
 msgid "Report chunk size used by tcpdump in MB (default '1')."
 msgstr "tcpdump 將使用的報告區塊大小（MB）（預設為“1”）。"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:189
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:209
 msgid ""
 "Reporting interface used by tcpdump, set to 'any' for multiple interfaces "
 "(default 'br-lan')."
 msgstr ""
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:31
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+msgid ""
+"Resets the final DNS blockfile 'adb_list.overall' after loading through the "
+"DNS backend."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:37
 msgid "Resume"
 msgstr "恢復"
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:139
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:149
 msgid "Runtime Information"
 msgstr "執行資訊"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:76
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84
 msgid "SSL req."
 msgstr "SSL 要求"
 
@@ -458,26 +505,35 @@ msgstr "SSL 要求"
 msgid "Save"
 msgstr "儲存"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:148
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
 msgid ""
-"Send notification emails in case of a processing error or if domain count is "
-"&le; 0."
-msgstr "如果發生錯誤或域計數 &le; 0，傳送通知電子郵件。"
+"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:102
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:246
+msgid "Sender address for adblock notification E-Mails."
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:110
 msgid ""
 "Set the nice level to 'low priority' and the adblock background processing "
 "will take fewer resources from the system."
 msgstr ""
 "設定 nice 級別為“低優先順序”，adblock 後臺程序將從系統中獲取更少的資源。"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:129
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:121
 msgid ""
 "Size of the download queue to handle downloads &amp; list processing in "
-"parallel (default '8')."
-msgstr "處理下載佇列的大小及並行處理列表（預設為“8”）。"
+"parallel (default '4')."
+msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:206
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:193
+msgid ""
+"Space separated list of firewall ports which should be redirected locally."
+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 ""
@@ -486,34 +542,37 @@ msgstr ""
 msgid "Start Date"
 msgstr "開始日期"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:46
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:54
 msgid "Startup Trigger"
 msgstr "啟動觸發器"
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:20
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:42
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:101
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:26
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:48
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:109
 msgid "Suspend"
 msgstr "暫停"
 
-#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:178
+#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:200
 msgid "Suspend / Resume Adblock"
 msgstr "暫停/恢復 Adblock"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:186
+msgid "TLD Compression Threshold"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
 msgid ""
-"Target directory for adblock backups. Please use only a non-volatile disk, e."
-"g. an external usb stick."
-msgstr "adblock 備份的目標目錄。請僅使用非易失性磁碟，例如：一個外接 U 盤。"
+"Target directory for adblock source backups. Default is '/tmp', please use "
+"preferably a non-volatile disk if available."
+msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:141
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
 msgid ""
-"Target directory for dns related report files. Please use preferably a non-"
-"volatile disk, e.g. an external usb stick."
+"Target directory for dns related report files. Default is '/tmp', please use "
+"preferably a non-volatile disk if available."
 msgstr ""
-"dns 相關報告檔案的目標目錄。請優先使用非易失性磁碟，例如：一個外接 U 盤。"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:168
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:165
 msgid "Target directory for the generated blocklist 'adb_list.overall'."
 msgstr "生成攔截列表“adb_list.overall”的目標目錄。"
 
@@ -527,11 +586,11 @@ msgstr "檔案過大，無法使用 LuCI 的線上編輯（&ge; 100 KB）。"
 msgid "The syslog output, pre-filtered for adblock related messages only."
 msgstr "系統日誌輸出，僅針對 adblock 相關的訊息進行了預篩選。"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:103
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:190
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:207
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:213
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:220
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:111
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:210
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:227
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:233
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:240
 msgid "This change requires a manual service stop/re-start to take effect."
 msgstr "此更改需要手動停止/重啟服務才能生效。"
 
@@ -557,6 +616,12 @@ msgid ""
 "for whitelisting."
 msgstr "此表單允許您查詢某些域的活動塊列表，例如用於列出白名單。"
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:129
+msgid ""
+"This option saves an enormous amount of storage space, but starts a small "
+"ubus/adblock monitor in the background."
+msgstr ""
+
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:82
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
 msgid "Time"
@@ -572,15 +637,19 @@ msgstr "要覆蓋預設路徑，請使用下面額外部分中的“DNS 目錄
 msgid "Top 10 Reporting"
 msgstr "前十報告"
 
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:251
+msgid "Topic for adblock notification E-Mails."
+msgstr ""
+
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
 msgid "Total DNS Queries"
 msgstr "DNS 查詢總數"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:178
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:181
 msgid "Trigger Delay"
 msgstr "觸發延遲"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:97
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:105
 msgid "Verbose Debug Logging"
 msgstr "詳細的除錯記錄"
 
@@ -592,25 +661,99 @@ msgstr "正在等待指令完成…"
 msgid "Whitelist"
 msgstr "白名單"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:175
 msgid "Whitelist File"
 msgstr "白名單檔案"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
 msgid "Yes"
 msgstr "是"
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:156
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:262
 msgid ""
-"You can use this restrictive blocklist e.g. for guest wifi or kidsafe "
-"configurations."
-msgstr "您可以使用此限制性攔截列表，例如訪客 wifi 或家長模式。"
+"e.g. to receive an E-Mail notification with every adblock run set this value "
+"to 200000."
+msgstr ""
 
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:162
-msgid ""
-"e.g. to receive an email notification with every adblock update set this "
-"value to 150000."
-msgstr "例如：要接收每個 adblock 更新的電子郵件通知時將此值設定為 150000。"
+#~ msgid "'Jail' Blocklist Creation"
+#~ msgstr "“Jail”攔截列表建立"
+
+#~ msgid "Backup Mode"
+#~ msgstr "備份模式"
+
+#~ msgid ""
+#~ "Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to "
+#~ "all domains except those listed in the whitelist file."
+#~ msgstr ""
+#~ "構建一個額外的“Jail”列表（/tmp/adb_list.jail），除白名單檔案中列出的域名"
+#~ "外，阻止訪問其他所有的域名。"
+
+#~ msgid ""
+#~ "Create compressed blocklist backups, they will be used in case of "
+#~ "download errors or during startup in backup mode."
+#~ msgstr "建立壓縮的攔截列表備份，它們將在下載錯誤或備份模式啟動期間使用。"
+
+#~ msgid ""
+#~ "Do not automatically update blocklists during startup, use blocklist "
+#~ "backups instead."
+#~ msgstr "啟動期間不要自動更新 blocklists，改用 blocklists 的備份。"
+
+#~ msgid "Email Notification"
+#~ msgstr "Email 提醒"
+
+#~ msgid "Email Notification Count"
+#~ msgstr "Email 提醒計數"
+
+#~ msgid "Enable Blocklist Backup"
+#~ msgstr "啟用 Blocklist 備份"
+
+#~ msgid "Enable DNS Query Report"
+#~ msgstr "啟用 DNS 查詢報告"
+
+#~ msgid ""
+#~ "Raise the minimum email notification count, to get emails if the overall "
+#~ "count is less or equal to the given limit (default 0),"
+#~ msgstr ""
+#~ "如果總數小於或等於給定限制（預設為 0），請提高最小電子郵件通知數，以獲取電"
+#~ "子郵件。"
+
+#~ msgid ""
+#~ "Redirect all DNS queries from 'lan' zone to the local resolver, apply to "
+#~ "udp and tcp protocol on ports 53, 853 and 5353."
+#~ msgstr ""
+#~ "將所有 DNS 查詢從“lan”區域重定向到本地解析器，適用於埠53、853和5353上的 "
+#~ "udp 和 tcp 協議。"
+
+#~ msgid ""
+#~ "Send notification emails in case of a processing error or if domain count "
+#~ "is &le; 0."
+#~ msgstr "如果發生錯誤或域計數 &le; 0，傳送通知電子郵件。"
+
+#~ msgid ""
+#~ "Size of the download queue to handle downloads &amp; list processing in "
+#~ "parallel (default '8')."
+#~ msgstr "處理下載佇列的大小及並行處理列表（預設為“8”）。"
+
+#~ msgid ""
+#~ "Target directory for adblock backups. Please use only a non-volatile "
+#~ "disk, e.g. an external usb stick."
+#~ msgstr "adblock 備份的目標目錄。請僅使用非易失性磁碟，例如：一個外接 U 盤。"
+
+#~ msgid ""
+#~ "Target directory for dns related report files. Please use preferably a "
+#~ "non-volatile disk, e.g. an external usb stick."
+#~ msgstr ""
+#~ "dns 相關報告檔案的目標目錄。請優先使用非易失性磁碟，例如：一個外接 U 盤。"
+
+#~ msgid ""
+#~ "You can use this restrictive blocklist e.g. for guest wifi or kidsafe "
+#~ "configurations."
+#~ msgstr "您可以使用此限制性攔截列表，例如訪客 wifi 或家長模式。"
+
+#~ msgid ""
+#~ "e.g. to receive an email notification with every adblock update set this "
+#~ "value to 150000."
+#~ msgstr "例如：要接收每個 adblock 更新的電子郵件通知時將此值設定為 150000。"
 
 #~ msgid ""
 #~ "Enable memory intense overall sort / duplicate removal on low memory "
diff --git a/applications/luci-app-advanced-reboot/Makefile b/applications/luci-app-advanced-reboot/Makefile
index 2a7df3bd1..329acece4 100644
--- 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-mod-admin-full
 LUCI_PKGARCH:=all
-PKG_RELEASE:=40
+PKG_RELEASE:=42
 
 include ../../luci.mk
 
diff --git a/applications/luci-app-advanced-reboot/README.md b/applications/luci-app-advanced-reboot/README.md
index 781a1c7f7..61e43637d 100644
--- a/applications/luci-app-advanced-reboot/README.md
+++ b/applications/luci-app-advanced-reboot/README.md
@@ -12,6 +12,7 @@ Currently supported dual-partition devices include:
 - Linksys E4200v2
 - Linksys EA4500
 - Linksys EA6350v3
+- Linksys EA8300
 - Linksys EA8500
 - Linksys WRT1200AC
 - Linksys WRT1900AC
@@ -36,6 +37,8 @@ opkg update
 opkg install luci-app-advanced-reboot
 ```
 
+If the ```luci-app-advanced-reboot``` package is not found in the official feed/repo for your version of OpenWrt/LEDE Project, you will need to [add a custom repo to your router](https://github.com/stangri/openwrt_packages/blob/master/README.md#on-your-router) first.
+
 ## Notes/Known Issues
 
 - When you reboot to a different partition, your current settings (WiFi SSID/password, etc.) will not apply to a different partition. Different partitions might have completely different settings and even firmware.
@@ -44,4 +47,4 @@ opkg install luci-app-advanced-reboot
 
 ## Thanks
 
-I'd like to thank everyone who helped create, test and troubleshoot this package. Without help from [@hnyman](https://github.com/hnyman), [@jpstyves](https://github.com/jpstyves), [@imi2003](https://github.com/imi2003) and many contributions from [@slh](https://github.com/pkgadd) it wouldn't have been possible.
+I'd like to thank everyone who helped create, test and troubleshoot this package. Without help from [@hnyman](https://github.com/hnyman), [@jpstyves](https://github.com/jpstyves), [@imi2003](https://github.com/imi2003), [@jeffsf](https://github.com/jeffsf) and many contributions from [@slh](https://github.com/pkgadd) it wouldn't have been possible.
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 f40eac50c..733242486 100644
--- a/applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua
+++ b/applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua
@@ -8,6 +8,7 @@ devices = {
   {"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"},
@@ -87,10 +88,11 @@ end
 
 function action_reboot()
   local uci = require "luci.model.uci".cursor()
+  local ip  = uci:get("network", "lan", "ipaddr")
   luci.template.render("admin_system/applyreboot", {
         title = luci.i18n.translate("Rebooting..."),
         msg   = luci.i18n.translate("The system is rebooting now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a few minutes before you try to reconnect. It might be necessary to renew the address of your computer to reach the device again, depending on your settings."),
-        addr  = luci.ip.new(uci:get("network", "lan", "ipaddr")) or "192.168.1.1"
+        addr  = luci.ip.new(type(ip) == "string" and ip or "192.168.1.1") or "192.168.1.1"
       })
   luci.sys.reboot()
 end
diff --git a/applications/luci-app-advanced-reboot/po/es/advanced-reboot.po b/applications/luci-app-advanced-reboot/po/es/advanced-reboot.po
index 3c46e4d61..582848fa5 100644
--- a/applications/luci-app-advanced-reboot/po/es/advanced-reboot.po
+++ b/applications/luci-app-advanced-reboot/po/es/advanced-reboot.po
@@ -3,12 +3,12 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Project-Id-Version: \n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
+"PO-Revision-Date: 2019-09-17 22:29-0300\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.2.1\n"
-"Last-Translator: \n"
+"X-Generator: Poedit 2.2.3\n"
+"Last-Translator: Franco Castillo <castillofrancodamian@gmail.com>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Language: es\n"
 
@@ -16,7 +16,7 @@ msgstr ""
 msgid "Action"
 msgstr "Acción"
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:82
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:83
 #: applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/advanced_reboot.htm:10
 msgid "Advanced Reboot"
 msgstr "Reinicio avanzado"
@@ -49,7 +49,7 @@ msgstr "ERROR:"
 msgid "Firmware/OS (Kernel)"
 msgstr "Firmware"
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:112
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:114
 msgid "No access to fw_printenv or fw_printenv!"
 msgstr "Sin acceso a fw_printenv o fw_printenv!"
 
@@ -81,19 +81,19 @@ msgstr "Reinicie el dispositivo a una partición alternativa"
 #: applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/advanced_reboot.htm:50
 #: applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/advanced_reboot.htm:74
 msgid "Reboot to alternative partition..."
-msgstr "Reiniciar a partición alternativa ..."
+msgstr "Reiniciar a la partición alternativa ..."
 
 #: applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/advanced_reboot.htm:45
 #: applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/advanced_reboot.htm:69
 msgid "Reboot to current partition"
 msgstr "Reiniciar a la partición actual"
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:91
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:163
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:93
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:165
 msgid "Rebooting..."
 msgstr "Reiniciando..."
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:197
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:199
 msgid "Shutting down..."
 msgstr "Apagando..."
 
@@ -101,7 +101,7 @@ msgstr "Apagando..."
 msgid "Status"
 msgstr "Estado"
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:92
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:94
 msgid ""
 "The system is rebooting now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
 "few minutes before you try to reconnect. It might be necessary to renew the "
@@ -113,7 +113,7 @@ msgstr ""
 "sea necesario renovar la dirección de su computadora para llegar al "
 "dispositivo nuevamente, dependiendo de su configuración."
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:164
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:166
 msgid ""
 "The system is rebooting to an alternative partition now.<br /> DO NOT POWER "
 "OFF THE DEVICE!<br /> Wait a few minutes before you try to reconnect. It "
@@ -126,7 +126,7 @@ msgstr ""
 "computadora para llegar al dispositivo nuevamente, dependiendo de su "
 "configuración."
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:198
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:200
 msgid ""
 "The system is shutting down now.<br /> DO NOT POWER OFF THE DEVICE!<br /> It "
 "might be necessary to renew the address of your computer to reach the device "
@@ -136,31 +136,31 @@ msgstr ""
 "Puede que sea necesario renovar la dirección de su computadora para llegar "
 "al dispositivo nuevamente, dependiendo de la configuración."
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:67
 #: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:68
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:147
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:148
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:69
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:149
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:150
 msgid "Unable to find Dual Boot Flag Partition."
 msgstr "No se puede encontrar la partición de bandera de arranque dual."
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:119
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:120
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:133
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:134
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:121
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:122
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:135
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:136
 msgid "Unable to obtain firmware environment variable"
 msgstr "No se puede obtener la variable de entorno de firmware"
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:155
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:156
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:157
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:158
 msgid "Unable to set Dual Boot Flag Partition entry for partition"
 msgstr ""
 "No se puede establecer la entrada de la partición del indicador de inicio "
 "dual para la partición"
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:125
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:126
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:139
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:140
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:127
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:128
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:141
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:142
 msgid "Unable to set firmware environment variable"
 msgstr "No se puede establecer la variable de entorno de firmware"
 
@@ -214,9 +214,9 @@ msgstr "Advertencia: ¡Este sistema no admite el apagado!"
 msgid "Warning: Unable to obtain device information!"
 msgstr "Advertencia: ¡No se puede obtener información del dispositivo!"
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:125
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:126
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:139
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:140
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:127
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:128
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:141
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:142
 msgid "to"
 msgstr "a"
diff --git a/applications/luci-app-advanced-reboot/po/ru/advanced-reboot.po b/applications/luci-app-advanced-reboot/po/ru/advanced-reboot.po
index b1f742b9f..5d66917ed 100644
--- a/applications/luci-app-advanced-reboot/po/ru/advanced-reboot.po
+++ b/applications/luci-app-advanced-reboot/po/ru/advanced-reboot.po
@@ -17,7 +17,7 @@ msgstr ""
 msgid "Action"
 msgstr "Действие"
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:82
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:83
 #: applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/advanced_reboot.htm:10
 msgid "Advanced Reboot"
 msgstr "Дополнительная перезагрузка"
@@ -50,7 +50,7 @@ msgstr "ОШИБКА:"
 msgid "Firmware/OS (Kernel)"
 msgstr "Прошивка/ОС (Ядро)"
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:112
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:114
 msgid "No access to fw_printenv or fw_printenv!"
 msgstr "Нет доступа к fw_printenv или fw_printenv!"
 
@@ -89,12 +89,12 @@ msgstr "Перезагрузить до альтернативного разд
 msgid "Reboot to current partition"
 msgstr "Перезагрузка к текущему разделу"
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:91
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:163
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:93
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:165
 msgid "Rebooting..."
 msgstr "Перезагрузка..."
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:197
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:199
 msgid "Shutting down..."
 msgstr "Отключается..."
 
@@ -102,7 +102,7 @@ msgstr "Отключается..."
 msgid "Status"
 msgstr "Состояние"
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:92
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:94
 msgid ""
 "The system is rebooting now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
 "few minutes before you try to reconnect. It might be necessary to renew the "
@@ -114,7 +114,7 @@ msgstr ""
 "снова. Возможно, потребуется обновить адрес компьютера для повторного "
 "доступа к устройству в зависимости от ваших настроек."
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:164
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:166
 msgid ""
 "The system is rebooting to an alternative partition now.<br /> DO NOT POWER "
 "OFF THE DEVICE!<br /> Wait a few minutes before you try to reconnect. It "
@@ -126,7 +126,7 @@ msgstr ""
 "установить соединение снова. Возможно, потребуется обновить адрес компьютера "
 "для повторного доступа к устройству в зависимости от ваших настроек."
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:198
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:200
 msgid ""
 "The system is shutting down now.<br /> DO NOT POWER OFF THE DEVICE!<br /> It "
 "might be necessary to renew the address of your computer to reach the device "
@@ -136,29 +136,29 @@ msgstr ""
 "Возможно, потребуется обновить адрес компьютера для повторного доступа к "
 "устройству в зависимости от настроек."
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:67
 #: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:68
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:147
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:148
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:69
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:149
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:150
 msgid "Unable to find Dual Boot Flag Partition."
 msgstr "Невозможно найти Dual Boot раздел."
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:119
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:120
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:133
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:134
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:121
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:122
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:135
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:136
 msgid "Unable to obtain firmware environment variable"
 msgstr "Невозможно получить переменную среды прошивки"
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:155
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:156
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:157
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:158
 msgid "Unable to set Dual Boot Flag Partition entry for partition"
 msgstr "Невозможно использовать Dual Boot раздел."
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:125
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:126
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:139
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:140
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:127
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:128
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:141
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:142
 msgid "Unable to set firmware environment variable"
 msgstr "Невозможно установить переменную среды прошивки"
 
@@ -211,10 +211,10 @@ msgstr "Внимание: Эта система не поддерживает о
 msgid "Warning: Unable to obtain device information!"
 msgstr ""
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:125
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:126
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:139
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:140
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:127
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:128
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:141
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:142
 msgid "to"
 msgstr ""
 
diff --git a/applications/luci-app-advanced-reboot/po/sv/advanced-reboot.po b/applications/luci-app-advanced-reboot/po/sv/advanced-reboot.po
index 97582e0fd..a793c24e9 100644
--- a/applications/luci-app-advanced-reboot/po/sv/advanced-reboot.po
+++ b/applications/luci-app-advanced-reboot/po/sv/advanced-reboot.po
@@ -5,7 +5,7 @@ msgstr "Content-Type: text/plain; charset=UTF-8\n"
 msgid "Action"
 msgstr "Åtgärd"
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:82
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:83
 #: applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/advanced_reboot.htm:10
 msgid "Advanced Reboot"
 msgstr "Avancerad omstart"
@@ -38,7 +38,7 @@ msgstr ""
 msgid "Firmware/OS (Kernel)"
 msgstr "Inre mjukvara/OS (Kärna)"
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:112
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:114
 msgid "No access to fw_printenv or fw_printenv!"
 msgstr ""
 
@@ -77,12 +77,12 @@ msgstr "Starta om till alternativ partition..."
 msgid "Reboot to current partition"
 msgstr "Starta om till nuvarande partition"
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:91
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:163
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:93
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:165
 msgid "Rebooting..."
 msgstr "Startar om..."
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:197
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:199
 msgid "Shutting down..."
 msgstr "Stänger av..."
 
@@ -90,7 +90,7 @@ msgstr "Stänger av..."
 msgid "Status"
 msgstr "Status"
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:92
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:94
 msgid ""
 "The system is rebooting now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
 "few minutes before you try to reconnect. It might be necessary to renew the "
@@ -98,7 +98,7 @@ msgid ""
 "settings."
 msgstr ""
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:164
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:166
 msgid ""
 "The system is rebooting to an alternative partition now.<br /> DO NOT POWER "
 "OFF THE DEVICE!<br /> Wait a few minutes before you try to reconnect. It "
@@ -106,7 +106,7 @@ msgid ""
 "again, depending on your settings."
 msgstr ""
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:198
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:200
 msgid ""
 "The system is shutting down now.<br /> DO NOT POWER OFF THE DEVICE!<br /> It "
 "might be necessary to renew the address of your computer to reach the device "
@@ -116,29 +116,29 @@ msgstr ""
 "inställningar så kan det vara nödvändigt att förnya din dators adress för "
 "att nå enheten igen."
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:67
 #: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:68
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:147
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:148
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:69
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:149
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:150
 msgid "Unable to find Dual Boot Flag Partition."
 msgstr ""
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:119
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:120
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:133
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:134
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:121
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:122
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:135
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:136
 msgid "Unable to obtain firmware environment variable"
 msgstr ""
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:155
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:156
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:157
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:158
 msgid "Unable to set Dual Boot Flag Partition entry for partition"
 msgstr ""
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:125
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:126
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:139
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:140
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:127
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:128
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:141
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:142
 msgid "Unable to set firmware environment variable"
 msgstr ""
 
@@ -181,10 +181,10 @@ msgstr "Varning: Det här systemet har inte stöd för avstängning!"
 msgid "Warning: Unable to obtain device information!"
 msgstr ""
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:125
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:126
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:139
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:140
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:127
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:128
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:141
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:142
 msgid "to"
 msgstr ""
 
diff --git a/applications/luci-app-advanced-reboot/po/templates/advanced-reboot.pot b/applications/luci-app-advanced-reboot/po/templates/advanced-reboot.pot
index c6ca42850..ab1ef12ff 100644
--- a/applications/luci-app-advanced-reboot/po/templates/advanced-reboot.pot
+++ b/applications/luci-app-advanced-reboot/po/templates/advanced-reboot.pot
@@ -5,7 +5,7 @@ msgstr "Content-Type: text/plain; charset=UTF-8"
 msgid "Action"
 msgstr ""
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:82
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:83
 #: applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/advanced_reboot.htm:10
 msgid "Advanced Reboot"
 msgstr ""
@@ -38,7 +38,7 @@ msgstr ""
 msgid "Firmware/OS (Kernel)"
 msgstr ""
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:112
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:114
 msgid "No access to fw_printenv or fw_printenv!"
 msgstr ""
 
@@ -77,12 +77,12 @@ msgstr ""
 msgid "Reboot to current partition"
 msgstr ""
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:91
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:163
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:93
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:165
 msgid "Rebooting..."
 msgstr ""
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:197
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:199
 msgid "Shutting down..."
 msgstr ""
 
@@ -90,7 +90,7 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:92
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:94
 msgid ""
 "The system is rebooting now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
 "few minutes before you try to reconnect. It might be necessary to renew the "
@@ -98,7 +98,7 @@ msgid ""
 "settings."
 msgstr ""
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:164
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:166
 msgid ""
 "The system is rebooting to an alternative partition now.<br /> DO NOT POWER "
 "OFF THE DEVICE!<br /> Wait a few minutes before you try to reconnect. It "
@@ -106,36 +106,36 @@ msgid ""
 "again, depending on your settings."
 msgstr ""
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:198
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:200
 msgid ""
 "The system is shutting down now.<br /> DO NOT POWER OFF THE DEVICE!<br /> It "
 "might be necessary to renew the address of your computer to reach the device "
 "again, depending on your settings."
 msgstr ""
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:67
 #: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:68
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:147
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:148
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:69
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:149
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:150
 msgid "Unable to find Dual Boot Flag Partition."
 msgstr ""
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:119
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:120
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:133
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:134
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:121
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:122
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:135
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:136
 msgid "Unable to obtain firmware environment variable"
 msgstr ""
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:155
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:156
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:157
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:158
 msgid "Unable to set Dual Boot Flag Partition entry for partition"
 msgstr ""
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:125
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:126
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:139
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:140
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:127
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:128
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:141
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:142
 msgid "Unable to set firmware environment variable"
 msgstr ""
 
@@ -174,9 +174,9 @@ msgstr ""
 msgid "Warning: Unable to obtain device information!"
 msgstr ""
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:125
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:126
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:139
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:140
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:127
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:128
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:141
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:142
 msgid "to"
 msgstr ""
diff --git a/applications/luci-app-advanced-reboot/po/zh-cn/advanced-reboot.po b/applications/luci-app-advanced-reboot/po/zh-cn/advanced-reboot.po
index 4b66d3bf0..a9a20e493 100644
--- a/applications/luci-app-advanced-reboot/po/zh-cn/advanced-reboot.po
+++ b/applications/luci-app-advanced-reboot/po/zh-cn/advanced-reboot.po
@@ -15,7 +15,7 @@ msgstr ""
 msgid "Action"
 msgstr "动作"
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:82
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:83
 #: applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/advanced_reboot.htm:10
 msgid "Advanced Reboot"
 msgstr "高级重启"
@@ -48,7 +48,7 @@ msgstr "错误："
 msgid "Firmware/OS (Kernel)"
 msgstr "固件/OS（内核）"
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:112
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:114
 msgid "No access to fw_printenv or fw_printenv!"
 msgstr "无法访问 fw_printenv 或 fw_printenv！"
 
@@ -87,12 +87,12 @@ msgstr "重启到备用分区…"
 msgid "Reboot to current partition"
 msgstr "重启到当前分区"
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:91
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:163
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:93
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:165
 msgid "Rebooting..."
 msgstr "正在重启…"
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:197
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:199
 msgid "Shutting down..."
 msgstr "正在关机…"
 
@@ -100,7 +100,7 @@ msgstr "正在关机…"
 msgid "Status"
 msgstr "状态"
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:92
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:94
 msgid ""
 "The system is rebooting now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
 "few minutes before you try to reconnect. It might be necessary to renew the "
@@ -110,7 +110,7 @@ msgstr ""
 "系统正在重启。<br />切勿关闭电源！ DO NOT POWER OFF THE DEVICE!<br />等待数分"
 "钟后即可尝试重新连接到路由。您可能需要更改计算机的 IP 地址以重新连接。"
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:164
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:166
 msgid ""
 "The system is rebooting to an alternative partition now.<br /> DO NOT POWER "
 "OFF THE DEVICE!<br /> Wait a few minutes before you try to reconnect. It "
@@ -121,7 +121,7 @@ msgstr ""
 "<br />等待数分钟后即可尝试重新连接到路由。您可能需要更改计算机的 IP 地址以重"
 "新连接。"
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:198
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:200
 msgid ""
 "The system is shutting down now.<br /> DO NOT POWER OFF THE DEVICE!<br /> It "
 "might be necessary to renew the address of your computer to reach the device "
@@ -130,29 +130,29 @@ msgstr ""
 "系统现在正在关机。<br />切勿关闭电源！ DO NOT POWER OFF THE DEVICE!<br />等待"
 "数分钟后即可尝试重新连接到路由。您可能需要更改计算机的 IP 地址以重新连接。"
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:67
 #: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:68
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:147
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:148
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:69
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:149
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:150
 msgid "Unable to find Dual Boot Flag Partition."
 msgstr "无法找到双引导标志分区。"
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:119
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:120
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:133
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:134
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:121
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:122
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:135
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:136
 msgid "Unable to obtain firmware environment variable"
 msgstr "无法获取固件环境变量"
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:155
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:156
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:157
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:158
 msgid "Unable to set Dual Boot Flag Partition entry for partition"
 msgstr "无法为分区设置双引导标志分区项"
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:125
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:126
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:139
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:140
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:127
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:128
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:141
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:142
 msgid "Unable to set firmware environment variable"
 msgstr "无法设置固件环境变量"
 
@@ -197,9 +197,9 @@ msgstr "警告：此系统不支持关闭电源！"
 msgid "Warning: Unable to obtain device information!"
 msgstr "警告：无法获取设备信息！"
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:125
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:126
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:139
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:140
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:127
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:128
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:141
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:142
 msgid "to"
 msgstr "至"
diff --git a/applications/luci-app-advanced-reboot/po/zh-tw/advanced-reboot.po b/applications/luci-app-advanced-reboot/po/zh-tw/advanced-reboot.po
index b820de9a0..0ddcec8fd 100644
--- a/applications/luci-app-advanced-reboot/po/zh-tw/advanced-reboot.po
+++ b/applications/luci-app-advanced-reboot/po/zh-tw/advanced-reboot.po
@@ -15,7 +15,7 @@ msgstr ""
 msgid "Action"
 msgstr "動作"
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:82
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:83
 #: applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/advanced_reboot.htm:10
 msgid "Advanced Reboot"
 msgstr "高階重啟"
@@ -48,7 +48,7 @@ msgstr "錯誤："
 msgid "Firmware/OS (Kernel)"
 msgstr "韌體/OS（核心）"
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:112
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:114
 msgid "No access to fw_printenv or fw_printenv!"
 msgstr "無法訪問 fw_printenv 或 fw_printenv！"
 
@@ -87,12 +87,12 @@ msgstr "重啟到備用分割槽…"
 msgid "Reboot to current partition"
 msgstr "重啟到當前分割槽"
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:91
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:163
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:93
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:165
 msgid "Rebooting..."
 msgstr "正在重啟…"
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:197
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:199
 msgid "Shutting down..."
 msgstr "正在關機…"
 
@@ -100,7 +100,7 @@ msgstr "正在關機…"
 msgid "Status"
 msgstr "狀態"
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:92
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:94
 msgid ""
 "The system is rebooting now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
 "few minutes before you try to reconnect. It might be necessary to renew the "
@@ -110,7 +110,7 @@ msgstr ""
 "系統正在重啟。<br />切勿關閉電源！ DO NOT POWER OFF THE DEVICE!<br />等待數分"
 "鍾後即可嘗試重新連線到路由。您可能需要更改計算機的 IP 位址以重新連線。"
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:164
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:166
 msgid ""
 "The system is rebooting to an alternative partition now.<br /> DO NOT POWER "
 "OFF THE DEVICE!<br /> Wait a few minutes before you try to reconnect. It "
@@ -121,7 +121,7 @@ msgstr ""
 "DEVICE!<br />等待數分鐘後即可嘗試重新連線到路由。您可能需要更改計算機的 IP 地"
 "址以重新連線。"
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:198
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:200
 msgid ""
 "The system is shutting down now.<br /> DO NOT POWER OFF THE DEVICE!<br /> It "
 "might be necessary to renew the address of your computer to reach the device "
@@ -130,29 +130,29 @@ msgstr ""
 "系統現在正在關機。<br />切勿關閉電源！ DO NOT POWER OFF THE DEVICE!<br />等待"
 "數分鐘後即可嘗試重新連線到路由。您可能需要更改計算機的 IP 位址以重新連線。"
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:67
 #: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:68
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:147
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:148
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:69
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:149
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:150
 msgid "Unable to find Dual Boot Flag Partition."
 msgstr "無法找到雙引導標誌分割槽。"
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:119
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:120
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:133
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:134
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:121
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:122
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:135
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:136
 msgid "Unable to obtain firmware environment variable"
 msgstr "無法獲取韌體環境變數"
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:155
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:156
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:157
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:158
 msgid "Unable to set Dual Boot Flag Partition entry for partition"
 msgstr "無法為分割槽設定雙引導標誌分割槽項"
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:125
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:126
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:139
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:140
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:127
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:128
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:141
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:142
 msgid "Unable to set firmware environment variable"
 msgstr "無法設定韌體環境變數"
 
@@ -198,9 +198,9 @@ msgstr "警告：此係統不支援關閉電源！"
 msgid "Warning: Unable to obtain device information!"
 msgstr "警告：無法獲取裝置資訊！"
 
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:125
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:126
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:139
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:140
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:127
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:128
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:141
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:142
 msgid "to"
 msgstr "至"
diff --git a/applications/luci-app-aria2/po/es/aria2.po b/applications/luci-app-aria2/po/es/aria2.po
index 61bd523d1..275f1b82d 100644
--- a/applications/luci-app-aria2/po/es/aria2.po
+++ b/applications/luci-app-aria2/po/es/aria2.po
@@ -3,12 +3,12 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Project-Id-Version: \n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
+"PO-Revision-Date: 2019-09-17 23:29-0300\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.2.2\n"
-"Last-Translator: \n"
+"X-Generator: Poedit 2.2.3\n"
+"Last-Translator: Franco Castillo <castillofrancodamian@gmail.com>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Language: es\n"
 
@@ -19,19 +19,19 @@ msgstr ""
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:414
 msgid "Additional BT tracker"
-msgstr ""
+msgstr "Tracker BT adicional"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:419
 msgid "Advanced Options"
-msgstr ""
+msgstr "Opciones avanzadas"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:169
 msgid "All proxy"
-msgstr ""
+msgstr "Todos los proxy"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:228
 msgid "Append HEADERs to HTTP request header."
-msgstr ""
+msgstr "Añadir encabezados al encabezado de solicitud HTTP."
 
 #: applications/luci-app-aria2/luasrc/controller/aria2.lua:18
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:35
@@ -45,18 +45,19 @@ msgid ""
 "Aria2 is a lightweight multi-protocol &amp; multi-source, cross platform "
 "download utility."
 msgstr ""
+"Aria2 es un multiprotocolo ligero &amp; utilidad de descarga multiplataforma."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:428
 msgid "Auto save interval"
-msgstr ""
+msgstr "Intervalo de guardado automático"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:56
 msgid "Basic Options"
-msgstr ""
+msgstr "Opciones avanzadas"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:276
 msgid "BitTorrent Options"
-msgstr ""
+msgstr "Opciones de BitTorrent"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:335
 msgid "BitTorrent listen port"
@@ -64,21 +65,23 @@ msgstr "BitTorrent escucha puerto"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:189
 msgid "CA certificate"
-msgstr ""
+msgstr "Certificado CA"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:195
 msgid "Certificate"
-msgstr ""
+msgstr "Certificado"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:182
 msgid "Check certificate"
-msgstr ""
+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."
 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."
 
 #: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:49
 #: applications/luci-app-aria2/luasrc/view/aria2/settings_header.htm:29
@@ -91,23 +94,23 @@ msgstr "Directorio de archivos de configuración"
 
 #: applications/luci-app-aria2/luasrc/controller/aria2.lua:21
 msgid "Configuration"
-msgstr ""
+msgstr "Configuración"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:230
 msgid "Connect timeout"
-msgstr ""
+msgstr "Tiempo de espera de conexión"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:19
 msgid "Content of config file: <code>%s</code>"
-msgstr ""
+msgstr "Contenido del archivo de configuración: <code>%s</code>"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:29
 msgid "Content of session file: <code>%s</code>"
-msgstr ""
+msgstr "Contenido del archivo de sesión: <code>%s</code>"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:341
 msgid "DHT Listen port"
-msgstr ""
+msgstr "Puerto de DHT"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:87
 msgid "Debug"
@@ -118,6 +121,8 @@ msgid ""
 "Disable IPv6. This is useful if you have to use broken DNS and want to avoid "
 "terribly slow AAAA record lookup."
 msgstr ""
+"Deshabilitar IPv6. Esto es útil si tiene que usar DNS roto y desea evitar "
+"una búsqueda de registros AAAA terriblemente lenta."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:440
 msgid "Disk cache"
@@ -126,51 +131,54 @@ msgstr "Caché de 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 ""
+"No divida menos de 2*TAMAÑO de rango de bytes. Valores posibles: 1M-1024M."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:254
 msgid "Download a file using N connections."
-msgstr ""
+msgstr "Descargue un archivo usando N conexiones."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:69
 msgid "Download directory"
-msgstr ""
+msgstr "Directorio de descarga"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:26
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:36
 msgid "Empty file."
-msgstr ""
+msgstr "Archivo vacío."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:280
 msgid "Enable IPv4 DHT functionality. It also enables UDP tracker support."
 msgstr ""
+"Habilite la funcionalidad DHT IPv4. También habilita el soporte de tracker "
+"UDP."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:290
 msgid "Enable IPv6 DHT functionality."
-msgstr ""
+msgstr "Habilite la funcionalidad DHT IPv6 ."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:298
 msgid "Enable Local Peer Discovery."
-msgstr ""
+msgstr "Habilitar el descubrimiento de pares locales."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:307
 msgid "Enable Peer Exchange extension."
-msgstr ""
+msgstr "Habilite la extensión de intercambio de pares."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:442
 msgid "Enable disk cache (in bytes), set 0 to disabled."
-msgstr ""
+msgstr "Habilite el caché de disco (en bytes), establezca 0 para deshabilitar."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:77
 msgid "Enable logging"
-msgstr ""
+msgstr "Habilitar el registro"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:305
 msgid "Enable peer exchange"
-msgstr ""
+msgstr "Habilitar el intercambio entre pares"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:166
 msgid "Enable proxy"
-msgstr ""
+msgstr "Habilitar proxy"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:58
 msgid "Enabled"
@@ -182,7 +190,7 @@ msgstr "Error"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:44
 msgid "Error: Can't find aria2c in PATH, please reinstall aria2."
-msgstr ""
+msgstr "Error: no se puede encontrar aria2c en PATH, reinstale aria2."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:482
 msgid "Extra Settings"
@@ -190,25 +198,25 @@ msgstr "Configuraciones extra"
 
 #: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:39
 msgid "Failed to load log data."
-msgstr ""
+msgstr "Error al cargar los datos del registro."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:350
 msgid "False"
-msgstr ""
+msgstr "Falso"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:447
 msgid "File allocation"
-msgstr ""
+msgstr "Asignación de archivos"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:25
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:35
 msgid "File does not exist."
-msgstr ""
+msgstr "El archivo no existe."
 
 #: applications/luci-app-aria2/luasrc/controller/aria2.lua:24
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:14
 msgid "Files"
-msgstr ""
+msgstr "Archivos"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:348
 msgid "Follow torrent"
@@ -216,11 +224,11 @@ msgstr "Seguir torrent"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:38
 msgid "For more information, please visit: %s"
-msgstr ""
+msgstr "Para obtener más información, visite: %s"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:460
 msgid "Force save"
-msgstr ""
+msgstr "Forzar guardado"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:129
 msgid "Generate Randomly"
@@ -228,35 +236,35 @@ msgstr "Generar aleatoriamente"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:210
 msgid "HTTP accept gzip"
-msgstr ""
+msgstr "HTTP acepta gzip"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:219
 msgid "HTTP no cache"
-msgstr ""
+msgstr "HTTP sin caché"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:164
 msgid "HTTP/FTP/SFTP Options"
-msgstr ""
+msgstr "Opciones HTTP/FTP/SFTP"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:227
 msgid "Header"
-msgstr ""
+msgstr "Encabezamiento"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:15
 msgid "Here shows the files used by aria2."
-msgstr ""
+msgstr "Aquí se muestran los archivos utilizados por aria2."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:278
 msgid "IPv4 <abbr title=\"Distributed Hash Table\">DHT</abbr> enabled"
-msgstr ""
+msgstr "<abbr title=\"Distributed Hash Table\">DHT</abbr> IPv4 habilitado"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:288
 msgid "IPv6 <abbr title=\"Distributed Hash Table\">DHT</abbr> enabled"
-msgstr ""
+msgstr "<abbr title=\"Distributed Hash Table\">DHT</abbr> IPv6 habilitado"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:421
 msgid "IPv6 disabled"
-msgstr ""
+msgstr "IPv6 deshabilitado"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:379
 msgid ""
@@ -265,6 +273,10 @@ msgid ""
 "Configuring this option with your preferred download speed can increase your "
 "download speed in some cases."
 msgstr ""
+"Si toda la velocidad de descarga de cada torrent es inferior a SPEED, aria2 "
+"aumenta temporalmente el número de pares para intentar obtener más velocidad "
+"de descarga. Configurar esta opción con su velocidad de descarga preferida "
+"puede aumentar su velocidad de descarga en algunos casos."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:88
 msgid "Info"
@@ -272,53 +284,55 @@ msgstr "Información"
 
 #: applications/luci-app-aria2/luasrc/view/aria2/settings_header.htm:33
 msgid "Installed web interface:"
-msgstr ""
+msgstr "Interfaz web instalada:"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:158
 msgid "Json-RPC URL"
-msgstr ""
+msgstr "URL de Json-RPC"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:351
 msgid "Keep in memory"
-msgstr ""
+msgstr "Guardar en la memoria"
 
 #: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:34
 msgid "Last 50 lines of log file:"
-msgstr ""
+msgstr "Últimas 50 líneas del archivo de registro:"
 
 #: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:36
 msgid "Last 50 lines of syslog:"
-msgstr ""
+msgstr "Últimas 50 líneas de syslog:"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:62
 msgid "Leave blank to use default user."
-msgstr ""
+msgstr "Déjelo en blanco para usar el usuario predeterminado."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:415
 msgid "List of additional BitTorrent tracker's announce URI."
-msgstr ""
+msgstr "Lista de URI de anuncio de trackers de BitTorrent adicionales."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:488
 msgid ""
 "List of extra settings. Format: option=value, eg. <code>netrc-path=/tmp/."
 "netrc</code>."
 msgstr ""
+"Lista de configuraciones adicionales. Formato: opción=valor, p. Ej. "
+"<code>netrc-path=/tmp/.netrc</code>."
 
 #: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:48
 msgid "Loading"
-msgstr ""
+msgstr "Cargando"
 
 #: applications/luci-app-aria2/luasrc/controller/aria2.lua:27
 msgid "Log"
-msgstr ""
+msgstr "Registro"
 
 #: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:45
 msgid "Log Data"
-msgstr ""
+msgstr "Dato de registro"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:80
 msgid "Log file"
-msgstr ""
+msgstr "Archivo de registro"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:85
 msgid "Log level"
@@ -326,7 +340,7 @@ msgstr "Nivel de registro"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:240
 msgid "Lowest speed limit"
-msgstr ""
+msgstr "Límite de velocidad mínima"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:94
 msgid "Max concurrent downloads"
@@ -338,7 +352,7 @@ msgstr "Máxima conexiones por servidor"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:475
 msgid "Max download limit"
-msgstr ""
+msgstr "Límite máximo de descarga"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:253
 msgid "Max number of split"
@@ -346,27 +360,27 @@ msgstr "Número máximo de división"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:367
 msgid "Max open files"
-msgstr ""
+msgstr "Máx. archivos abiertos"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:468
 msgid "Max overall download limit"
-msgstr ""
+msgstr "Límite máximo de descarga total"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:353
 msgid "Max overall upload limit"
-msgstr ""
+msgstr "Límite total máximo de carga"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:372
 msgid "Max peers"
-msgstr ""
+msgstr "Máx. pares"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:262
 msgid "Max tries"
-msgstr ""
+msgstr "Máx. de intentos"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:360
 msgid "Max upload limit"
-msgstr ""
+msgstr "Límite máximo de carga"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:258
 msgid "Min split size"
@@ -379,11 +393,11 @@ msgstr "Sin autenticacion"
 #: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:35
 #: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:37
 msgid "No log data."
-msgstr ""
+msgstr "No hay datos de registro."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:454
 msgid "None"
-msgstr ""
+msgstr "Ninguno"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:89
 msgid "Notice"
@@ -391,23 +405,24 @@ msgstr "Aviso"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:99
 msgid "Pause"
-msgstr ""
+msgstr "Pausa"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:99
 msgid "Pause download after added."
-msgstr ""
+msgstr "Pausa la descarga después de añadir."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:105
 msgid "Pause downloads created as a result of metadata download."
 msgstr ""
+"Pausa las descargas creadas como resultado de la descarga de metadatos."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:104
 msgid "Pause metadata"
-msgstr ""
+msgstr "Pausar metadatos"
 
 #: applications/luci-app-aria2/luasrc/view/aria2/settings_header.htm:64
 msgid "Please input token length:"
-msgstr ""
+msgstr "Ingrese la longitud del token:"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:393
 msgid "Prefix of peer ID"
@@ -415,19 +430,19 @@ msgstr "Prefijo de ID de par"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:203
 msgid "Private key"
-msgstr ""
+msgstr "Clave privada"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:177
 msgid "Proxy password"
-msgstr ""
+msgstr "Contraseña de proxy"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:174
 msgid "Proxy user"
-msgstr ""
+msgstr "Usuario de proxy"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:97
 msgid "RPC Options"
-msgstr ""
+msgstr "Opciones de RPC"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:114
 msgid "RPC authentication method"
@@ -435,7 +450,7 @@ msgstr "Método de autenticación RPC"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:140
 msgid "RPC certificate"
-msgstr ""
+msgstr "Certificado de RPC"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:122
 msgid "RPC password"
@@ -447,21 +462,24 @@ msgstr "Puerto RPC"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:149
 msgid "RPC private key"
-msgstr ""
+msgstr "Clave privada de RPC"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:133
 msgid "RPC secure"
-msgstr ""
+msgstr "RPC seguro"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:126
 msgid "RPC token"
-msgstr ""
+msgstr "Token RPC"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:134
 msgid ""
 "RPC transport will be encrypted by SSL/TLS. The RPC clients must use https "
 "scheme to access the server. For WebSocket client, use wss scheme."
 msgstr ""
+"El transporte RPC será encriptado por SSL/TLS. Los clientes RPC deben usar "
+"el esquema https para acceder al servidor. Para el cliente WebSocket, use el "
+"esquema wss."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:119
 msgid "RPC username"
@@ -469,11 +487,11 @@ msgstr "Nombre de usuario RPC"
 
 #: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:51
 msgid "Refresh every 10 seconds."
-msgstr ""
+msgstr "Actualiza cada 10 segundos."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:322
 msgid "Remove unselected file"
-msgstr ""
+msgstr "Eliminar archivo no seleccionado"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:323
 msgid ""
@@ -481,14 +499,17 @@ msgid ""
 "Please use this option with care because it will actually remove files from "
 "your disk."
 msgstr ""
+"Elimina los archivos no seleccionados cuando se completa la descarga en "
+"BitTorrent. Utilice esta opción con cuidado porque en realidad eliminará los "
+"archivos de su disco."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:377
 msgid "Request peer speed limit"
-msgstr ""
+msgstr "Solicitar límite de velocidad del par"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:266
 msgid "Retry wait"
-msgstr ""
+msgstr "Espera de reintento"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:61
 msgid "Run daemon as user"
@@ -496,13 +517,15 @@ msgstr "Ejecutar demonio como usuario"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
 msgid "Sava metadata"
-msgstr ""
+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 "
 "is not saved during download."
 msgstr ""
+"Guarde un archivo de control (*.aria2) cada N segundos. Si se da 0, no se "
+"guarda un archivo de control durante la descarga."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:461
 msgid ""
@@ -510,12 +533,18 @@ msgid ""
 "This option also saves control file in that situations. This may be useful "
 "to save BitTorrent seeding which is recognized as completed state."
 msgstr ""
+"Guarde la descarga en el archivo de sesión incluso si la descarga se ha "
+"completado o eliminado. Esta opción también guarda el archivo de control en "
+"esas situaciones. Esto puede ser útil para guardar la siembra de BitTorrent "
+"que se reconoce como estado completado."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:435
 msgid ""
 "Save error/unfinished downloads to session file every N seconds. If 0 is "
 "given, file will be saved only when aria2 exits."
 msgstr ""
+"Guarde el error/descargas inacabadas en el archivo de sesión cada N "
+"segundos. Si se da 0, el archivo se guardará solo cuando salga aria2."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:316
 msgid ""
@@ -523,26 +552,30 @@ msgid ""
 "BitTorrent Magnet URI is used. The file name is hex encoded info hash with "
 "suffix \".torrent\"."
 msgstr ""
+"Guardar metadatos como archivo \".torrent\". Esta opción solo tiene efecto "
+"cuando se utiliza el URI de imán de BitTorrent. El nombre del archivo es "
+"hash de información codificado hexadecimal con sufijo \".torrent\"."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
 msgid "Save session interval"
-msgstr ""
+msgstr "Guardar intervalo de sesión"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:330
 msgid "Seed previously downloaded files without verifying piece hashes."
 msgstr ""
+"Sembrar archivos descargados previamente sin verificar hashes de piezas."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:401
 msgid "Seed ratio"
-msgstr ""
+msgstr "Proporción de semilla"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:408
 msgid "Seed time"
-msgstr ""
+msgstr "Tiempo de semilla"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:329
 msgid "Seed unverified"
-msgstr ""
+msgstr "Semilla sin verificar"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:211
 msgid ""
@@ -550,6 +583,9 @@ msgid ""
 "if remote server responds with <code>Content-Encoding: gzip</code> or "
 "<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>."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:220
 msgid ""
@@ -558,6 +594,10 @@ msgid ""
 "you can add Cache-Control header with a directive you like using \"Header\" "
 "option."
 msgstr ""
+"Envíe el encabezado <code>Cache-Control: no-cache</code> y <code>Pragma: no-"
+"cache</code> para evitar el contenido en caché. Si está deshabilitado, estos "
+"encabezados no se envían y puede agregar el encabezado Cache-Control con una "
+"directiva que le guste usando la opción \"Encabezado\"."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:336
 msgid ""
@@ -565,30 +605,44 @@ msgid ""
 "\"6881-6999\" and \"6881-6889,6999\". Make sure that the specified ports are "
 "open for incoming TCP traffic."
 msgstr ""
+"Establezca el número de puerto TCP para las descargas de BitTorrent. Formato "
+"de aceptación: \"6881,6885\", \"6881-6999\" y \"6881-6889,6999\". Asegúrese "
+"de que los puertos especificados estén abiertos para el tráfico TCP entrante."
 
 #: 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 "
 "that the specified ports are open for incoming UDP traffic."
 msgstr ""
+"Configure el puerto de escucha UDP utilizado por DHT (IPv4, IPv6) y el "
+"tracker UDP. Asegúrese de que los puertos especificados estén abiertos para "
+"el tráfico UDP entrante."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:477
 msgid ""
 "Set max download speed per each download in bytes/sec. 0 means unrestricted."
 msgstr ""
+"Establezca la velocidad máxima de descarga por cada descarga en bytes/seg. 0 "
+"significa sin restricciones."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:470
 msgid "Set max overall download speed in bytes/sec. 0 means unrestricted."
 msgstr ""
+"Establezca la velocidad máxima de descarga global en bytes/seg. 0 significa "
+"sin restricciones."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:355
 msgid "Set max overall upload speed in bytes/sec. 0 means unrestricted."
 msgstr ""
+"Establezca la velocidad máxima de carga general en bytes/seg. 0 significa "
+"sin restricciones."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:362
 msgid ""
 "Set max upload speed per each torrent in bytes/sec. 0 means unrestricted."
 msgstr ""
+"Establezca la velocidad máxima de carga por cada torrent en bytes/seg. 0 "
+"significa sin restricciones."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:231
 msgid ""
@@ -596,30 +650,35 @@ msgid ""
 "server. After the connection is established, this option makes no effect and "
 "\"Timeout\" option is used instead."
 msgstr ""
+"Establezca el tiempo de espera de conexión en segundos para establecer la "
+"conexión al servidor HTTP/FTP/proxy. Una vez establecida la conexión, esta "
+"opción no tiene efecto y en su lugar se utiliza la opción \"Tiempo de espera"
+"\"."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:267
 msgid "Set the seconds to wait between retries."
-msgstr ""
+msgstr "Establezca los segundos para esperar entre reintentos."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:272
 msgid "Set user agent for HTTP(S) downloads."
-msgstr ""
+msgstr "Establecer agente de usuario para descargas HTTP(S)."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:35
 msgid "Settings"
-msgstr ""
+msgstr "Configuraciones"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:483
 msgid "Settings in this section will be added to config file."
 msgstr ""
+"La configuración de esta sección se agregará al archivo de configuración."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:487
 msgid "Settings list"
-msgstr ""
+msgstr "Lista de configuraciones"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:161
 msgid "Show URL"
-msgstr ""
+msgstr "Mostrar URL"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:448
 msgid ""
@@ -631,12 +690,22 @@ msgid ""
 "FAT32 because it takes almost same time as \"prealloc\" and it blocks aria2 "
 "entirely until allocation finishes."
 msgstr ""
+"Especifique el método de asignación de archivos. Si está utilizando sistemas "
+"de archivos más nuevos como ext4 (con soporte de extensión), btrfs, xfs o "
+"NTFS (solo compilación MinGW), \"falloc\" es su mejor opción. Asigna "
+"archivos grandes (pocos GiB) casi instantáneamente, pero puede no estar "
+"disponible si su sistema no tiene la función posix_fallocate(3). No use "
+"\"falloc\" con sistemas de archivos heredados como ext3 y FAT32 porque toma "
+"casi el mismo tiempo que \"prealloc\" y bloquea completamente aria2 hasta "
+"que finaliza la asignación."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:368
 msgid ""
 "Specify maximum number of files to open in multi-file BitTorrent download "
 "globally."
 msgstr ""
+"Especifique el número máximo de archivos para abrir en la descarga de "
+"BitTorrent de varios archivos a nivel mundial."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:409
 msgid ""
@@ -644,6 +713,10 @@ 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 siembra en minutos. Si se especifica la opción "
+"\"Proporción de semillas\" junto con esta opción, la siembra finaliza cuando "
+"se cumple al menos una de las condiciones. Especificar 0 deshabilita la "
+"siembra después de completar la descarga."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:402
 msgid ""
@@ -651,10 +724,16 @@ msgid ""
 "RATIO. You are strongly encouraged to specify equals or more than 1.0 here. "
 "Specify 0.0 if you intend to do seeding regardless of share ratio."
 msgstr ""
+"Especificar proporción de participación. La semilla ha completado torrents "
+"hasta que la proporción de participación alcance la PROPORCIÓN. Le "
+"recomendamos encarecidamente que especifique iguales o más de 1.0 aquí. "
+"Especifique 0.0 si tiene la intención de sembrar, independientemente de la "
+"proporción de acciones."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:373
 msgid "Specify the maximum number of peers per torrent, 0 means unlimited."
 msgstr ""
+"Especifique el número máximo de pares por torrent, 0 significa ilimitado."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:394
 msgid ""
@@ -663,16 +742,22 @@ msgid ""
 "than 20 bytes are specified, random byte data are added to make its length "
 "20 bytes."
 msgstr ""
+"Especifique el prefijo de la ID del par. La ID del par en BitTorrent tiene "
+"20 bytes de longitud. Si se especifican más de 20 bytes, solo se utilizan "
+"los primeros 20 bytes. Si se especifican menos de 20 bytes, se agregan datos "
+"de bytes aleatorios para que su longitud sea de 20 bytes."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:388
 msgid ""
 "Stop BitTorrent download if download speed is 0 in consecutive N seconds. If "
 "0 is given, this feature is disabled."
 msgstr ""
+"Detenga la descarga de BitTorrent si la velocidad de descarga es 0 en N "
+"segundos consecutivos. Si se da 0, esta característica está deshabilitada."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:387
 msgid "Stop timeout"
-msgstr ""
+msgstr "Detener tiempo de espera"
 
 #: applications/luci-app-aria2/luasrc/view/aria2/settings_header.htm:48
 msgid "The Aria2 service is not running."
@@ -685,18 +770,22 @@ msgstr "El servicio Aria2 se está ejecutando."
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:74
 msgid "The directory to store the config file, session file and DHT file."
 msgstr ""
+"El directorio para almacenar el archivo de configuración, el archivo de "
+"sesión 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>"
 msgstr ""
+"El directorio para almacenar el archivo descargado. p.ej. <code>/mnt/sda1</"
+"code>"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81
 msgid "The file name of the log file."
-msgstr ""
+msgstr "El nombre del archivo de registro."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:249
 msgid "The maximum number of connections to one server for each download."
-msgstr ""
+msgstr "El número máximo de conexiones a un servidor para cada descarga."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:281
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:291
@@ -704,10 +793,11 @@ msgstr ""
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:308
 msgid "This option will be ignored if a private flag is set in a torrent."
 msgstr ""
+"Esta opción se ignorará si se establece un indicador privado en un torrent."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:236
 msgid "Timeout"
-msgstr ""
+msgstr "Tiempo de espera"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:117
 msgid "Token"
@@ -715,7 +805,7 @@ msgstr "Token"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:349
 msgid "True"
-msgstr ""
+msgstr "Verdadero"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:156
 msgid "Use WebSocket"
@@ -723,13 +813,16 @@ msgstr "Utilizar websocket"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:170
 msgid "Use a proxy server for all protocols."
-msgstr ""
+msgstr "Use un servidor proxy para todos los protocolos."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:190
 msgid ""
 "Use the certificate authorities in FILE to verify the peers. The certificate "
 "file must be in PEM format and can contain multiple CA certificates."
 msgstr ""
+"Use las autoridades de certificación en ARCHIVO para verificar los pares. El "
+"archivo del certificado debe estar en formato .PEM y puede contener "
+"múltiples certificados de CA."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:141
 msgid ""
@@ -739,6 +832,12 @@ msgid ""
 "PKCS12 files with a blank import password can be opened!<br/>When using PEM, "
 "you have to specify the \"RPC private key\" as well."
 msgstr ""
+"Utilice el certificado en ARCHIVO para el servidor RPC. El certificado debe "
+"estar en PKCS12 (.p12, .pfx) o en formato .PEM. <br/>Los archivos PKCS12 "
+"deben contener el certificado, una clave y, opcionalmente, una cadena de "
+"certificados adicionales. ¡Solo se pueden abrir archivos PKCS12 con una "
+"contraseña de importación en blanco!<br/>Al usar PEM, también debe "
+"especificar la \"clave privada RPC\"."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:196
 msgid ""
@@ -748,22 +847,32 @@ 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 ""
+"Use el certificado del cliente en ARCHIVO. El certificado debe estar en "
+"PKCS12 (.p12, .pfx) o en formato PEM.<br/>Los archivos PKCS12 deben contener "
+"el certificado, una clave y, opcionalmente, una cadena de certificados "
+"adicionales. ¡Solo se pueden abrir archivos PKCS12 con una contraseña de "
+"importación en blanco!<br/>Al usar PEM, también debe especificar la \"Clave "
+"privada\"."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:150
 msgid ""
 "Use the private key in FILE for RPC server. The private key must be "
 "decrypted and in PEM format."
 msgstr ""
+"Use la clave privada en ARCHIVO para el servidor RPC. La clave privada debe "
+"ser descifrada y en formato .PEM."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:204
 msgid ""
 "Use the private key in FILE. The private key must be decrypted and in PEM "
 "format. The behavior when encrypted one is given is undefined."
 msgstr ""
+"Use la clave privada en ARCHIVO. La clave privada debe ser descifrada y en "
+"formato .PEM. El comportamiento cuando se da cifrado uno no está definido."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:271
 msgid "User agent"
-msgstr ""
+msgstr "Agente de usuario"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:116
 msgid "Username & Password"
@@ -773,6 +882,8 @@ msgstr "Nombre de usuario y contraseña"
 msgid ""
 "Verify the peer using certificates specified in \"CA certificate\" option."
 msgstr ""
+"Verifique el par utilizando los certificados especificados en la opción "
+"\"Certificado CA\"."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:90
 msgid "Warn"
@@ -786,19 +897,19 @@ msgstr "Advertir"
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:471
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:478
 msgid "You can append K or M."
-msgstr ""
+msgstr "Puedes agregar K o M."
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:457
 msgid "falloc"
-msgstr ""
+msgstr "falloc"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:455
 msgid "prealloc"
-msgstr ""
+msgstr "prealloc"
 
 #: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:456
 msgid "trunc"
-msgstr ""
+msgstr "trunc"
 
 #~ msgid "\"Falloc\" is not available in all cases."
 #~ msgstr "\"Falloc\" no está disponible en todos los casos."
diff --git a/applications/luci-app-banip/luasrc/controller/banip.lua b/applications/luci-app-banip/luasrc/controller/banip.lua
index 42328d7ea..6ada1d516 100644
--- a/applications/luci-app-banip/luasrc/controller/banip.lua
+++ b/applications/luci-app-banip/luasrc/controller/banip.lua
@@ -30,7 +30,9 @@ function index()
 end
 
 function ban_action(name)
-	if name == "do_reload" then
+	if name == "do_refresh" then
+		luci.sys.call("/etc/init.d/banip refresh >/dev/null 2>&1")
+	elseif name == "do_reload" then
 		luci.sys.call("/etc/init.d/banip reload >/dev/null 2>&1")
 	end
 	luci.http.prepare_content("text/plain")
diff --git a/applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua b/applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua
index 57294e5c4..9ce6703a4 100644
--- a/applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua
+++ b/applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua
@@ -45,8 +45,6 @@ o4:value("uclient-fetch")
 o4:value("wget")
 o4:value("curl")
 o4:value("aria2c")
-o4:value("wget-nossl", "wget-nossl (noSSL)")
-o4:value("busybox", "wget-busybox (noSSL)")
 o4.default = "uclient-fetch"
 o4.rmempty = false
 	
@@ -57,22 +55,9 @@ ds.template = "banip/runtime"
 
 -- Source Table
 
-bl = m:section(TypedSection, "source", translate("IP Blocklist Sources"))
+bl = m:section(TypedSection, "source", translate("IPSet Sources"))
 bl.template = "banip/sourcelist"
 
-ssl = bl:option(DummyValue, "ban_src", translate("SSL req."))
-function ssl.cfgvalue(self, section)
-	local source = self.map:get(section, "ban_src") or self.map:get(section, "ban_src_6")
-	if source then
-		if source:match("https://") then
-			return translate("Yes")
-		else
-			return translate("No")
-		end
-	end
-	return translate("n/a")
-end
-
 name_4 = bl:option(Flag, "ban_src_on", translate("enable IPv4"))
 name_4.rmempty = false
 
@@ -108,28 +93,35 @@ e2.disabled = "0"
 e2.enabled = "10"
 e2.rmempty = false
 
-e3 = e:option(Flag, "ban_backup", translate("Enable Blocklist Backup"),
-	translate("Create compressed blocklist backups, they will be used in case of download errors or during startup in 'backup mode'."))
-e3.rmempty = false
-
-e4 = e:option(Value, "ban_backupdir", translate("Backup Directory"),
-	translate("Target directory for banIP backups. Please use preferably a non-volatile disk, e.g. an external usb stick."))
-e4:depends("ban_backup", 1)
-e4.datatype = "directory"
-e4.default = "/mnt"
-e4.rmempty = true
-
-e5 = e:option(Flag, "ban_backupboot", translate("Backup Mode"),
-	translate("Do not automatically update blocklists during startup, use their backups instead."))
-e5:depends("ban_backup", 1)
-e5.rmempty = true
+e3 = e:option(Value, "ban_backupdir", translate("Backup Directory"),
+	translate("Target directory for banIP backups. Default is '/tmp', please use preferably a non-volatile disk if available."))
+e3.datatype = "directory"
+e3.default = "/tmp"
+e3.rmempty = true
 
-e6 = e:option(Value, "ban_maxqueue", translate("Max. Download Queue"),
+e4 = e:option(Value, "ban_maxqueue", translate("Max. Download Queue"),
 	translate("Size of the download queue to handle downloads &amp; IPset processing in parallel (default '4'). ")
 	.. translate("For further performance improvements you can raise this value, e.g. '8' or '16' should be safe."))
-e6.default = 4
-e6.datatype = "range(1,32)"
-e6.rmempty = false
+e4.default = 4
+e4.datatype = "range(1,32)"
+e4.rmempty = false
+
+e5 = e:option(ListValue, "ban_sshdaemon", translate("SSH Daemon"),
+	translate("Select the SSH daemon for logfile parsing, to detect break-in events."))
+e5:value("dropbear")
+e5:value("sshd")
+e5.default = "dropbear"
+e5.rmempty = true
+
+e6 = e:option(Flag, "ban_autoblacklist", translate("Local Save Blacklist Addons"),
+  translate("Blacklist auto addons are stored temporary in the IPSet and saved permanently in the local blacklist. Disable this option to prevent the local save."))
+e6.default = e6.enabled
+e6.rmempty = true
+
+e7 = e:option(Flag, "ban_autowhitelist", translate("Local Save Whitelist Addons"),
+  translate("Whitelist auto addons are stored temporary in the IPSet and saved permanently in the local whitelist. Disable this option to prevent the local save."))
+e7.default = e7.enabled
+e7.rmempty = true
 
 -- Optional Extra Options
 
@@ -139,72 +131,79 @@ e20.default = 2
 e20.datatype = "range(1,60)"
 e20.optional = true
 
-e21 = e:option(Value, "ban_fetchparm", translate("Download Options"),
-	translate("Special options for the selected download utility, e.g. '--timeout=20 --no-check-certificate -O'."))
+e21 = e:option(ListValue, "ban_starttype", translate("Start Type"),
+	translate("Select the used start type during boot."))
+e21:value("start")
+e21:value("reload")
+e21.default = "start"
 e21.optional = true
 
-e22 = e:option(Value, "ban_wan_input_chain", translate("WAN Input Chain IPv4"))
-e22.default = "input_wan_rule"
-e22.datatype = "uciname"
+e22 = e:option(Value, "ban_fetchparm", translate("Download Options"),
+	translate("Special options for the selected download utility, e.g. '--timeout=20 --no-check-certificate -O'."))
 e22.optional = true
 
-e23 = e:option(Value, "ban_wan_forward_chain", translate("WAN Forward Chain IPv4"))
-e23.default = "forwarding_wan_rule"
-e23.datatype = "uciname"
-e23.optional = true
-
-e24 = e:option(Value, "ban_lan_input_chain", translate("LAN Input Chain IPv4"))
-e24.default = "input_lan_rule"
-e24.datatype = "uciname"
-e24.optional = true
-
-e25 = e:option(Value, "ban_lan_forward_chain", translate("LAN Forward Chain IPv4"))
-e25.default = "forwarding_lan_rule"
-e25.datatype = "uciname"
-e25.optional = true
-
-e26 = e:option(ListValue, "ban_target_src", translate("SRC Target IPv4"))
-e26:value("REJECT")
-e26:value("DROP")
-e26.default = "DROP"
-e26.optional = true
-
-e27 = e:option(ListValue, "ban_target_dst", translate("DST Target IPv4"))
-e27:value("REJECT")
-e27:value("DROP")
-e27.default = "REJECT"
-e27.optional = true
-
-e28 = e:option(Value, "ban_wan_input_chain_6", translate("WAN Input Chain IPv6"))
-e28.default = "input_wan_rule"
-e28.datatype = "uciname"
-e28.optional = true
-
-e29 = e:option(Value, "ban_wan_forward_chain_6", translate("WAN Forward Chain IPv6"))
-e29.default = "forwarding_wan_rule"
-e29.datatype = "uciname"
-e29.optional = true
-
-e30 = e:option(Value, "ban_lan_input_chain_6", translate("LAN Input Chain IPv6"))
-e30.default = "input_lan_rule"
+e30 = e:option(Value, "ban_wan_input_chain", translate("WAN Input Chain IPv4"))
+e30.default = "input_wan_rule"
 e30.datatype = "uciname"
 e30.optional = true
 
-e31 = e:option(Value, "ban_lan_forward_chain_6", translate("LAN Forward Chain IPv6"))
-e31.default = "forwarding_lan_rule"
+e31 = e:option(Value, "ban_wan_forward_chain", translate("WAN Forward Chain IPv4"))
+e31.default = "forwarding_wan_rule"
 e31.datatype = "uciname"
 e31.optional = true
 
-e32 = e:option(ListValue, "ban_target_src_6", translate("SRC Target IPv6"))
-e32:value("REJECT")
-e32:value("DROP")
-e32.default = "DROP"
+e32 = e:option(Value, "ban_lan_input_chain", translate("LAN Input Chain IPv4"))
+e32.default = "input_lan_rule"
+e32.datatype = "uciname"
 e32.optional = true
 
-e33 = e:option(ListValue, "ban_target_dst_6", translate("DST Target IPv6"))
-e33:value("REJECT")
-e33:value("DROP")
-e33.default = "REJECT"
+e33 = e:option(Value, "ban_lan_forward_chain", translate("LAN Forward Chain IPv4"))
+e33.default = "forwarding_lan_rule"
+e33.datatype = "uciname"
 e33.optional = true
 
+e34 = e:option(ListValue, "ban_target_src", translate("SRC Target IPv4"))
+e34:value("REJECT")
+e34:value("DROP")
+e34.default = "DROP"
+e34.optional = true
+
+e35 = e:option(ListValue, "ban_target_dst", translate("DST Target IPv4"))
+e35:value("REJECT")
+e35:value("DROP")
+e35.default = "REJECT"
+e35.optional = true
+
+e36 = e:option(Value, "ban_wan_input_chain_6", translate("WAN Input Chain IPv6"))
+e36.default = "input_wan_rule"
+e36.datatype = "uciname"
+e36.optional = true
+
+e37 = e:option(Value, "ban_wan_forward_chain_6", translate("WAN Forward Chain IPv6"))
+e37.default = "forwarding_wan_rule"
+e37.datatype = "uciname"
+e37.optional = true
+
+e38 = e:option(Value, "ban_lan_input_chain_6", translate("LAN Input Chain IPv6"))
+e38.default = "input_lan_rule"
+e38.datatype = "uciname"
+e38.optional = true
+
+e39 = e:option(Value, "ban_lan_forward_chain_6", translate("LAN Forward Chain IPv6"))
+e39.default = "forwarding_lan_rule"
+e39.datatype = "uciname"
+e39.optional = true
+
+e40 = e:option(ListValue, "ban_target_src_6", translate("SRC Target IPv6"))
+e40:value("REJECT")
+e40:value("DROP")
+e40.default = "DROP"
+e40.optional = true
+
+e41 = e:option(ListValue, "ban_target_dst_6", translate("DST Target IPv6"))
+e41:value("REJECT")
+e41:value("DROP")
+e41.default = "REJECT"
+e41.optional = true
+
 return m
diff --git a/applications/luci-app-banip/luasrc/view/banip/runtime.htm b/applications/luci-app-banip/luasrc/view/banip/runtime.htm
index 410528130..44682206b 100644
--- a/applications/luci-app-banip/luasrc/view/banip/runtime.htm
+++ b/applications/luci-app-banip/luasrc/view/banip/runtime.htm
@@ -10,16 +10,23 @@ This is free software, licensed under the Apache License, Version 2.0
 	{
 			var btn1         = document.getElementById("btn1");
 			var btn1_running = document.getElementById("btn1_running");
+			var btn2         = document.getElementById("btn2");
+			var btn2_running = document.getElementById("btn2_running");
 			var view         = document.getElementById("value_1");
 			var input        = json.data.status;
 
-			btn1.value = "<%:Reload%>";
-			btn1.name  = "do_reload";
+			btn1.value = "<%:Refresh%>";
+			btn1.name  = "do_refresh";
+
+			btn2.value = "<%:Reload%>";
+			btn2.name  = "do_reload";
 			view.innerHTML = input || "-";
 			if (input != "running")
 			{
 				btn1.disabled = false;
 				running(btn1_running, 0);
+				btn2.disabled = false;
+				running(btn2_running, 0);
 			}
 			view = document.getElementById("value_2");
 			input = json.data.version;
@@ -31,6 +38,9 @@ This is free software, licensed under the Apache License, Version 2.0
 			input = json.data.ipset_info;
 			view.innerHTML = input || "-";
 			view = document.getElementById("value_5");
+			input = json.data.backup_dir;
+			view.innerHTML = input || "-";
+			view = document.getElementById("value_6");
 			input = json.data.last_run;
 			view.innerHTML = input || "-";
 	}
@@ -39,10 +49,21 @@ function btn_action(action)
 	{
 		var btn1 = document.getElementById("btn1");
 		var btn1_running = document.getElementById("btn1_running");
+		var btn2 = document.getElementById("btn2");
+		var btn2_running = document.getElementById("btn2_running");
 
-		btn1.disabled = true;
-		running(btn1_running, 1);
-
+		if (action.name === "do_refresh")
+		{
+			btn1.disabled = true;
+			btn2.disabled = true;
+			running(btn1_running, 1);
+		}
+		else if (action.name === "do_reload")
+		{
+			btn1.disabled = true;
+			btn2.disabled = true;
+			running(btn2_running, 1);
+		}
 		new XHR.get('<%=luci.dispatcher.build_url("admin", "services", "banip")%>/action/' + action.name, null,
 		function(x)
 		{
@@ -114,17 +135,30 @@ function btn_action(action)
 	</div>
 </div>
 <div class="cbi-value" id="status_5">
-	<label class="cbi-value-title" for="status_5"><%:Last Run%></label>
+	<label class="cbi-value-title" for="status_5"><%:Backup Directory%></label>
 	<div class="cbi-value-field">
 		<span class="runtime" id="value_5">-</span>
 	</div>
 </div>
+<div class="cbi-value" id="status_6">
+	<label class="cbi-value-title" for="status_6"><%:Last Run%></label>
+	<div class="cbi-value-field">
+		<span class="runtime" id="value_6">-</span>
+	</div>
+</div>
 <hr />
 <div class="cbi-value" id="button_1">
-	<label class="cbi-value-title" for="button_1"><%:Reload IPSets%></label>
+	<label class="cbi-value-title" for="button_1"><%:Refresh IPSets%></label>
 	<div class="cbi-value-field">
-		<input class="cbi-button cbi-button-apply" id="btn1" type="button" name="do_reload" value="<%:Reload%>" onclick="btn_action(this)" />
+		<input class="cbi-button cbi-button-apply" id="btn1" type="button" name="do_refresh" value="<%:Refresh%>" onclick="btn_action(this)" />
 		<span id="btn1_running" class="btn_running"></span>
 	</div>
 </div>
+<div class="cbi-value" id="button_2">
+	<label class="cbi-value-title" for="button_2"><%:Reload IPSet Sources%></label>
+	<div class="cbi-value-field">
+		<input class="cbi-button cbi-button-reset" id="btn2" type="button" name="do_reload" value="<%:Reload%>" onclick="btn_action(this)" />
+		<span id="btn2_running" class="btn_running"></span>
+	</div>
+</div>
 
diff --git a/applications/luci-app-banip/po/es/banip.po b/applications/luci-app-banip/po/es/banip.po
index 2edcd63d3..b8395a76a 100644
--- a/applications/luci-app-banip/po/es/banip.po
+++ b/applications/luci-app-banip/po/es/banip.po
@@ -2,12 +2,12 @@ msgid ""
 msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Project-Id-Version: \n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: 2019-07-25 19:35-0300\n"
+"POT-Creation-Date: 2019-07-23 22:17-0300\n"
+"PO-Revision-Date: 2019-09-17 22:33-0300\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.2.1\n"
+"X-Generator: Poedit 2.2.3\n"
 "Last-Translator: Franco Castillo <castillofrancodamian@gmail.com>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Language: es\n"
@@ -20,11 +20,11 @@ msgstr "Resumen de ASN"
 msgid "ASN Prefixes"
 msgstr "Prefijos ASN"
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:91
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:76
 msgid "ASN/Country"
 msgstr "ASN/País"
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:137
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:129
 msgid "Additional trigger delay in seconds before banIP processing begins."
 msgstr ""
 "Demora adicional del disparador en segundos antes de que comience el "
@@ -38,13 +38,20 @@ msgstr "Avanzado"
 msgid "Automatic WAN Interface Detection"
 msgstr "Detección automática de la interfaz WAN"
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:115
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:96
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:138
 msgid "Backup Directory"
 msgstr "Directorio de copia de seguridad"
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:122
-msgid "Backup Mode"
-msgstr "Modo de copia de seguridad"
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:117
+msgid ""
+"Blacklist auto addons are stored temporary in the IPSet and saved "
+"permanently in the local blacklist. Disable this option to prevent the local "
+"save."
+msgstr ""
+"Los complementos automáticos de la lista negra se almacenan temporalmente en "
+"el IPSet y se guardan permanentemente en la lista negra local. Deshabilite "
+"esta opción para evitar el guardado local."
 
 #: applications/luci-app-banip/luasrc/view/banip/ipsetview.htm:45
 msgid "Check the current available IPSets."
@@ -61,28 +68,19 @@ msgstr ""
 msgid "Country Resources"
 msgstr "Recursos del país"
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:112
-msgid ""
-"Create compressed blocklist backups, they will be used in case of download "
-"errors or during startup in 'backup mode'."
-msgstr ""
-"Cree copias de seguridad de listas de bloqueo comprimidas, se utilizarán en "
-"caso de errores de descarga o durante el inicio en el \"modo de copia de "
-"seguridad\"."
-
 #: applications/luci-app-banip/luasrc/view/banip/ripeview.htm:94
 msgid "DNS Chain"
 msgstr "Cadena de DNS"
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:172
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:171
 msgid "DST Target IPv4"
 msgstr "Objetivo DST IPv4"
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:204
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:203
 msgid "DST Target IPv6"
 msgstr "Objetivo DST IPv6"
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:89
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:74
 msgid "Description"
 msgstr "Descripción"
 
@@ -94,15 +92,7 @@ msgstr ""
 "Deshabilitar la detección automática de WAN y seleccione sus interfaces "
 "preferidas manualmente."
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:123
-msgid ""
-"Do not automatically update blocklists during startup, use their backups "
-"instead."
-msgstr ""
-"No actualice automáticamente las listas de bloqueo durante el inicio, use "
-"sus copias de seguridad en su lugar."
-
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:142
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:141
 msgid "Download Options"
 msgstr "Opciones de descarga"
 
@@ -110,7 +100,7 @@ msgstr "Opciones de descarga"
 msgid "Download Utility"
 msgstr "Utilidad de descarga"
 
-#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:105
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:126
 msgid "Download Utility (SSL Library)"
 msgstr "Utilidad de descarga (Librería SSL)"
 
@@ -126,15 +116,11 @@ msgstr "Editar configuración"
 msgid "Edit Whitelist"
 msgstr "Editar lista blanca"
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:111
-msgid "Enable Blocklist Backup"
-msgstr "Habilitar copia de seguridad de lista de bloqueo"
-
 #: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:20
 msgid "Enable banIP"
 msgstr "Habilitar banIP"
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:101
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:86
 msgid "Enable verbose debug logging in case of any processing error."
 msgstr ""
 "Habilite el registro de depuración detallado en caso de cualquier error de "
@@ -144,7 +130,7 @@ msgstr ""
 msgid "Enter IP/CIDR/ASN/ISO"
 msgstr "Ingrese IP/CIDR/ASN/ISO"
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:97
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:82
 msgid "Extra Options"
 msgstr "Opciones extra"
 
@@ -156,7 +142,7 @@ msgstr ""
 "Para obtener más información <a href=\"%s\" target=\"_blank\">consulte la "
 "documentación en línea</a>"
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:129
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:104
 msgid ""
 "For further performance improvements you can raise this value, e.g. '8' or "
 "'16' should be safe."
@@ -172,18 +158,18 @@ msgstr "Geolocalización"
 msgid "IANA Information"
 msgstr "Información IANA"
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:60
-msgid "IP Blocklist Sources"
-msgstr "Fuentes de lista de bloqueo de IP"
-
 #: applications/luci-app-banip/luasrc/view/banip/ripeview.htm:91
 msgid "IP/ASN Mapping"
 msgstr "Asignación de IP/ASN"
 
-#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:111
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:132
 msgid "IPSet Information"
 msgstr "Información de IPSet"
 
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:58
+msgid "IPSet Sources"
+msgstr "Fuentes de IPSet"
+
 #: applications/luci-app-banip/luasrc/controller/banip.lua:18
 msgid "IPSet-Lookup"
 msgstr "Búsqueda de IPSet"
@@ -199,23 +185,23 @@ msgstr ""
 msgid "Interface Selection"
 msgstr "Selección de interfaz"
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:161
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:160
 msgid "LAN Forward Chain IPv4"
 msgstr "Cadena de reenvío LAN IPv4"
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:193
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:192
 msgid "LAN Forward Chain IPv6"
 msgstr "Cadena de reenvío LAN IPv6"
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:156
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:155
 msgid "LAN Input Chain IPv4"
 msgstr "Cadena de entrada LAN IPv4"
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:188
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:187
 msgid "LAN Input Chain IPv6"
 msgstr "Cadena de entrada LAN IPv6"
 
-#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:117
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:144
 msgid "Last Run"
 msgstr "Último arranque"
 
@@ -229,7 +215,7 @@ msgstr ""
 msgid "Load"
 msgstr "Cargar"
 
-#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:60
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:81
 msgid "Loading"
 msgstr "Cargando"
 
@@ -238,24 +224,28 @@ msgstr "Cargando"
 msgid "Loading ..."
 msgstr "CArgando..."
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:104
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:116
+msgid "Local Save Blacklist Addons"
+msgstr "Complementos locales para guardar la lista negra"
+
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:121
+msgid "Local Save Whitelist Addons"
+msgstr "Complementos locales para guardar la lista blanca"
+
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:89
 msgid "Low Priority Service"
 msgstr "Servicio de baja prioridad"
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:127
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:102
 msgid "Max. Download Queue"
 msgstr "Máx. cola de descarga"
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:70
-msgid "No"
-msgstr "No"
-
 #: applications/luci-app-banip/luasrc/view/banip/ipsetview.htm:34
 #: applications/luci-app-banip/luasrc/view/banip/ripeview.htm:65
 msgid "No response!"
 msgstr "¡Ninguna respuesta!"
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:98
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:83
 msgid ""
 "Options for further tweaking in case the defaults are not suitable for you."
 msgstr ""
@@ -285,34 +275,43 @@ msgstr "Edite este archivo directamente en una sesión de terminal."
 msgid "RIPE-Lookup"
 msgstr "Buscar RIPE"
 
-#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:16
-#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:126
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:18
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:153
+msgid "Refresh"
+msgstr "Actualizar"
+
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:151
+msgid "Refresh IPSets"
+msgstr "Actualizar IPSets"
+
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:21
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:160
 msgid "Reload"
 msgstr "Recargar"
 
-#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:124
-msgid "Reload IPSets"
-msgstr "Recargar IPSets"
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:158
+msgid "Reload IPSet Sources"
+msgstr "Recargar las fuentes de IPSet"
 
-#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:91
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:112
 msgid "Runtime Information"
 msgstr "Información de tiempo de ejecución"
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:166
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:165
 msgid "SRC Target IPv4"
 msgstr "Objetivo SRC IPv4"
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:198
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:197
 msgid "SRC Target IPv6"
 msgstr "Objetivo SRC IPv6"
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:82
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:67
 msgid "SRC/DST"
 msgstr "SRC/DST"
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:63
-msgid "SSL req."
-msgstr "SSL requerido."
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:109
+msgid "SSH Daemon"
+msgstr "Demonio SSH"
 
 #: applications/luci-app-banip/luasrc/model/cbi/banip/blacklist_tab.lua:27
 #: applications/luci-app-banip/luasrc/model/cbi/banip/configuration_tab.lua:26
@@ -320,7 +319,17 @@ msgstr "SSL requerido."
 msgid "Save"
 msgstr "Guardar"
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:105
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:110
+msgid "Select the SSH daemon for logfile parsing, to detect break-in events."
+msgstr ""
+"Seleccione el demonio SSH para el análisis del archivo de registro, para "
+"detectar eventos de intrusión."
+
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:135
+msgid "Select the used start type during boot."
+msgstr "Seleccione el tipo de inicio utilizado durante el arranque."
+
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:90
 msgid ""
 "Set the nice level to 'low priority' and banIP background processing will "
 "take less resources from the system."
@@ -332,7 +341,7 @@ msgstr ""
 msgid "Show only set member with packet counter &gt; 0"
 msgstr "Mostrar solo el miembro establecido con el contador de paquetes &gt; 0"
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:128
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:103
 msgid ""
 "Size of the download queue to handle downloads &amp; IPset processing in "
 "parallel (default '4')."
@@ -340,7 +349,7 @@ msgstr ""
 "Tamaño de la cola de descarga para manejar descargas &amp; Procesamiento de "
 "IPset en paralelo (predeterminado es '4')."
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:143
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:142
 msgid ""
 "Special options for the selected download utility, e.g. '--timeout=20 --no-"
 "check-certificate -O'."
@@ -348,13 +357,18 @@ msgstr ""
 "Opciones especiales para la utilidad de descarga seleccionada, por ejemplo, "
 "'--timeout=20 --no-check-certificate -O'."
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:116
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:134
+msgid "Start Type"
+msgstr "Tipo de inicio"
+
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:97
 msgid ""
-"Target directory for banIP backups. Please use preferably a non-volatile "
-"disk, e.g. an external usb stick."
+"Target directory for banIP backups. Default is '/tmp', please use preferably "
+"a non-volatile disk if available."
 msgstr ""
-"Directorio de destino para las copias de seguridad de banIP. Utilice "
-"preferiblemente un disco no volátil, por ej. una memoria usb externa."
+"Directorio de destino para copias de seguridad de banIP. El valor "
+"predeterminado es '/tmp', utilice preferiblemente un disco no volátil si "
+"está disponible."
 
 #: applications/luci-app-banip/luasrc/view/banip/ripeview.htm:77
 msgid ""
@@ -379,7 +393,7 @@ msgid "The syslog output, pre-filtered for banIP related messages only."
 msgstr ""
 "La salida de syslog, prefiltrada solo para mensajes relacionados con banIP."
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:106
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:91
 msgid "This change requires a manual service stop/re-start to take effect."
 msgstr ""
 "Este cambio requiere una parada/reinicio manual del servicio para que tenga "
@@ -469,11 +483,11 @@ msgstr ""
 "Este formulario le permite modificar el contenido del archivo de "
 "configuración de banIP principal (/etc/config/banip)."
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:136
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:128
 msgid "Trigger Delay"
 msgstr "Retardo de disparo"
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:100
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:85
 msgid "Verbose Debug Logging"
 msgstr "Registro de depuración detallado"
 
@@ -481,51 +495,99 @@ msgstr "Registro de depuración detallado"
 msgid "View Logfile"
 msgstr "Ver archivo de registro"
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:151
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:150
 msgid "WAN Forward Chain IPv4"
 msgstr "Cadena de reenvío WAN IPv4"
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:183
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:182
 msgid "WAN Forward Chain IPv6"
 msgstr "Cadena de reenvío WAN IPv6"
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:146
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:145
 msgid "WAN Input Chain IPv4"
 msgstr "Cadena de entrada WAN IPv4"
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:178
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:177
 msgid "WAN Input Chain IPv6"
 msgstr "Cadena de entrada WAN IPv6"
 
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:122
+msgid ""
+"Whitelist auto addons are stored temporary in the IPSet and saved "
+"permanently in the local whitelist. Disable this option to prevent the local "
+"save."
+msgstr ""
+"Los complementos automáticos de la lista blanca se almacenan temporalmente "
+"en el IPSet y se guardan permanentemente en la lista blanca local. "
+"Deshabilite esta opción para evitar el guardado local."
+
 #: applications/luci-app-banip/luasrc/view/banip/ripeview.htm:93
 msgid "Whois Information"
 msgstr "Información Whois"
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:68
-msgid "Yes"
-msgstr "Sí"
-
 #: applications/luci-app-banip/luasrc/controller/banip.lua:16
 #: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:10
 msgid "banIP"
 msgstr "banIP"
 
-#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:93
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:114
 msgid "banIP Status"
 msgstr "Estado de banIP"
 
-#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:99
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:120
 msgid "banIP Version"
 msgstr "Versión de banIP"
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:76
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:61
 msgid "enable IPv4"
 msgstr "habilitar IPv4"
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:79
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:64
 msgid "enable IPv6"
 msgstr "habilitar IPv6"
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:73
-msgid "n/a"
-msgstr "n/d"
+#~ msgid "Backup Mode"
+#~ msgstr "Modo de copia de seguridad"
+
+#~ msgid ""
+#~ "Create compressed blocklist backups, they will be used in case of "
+#~ "download errors or during startup in 'backup mode'."
+#~ msgstr ""
+#~ "Cree copias de seguridad de listas de bloqueo comprimidas, se utilizarán "
+#~ "en caso de errores de descarga o durante el inicio en el \"modo de copia "
+#~ "de seguridad\"."
+
+#~ msgid ""
+#~ "Do not automatically update blocklists during startup, use their backups "
+#~ "instead."
+#~ msgstr ""
+#~ "No actualice automáticamente las listas de bloqueo durante el inicio, use "
+#~ "sus copias de seguridad en su lugar."
+
+#~ msgid "Enable Blocklist Backup"
+#~ msgstr "Habilitar copia de seguridad de lista de bloqueo"
+
+#~ msgid "IP Blocklist Sources"
+#~ msgstr "Fuentes de lista de bloqueo de IP"
+
+#~ msgid "No"
+#~ msgstr "No"
+
+#~ msgid "Reload IPSets"
+#~ msgstr "Recargar IPSets"
+
+#~ msgid "SSL req."
+#~ msgstr "SSL requerido."
+
+#~ msgid ""
+#~ "Target directory for banIP backups. Please use preferably a non-volatile "
+#~ "disk, e.g. an external usb stick."
+#~ msgstr ""
+#~ "Directorio de destino para las copias de seguridad de banIP. Utilice "
+#~ "preferiblemente un disco no volátil, por ej. una memoria usb externa."
+
+#~ msgid "Yes"
+#~ msgstr "Sí"
+
+#~ msgid "n/a"
+#~ msgstr "n/d"
diff --git a/applications/luci-app-banip/po/templates/banip.pot b/applications/luci-app-banip/po/templates/banip.pot
index 1332bc9c3..b477622ee 100644
--- a/applications/luci-app-banip/po/templates/banip.pot
+++ b/applications/luci-app-banip/po/templates/banip.pot
@@ -9,11 +9,11 @@ msgstr ""
 msgid "ASN Prefixes"
 msgstr ""
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:91
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:76
 msgid "ASN/Country"
 msgstr ""
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:137
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:129
 msgid "Additional trigger delay in seconds before banIP processing begins."
 msgstr ""
 
@@ -25,12 +25,16 @@ msgstr ""
 msgid "Automatic WAN Interface Detection"
 msgstr ""
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:115
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:96
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:138
 msgid "Backup Directory"
 msgstr ""
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:122
-msgid "Backup Mode"
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:117
+msgid ""
+"Blacklist auto addons are stored temporary in the IPSet and saved "
+"permanently in the local blacklist. Disable this option to prevent the local "
+"save."
 msgstr ""
 
 #: applications/luci-app-banip/luasrc/view/banip/ipsetview.htm:45
@@ -46,25 +50,19 @@ msgstr ""
 msgid "Country Resources"
 msgstr ""
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:112
-msgid ""
-"Create compressed blocklist backups, they will be used in case of download "
-"errors or during startup in 'backup mode'."
-msgstr ""
-
 #: applications/luci-app-banip/luasrc/view/banip/ripeview.htm:94
 msgid "DNS Chain"
 msgstr ""
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:172
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:171
 msgid "DST Target IPv4"
 msgstr ""
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:204
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:203
 msgid "DST Target IPv6"
 msgstr ""
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:89
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:74
 msgid "Description"
 msgstr ""
 
@@ -74,13 +72,7 @@ msgid ""
 "manually."
 msgstr ""
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:123
-msgid ""
-"Do not automatically update blocklists during startup, use their backups "
-"instead."
-msgstr ""
-
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:142
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:141
 msgid "Download Options"
 msgstr ""
 
@@ -88,7 +80,7 @@ msgstr ""
 msgid "Download Utility"
 msgstr ""
 
-#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:105
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:126
 msgid "Download Utility (SSL Library)"
 msgstr ""
 
@@ -104,15 +96,11 @@ msgstr ""
 msgid "Edit Whitelist"
 msgstr ""
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:111
-msgid "Enable Blocklist Backup"
-msgstr ""
-
 #: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:20
 msgid "Enable banIP"
 msgstr ""
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:101
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:86
 msgid "Enable verbose debug logging in case of any processing error."
 msgstr ""
 
@@ -120,7 +108,7 @@ msgstr ""
 msgid "Enter IP/CIDR/ASN/ISO"
 msgstr ""
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:97
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:82
 msgid "Extra Options"
 msgstr ""
 
@@ -130,7 +118,7 @@ msgid ""
 "documentation</a>"
 msgstr ""
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:129
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:104
 msgid ""
 "For further performance improvements you can raise this value, e.g. '8' or "
 "'16' should be safe."
@@ -144,18 +132,18 @@ msgstr ""
 msgid "IANA Information"
 msgstr ""
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:60
-msgid "IP Blocklist Sources"
-msgstr ""
-
 #: applications/luci-app-banip/luasrc/view/banip/ripeview.htm:91
 msgid "IP/ASN Mapping"
 msgstr ""
 
-#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:111
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:132
 msgid "IPSet Information"
 msgstr ""
 
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:58
+msgid "IPSet Sources"
+msgstr ""
+
 #: applications/luci-app-banip/luasrc/controller/banip.lua:18
 msgid "IPSet-Lookup"
 msgstr ""
@@ -170,23 +158,23 @@ msgstr ""
 msgid "Interface Selection"
 msgstr ""
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:161
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:160
 msgid "LAN Forward Chain IPv4"
 msgstr ""
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:193
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:192
 msgid "LAN Forward Chain IPv6"
 msgstr ""
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:156
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:155
 msgid "LAN Input Chain IPv4"
 msgstr ""
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:188
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:187
 msgid "LAN Input Chain IPv6"
 msgstr ""
 
-#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:117
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:144
 msgid "Last Run"
 msgstr ""
 
@@ -199,7 +187,7 @@ msgstr ""
 msgid "Load"
 msgstr ""
 
-#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:60
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:81
 msgid "Loading"
 msgstr ""
 
@@ -208,16 +196,20 @@ msgstr ""
 msgid "Loading ..."
 msgstr ""
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:104
-msgid "Low Priority Service"
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:116
+msgid "Local Save Blacklist Addons"
 msgstr ""
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:127
-msgid "Max. Download Queue"
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:121
+msgid "Local Save Whitelist Addons"
+msgstr ""
+
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:89
+msgid "Low Priority Service"
 msgstr ""
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:70
-msgid "No"
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:102
+msgid "Max. Download Queue"
 msgstr ""
 
 #: applications/luci-app-banip/luasrc/view/banip/ipsetview.htm:34
@@ -225,7 +217,7 @@ msgstr ""
 msgid "No response!"
 msgstr ""
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:98
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:83
 msgid ""
 "Options for further tweaking in case the defaults are not suitable for you."
 msgstr ""
@@ -251,33 +243,42 @@ msgstr ""
 msgid "RIPE-Lookup"
 msgstr ""
 
-#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:16
-#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:126
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:18
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:153
+msgid "Refresh"
+msgstr ""
+
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:151
+msgid "Refresh IPSets"
+msgstr ""
+
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:21
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:160
 msgid "Reload"
 msgstr ""
 
-#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:124
-msgid "Reload IPSets"
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:158
+msgid "Reload IPSet Sources"
 msgstr ""
 
-#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:91
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:112
 msgid "Runtime Information"
 msgstr ""
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:166
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:165
 msgid "SRC Target IPv4"
 msgstr ""
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:198
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:197
 msgid "SRC Target IPv6"
 msgstr ""
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:82
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:67
 msgid "SRC/DST"
 msgstr ""
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:63
-msgid "SSL req."
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:109
+msgid "SSH Daemon"
 msgstr ""
 
 #: applications/luci-app-banip/luasrc/model/cbi/banip/blacklist_tab.lua:27
@@ -286,7 +287,15 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:105
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:110
+msgid "Select the SSH daemon for logfile parsing, to detect break-in events."
+msgstr ""
+
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:135
+msgid "Select the used start type during boot."
+msgstr ""
+
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:90
 msgid ""
 "Set the nice level to 'low priority' and banIP background processing will "
 "take less resources from the system."
@@ -296,22 +305,26 @@ msgstr ""
 msgid "Show only set member with packet counter &gt; 0"
 msgstr ""
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:128
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:103
 msgid ""
 "Size of the download queue to handle downloads &amp; IPset processing in "
 "parallel (default '4')."
 msgstr ""
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:143
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:142
 msgid ""
 "Special options for the selected download utility, e.g. '--timeout=20 --no-"
 "check-certificate -O'."
 msgstr ""
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:116
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:134
+msgid "Start Type"
+msgstr ""
+
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:97
 msgid ""
-"Target directory for banIP backups. Please use preferably a non-volatile "
-"disk, e.g. an external usb stick."
+"Target directory for banIP backups. Default is '/tmp', please use preferably "
+"a non-volatile disk if available."
 msgstr ""
 
 #: applications/luci-app-banip/luasrc/view/banip/ripeview.htm:77
@@ -331,7 +344,7 @@ msgstr ""
 msgid "The syslog output, pre-filtered for banIP related messages only."
 msgstr ""
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:106
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:91
 msgid "This change requires a manual service stop/re-start to take effect."
 msgstr ""
 
@@ -395,11 +408,11 @@ msgid ""
 "file (/etc/config/banip)."
 msgstr ""
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:136
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:128
 msgid "Trigger Delay"
 msgstr ""
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:100
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:85
 msgid "Verbose Debug Logging"
 msgstr ""
 
@@ -407,28 +420,31 @@ msgstr ""
 msgid "View Logfile"
 msgstr ""
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:151
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:150
 msgid "WAN Forward Chain IPv4"
 msgstr ""
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:183
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:182
 msgid "WAN Forward Chain IPv6"
 msgstr ""
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:146
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:145
 msgid "WAN Input Chain IPv4"
 msgstr ""
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:178
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:177
 msgid "WAN Input Chain IPv6"
 msgstr ""
 
-#: applications/luci-app-banip/luasrc/view/banip/ripeview.htm:93
-msgid "Whois Information"
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:122
+msgid ""
+"Whitelist auto addons are stored temporary in the IPSet and saved "
+"permanently in the local whitelist. Disable this option to prevent the local "
+"save."
 msgstr ""
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:68
-msgid "Yes"
+#: applications/luci-app-banip/luasrc/view/banip/ripeview.htm:93
+msgid "Whois Information"
 msgstr ""
 
 #: applications/luci-app-banip/luasrc/controller/banip.lua:16
@@ -436,22 +452,18 @@ msgstr ""
 msgid "banIP"
 msgstr ""
 
-#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:93
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:114
 msgid "banIP Status"
 msgstr ""
 
-#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:99
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:120
 msgid "banIP Version"
 msgstr ""
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:76
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:61
 msgid "enable IPv4"
 msgstr ""
 
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:79
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:64
 msgid "enable IPv6"
 msgstr ""
-
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:73
-msgid "n/a"
-msgstr ""
diff --git a/applications/luci-app-ddns/po/es/ddns.po b/applications/luci-app-ddns/po/es/ddns.po
index 9e649c2dd..092319bb1 100644
--- a/applications/luci-app-ddns/po/es/ddns.po
+++ b/applications/luci-app-ddns/po/es/ddns.po
@@ -2,15 +2,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: luci-app-ddns 2.4.0-1\n"
 "POT-Creation-Date: 2016-01-30 11:07+0100\n"
-"PO-Revision-Date: 2019-05-15 20:11-0300\n"
-"Last-Translator: José Vicente <josevteg@gmail.com>\n"
+"PO-Revision-Date: 2019-09-17 22:38-0300\n"
+"Last-Translator: Franco Castillo <castillofrancodamian@gmail.com>\n"
 "Language-Team: \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: Poedit 2.2.1\n"
+"X-Generator: Poedit 2.2.3\n"
 
 #: applications/luci-app-ddns/luasrc/view/ddns/overview_status.htm:145
 msgid "&"
@@ -28,7 +28,7 @@ msgstr "-- Predeterminado --"
 #: applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua:53
 #: applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua:264
 msgid "Advanced Settings"
-msgstr "Ajustes avanzados"
+msgstr "Configuración avanzada"
 
 #: applications/luci-app-ddns/luasrc/model/cbi/ddns/global.lua:46
 msgid "Allow non-public IP's"
@@ -42,7 +42,7 @@ msgstr "Aplicando cambios"
 #: applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua:50
 #: applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua:263
 msgid "Basic Settings"
-msgstr "Ajustes básicos"
+msgstr "Configuración básica"
 
 #: applications/luci-app-ddns/luasrc/model/cbi/ddns/hints.lua:25
 msgid ""
@@ -376,7 +376,7 @@ msgstr "GNU Wget usará la IP de la red dada, cURL usará la interfaz física."
 
 #: applications/luci-app-ddns/luasrc/model/cbi/ddns/global.lua:26
 msgid "Global Settings"
-msgstr "Ajustes globales"
+msgstr "Configuración global"
 
 #: applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua:606
 #: applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua:615
@@ -802,7 +802,7 @@ msgstr "No hay servicio configurado."
 #: applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua:56
 #: applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua:265
 msgid "Timer Settings"
-msgstr "Ajustes del temporizador"
+msgstr "Configuración del temporizador"
 
 #: applications/luci-app-ddns/luasrc/model/cbi/ddns/overview.lua:101
 msgid "To change global settings click here"
diff --git a/applications/luci-app-dump1090/po/es/dump1090.po b/applications/luci-app-dump1090/po/es/dump1090.po
index 18c16bb8b..05782c6ec 100644
--- a/applications/luci-app-dump1090/po/es/dump1090.po
+++ b/applications/luci-app-dump1090/po/es/dump1090.po
@@ -206,8 +206,7 @@ msgstr "Puerto de escucha de salida TCP sin formato"
 
 #: applications/luci-app-dump1090/luasrc/model/cbi/dump1090.lua:97
 msgid "TCP raw output memory flush rate in seconds"
-msgstr ""
-"Velocidad de descarga de memoria de salida sin formato TCP en segundos"
+msgstr "Velocidad de descarga de memoria de salida sin formato TCP en segundos"
 
 #: applications/luci-app-dump1090/luasrc/model/cbi/dump1090.lua:93
 msgid "TCP raw output minimum size"
@@ -224,8 +223,7 @@ msgstr "Use el demodulador de 2.4MHz"
 #: applications/luci-app-dump1090/luasrc/model/cbi/dump1090.lua:44
 msgid "When reading from a file play back in realtime, not at max speed"
 msgstr ""
-"Al leer desde un archivo, reproducir en tiempo real, no a la velocidad "
-"máxima"
+"Al leer desde un archivo, reproducir en tiempo real, no a la velocidad máxima"
 
 #: applications/luci-app-dump1090/luasrc/model/cbi/dump1090.lua:180
 msgid "Write json output every t seconds"
diff --git a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js
index 63af69f8a..80938711e 100644
--- a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js
+++ b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js
@@ -75,7 +75,8 @@ function forward_via_txt(s) {
 return L.view.extend({
 	callHostHints: rpc.declare({
 		object: 'luci',
-		method: 'host_hints'
+		method: 'getHostHints',
+		expect: { '': {} }
 	}),
 
 	load: function() {
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 4252cf369..6df3bc7f8 100644
--- 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
@@ -112,7 +112,8 @@ function rule_target_txt(s) {
 return L.view.extend({
 	callHostHints: rpc.declare({
 		object: 'luci',
-		method: 'host_hints'
+		method: 'getHostHints',
+		expect: { '': {} }
 	}),
 
 	load: function() {
@@ -221,42 +222,44 @@ return L.view.extend({
 		o.cast = 'table';
 		o.placeholder = _('any');
 		o.value('', 'any');
-		o.value('echo-reply');
+		o.value('address-mask-reply');
+		o.value('address-mask-request');
+		o.value('communication-prohibited');
 		o.value('destination-unreachable');
-		o.value('network-unreachable');
-		o.value('host-unreachable');
-		o.value('protocol-unreachable');
-		o.value('port-unreachable');
+		o.value('echo-reply');
+		o.value('echo-request');
 		o.value('fragmentation-needed');
-		o.value('source-route-failed');
-		o.value('network-unknown');
+		o.value('host-precedence-violation');
+		o.value('host-prohibited');
+		o.value('host-redirect');
 		o.value('host-unknown');
+		o.value('host-unreachable');
+		o.value('ip-header-bad');
+		o.value('neighbour-advertisement');
+		o.value('neighbour-solicitation');
 		o.value('network-prohibited');
-		o.value('host-prohibited');
-		o.value('TOS-network-unreachable');
-		o.value('TOS-host-unreachable');
-		o.value('communication-prohibited');
-		o.value('host-precedence-violation');
+		o.value('network-redirect');
+		o.value('network-unknown');
+		o.value('network-unreachable');
+		o.value('parameter-problem');
+		o.value('port-unreachable');
 		o.value('precedence-cutoff');
-		o.value('source-quench');
+		o.value('protocol-unreachable');
 		o.value('redirect');
-		o.value('network-redirect');
-		o.value('host-redirect');
-		o.value('TOS-network-redirect');
-		o.value('TOS-host-redirect');
-		o.value('echo-request');
+		o.value('required-option-missing');
 		o.value('router-advertisement');
 		o.value('router-solicitation');
+		o.value('source-quench');
+		o.value('source-route-failed');
 		o.value('time-exceeded');
-		o.value('ttl-zero-during-transit');
-		o.value('ttl-zero-during-reassembly');
-		o.value('parameter-problem');
-		o.value('ip-header-bad');
-		o.value('required-option-missing');
-		o.value('timestamp-request');
 		o.value('timestamp-reply');
-		o.value('address-mask-request');
-		o.value('address-mask-reply');
+		o.value('timestamp-request');
+		o.value('TOS-host-redirect');
+		o.value('TOS-host-unreachable');
+		o.value('TOS-network-redirect');
+		o.value('TOS-network-unreachable');
+		o.value('ttl-zero-during-reassembly');
+		o.value('ttl-zero-during-transit');
 		o.depends('proto', 'icmp');
 
 		o = s.taboption('general', widgets.ZoneSelect, 'src', _('Source zone'));
diff --git a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js
index 4d13752b3..78a662626 100644
--- a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js
+++ b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js
@@ -7,28 +7,22 @@
 'require tools.widgets as widgets';
 
 return L.view.extend({
-	callOffloadSupport: rpc.declare({
-		object: 'luci',
-		method: 'offload_support',
-		expect: { offload_support: false }
-	}),
-
 	callConntrackHelpers: rpc.declare({
 		object: 'luci',
-		method: 'conntrack_helpers',
-		expect: { helpers: [] }
+		method: 'getConntrackHelpers',
+		expect: { result: [] }
 	}),
 
 	load: function() {
 		return Promise.all([
-			this.callOffloadSupport(),
-			this.callConntrackHelpers()
+			this.callConntrackHelpers(),
+			firewall.getDefaults()
 		]);
 	},
 
 	render: function(data) {
-		var hasOffloading = data[0],
-		    ctHelpers = data[1],
+		var ctHelpers = data[0],
+		    fwDefaults = data[1],
 		    m, s, o, inp, out;
 
 		m = new form.Map('firewall', _('Firewall - Zone Settings'),
@@ -55,7 +49,7 @@ return L.view.extend({
 
 		/* Netfilter flow offload support */
 
-		if (hasOffloading) {
+		if (L.hasSystemFeature('offloading')) {
 			s = m.section(form.TypedSection, 'defaults', _('Routing/NAT Offloading'),
 				_('Experimental feature. Not fully compatible with QoS/SQM.'));
 
@@ -90,7 +84,8 @@ return L.view.extend({
 		o.modalonly = true;
 		o.cfgvalue = function(section_id) {
 			var name = uci.get('firewall', section_id, 'name');
-
+			if (name == null)
+				name = _("this new zone");
 			return _('This section defines common properties of %q. The <em>input</em> and <em>output</em> options set the default policies for traffic entering and leaving this zone while the <em>forward</em> option describes the policy for forwarded traffic between different networks within the zone. <em>Covered networks</em> specifies which available networks are members of this zone.')
 				.replace(/%s/g, name).replace(/%q/g, '"' + name + '"');
 		};
@@ -98,11 +93,14 @@ return L.view.extend({
 		o = s.taboption('general', form.Value, 'name', _('Name'));
 		o.placeholder = _('Unnamed zone');
 		o.modalonly = true;
+		o.rmempty = false;
 		o.datatype = 'and(uciname,maxlength(11))';
 		o.write = function(section_id, formvalue) {
 			var cfgvalue = this.cfgvalue(section_id);
 
-			if (cfgvalue != formvalue)
+			if (cfgvalue == null || cfgvalue == '')
+				return uci.set('firewall', section_id, 'name', formvalue);
+			else if (cfgvalue != formvalue)
 				return firewall.renameZone(cfgvalue, formvalue);
 		};
 
@@ -126,6 +124,10 @@ return L.view.extend({
 			p[i].editable = true;
 		}
 
+		p[0].default = fwDefaults.getInput();
+		p[1].default = fwDefaults.getOutput();
+		p[2].default = fwDefaults.getForward();
+
 		o = s.taboption('general', form.Flag, 'masq', _('Masquerading'));
 		o.editable = true;
 
@@ -167,13 +169,15 @@ return L.view.extend({
 		o.modalonly = true;
 		o.cfgvalue = function(section_id) {
 			var name = uci.get('firewall', section_id, 'name');
-
+			if (name == null)
+				name = _("this new zone");
 			return _('The options below control the forwarding policies between this zone (%s) and other zones. <em>Destination zones</em> cover forwarded traffic <strong>originating from %q</strong>. <em>Source zones</em> match forwarded traffic from other zones <strong>targeted at %q</strong>. The forwarding rule is <em>unidirectional</em>, e.g. a forward from lan to wan does <em>not</em> imply a permission to forward from wan to lan as well.')
 				.format(name);
 		};
 
 		o = s.taboption('advanced', widgets.DeviceSelect, 'device', _('Covered devices'), _('Use this option to classify zone traffic by raw, non-<em>uci</em> managed network devices.'));
 		o.modalonly = true;
+		o.noaliases = true;
 		o.multiple = true;
 
 		o = s.taboption('advanced', form.DynamicList, 'subnet', _('Covered subnets'), _('Use this option to classify zone traffic by source or destination subnet instead of networks or devices.'));
@@ -256,8 +260,11 @@ return L.view.extend({
 		o.rawhtml = true;
 		o.modalonly = true;
 		o.cfgvalue = function(section_id) {
+			var name = uci.get('firewall', section_id, 'name');
+			if (name == null)
+				name = _("this new zone");
 			return _('The options below control the forwarding policies between this zone (%s) and other zones. <em>Destination zones</em> cover forwarded traffic <strong>originating from %q</strong>. <em>Source zones</em> match forwarded traffic from other zones <strong>targeted at %q</strong>. The forwarding rule is <em>unidirectional</em>, e.g. a forward from lan to wan does <em>not</em> imply a permission to forward from wan to lan as well.')
-				.format(uci.get('firewall', section_id, 'name'));
+				.format(name);
 		};
 
 		out = o = s.taboption('general', widgets.ZoneSelect, 'out', _('Allow forward to <em>destination zones</em>:'));
@@ -270,7 +277,7 @@ return L.view.extend({
 		o.cfgvalue = function(section_id) {
 			var out = (this.option == 'out'),
 			    zone = this.lookupZone(uci.get('firewall', section_id, 'name')),
-			    fwds = zone.getForwardingsBy(out ? 'src' : 'dest'),
+			    fwds = zone ? zone.getForwardingsBy(out ? 'src' : 'dest') : [],
 			    value = [];
 
 			for (var i = 0; i < fwds.length; i++)
@@ -281,7 +288,7 @@ return L.view.extend({
 		o.write = o.remove = function(section_id, formvalue) {
 			var out = (this.option == 'out'),
 			    zone = this.lookupZone(uci.get('firewall', section_id, 'name')),
-			    fwds = zone.getForwardingsBy(out ? 'src' : 'dest');
+			    fwds = zone ? zone.getForwardingsBy(out ? 'src' : 'dest') : [];
 
 			if (formvalue == null)
 				formvalue = [];
diff --git a/applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm b/applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm
deleted file mode 100644
index 38f36b49c..000000000
--- a/applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm
+++ /dev/null
@@ -1,90 +0,0 @@
-<%-
-	local fw = require "luci.model.firewall".init()
-	local izl = { }
-	local ezl = { }
-	local _, z
-	for _, z in ipairs(fw:get_zones()) do
-		if z:name() ~= "wan" then
-			izl[#izl+1] = z
-		end
-		if z:name() ~= "lan" then
-			ezl[#ezl+1] = z
-		end
-	end
-
-	local keys, vals = { }, { }
-	luci.sys.net.ipv4_hints(function(ip, name)
-		keys[#keys+1] = ip
-		vals[#vals+1] = '%s (%s)' %{ ip, name }
-	end)
--%>
-
-<h4><%:New port forward%></h4>
-<div class="table">
-	<div class="tr table-titles">
-		<div class="th"><%:Name%></div>
-		<div class="th"><%:Protocol%></div>
-		<div class="th"><%:External zone%></div>
-		<div class="th"><%:External port%></div>
-		<div class="th"><%:Internal zone%></div>
-		<div class="th"><%:Internal IP address%></div>
-		<div class="th"><%:Internal port%></div>
-		<div class="th"></div>
-	</div>
-	<div class="tr">
-		<div class="td">
-			<input type="text" class="cbi-input-text" id="_newfwd.name" name="_newfwd.name" placeholder="<%:New port forward%>" />
-		</div>
-		<div class="td">
-			<select class="cbi-input-select" id="_newfwd.proto" name="_newfwd.proto">
-				<option value="tcp udp">TCP+UDP</option>
-				<option value="tcp">TCP</option>
-				<option value="udp">UDP</option>
-				<option value="other"><%:Other...%></option>
-			</select>
-		</div>
-		<div class="td">
-			<select class="cbi-input-select" id="_newfwd.extzone" name="_newfwd.extzone">
-				<% for _, z in ipairs(ezl) do -%><option value="<%=z:name()%>"><%=z:name()%></option><%- end %>
-			</select>
-		</div>
-		<div class="td">
-			<input type="text" class="cbi-input-text" id="_newfwd.extport" name="_newfwd.extport" data-type="portrange" data-optional="true" />
-		</div>
-		<div class="td">
-			<select class="cbi-input-select" id="_newfwd.intzone" name="_newfwd.intzone">
-				<% for _, z in ipairs(izl) do -%><option value="<%=z:name()%>"><%=z:name()%></option><%- end %>
-			</select>
-		</div>
-		<div class="td">
-			<input type="text" class="cbi-input-text" id="_newfwd.intaddr" name="_newfwd.intaddr" data-type="host" data-optional="true"<%=
-				ifattr(#keys > 0, "data-choices", {keys, vals})
-			%>/>
-		</div>
-		<div class="td">
-			<input type="text" class="cbi-input-text" id="_newfwd.intport" name="_newfwd.intport" data-type="portrange" data-optional="true" />
-		</div>
-		<div class="td bottom">
-			<input type="submit" class="cbi-button cbi-button-add" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>.<%=section%>" value="<%:Add%>" />
-		</div>
-	</div>
-</div>
-
-<script type="text/javascript">//<![CDATA[
-	document.getElementById('_newfwd.extport').addEventListener('blur',
-		function() {
-			var n = document.getElementById('_newfwd.name');
-			var p = document.getElementById('_newfwd.proto');
-			var i = document.getElementById('_newfwd.intport');
-
-			if (!this.className.match(/invalid/))
-			{
-				if (!i.value) i.value = this.value;
-
-				if (!n.value)
-				{
-					n.value = 'Forward' + this.value;
-				}
-			}
-		});
-//]]></script>
diff --git a/applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm b/applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm
deleted file mode 100644
index e0092a7a5..000000000
--- a/applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm
+++ /dev/null
@@ -1,89 +0,0 @@
-<%
-	local fw = require "luci.model.firewall".init()
-	local zones = fw:get_zones()
-%>
-
-<% if #zones > 0 then %>
-	<h4><%:Open ports on router%></h4>
-	<div class="table">
-		<div class="tr cbi-section-table-titles">
-			<div class="th"><%:Name%></div>
-			<div class="th"><%:Protocol%></div>
-			<div class="th"><%:External port%></div>
-			<div class="th"></div>
-		</div>
-		<div class="tr">
-			<div class="td">
-				<input type="text" class="cbi-input-text" id="_newopen.name" name="_newopen.name" placeholder="<%:New input rule%>" />
-			</div>
-			<div class="td">
-				<select class="cbi-input-select" id="_newopen.proto" name="_newopen.proto">
-					<option value="tcp udp">TCP+UDP</option>
-					<option value="tcp">TCP</option>
-					<option value="udp">UDP</option>
-					<option value="other"><%:Other...%></option>
-				</select>
-			</div>
-			<div class="td">
-				<input type="text" class="cbi-input-text" id="_newopen.extport" name="_newopen.extport" />
-			</div>
-			<div class="td bottom">
-				<input type="submit" class="cbi-button cbi-button-add" name="_newopen.submit" value="<%:Add%>" />
-			</div>
-		</div>
-	</div>
-<% end %>
-<% if #zones > 1 then %>
-	<h4><%:New forward rule%></h4>
-	<div class="table">
-		<div class="tr cbi-section-table-titles">
-			<div class="th"><%:Name%></div>
-			<div class="th"><%:Source zone%></div>
-			<div class="th"><%:Destination zone%></div>
-			<div class="th"></div>
-		</div>
-		<div class="tr">
-			<div class="td">
-				<input type="text" class="cbi-input-text" id="_newfwd.name" name="_newfwd.name" placeholder="<%:New forward rule%>" />
-			</div>
-			<div class="td">
-				<select class="cbi-input-text" id="_newfwd.src" name="_newfwd.src">
-					<% local k, v; for k, v in ipairs(fw:get_zones()) do -%>
-						<option<%=ifattr(v:name() == "wan", "selected", "selected")%> value="<%=v:name()%>"><%=v:name()%></option>
-					<%- end %>
-				</select>
-			</div>
-			<div class="td">
-				<select class="cbi-input-text" id="_newfwd.dest" name="_newfwd.dest">
-					<% local k, v; for k, v in ipairs(fw:get_zones()) do -%>
-						<option<%=ifattr(v:name() == "lan", "selected", "selected")%> value="<%=v:name()%>"><%=v:name()%></option>
-					<%- end %>
-				</select>
-			</div>
-			<div class="td bottom">
-				<input type="submit" class="cbi-button cbi-button-link" name="_newfwd.submit" value="<%:Add and edit...%>" />
-			</div>
-		</div>
-	</div>
-<% else %>
-	<input type="submit" class="cbi-button cbi-button-add" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>.<%=section%>" value="<%:Add%>" />
-<% end %>
-
-<% if #zones > 0 then %>
-	<script type="text/javascript">//<![CDATA[
-		cbi_validate_field('_newopen.extport', true, 'list(neg(portrange))');
-		document.getElementById('_newopen.extport').addEventListener('blur',
-			function() {
-				var n = document.getElementById('_newopen.name');
-				var p = document.getElementById('_newopen.proto');
-
-				if (!this.className.match(/invalid/))
-				{
-					if (!n.value && this.value)
-					{
-						n.value = 'Open' + this.value;
-					}
-				}
-			});
-	//]]></script>
-<% end %>
diff --git a/applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm b/applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm
deleted file mode 100644
index 0b4774ccc..000000000
--- a/applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm
+++ /dev/null
@@ -1,59 +0,0 @@
-<%
-	local fw = require "luci.model.firewall".init()
-	local nw = require "luci.model.network".init()
-	local zones = fw:get_zones()
-
-	local keys, vals, a, k, v = {}, {}
-	for k, v in ipairs(nw:get_interfaces()) do
-		for k, a in ipairs(v:ipaddrs()) do
-			keys[#keys+1] = a:host():string()
-			vals[#vals+1] = '%s (%s)' %{ a:host(), v:shortname() }
-		end
-	end
-%>
-
-<% if #zones > 1 then %>
-	<h4><%:New source NAT%></h4>
-	<div class="table">
-		<div class="tr cbi-section-table-titles">
-			<div class="th"><%:Name%></div>
-			<div class="th"><%:Source zone%></div>
-			<div class="th"><%:Destination zone%></div>
-			<div class="th"><%:To source IP%></div>
-			<div class="th"><%:To source port%></div>
-			<div class="th"></div>
-		</div>
-		<div class="tr">
-			<div class="td">
-				<input type="text" class="cbi-input-text" id="_newsnat.name" name="_newsnat.name" placeholder="<%:New SNAT rule%>" />
-			</div>
-			<div class="td">
-				<select class="cbi-input-text" id="_newsnat.src" name="_newsnat.src">
-					<% local k, v; for k, v in ipairs(fw:get_zones()) do -%>
-						<option<%=ifattr(v:name() == "lan", "selected", "selected")%> value="<%=v:name()%>"><%=v:name()%></option>
-					<%- end %>
-				</select>
-			</div>
-			<div class="td">
-				<select class="cbi-input-text" id="_newsnat.dest" name="_newsnat.dest">
-					<% local k, v; for k, v in ipairs(fw:get_zones()) do -%>
-						<option<%=ifattr(v:name() == "wan", "selected", "selected")%> value="<%=v:name()%>"><%=v:name()%></option>
-					<%- end %>
-				</select>
-			</div>
-			<div class="td">
-				<input type="text" class="cbi-input-text" id="_newsnat.dip" name="_newsnat.dip" placeholder="<%:Do not rewrite%>" data-type="ip4addr" data-optional="true"<%=
-					ifattr(#keys > 0, "data-choices", { keys, vals })
-				%> />
-			</div>
-			<div class="td">
-				<input type="text" class="cbi-input-text" id="_newsnat.dport" name="_newsnat.dport" placeholder="<%:Do not rewrite%>" data-type="portrange" data-optional="true" />
-			</div>
-			<div class="td bottom">
-				<input type="submit" class="cbi-button cbi-button-link" name="_newsnat.submit" value="<%:Add and edit...%>" />
-			</div>
-		</div>
-	</div>
-<% else %>
-	<input type="submit" class="cbi-button cbi-button-add" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>.<%=section%>" value="<%:Add%>" />
-<% end %>
diff --git a/applications/luci-app-firewall/po/ca/firewall.po b/applications/luci-app-firewall/po/ca/firewall.po
index abb27d8b0..b5b395fb9 100644
--- a/applications/luci-app-firewall/po/ca/firewall.po
+++ b/applications/luci-app-firewall/po/ca/firewall.po
@@ -15,7 +15,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.6\n"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
 msgid "%s in %s"
 msgstr "%s en %s"
 
@@ -24,7 +24,7 @@ msgstr "%s en %s"
 msgid "%s%s with %s"
 msgstr "%s%s amb %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
 msgid "%s, %s in %s"
 msgstr "%s, %s en %s"
 
@@ -57,89 +57,77 @@ msgstr ""
 msgid "Accept output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:325
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
 msgid "Action"
 msgstr "Acció"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "Afegeix"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "Afegeix i edita..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
 "traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: 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:84
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
 msgid "Advanced Settings"
 msgstr "Ajusts avançats"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
 msgid "Allow \"invalid\" traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Permet el reenviament des dels <em>zones d'origen</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "Permet el reenviament als <em>zones de destí</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
 msgid "Any"
 msgstr "Qualsevol"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:341
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
 msgid "Any day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
 msgid "Automatic helper assignment"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Conntrack helpers"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid "Covered devices"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
 msgid "Covered networks"
 msgstr "Xarxes cobertes"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered subnets"
 msgstr ""
 
@@ -158,17 +146,15 @@ msgstr ""
 "ordres s'executen després de cada reinici de tallafocs, just després el "
 "conjunt de regles per defecte s'ha carregat."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
 msgid "Destination address"
 msgstr "Adreça de destí"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
 msgid "Destination port"
 msgstr "Port de destí"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:299
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
 msgid "Destination zone"
 msgstr "Zona de destí"
 
@@ -191,17 +177,12 @@ msgstr ""
 msgid "Discard output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "No reescriguis"
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
@@ -217,64 +198,58 @@ msgstr ""
 msgid "Do not track output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:42
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
 msgid "Drop invalid packets"
 msgstr "Descarta els paquets invàlids"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:148
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr "Habilita"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
 msgid "Enable NAT Loopback"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
 msgid "Enable SYN-flood protection"
 msgstr "Habilita protecció contra la inundació SYN"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
 msgid "Enable logging on this zone"
 msgstr "Habilita el registre d'aquesta zona"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
 msgid "External IP address"
 msgstr "Adreça IP extern"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:222
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
 msgid "External port"
 msgstr "Port extern"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "Zona extern"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:266
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
 msgid "Extra arguments"
 msgstr "Paràmetres extres"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid "Extra destination arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid "Extra source arguments"
 msgstr ""
 
@@ -286,32 +261,32 @@ msgstr "Tallafocs"
 msgid "Firewall - Custom Rules"
 msgstr "Tallafocs - Regles personalitzades"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
 msgid "Firewall - Port Forwards"
 msgstr "Tallafocs - Reenviaments de port"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
 msgid "Firewall - Traffic Rules"
 msgstr "Tallafocs - Regles de tràfic"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
 msgid "Firewall - Zone Settings"
 msgstr "Tallafocs - Ajusts de zona"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
 msgid "Force connection tracking"
 msgstr "Força el rastreig de connexió"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
 msgid "Forward"
 msgstr "Reenvia"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
 msgid "Forward to"
 msgstr "Reenvia a"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
 msgid "Friday"
 msgstr ""
 
@@ -342,15 +317,15 @@ msgstr ""
 msgid "From %s on <var>this device</var> with source %s and %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:99
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:135
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:37
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
+#: 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
 msgid "General Settings"
 msgstr "Ajusts generals"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
 msgid "Hardware flow offloading"
 msgstr ""
 
@@ -374,13 +349,13 @@ msgid "IPv4"
 msgstr "IPv4"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
 msgid "IPv4 and IPv6"
 msgstr "IPv4 i IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
 msgid "IPv4 only"
 msgstr "Només IPv4"
 
@@ -388,32 +363,29 @@ msgstr "Només IPv4"
 msgid "IPv6"
 msgstr "IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:187
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
 msgid "IPv6 only"
 msgstr "Només IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Input"
 msgstr "Entrada"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
 msgid "Internal IP address"
 msgstr "Adreça IP interna"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
 msgid "Internal port"
 msgstr "Port intern"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
 msgid "Internal zone"
 msgstr "Zona interna"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
 msgid "Limit log messages"
 msgstr "Limita els missatges de registre"
 
@@ -427,24 +399,24 @@ msgstr ""
 msgid "MACs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
 msgid "MSS clamping"
 msgstr "Fixació MSS"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
 msgid "Masquerading"
 msgstr "Mascarada"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:124
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
 msgid "Match"
 msgstr "Coincideix"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
 msgid "Match ICMP type"
 msgstr "Coincideix amb el tipus ICMP"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
 msgid ""
 "Match incoming traffic directed at the given destination port or port range "
 "on this host"
@@ -452,22 +424,18 @@ msgstr ""
 "Coincideix amb trànsit entrant dirigit al port o rang de ports de destí en "
 "aquest host donat"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
 msgid "Monday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
 msgid "Month Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:120
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:168
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:98
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
 msgid "Name"
 msgstr "Nom"
 
@@ -475,41 +443,19 @@ msgstr "Nom"
 msgid "Network"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "Nova regla SNAT"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "Nova regla de reenviament"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "Nova regla d'entrada"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "Nou reenviament de port"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "Nou origen NAT"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr "Només coincideix amb trànsit entrant dirigit a la adreça IP donada."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
 msgid "Only match incoming traffic from these MACs."
 msgstr "Només coincideix amb trànsit entrant des d'aquests MAC."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 msgid "Only match incoming traffic from this IP or range."
 msgstr "Només coincideix amb trànsit entrant des d'aquest IP o rang."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
 msgid ""
 "Only match incoming traffic originating from the given source port or port "
 "range on the client host"
@@ -517,26 +463,17 @@ msgstr ""
 "Només coincideix amb trànsit originant en el host client des del port o del "
 "rang de ports d'origen donat"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "Obre els ports en el encaminador"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Altre..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Output"
 msgstr "Sortida"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr "Passa paràmetres addicionals al iptables. Utilitzeu-ho amb cura!"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -545,12 +482,12 @@ msgid ""
 "all services."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
 msgid "Port Forwards"
 msgstr "Reenviaments de port"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
@@ -558,25 +495,23 @@ msgstr ""
 "El reenviament de ports permet que els ordinadors remots en el Internet "
 "connectin a un ordinador o servei específic dins del LAN privat."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
 msgid ""
 "Prevent the installation of <em>NOTRACK</em> rules which would bypass "
 "connection tracking."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:153
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:204
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
 msgid "Protocol"
 msgstr "Protocol"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: 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 "Redirigeix trànsit entrant coincidit al port donat en el host intern"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr "Redirigeix trànsit entrant coincidit al host intern especificat"
 
@@ -595,7 +530,7 @@ msgstr ""
 msgid "Refuse output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 
@@ -603,20 +538,20 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "Restringeix la mascarada a les subxarxes de destí donades"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
 msgid "Restrict Masquerading to given source subnets"
 msgstr "Restringeix la mascarada a les subxarxes d'origen donades"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:197
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
 msgid "Restrict to address family"
 msgstr "Restringeix a la família d'adreces"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
 msgid "Routing/NAT Offloading"
 msgstr ""
 
@@ -628,64 +563,62 @@ msgstr ""
 msgid "Rule is enabled"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
 msgid "Saturday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
 msgid "Software based offloading for routing/NAT"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
 msgid "Software flow offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
 msgid "Source IP address"
 msgstr "Adreça IP d'origen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
 msgid "Source MAC address"
 msgstr "Adreça MAC d'origen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
 msgid "Source address"
 msgstr "Adreça d'origen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
 msgid "Source port"
 msgstr "Port d'origen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:262
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
 msgid "Source zone"
 msgstr "Zona d'origen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
 msgid "Start Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
 msgid "Start Time (hh.mm.ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
 msgid "Stop Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
 msgid "Stop Time (hh.mm.ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
 msgid "Sunday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
 msgid ""
 "The firewall creates zones over your network interfaces to control network "
 "traffic flow."
@@ -693,8 +626,8 @@ msgstr ""
 "El tallafocs crea zones a les teves interfícies de xarxa per controlar el "
 "flux de tràfic de xarxa."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:171
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:259
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -710,7 +643,7 @@ msgstr ""
 "regla de reenviament es <em>unidirectional</em>, per exemple un reenviament "
 "de lan a wan <em>no</em> implica permís per reenviar de wan a lan també."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
 #, fuzzy
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
@@ -726,15 +659,15 @@ msgstr ""
 "<em>Xarxes cobertes</em> especifica quines xarxes disponibles són membres "
 "d'aquesta zona."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
 msgid "Thursday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
 msgid "Time Restrictions"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
 msgid "Time in UTC"
 msgstr ""
 
@@ -754,20 +687,12 @@ msgstr "A %s en <var>aquest dispositiu</var>"
 msgid "To %s, %s in %s"
 msgstr "A %s, %s en %s"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr "A l'IP d'origen"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr "Al port d'origen"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
 msgid "Traffic Rules"
 msgstr "Regles de trànsit"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
 "for example to reject traffic between certain hosts or to open WAN ports on "
@@ -777,31 +702,31 @@ msgstr ""
 "zones distintes, per exemple per a rebutjar trànsit entre certs hosts o "
 "obrir ports WAN en el encaminador."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
 msgid "Tuesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:107
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
 msgid "Unnamed forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:144
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
 msgid "Unnamed rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:99
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
 msgid "Unnamed zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -815,44 +740,44 @@ msgstr "Via %s"
 msgid "Via %s at %s"
 msgstr "Via %s a %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
 msgid "Wednesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
 msgid "Week Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
 msgid "Zone ⇒ Forwardings"
 msgstr "Zona ⇒ Reenviaments"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
 msgid "Zones"
 msgstr "Zones"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:329
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
 msgid "accept"
 msgstr "accepta"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:254
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:222
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
 msgid "any"
 msgstr "qualsevol"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
 msgid "any host"
@@ -866,7 +791,7 @@ msgstr "qualsevol IP d'encaminador"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr "qualsevol zona"
@@ -876,13 +801,13 @@ msgstr "qualsevol zona"
 msgid "day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
 msgid "don't track"
 msgstr "no rastregis"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
 msgid "drop"
 msgstr "descarta"
 
@@ -913,9 +838,9 @@ msgstr ""
 msgid "ports"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:330
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
 msgid "reject"
 msgstr "rebutja"
 
@@ -924,6 +849,12 @@ msgstr "rebutja"
 msgid "second"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
@@ -934,6 +865,45 @@ msgstr ""
 msgid "types"
 msgstr ""
 
+#~ msgid "Add"
+#~ msgstr "Afegeix"
+
+#~ msgid "Add and edit..."
+#~ msgstr "Afegeix i edita..."
+
+#~ msgid "Do not rewrite"
+#~ msgstr "No reescriguis"
+
+#~ msgid "External zone"
+#~ msgstr "Zona extern"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "Nova regla SNAT"
+
+#~ msgid "New forward rule"
+#~ msgstr "Nova regla de reenviament"
+
+#~ msgid "New input rule"
+#~ msgstr "Nova regla d'entrada"
+
+#~ msgid "New port forward"
+#~ msgstr "Nou reenviament de port"
+
+#~ msgid "New source NAT"
+#~ msgstr "Nou origen NAT"
+
+#~ msgid "Open ports on router"
+#~ msgstr "Obre els ports en el encaminador"
+
+#~ msgid "Other..."
+#~ msgstr "Altre..."
+
+#~ msgid "To source IP"
+#~ msgstr "A l'IP d'origen"
+
+#~ msgid "To source port"
+#~ msgstr "Al port d'origen"
+
 #~ msgid "(Unnamed Entry)"
 #~ msgstr "(Entrada sense nom)"
 
diff --git a/applications/luci-app-firewall/po/cs/firewall.po b/applications/luci-app-firewall/po/cs/firewall.po
index dfe7c5bc9..b465d137f 100644
--- a/applications/luci-app-firewall/po/cs/firewall.po
+++ b/applications/luci-app-firewall/po/cs/firewall.po
@@ -11,7 +11,7 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Generator: Pootle 2.0.6\n"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
 msgid "%s in %s"
 msgstr "%s v %s"
 
@@ -20,7 +20,7 @@ msgstr "%s v %s"
 msgid "%s%s with %s"
 msgstr "%s%s s %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
 msgid "%s, %s in %s"
 msgstr "%s, %s v %s"
 
@@ -53,89 +53,77 @@ msgstr ""
 msgid "Accept output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:325
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
 msgid "Action"
 msgstr "Akce"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "Přidat"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "Přidat a upravit"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
 "traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: 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:84
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
 msgid "Advanced Settings"
 msgstr "Pokročilé nastavení"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
 msgid "Allow \"invalid\" traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Povolit přesměrování ze <em>zdrojových oblastí</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "Povolit přesměrování do <em>zdrojových oblastí</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
 msgid "Any"
 msgstr "Libovolné"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:341
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
 msgid "Any day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
 msgid "Automatic helper assignment"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Conntrack helpers"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid "Covered devices"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
 msgid "Covered networks"
 msgstr "Pokryté sítě"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered subnets"
 msgstr ""
 
@@ -153,17 +141,15 @@ msgstr ""
 "nejsou jinak pokryté frameworkem firewallu. Příkazy jsou spuštěny po každém "
 "restartu firewallu, právě po načtení výchozí sady pravidel."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
 msgid "Destination address"
 msgstr "Cílová adresa"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
 msgid "Destination port"
 msgstr "Cílový port"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:299
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
 msgid "Destination zone"
 msgstr "Cílová oblast"
 
@@ -186,17 +172,12 @@ msgstr ""
 msgid "Discard output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "Nepřepisovat"
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
@@ -212,64 +193,58 @@ msgstr ""
 msgid "Do not track output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:42
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
 msgid "Drop invalid packets"
 msgstr "Zahazovat neplatné pakety"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:148
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr "Povolit"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
 msgid "Enable NAT Loopback"
 msgstr "Povolit NAT Loopback"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
 msgid "Enable SYN-flood protection"
 msgstr "Povolit ochranu proti SYN-flood"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
 msgid "Enable logging on this zone"
 msgstr "Povolit logování v této oblasti"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
 msgid "External IP address"
 msgstr "Vnější IP adresa"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:222
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
 msgid "External port"
 msgstr "Vnější port"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "Vnější zóna"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:266
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
 msgid "Extra arguments"
 msgstr "Dodatečné argumenty"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid "Extra destination arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid "Extra source arguments"
 msgstr ""
 
@@ -281,32 +256,32 @@ msgstr "Firewall"
 msgid "Firewall - Custom Rules"
 msgstr "Firewall - Vlastní pravidla"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
 msgid "Firewall - Port Forwards"
 msgstr "Firewall - Přesměrování portů"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
 msgid "Firewall - Traffic Rules"
 msgstr "Firewall - Pravidla síťového provozu"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
 msgid "Firewall - Zone Settings"
 msgstr "Firewall - Nastavení zón"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
 msgid "Force connection tracking"
 msgstr "Vynutit sledování připojení"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
 msgid "Forward"
 msgstr "Přesměrování"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
 msgid "Forward to"
 msgstr "Přesměrovat na"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
 msgid "Friday"
 msgstr ""
 
@@ -337,15 +312,15 @@ msgstr ""
 msgid "From %s on <var>this device</var> with source %s and %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:99
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:135
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:37
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
+#: 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
 msgid "General Settings"
 msgstr "Obecné nastavení"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
 msgid "Hardware flow offloading"
 msgstr ""
 
@@ -369,13 +344,13 @@ msgid "IPv4"
 msgstr "IPv4"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
 msgid "IPv4 and IPv6"
 msgstr "IPv4 a IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
 msgid "IPv4 only"
 msgstr "pouze IPv4"
 
@@ -383,32 +358,29 @@ msgstr "pouze IPv4"
 msgid "IPv6"
 msgstr "IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:187
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
 msgid "IPv6 only"
 msgstr "pouze IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Input"
 msgstr "Vstup"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
 msgid "Internal IP address"
 msgstr "Vnitřní IP adresa"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
 msgid "Internal port"
 msgstr "Vnitřní port"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
 msgid "Internal zone"
 msgstr "Vnitřní zóna"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
 msgid "Limit log messages"
 msgstr "Omezit logovací zprávy"
 
@@ -422,24 +394,24 @@ msgstr ""
 msgid "MACs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
 msgid "MSS clamping"
 msgstr "MSS clamping"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
 msgid "Masquerading"
 msgstr "Maškárádování"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:124
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
 msgid "Match"
 msgstr "Shoda"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
 msgid "Match ICMP type"
 msgstr "Odpovídá ICMP typu"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
 msgid ""
 "Match incoming traffic directed at the given destination port or port range "
 "on this host"
@@ -447,22 +419,18 @@ msgstr ""
 "Vybrat příchozí provoz, směrovaný na zadaný cílový port nebo rozsah portů "
 "tohoto hostitele"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
 msgid "Monday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
 msgid "Month Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:120
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:168
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:98
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
 msgid "Name"
 msgstr "Název"
 
@@ -470,41 +438,19 @@ msgstr "Název"
 msgid "Network"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "Nové pravidlo SNAT"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "Nové přesměrovací pravidlo"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "Nové vstupní pravidlo"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "Nové přesměrování portu"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "Nový zdrojový NAT (SNAT)"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr "Vybrat pouze příchozí provoz, směrovaný na danou IP adresu."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
 msgid "Only match incoming traffic from these MACs."
 msgstr "Vybrat pouze příchozí provoz z těchto MAC adres."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 msgid "Only match incoming traffic from this IP or range."
 msgstr "Vybrat pouze příchozí provoz z této IP nebo rozsahu IP adres."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
 msgid ""
 "Only match incoming traffic originating from the given source port or port "
 "range on the client host"
@@ -512,26 +458,17 @@ msgstr ""
 "Vybrat pouze příchozí provoz, pocházející ze zadaného portu nebo rozsahu "
 "portů klienta."
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "Otevřené porty na routeru"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Ostatní ..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Output"
 msgstr "Výstup"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr "Předává další argumenty iptables. Používat opatrně!"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -540,12 +477,12 @@ msgid ""
 "all services."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
 msgid "Port Forwards"
 msgstr "Přesměrování portů"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
@@ -554,26 +491,24 @@ msgstr ""
 "Internetu připojení k vybraným počítačům nebo službám uvnitř privátní sítě "
 "LAN."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
 msgid ""
 "Prevent the installation of <em>NOTRACK</em> rules which would bypass "
 "connection tracking."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:153
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:204
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
 msgid "Protocol"
 msgstr "Protokol"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: 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."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr "Přesměrovat vybraný příchozí provoz na uvedeného vnitřního hostitele."
 
@@ -592,7 +527,7 @@ msgstr ""
 msgid "Refuse output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 
@@ -600,20 +535,20 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "Omezit maškarádování na uvedené cílové podsítě"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
 msgid "Restrict Masquerading to given source subnets"
 msgstr "Omezit maškarádování na uvedené zdrojové podsítě"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:197
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
 msgid "Restrict to address family"
 msgstr "Omezit na rodinu adres"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
 msgid "Routing/NAT Offloading"
 msgstr ""
 
@@ -625,64 +560,62 @@ msgstr ""
 msgid "Rule is enabled"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
 msgid "Saturday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
 msgid "Software based offloading for routing/NAT"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
 msgid "Software flow offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
 msgid "Source IP address"
 msgstr "Zdrojová IP adresa"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
 msgid "Source MAC address"
 msgstr "Zdrojová MAC adresa"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
 msgid "Source address"
 msgstr "Zdrojová adresa"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
 msgid "Source port"
 msgstr "Zdrojový port"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:262
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
 msgid "Source zone"
 msgstr "Zdrojová zóna"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
 msgid "Start Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
 msgid "Start Time (hh.mm.ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
 msgid "Stop Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
 msgid "Stop Time (hh.mm.ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
 msgid "Sunday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
 msgid ""
 "The firewall creates zones over your network interfaces to control network "
 "traffic flow."
@@ -690,8 +623,8 @@ msgstr ""
 "Firewall vytváří zóny přes vaše síťová rozhraní za účelem řízení síťového "
 "provozu."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:171
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:259
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -707,7 +640,7 @@ msgstr ""
 "Přesměrovávací pravidlo je <em>jednosměrné</em>, například přesměrování z "
 "lan do wan <em>nepovoluje</em> přesměrování z wan do lan (a naopak)."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
 #, fuzzy
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
@@ -722,15 +655,15 @@ msgstr ""
 "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:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
 msgid "Thursday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
 msgid "Time Restrictions"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
 msgid "Time in UTC"
 msgstr ""
 
@@ -750,20 +683,12 @@ msgstr "Na %s na <var>tomto zařízení</var>"
 msgid "To %s, %s in %s"
 msgstr "Na %s, %s v %s"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr "Na zdrojovou IP"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr "Na zdrojový port"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
 msgid "Traffic Rules"
 msgstr "Pravidla síťového provozu"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
 "for example to reject traffic between certain hosts or to open WAN ports on "
@@ -773,31 +698,31 @@ msgstr ""
 "různými zónami, například pro odmítnutí provozu mezi jistými hostiteli nebo "
 "pro otevření WAN portů na routeru."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
 msgid "Tuesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:107
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
 msgid "Unnamed forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:144
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
 msgid "Unnamed rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:99
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
 msgid "Unnamed zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -811,44 +736,44 @@ msgstr "Prostřednictvím %s"
 msgid "Via %s at %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
 msgid "Wednesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
 msgid "Week Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
 msgid "Zone ⇒ Forwardings"
 msgstr "Zóna ⇒ Přesměrování"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
 msgid "Zones"
 msgstr "Zóny"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:329
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
 msgid "accept"
 msgstr "přijmout"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:254
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:222
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
 msgid "any"
 msgstr "libovolný"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
 msgid "any host"
@@ -862,7 +787,7 @@ msgstr "libovolná IP routeru"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr "libovolná zóna"
@@ -872,13 +797,13 @@ msgstr "libovolná zóna"
 msgid "day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
 msgid "don't track"
 msgstr "nesledovat"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
 msgid "drop"
 msgstr "zahodit"
 
@@ -909,9 +834,9 @@ msgstr ""
 msgid "ports"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:330
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
 msgid "reject"
 msgstr "odmítnout"
 
@@ -920,6 +845,12 @@ msgstr "odmítnout"
 msgid "second"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
@@ -930,6 +861,45 @@ msgstr ""
 msgid "types"
 msgstr ""
 
+#~ msgid "Add"
+#~ msgstr "Přidat"
+
+#~ msgid "Add and edit..."
+#~ msgstr "Přidat a upravit"
+
+#~ msgid "Do not rewrite"
+#~ msgstr "Nepřepisovat"
+
+#~ msgid "External zone"
+#~ msgstr "Vnější zóna"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "Nové pravidlo SNAT"
+
+#~ msgid "New forward rule"
+#~ msgstr "Nové přesměrovací pravidlo"
+
+#~ msgid "New input rule"
+#~ msgstr "Nové vstupní pravidlo"
+
+#~ msgid "New port forward"
+#~ msgstr "Nové přesměrování portu"
+
+#~ msgid "New source NAT"
+#~ msgstr "Nový zdrojový NAT (SNAT)"
+
+#~ msgid "Open ports on router"
+#~ msgstr "Otevřené porty na routeru"
+
+#~ msgid "Other..."
+#~ msgstr "Ostatní ..."
+
+#~ msgid "To source IP"
+#~ msgstr "Na zdrojovou IP"
+
+#~ msgid "To source port"
+#~ msgstr "Na zdrojový port"
+
 #~ msgid "(Unnamed Entry)"
 #~ msgstr "(Nepojmenovaný vstup)"
 
diff --git a/applications/luci-app-firewall/po/de/firewall.po b/applications/luci-app-firewall/po/de/firewall.po
index ba09ba196..23ab725a5 100644
--- a/applications/luci-app-firewall/po/de/firewall.po
+++ b/applications/luci-app-firewall/po/de/firewall.po
@@ -13,7 +13,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.6\n"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
 msgid "%s in %s"
 msgstr "%s in %s"
 
@@ -22,7 +22,7 @@ msgstr "%s in %s"
 msgid "%s%s with %s"
 msgstr "%s%s mit %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
 msgid "%s, %s in %s"
 msgstr "%s, %s in %s"
 
@@ -55,89 +55,77 @@ msgstr ""
 msgid "Accept output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:325
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
 msgid "Action"
 msgstr "Aktion"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "Hinzufügen"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "Hinzufügen und bearbeiten..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
 "traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: 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:84
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
 msgid "Advanced Settings"
 msgstr "Erweiterte Einstellungen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
 msgid "Allow \"invalid\" traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Erlaube Weiterleitung von <em>Quellzone</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "Erlaube Weiterleitung zu <em>Zielzone</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
 msgid "Any"
 msgstr "beliebig"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:341
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
 msgid "Any day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
 msgid "Automatic helper assignment"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Conntrack helpers"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid "Covered devices"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
 msgid "Covered networks"
 msgstr "Abgedeckte Netzwerke"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered subnets"
 msgstr ""
 
@@ -156,17 +144,15 @@ msgstr ""
 "Befehle werden mit jedem Firewall-Neustart abgearbeitet, direkt nach dem "
 "Laden der Basisregeln."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
 msgid "Destination address"
 msgstr "Zieladresse"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
 msgid "Destination port"
 msgstr "Zielport"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:299
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
 msgid "Destination zone"
 msgstr "Ziel-Zone"
 
@@ -189,17 +175,12 @@ msgstr ""
 msgid "Discard output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "Nicht umschreiben"
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
@@ -215,64 +196,58 @@ msgstr ""
 msgid "Do not track output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:42
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
 msgid "Drop invalid packets"
 msgstr "Ungültige Pakete verwerfen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:148
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr "Aktivieren"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
 msgid "Enable NAT Loopback"
 msgstr "NAT-Loopback aktivieren"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
 msgid "Enable SYN-flood protection"
 msgstr "Schutz vor SYN-flood-Attacken"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
 msgid "Enable logging on this zone"
 msgstr "Protokollierung innerhalb der Zone aktivieren"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr "Experimentelle Funktion. Nicht vollständig kompatibel mit QoS/SQM."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
 msgid "External IP address"
 msgstr "Externe IP-Adresse"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:222
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
 msgid "External port"
 msgstr "Externer Port"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "Externe Zone"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:266
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
 msgid "Extra arguments"
 msgstr "Zusätzliche Argumente"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid "Extra destination arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid "Extra source arguments"
 msgstr ""
 
@@ -284,32 +259,32 @@ msgstr "Firewall"
 msgid "Firewall - Custom Rules"
 msgstr "Firewall - Benutzerdefinierte Regeln"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
 msgid "Firewall - Port Forwards"
 msgstr "Firewall - Portweiterleitungen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
 msgid "Firewall - Traffic Rules"
-msgstr "Firewall - Verkehrsregeln"
+msgstr "Firewall - Traffic-Regeln"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
 msgid "Firewall - Zone Settings"
 msgstr "Firewall - Zoneneinstellungen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
 msgid "Force connection tracking"
 msgstr "Connectiontracking erzwingen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
 msgid "Forward"
 msgstr "Weitergeleitet"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
 msgid "Forward to"
 msgstr "Weiterleiten an"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
 msgid "Friday"
 msgstr "Freitag"
 
@@ -340,15 +315,15 @@ msgstr ""
 msgid "From %s on <var>this device</var> with source %s and %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:99
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:135
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:37
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
+#: 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
 msgid "General Settings"
 msgstr "Allgemein"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
 msgid "Hardware flow offloading"
 msgstr "Hardwarebeschleunigte Flusskontrolle"
 
@@ -372,13 +347,13 @@ msgid "IPv4"
 msgstr "IPv4"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
 msgid "IPv4 and IPv6"
 msgstr "IPv4 und IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
 msgid "IPv4 only"
 msgstr "nur IPv4"
 
@@ -386,32 +361,29 @@ msgstr "nur IPv4"
 msgid "IPv6"
 msgstr "IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:187
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
 msgid "IPv6 only"
 msgstr "nur IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Input"
-msgstr "Eingang"
+msgstr "Eingehend"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
 msgid "Internal IP address"
 msgstr "Interne IP-Adresse"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
 msgid "Internal port"
 msgstr "Interner Port"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
 msgid "Internal zone"
 msgstr "Interne Zone"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
 msgid "Limit log messages"
 msgstr "Protokollnachrichten limitieren"
 
@@ -425,24 +397,24 @@ msgstr ""
 msgid "MACs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
 msgid "MSS clamping"
 msgstr "MSS Korrektur"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
 msgid "Masquerading"
 msgstr "NAT aktivieren"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:124
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
 msgid "Match"
 msgstr "Filter"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
 msgid "Match ICMP type"
 msgstr "Nach ICMP-Typ filtern"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
 msgid ""
 "Match incoming traffic directed at the given destination port or port range "
 "on this host"
@@ -450,22 +422,18 @@ msgstr ""
 "Eingehende Verbindungen filtern welche an den angegebenen Port oder "
 "Portbereich auf dem lokalen Gerät gerichtet sind"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
 msgid "Monday"
 msgstr "Montag"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
 msgid "Month Days"
 msgstr "Monatstage"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:120
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:168
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:98
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
 msgid "Name"
 msgstr "Name"
 
@@ -473,68 +441,37 @@ msgstr "Name"
 msgid "Network"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "Neue SNAT-Regel"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "Neuer Weiterleitungsregel"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "Neue Eingangsregel"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "Neue Portweiterleitung"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "Neues SNAT"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
 msgid "Only match incoming traffic directed at the given IP address."
-msgstr "Selektiere nur Verkehr der an die angegebene IP-Adresse gerichtet ist."
+msgstr "Selektiere nur Traffic der an die angegebene IP-Adresse gerichtet ist."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
 msgid "Only match incoming traffic from these MACs."
-msgstr "Selektiere nur Verkehr von den angegebenen MAC-Adressen."
+msgstr "Selektiere nur Traffic von den angegebenen MAC-Adressen."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 msgid "Only match incoming traffic from this IP or range."
-msgstr "Selektiere nur Verkehr vom angebenem Quell-IP-Adressbereich."
+msgstr "Selektiere nur Traffic vom angebenem Quell-IP-Adressbereich."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
 msgid ""
 "Only match incoming traffic originating from the given source port or port "
 "range on the client host"
-msgstr "Selektiere nur Verkehr von den angegebenen Quell-Ports auf dem Client."
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "Ports auf dem Router öffnen"
+msgstr "Selektiere nur Traffic von den angegebenen Quell-Ports auf dem Client."
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Anderes..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Output"
-msgstr "Ausgang"
+msgstr "Ausgehend"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 "Gibt zusätzliche Kommandozeilenargumente an iptables weiter. Mit Vorsicht "
 "benutzen!"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -543,12 +480,12 @@ msgid ""
 "all services."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
 msgid "Port Forwards"
 msgstr "Portweiterleitungen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
@@ -556,27 +493,25 @@ msgstr ""
 "Portweiterleitungen ermöglichen es entfernten Rechnern im Internet auf "
 "bestimmte Computer oder Dienste im lokalen LAN zuzugreifen."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
 msgid ""
 "Prevent the installation of <em>NOTRACK</em> rules which would bypass "
 "connection tracking."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:153
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:204
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: 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 ""
 "Gefilterte Verbindungen an den angegeben Port auf dem internen Host "
 "weiterleiten"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr "Gefilterte Verbindungen an den angegeben internen Host weiterleiten"
 
@@ -595,7 +530,7 @@ msgstr ""
 msgid "Refuse output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 "Erfordert Hardware-NAT-Unterstützung. (Zumindest für mt7621 implementiert)"
@@ -604,20 +539,20 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "NAT auf die angegebenen Ziel-Subnetze beschränken"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
 msgid "Restrict Masquerading to given source subnets"
 msgstr "NAT auf die angegebenen Quell-Subnetze beschränken"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:197
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
 msgid "Restrict to address family"
 msgstr "Beschränke auf Adressfamilie"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
 msgid "Routing/NAT Offloading"
 msgstr "Routing/NAT-Beschleunigung"
 
@@ -629,73 +564,71 @@ msgstr "Regel ist deaktiviert"
 msgid "Rule is enabled"
 msgstr "Regel ist aktiviert"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
 msgid "Saturday"
 msgstr "Samstag"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
 msgid "Software based offloading for routing/NAT"
 msgstr "Softwarebasierte Auslagerung für Routing/NAT"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
 msgid "Software flow offloading"
 msgstr "Beschleunigte Flusskontrolle"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
 msgid "Source IP address"
 msgstr "Quell-IP-Adresse"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
 msgid "Source MAC address"
 msgstr "Quell-MAC-Adresse"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
 msgid "Source address"
 msgstr "Quelladresse"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
 msgid "Source port"
 msgstr "Quellport"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:262
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
 msgid "Source zone"
 msgstr "Quell-Zone"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
 msgid "Start Date (yyyy-mm-dd)"
 msgstr "Startdatum (JJJJ-MM-TT)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
 msgid "Start Time (hh.mm.ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
 msgid "Stop Date (yyyy-mm-dd)"
 msgstr "Enddatum (JJJJ-MM-TT)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
 msgid "Stop Time (hh.mm.ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
 msgid ""
 "The firewall creates zones over your network interfaces to control network "
 "traffic flow."
 msgstr ""
 "Die Firewall erstellt Netzwerkzonen über bestimmte Netzwerkschnittstellen um "
-"den Netzverkehr zu trennen."
+"den Netzwerk-Traffic zu trennen."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:171
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:259
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -704,16 +637,16 @@ msgid ""
 "rule is <em>unidirectional</em>, e.g. a forward from lan to wan does "
 "<em>not</em> imply a permission to forward from wan to lan as well."
 msgstr ""
-"Die untenstehenen Optionen regeln die Verfahreinsweisen für Verkehr zwischen "
+"Die untenstehenen Optionen regeln die Verfahreinsweisen für Traffic zwischen "
 "dieser Zone (%s) und anderen Zonen. <em>Ziel-Zonen</em> decken "
-"weitergeleiteten Verkehr <strong>von %q</strong> ab. <em>Quell-Zonen</em> "
-"treffen auf weitergeleiteten Verkehr aus anderen Zonen zu, welcher "
+"weitergeleiteten Traffic <strong>von %q</strong> ab. <em>Quell-Zonen</em> "
+"treffen auf weitergeleiteten Traffic aus anderen Zonen zu, welcher "
 "<strong>an %q gerichtet</strong> ist. Die Weiterleitung gilt nur in eine "
 "Richtung, d.h. eine erlaubte Weiterleitung von LAN nach WAN impliziert "
 "<em>nicht</em> zusätzlich die Erlaubnis, auch von WAN nach LAN "
 "weiterzuleiten."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
 #, fuzzy
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
@@ -724,20 +657,20 @@ msgid ""
 msgstr ""
 "Diese Sektion definiert allgemeine Eigenschaften der %q Zone. Die "
 "<em>Eingang</em> und <em>Ausgang</em> Optionen regeln die Verfahrensweise "
-"für Verkehr der in diese Zone eintritt oder diese verlässt. "
-"<em>Weitergeleitet</em> trifft auf Verkehr zwischen verschiedenen "
+"für Traffic der in diese Zone eintritt oder diese verlässt. "
+"<em>Weitergeleitet</em> trifft auf Traffic zwischen verschiedenen "
 "Schnittstellen innerhalb dieser Zone zu. <em>Abgedeckte Netzwerke</em> "
 "definieren die Zugehörigkeit von Schnittstellen zu dieser Zone."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
 msgid "Time Restrictions"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
 msgid "Time in UTC"
 msgstr "Zeit ist UTC"
 
@@ -757,54 +690,46 @@ msgstr "Zu %s auf <var>diesem Gerät</var>"
 msgid "To %s, %s in %s"
 msgstr "Zu %s, %s in %s"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr "Zu Quell-IP"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr "Zu Quell-Port"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
 msgid "Traffic Rules"
-msgstr "Verkehrsregeln"
+msgstr "Traffic-Regeln"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
 "for example to reject traffic between certain hosts or to open WAN ports on "
 "the router."
 msgstr ""
-"Verkehrsregeln bestimmen den Fluss der Pakete zwischen verschiedenen Zonen, "
-"zum Beispiel um Verkehr zwischen bestimmten Rechnern zu unterbinden oder um "
+"Traffic-Regeln bestimmen den Fluss der Pakete zwischen verschiedenen Zonen, "
+"zum Beispiel um Traffic zwischen bestimmten Rechnern zu unterbinden oder um "
 "WAN-Ports auf dem Router zu öffnen."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:107
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
 msgid "Unnamed forward"
 msgstr "Unbenannte Portweiterleitung"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:144
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
 msgid "Unnamed rule"
 msgstr "Unbennante Regel"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:99
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
 msgid "Unnamed zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -818,46 +743,46 @@ msgstr "Über %s"
 msgid "Via %s at %s"
 msgstr "Über %s an %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
 msgid "Week Days"
 msgstr "Wochentage"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
 msgid "Zone ⇒ Forwardings"
 msgstr "Zone ⇒ Weiterleitungen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
 msgid "Zones"
 msgstr "Zonen"
 
 # Die richtige Übersetzung von ACCEPT im Firewallkontext ist nicht "Annehmen" sondern "Zulassen". Man kann ja keinen
-# ausgehenden Verkehr annehmen. 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:329
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
+# ausgehenden Traffic annehmen. 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
 msgid "accept"
 msgstr "zulassen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:254
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:222
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
 msgid "any"
 msgstr "beliebig"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
 msgid "any host"
@@ -871,7 +796,7 @@ msgstr "beliebige Router-IP"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr "beliebige Zone"
@@ -881,13 +806,13 @@ msgstr "beliebige Zone"
 msgid "day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
 msgid "don't track"
 msgstr "nicht verfolgen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
 msgid "drop"
 msgstr "verwerfen"
 
@@ -918,9 +843,9 @@ msgstr ""
 msgid "ports"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:330
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
 msgid "reject"
 msgstr "zurückweisen"
 
@@ -929,6 +854,12 @@ msgstr "zurückweisen"
 msgid "second"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
@@ -939,6 +870,45 @@ msgstr ""
 msgid "types"
 msgstr ""
 
+#~ msgid "Add"
+#~ msgstr "Hinzufügen"
+
+#~ msgid "Add and edit..."
+#~ msgstr "Hinzufügen und bearbeiten..."
+
+#~ msgid "Do not rewrite"
+#~ msgstr "Nicht umschreiben"
+
+#~ msgid "External zone"
+#~ msgstr "Externe Zone"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "Neue SNAT-Regel"
+
+#~ msgid "New forward rule"
+#~ msgstr "Neue Weiterleitungsregel"
+
+#~ msgid "New input rule"
+#~ msgstr "Neue eingehende Regel"
+
+#~ msgid "New port forward"
+#~ msgstr "Neue Portweiterleitung"
+
+#~ msgid "New source NAT"
+#~ msgstr "Neues SNAT"
+
+#~ msgid "Open ports on router"
+#~ msgstr "Ports auf dem Router öffnen"
+
+#~ msgid "Other..."
+#~ msgstr "Anderes..."
+
+#~ msgid "To source IP"
+#~ msgstr "Zu Quell-IP"
+
+#~ msgid "To source port"
+#~ msgstr "Zu Quell-Port"
+
 #~ msgid "(Unnamed Entry)"
 #~ msgstr "(Unbenannter Eintrag)"
 
diff --git a/applications/luci-app-firewall/po/el/firewall.po b/applications/luci-app-firewall/po/el/firewall.po
index 36e2e3a36..04cb7c343 100644
--- a/applications/luci-app-firewall/po/el/firewall.po
+++ b/applications/luci-app-firewall/po/el/firewall.po
@@ -13,7 +13,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.4\n"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
 msgid "%s in %s"
 msgstr ""
 
@@ -22,7 +22,7 @@ msgstr ""
 msgid "%s%s with %s"
 msgstr "%s%s με %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
 msgid "%s, %s in %s"
 msgstr ""
 
@@ -55,89 +55,77 @@ msgstr ""
 msgid "Accept output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:325
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
 msgid "Action"
 msgstr "Ενέργεια"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "Προσθήκη"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "Προσθήκη και επεξεργασία..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
 "traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: 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:84
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
 msgid "Advanced Settings"
 msgstr "Ρυθμίσεις για προχωρημένους"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
 msgid "Allow \"invalid\" traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
 msgid "Allow forward from <em>source zones</em>:"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
 msgid "Any"
 msgstr "Οποιοδήποτε"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:341
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
 msgid "Any day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
 msgid "Automatic helper assignment"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Conntrack helpers"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid "Covered devices"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
 msgid "Covered networks"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered subnets"
 msgstr ""
 
@@ -152,17 +140,15 @@ msgid ""
 "each firewall restart, right after the default ruleset has been loaded."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
 msgid "Destination address"
 msgstr "Διεύθυνση προορισμού"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
 msgid "Destination port"
 msgstr "Θύρα προορισμού"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:299
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
 #, fuzzy
 msgid "Destination zone"
 msgstr "Ζώνη προορισμού"
@@ -186,17 +172,12 @@ msgstr ""
 msgid "Discard output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
@@ -212,65 +193,59 @@ msgstr ""
 msgid "Do not track output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:42
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
 msgid "Drop invalid packets"
 msgstr "Αγνόηση μη-έγκυρων πακετών"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:148
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr "Ενεργοποίηση"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
 msgid "Enable NAT Loopback"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
 #, fuzzy
 msgid "Enable SYN-flood protection"
 msgstr "Προστασία SYN-flood"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
 msgid "Enable logging on this zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
 msgid "External IP address"
 msgstr "Εξωτερική διεύθυνση IP"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:222
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
 msgid "External port"
 msgstr "Εξωτερική θύρα"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:266
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
 msgid "Extra arguments"
 msgstr "Επιπλέον παράμετροι"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid "Extra destination arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid "Extra source arguments"
 msgstr ""
 
@@ -282,32 +257,32 @@ msgstr "Τείχος προστασίας"
 msgid "Firewall - Custom Rules"
 msgstr "Τείχος προστασίας - Προσαρμοσμένοι Κανόνες"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
 msgid "Firewall - Port Forwards"
 msgstr "Τείχος προστασίας - Προώθηση Θυρών"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
 msgid "Firewall - Traffic Rules"
 msgstr "Τείχος προστασίας - Κανόνες Κίνησεις"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
 msgid "Firewall - Zone Settings"
 msgstr "Τείχος προστασίας - Ρυθμίσεις Ζώνης"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
 msgid "Force connection tracking"
 msgstr "Επιβολή παρακολούθησης σύνδεσης"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
 msgid "Forward"
 msgstr "Προώθηση"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
 msgid "Forward to"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
 msgid "Friday"
 msgstr ""
 
@@ -338,15 +313,15 @@ msgstr ""
 msgid "From %s on <var>this device</var> with source %s and %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:99
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:135
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:37
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
+#: 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
 msgid "General Settings"
 msgstr "Γενικές Ρυθμίσεις"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
 msgid "Hardware flow offloading"
 msgstr ""
 
@@ -370,13 +345,13 @@ msgid "IPv4"
 msgstr "IPv4"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
 msgid "IPv4 and IPv6"
 msgstr "IPv4 και IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
 msgid "IPv4 only"
 msgstr "Μόνο IPv4"
 
@@ -384,34 +359,31 @@ msgstr "Μόνο IPv4"
 msgid "IPv6"
 msgstr "IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:187
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
 msgid "IPv6 only"
 msgstr "Μόνο IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Input"
 msgstr "Είσοδος"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
 #, fuzzy
 msgid "Internal IP address"
 msgstr "Εσωτερική διεύθυνση"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
 #, fuzzy
 msgid "Internal port"
 msgstr "Εξωτερική θύρα"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
 msgid "Internal zone"
 msgstr "Εσωτερική ζώνη"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
 msgid "Limit log messages"
 msgstr "Περιορισμός καταγραφών συστήματος"
 
@@ -425,46 +397,42 @@ msgstr ""
 msgid "MACs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
 #, fuzzy
 msgid "MSS clamping"
 msgstr "Περιορισμός MSS"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
 msgid "Masquerading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:124
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
 msgid "Match"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
 msgid "Match ICMP type"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
 msgid ""
 "Match incoming traffic directed at the given destination port or port range "
 "on this host"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
 msgid "Monday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
 msgid "Month Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:120
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:168
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:98
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
 msgid "Name"
 msgstr "Όνομα"
 
@@ -472,66 +440,35 @@ msgstr "Όνομα"
 msgid "Network"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
 msgid "Only match incoming traffic from these MACs."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 msgid "Only match incoming traffic from this IP or range."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
 msgid ""
 "Only match incoming traffic originating from the given source port or port "
 "range on the client host"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Άλλο..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Output"
 msgstr "Έξοδος"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -540,36 +477,34 @@ msgid ""
 "all services."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
 msgid "Port Forwards"
 msgstr "Προώθηση Θυρών"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
 msgid ""
 "Prevent the installation of <em>NOTRACK</em> rules which would bypass "
 "connection tracking."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:153
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:204
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
 msgid "Protocol"
 msgstr "Πρωτόκολλο"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: 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 ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr ""
 
@@ -588,7 +523,7 @@ msgstr ""
 msgid "Refuse output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 
@@ -596,20 +531,20 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
 msgid "Restrict Masquerading to given destination subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
 msgid "Restrict Masquerading to given source subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:197
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
 msgid "Restrict to address family"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
 msgid "Routing/NAT Offloading"
 msgstr ""
 
@@ -621,67 +556,65 @@ msgstr ""
 msgid "Rule is enabled"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
 msgid "Saturday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
 msgid "Software based offloading for routing/NAT"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
 msgid "Software flow offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
 #, fuzzy
 msgid "Source IP address"
 msgstr "Διεύθυνση MAC πηγής"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
 msgid "Source MAC address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
 #, fuzzy
 msgid "Source address"
 msgstr "Διεύθυνση MAC πηγής"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
 msgid "Source port"
 msgstr "Θύρα πηγής"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:262
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
 #, fuzzy
 msgid "Source zone"
 msgstr "Θύρα πηγής"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
 msgid "Start Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
 msgid "Start Time (hh.mm.ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
 msgid "Stop Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
 msgid "Stop Time (hh.mm.ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
 msgid "Sunday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
 msgid ""
 "The firewall creates zones over your network interfaces to control network "
 "traffic flow."
@@ -689,8 +622,8 @@ msgstr ""
 "Το τείχος προστασίας δημιουργεί ζώνες πάνω στις διεπαφές δικτύου για να "
 "ελέγχει την δικτυακή κίνηση."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:171
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:259
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -700,7 +633,7 @@ msgid ""
 "<em>not</em> imply a permission to forward from wan to lan as well."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -709,15 +642,15 @@ msgid ""
 "networks</em> specifies which available networks are members of this zone."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
 msgid "Thursday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
 msgid "Time Restrictions"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
 msgid "Time in UTC"
 msgstr ""
 
@@ -737,51 +670,43 @@ msgstr ""
 msgid "To %s, %s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
 msgid "Traffic Rules"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
 "for example to reject traffic between certain hosts or to open WAN ports on "
 "the router."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
 msgid "Tuesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:107
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
 msgid "Unnamed forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:144
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
 msgid "Unnamed rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:99
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
 msgid "Unnamed zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -795,44 +720,44 @@ msgstr ""
 msgid "Via %s at %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
 msgid "Wednesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
 msgid "Week Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
 msgid "Zone ⇒ Forwardings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
 msgid "Zones"
 msgstr "Ζώνες"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:329
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
 msgid "accept"
 msgstr "αποδοχή"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:254
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:222
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
 msgid "any"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
 msgid "any host"
@@ -846,7 +771,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr ""
@@ -856,13 +781,13 @@ msgstr ""
 msgid "day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
 msgid "don't track"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
 msgid "drop"
 msgstr "αγνόηση"
 
@@ -893,9 +818,9 @@ msgstr ""
 msgid "ports"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:330
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
 msgid "reject"
 msgstr "απόρριψη"
 
@@ -904,6 +829,12 @@ msgstr "απόρριψη"
 msgid "second"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
@@ -914,5 +845,14 @@ msgstr ""
 msgid "types"
 msgstr ""
 
+#~ msgid "Add"
+#~ msgstr "Προσθήκη"
+
+#~ msgid "Add and edit..."
+#~ msgstr "Προσθήκη και επεξεργασία..."
+
+#~ msgid "Other..."
+#~ msgstr "Άλλο..."
+
 #~ msgid "Destination IP address"
 #~ msgstr "Διεύθυνση IP προορισμού"
diff --git a/applications/luci-app-firewall/po/en/firewall.po b/applications/luci-app-firewall/po/en/firewall.po
index 645560ca7..e38a33d2a 100644
--- a/applications/luci-app-firewall/po/en/firewall.po
+++ b/applications/luci-app-firewall/po/en/firewall.po
@@ -11,7 +11,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
 msgid "%s in %s"
 msgstr ""
 
@@ -20,7 +20,7 @@ msgstr ""
 msgid "%s%s with %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
 msgid "%s, %s in %s"
 msgstr ""
 
@@ -53,89 +53,77 @@ msgstr ""
 msgid "Accept output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:325
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
 msgid "Action"
 msgstr "Action"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
 "traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: 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:84
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
 msgid "Advanced Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
 msgid "Allow \"invalid\" traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
 msgid "Allow forward from <em>source zones</em>:"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
 msgid "Any"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:341
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
 msgid "Any day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
 msgid "Automatic helper assignment"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Conntrack helpers"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid "Covered devices"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
 msgid "Covered networks"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered subnets"
 msgstr ""
 
@@ -150,17 +138,15 @@ msgid ""
 "each firewall restart, right after the default ruleset has been loaded."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
 msgid "Destination address"
 msgstr "Destination address"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
 msgid "Destination port"
 msgstr "Destination port"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:299
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
 msgid "Destination zone"
 msgstr "Destination zone"
 
@@ -183,17 +169,12 @@ msgstr ""
 msgid "Discard output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
@@ -209,64 +190,58 @@ msgstr ""
 msgid "Do not track output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:42
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
 msgid "Drop invalid packets"
 msgstr "Drop invalid packets"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:148
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
 msgid "Enable NAT Loopback"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
 msgid "Enable SYN-flood protection"
 msgstr "Enable SYN-flood protection"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
 msgid "Enable logging on this zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
 msgid "External IP address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:222
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
 msgid "External port"
 msgstr "External port"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:266
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
 msgid "Extra arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid "Extra destination arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid "Extra source arguments"
 msgstr ""
 
@@ -282,32 +257,32 @@ msgstr "Firewall"
 msgid "Firewall - Custom Rules"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
 msgid "Firewall - Port Forwards"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
 msgid "Firewall - Traffic Rules"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
 msgid "Firewall - Zone Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
 msgid "Force connection tracking"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
 msgid "Forward"
 msgstr "Forward"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
 msgid "Forward to"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
 msgid "Friday"
 msgstr ""
 
@@ -338,15 +313,15 @@ msgstr ""
 msgid "From %s on <var>this device</var> with source %s and %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:99
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:135
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:37
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
+#: 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
 msgid "General Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
 msgid "Hardware flow offloading"
 msgstr ""
 
@@ -370,13 +345,13 @@ msgid "IPv4"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
 msgid "IPv4 and IPv6"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
 msgid "IPv4 only"
 msgstr ""
 
@@ -384,32 +359,29 @@ msgstr ""
 msgid "IPv6"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:187
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
 msgid "IPv6 only"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Input"
 msgstr "Input"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
 msgid "Internal IP address"
 msgstr "Internal IP address"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
 msgid "Internal port"
 msgstr "Internal port"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
 msgid "Internal zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
 msgid "Limit log messages"
 msgstr ""
 
@@ -423,24 +395,24 @@ msgstr ""
 msgid "MACs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
 msgid "MSS clamping"
 msgstr "MSS clamping"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
 msgid "Masquerading"
 msgstr "Masquerading"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:124
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
 msgid "Match"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
 msgid "Match ICMP type"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
 msgid ""
 "Match incoming traffic directed at the given destination port or port range "
 "on this host"
@@ -448,22 +420,18 @@ msgstr ""
 "Match incoming traffic directed at the given destination port or port range "
 "on this host"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
 msgid "Monday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
 msgid "Month Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:120
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:168
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:98
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
 msgid "Name"
 msgstr "Name"
 
@@ -471,66 +439,35 @@ msgstr "Name"
 msgid "Network"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
 msgid "Only match incoming traffic from these MACs."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 msgid "Only match incoming traffic from this IP or range."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
 msgid ""
 "Only match incoming traffic originating from the given source port or port "
 "range on the client host"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Output"
 msgstr "Output"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -539,37 +476,35 @@ msgid ""
 "all services."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
 msgid "Port Forwards"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
 msgid ""
 "Prevent the installation of <em>NOTRACK</em> rules which would bypass "
 "connection tracking."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:153
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:204
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
 msgid "Protocol"
 msgstr "Protocol"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: 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 ""
 "Redirect matched incoming traffic to the given port on the internal host"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr "Redirect matched incoming traffic to the specified internal host"
 
@@ -588,7 +523,7 @@ msgstr ""
 msgid "Refuse output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 
@@ -596,20 +531,20 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
 msgid "Restrict Masquerading to given destination subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
 msgid "Restrict Masquerading to given source subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:197
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
 msgid "Restrict to address family"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
 msgid "Routing/NAT Offloading"
 msgstr ""
 
@@ -621,15 +556,15 @@ msgstr ""
 msgid "Rule is enabled"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
 msgid "Saturday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
 msgid "Software based offloading for routing/NAT"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
 msgid "Software flow offloading"
 msgstr ""
 
@@ -663,52 +598,50 @@ msgstr ""
 # msgid "Protocol"
 # msgstr ""
 #
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
 msgid "Source IP address"
 msgstr "Source IP address"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
 msgid "Source MAC address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
 msgid "Source address"
 msgstr "Source address"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
 msgid "Source port"
 msgstr "Source port"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:262
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
 msgid "Source zone"
 msgstr "Source zone"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
 msgid "Start Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
 msgid "Start Time (hh.mm.ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
 msgid "Stop Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
 msgid "Stop Time (hh.mm.ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
 msgid "Sunday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
 msgid ""
 "The firewall creates zones over your network interfaces to control network "
 "traffic flow."
@@ -716,8 +649,8 @@ msgstr ""
 "The firewall creates zones over your network interfaces to control network "
 "traffic flow."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:171
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:259
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -727,7 +660,7 @@ msgid ""
 "<em>not</em> imply a permission to forward from wan to lan as well."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -736,15 +669,15 @@ msgid ""
 "networks</em> specifies which available networks are members of this zone."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
 msgid "Thursday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
 msgid "Time Restrictions"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
 msgid "Time in UTC"
 msgstr ""
 
@@ -764,51 +697,43 @@ msgstr ""
 msgid "To %s, %s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
 msgid "Traffic Rules"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
 "for example to reject traffic between certain hosts or to open WAN ports on "
 "the router."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
 msgid "Tuesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:107
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
 msgid "Unnamed forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:144
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
 msgid "Unnamed rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:99
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
 msgid "Unnamed zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -822,44 +747,44 @@ msgstr ""
 msgid "Via %s at %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
 msgid "Wednesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
 msgid "Week Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
 msgid "Zone ⇒ Forwardings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
 msgid "Zones"
 msgstr "Zones"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:329
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
 msgid "accept"
 msgstr "accept"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:254
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:222
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
 msgid "any"
 msgstr "any"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
 msgid "any host"
@@ -873,7 +798,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr ""
@@ -883,13 +808,13 @@ msgstr ""
 msgid "day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
 msgid "don't track"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
 msgid "drop"
 msgstr "drop"
 
@@ -920,9 +845,9 @@ msgstr ""
 msgid "ports"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:330
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
 msgid "reject"
 msgstr "reject"
 
@@ -931,6 +856,12 @@ msgstr "reject"
 msgid "second"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
diff --git a/applications/luci-app-firewall/po/es/firewall.po b/applications/luci-app-firewall/po/es/firewall.po
index 7bb1a1e41..767da3f15 100644
--- a/applications/luci-app-firewall/po/es/firewall.po
+++ b/applications/luci-app-firewall/po/es/firewall.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-03-30 17:00+0200\n"
-"PO-Revision-Date: 2019-08-01 22:47-0300\n"
+"PO-Revision-Date: 2019-09-17 23:31-0300\n"
 "Last-Translator: Franco Castillo <castillofrancodamian@gmail.com>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
@@ -13,7 +13,7 @@ msgstr ""
 "X-Generator: Poedit 2.2.3\n"
 "Language-Team: \n"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
 msgid "%s in %s"
 msgstr "%s en %s"
 
@@ -22,7 +22,7 @@ msgstr "%s en %s"
 msgid "%s%s with %s"
 msgstr "%s%s con %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
 msgid "%s, %s in %s"
 msgstr "%s, %s en %s"
 
@@ -56,24 +56,12 @@ msgstr "Aceptar entrada"
 msgid "Accept output"
 msgstr "Aceptar salida"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:325
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
 msgid "Action"
 msgstr "Acción"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "Añadir"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "Añadir y editar..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
@@ -83,7 +71,7 @@ msgstr ""
 "tráfico de destino de la zona, p.e. <code>-p tcp --dport 443</code> para que "
 "solo coincida con el tráfico HTTPS saliente."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -92,61 +80,61 @@ msgstr ""
 "tráfico de origen de zona, p.e. <code>-p tcp --sport 443</code> para que "
 "solo coincida con el tráfico HTTPS entrante."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: 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:84
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
 msgid "Advanced Settings"
 msgstr "Configuración avanzada"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
 msgid "Allow \"invalid\" traffic"
 msgstr "Permitir tráfico \"inválido\""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Permitir reenvío desde <em>zonas de origen</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "Permitir reenvío a <em>zonas de destino</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
 msgid "Any"
 msgstr "Cualquiera"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:341
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
 msgid "Any day"
 msgstr "Cualquier día"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
 msgid "Automatic helper assignment"
 msgstr "Asignación automática de ayuda"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
 "Asigna automáticamente ayudantes de conntrack según el protocolo de tráfico "
 "y el puerto"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
 msgid "Conntrack Settings"
 msgstr "Configuraciones de Conntrack"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Conntrack helpers"
 msgstr "Ayudantes de Conntrack"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid "Covered devices"
 msgstr "Dispositivos cubiertos"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
 msgid "Covered networks"
 msgstr "Redes cubiertas"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered subnets"
 msgstr "Subredes cubiertas"
 
@@ -165,17 +153,15 @@ msgstr ""
 "cualquier reinicio del FIrewall, justo tras haber cargado el conjunto de "
 "reglas predeterminadas."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
 msgid "Destination address"
 msgstr "Dirección de destino"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
 msgid "Destination port"
 msgstr "Puerto de destino"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:299
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
 msgid "Destination zone"
 msgstr "Zona de destino"
 
@@ -198,7 +184,7 @@ msgstr "Descartar entrada"
 msgid "Discard output"
 msgstr "Descartar salida"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
@@ -207,11 +193,6 @@ msgstr ""
 "estado conntrack <em>inválido</em>. Esto puede ser necesario para "
 "configuraciones complejas de rutas asimétricas."
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "No reescribir"
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
@@ -227,66 +208,60 @@ msgstr "No seguir entrada"
 msgid "Do not track output"
 msgstr "No seguir salida"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:42
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
 msgid "Drop invalid packets"
 msgstr "Descartar paquetes inválidos"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:148
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr "Habilitar"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
 msgid "Enable NAT Loopback"
 msgstr "Habilitar bucle NAT"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
 msgid "Enable SYN-flood protection"
 msgstr "Habilitar protección contra inundaciones SYN"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
 msgid "Enable logging on this zone"
 msgstr "Habilitar registro en esta zona"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr "Característica experimental. No es totalmente compatible con QoS/SQM."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 "Elige explícitamente los ayudantes de seguimiento de conexión permitidos "
 "para el tráfico de zona"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
 msgid "External IP address"
 msgstr "Dirección IP externa"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:222
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
 msgid "External port"
 msgstr "Puerto externo"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "Zona externa"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:266
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
 msgid "Extra arguments"
 msgstr "Parámetros extra"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid "Extra destination arguments"
 msgstr "Argumentos de destino adicionales"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
 msgid "Extra iptables arguments"
 msgstr "Argumentos adicionales de iptables"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid "Extra source arguments"
 msgstr "Argumentos fuente adicionales"
 
@@ -298,32 +273,32 @@ msgstr "Firewall"
 msgid "Firewall - Custom Rules"
 msgstr "Firewall - Reglas personalizadas"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
 msgid "Firewall - Port Forwards"
 msgstr "Firewall - Reenvíos de puertos"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
 msgid "Firewall - Traffic Rules"
 msgstr "Firewall - Reglas de tráfico"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
 msgid "Firewall - Zone Settings"
 msgstr "Firewall - Configuración de la zona"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
 msgid "Force connection tracking"
 msgstr "Forzar seguimiento de conexión"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
 msgid "Forward"
 msgstr "Reenviar"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
 msgid "Forward to"
 msgstr "Reenviar a"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
 msgid "Friday"
 msgstr "Viernes"
 
@@ -354,15 +329,15 @@ msgstr "Desde %s en <var>este dispositivo</var> con la fuente %s"
 msgid "From %s on <var>this device</var> with source %s and %s"
 msgstr "De %s en <var>este dispositivo</var> con la fuente %s y %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:99
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:135
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:37
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
+#: 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
 msgid "General Settings"
 msgstr "Configuración general"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
 msgid "Hardware flow offloading"
 msgstr "Flow Offloading por hardware"
 
@@ -386,13 +361,13 @@ msgid "IPv4"
 msgstr "IPv4"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
 msgid "IPv4 and IPv6"
 msgstr "IPv4 e IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
 msgid "IPv4 only"
 msgstr "Sólo IPv4"
 
@@ -400,32 +375,29 @@ msgstr "Sólo IPv4"
 msgid "IPv6"
 msgstr "IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:187
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
 msgid "IPv6 only"
 msgstr "Sólo IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Input"
 msgstr "Entrada"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
 msgid "Internal IP address"
 msgstr "Dirección IP interna"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
 msgid "Internal port"
 msgstr "Puerto interno"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
 msgid "Internal zone"
 msgstr "Zona interna"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
 msgid "Limit log messages"
 msgstr "Limitar registro de mensajes"
 
@@ -439,24 +411,24 @@ msgstr "MAC"
 msgid "MACs"
 msgstr "MACs"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
 msgid "MSS clamping"
 msgstr "Fijado de MSS"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
 msgid "Masquerading"
 msgstr "Enmascaramiento"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:124
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
 msgid "Match"
 msgstr "Coincidir"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
 msgid "Match ICMP type"
 msgstr "Coincidir con tipo ICMP"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
 msgid ""
 "Match incoming traffic directed at the given destination port or port range "
 "on this host"
@@ -464,22 +436,18 @@ msgstr ""
 "Coincidir con tráfico de entrada dirigido al puerto o rango de puertos "
 "destino en este host"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
 msgid "Monday"
 msgstr "Lunes"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
 msgid "Month Days"
 msgstr "Días del mes"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:120
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:168
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:98
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
 msgid "Name"
 msgstr "Nombre"
 
@@ -487,41 +455,19 @@ msgstr "Nombre"
 msgid "Network"
 msgstr "Red"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "Nueva regla SNAT"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "Nueva regla de reenvío"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "Nueva regla de entrada"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "Nuevo reenvío de puerto"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "Nuevo origen NAT"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr "Coincidir sólo con tráfico de entrada a esta dirección IP."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
 msgid "Only match incoming traffic from these MACs."
 msgstr "Coincidir sólo con tráfico de entrada desde estas MACs."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 msgid "Only match incoming traffic from this IP or range."
 msgstr "Coincidir sólo con tráfico de entrada desde esta IP o rango."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
 msgid ""
 "Only match incoming traffic originating from the given source port or port "
 "range on the client host"
@@ -529,26 +475,17 @@ msgstr ""
 "Solo coincida con el tráfico entrante que se origina desde el puerto de "
 "origen o el rango de puertos en el host del cliente"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "Abrir puertos en el router"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Otros..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Output"
 msgstr "Salida"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr "Agrega más parámetros a iptables. ¡Utilice con cuidado!"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -563,12 +500,12 @@ msgstr ""
 "conjunto de reglas del firewall se rompa, exponiendo completamente todos los "
 "servicios."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
 msgid "Port Forwards"
 msgstr "Reenvíos de puertos"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
@@ -576,7 +513,7 @@ msgstr ""
 "El reenvío de puertos permite a ordenadores remotos en internet conectar a "
 "un ordenador o servicio específico en la LAN privada."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
 msgid ""
 "Prevent the installation of <em>NOTRACK</em> rules which would bypass "
 "connection tracking."
@@ -584,21 +521,19 @@ msgstr ""
 "Evite la instalación de reglas <em>NOTRACK</em> que evitarían el seguimiento "
 "de la conexión."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:153
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:204
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: 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 ""
 "Redirigir el tráfico de entrada que coincida al puerto dado en el host "
 "interno"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr ""
 "Redirigir el tráfico de entrada que coincida al host interno especificado"
@@ -618,7 +553,7 @@ msgstr "Rechazar entrada"
 msgid "Refuse output"
 msgstr "Rechazar salida"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 "Requiere soporte de NAT por hardware. Implementado al menos para mt7621"
@@ -627,20 +562,20 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr "Reiniciar Firewall"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "Restringir enmascaramiento a las subredes destino"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
 msgid "Restrict Masquerading to given source subnets"
 msgstr "Restringir enmascaramiento a las subredes origen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:197
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
 msgid "Restrict to address family"
 msgstr "Restringir a la familia de direcciones"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
 msgid "Routing/NAT Offloading"
 msgstr "Enrutamiento/NAT Offloading"
 
@@ -652,64 +587,62 @@ msgstr "Regla deshabilitada"
 msgid "Rule is enabled"
 msgstr "Regla habilitada"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
 msgid "Saturday"
 msgstr "Sábado"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
 msgid "Software based offloading for routing/NAT"
 msgstr "Offloading basado en software para enrutamiento/NAT"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
 msgid "Software flow offloading"
 msgstr "Flow Offloading por software"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
 msgid "Source IP address"
 msgstr "Dirección IP origen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
 msgid "Source MAC address"
 msgstr "Dirección MAC origen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
 msgid "Source address"
 msgstr "Dirección de origen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
 msgid "Source port"
 msgstr "Puerto de origen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:262
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
 msgid "Source zone"
 msgstr "Zona de origen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
 msgid "Start Date (yyyy-mm-dd)"
 msgstr "Fecha de inicio (aaaa-mm-dd)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
 msgid "Start Time (hh.mm.ss)"
 msgstr "Hora de inicio (hh.mm.ss)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
 msgid "Stop Date (yyyy-mm-dd)"
 msgstr "Fecha de finalización (aaaa-mm-dd)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
 msgid "Stop Time (hh.mm.ss)"
 msgstr "Hora de finalización (hh.mm.ss)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
 msgid "Sunday"
 msgstr "Domingo"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
 msgid ""
 "The firewall creates zones over your network interfaces to control network "
 "traffic flow."
@@ -717,8 +650,8 @@ msgstr ""
 "El Firewall crea zonas sobre sus interfaces de red para controlar el flujo "
 "del tráfico."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:171
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:259
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -735,7 +668,7 @@ msgstr ""
 "la LAN a la WAN <em>no</em> implica permiso para reenviar desde la WAN a la "
 "LAN también."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -750,15 +683,15 @@ msgstr ""
 "<em>Redes cubiertas</em> especifican qué redes disponibles son miembros de "
 "esta zona."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
 msgid "Thursday"
 msgstr "Jueves"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
 msgid "Time Restrictions"
 msgstr "Restricciones de tiempo"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
 msgid "Time in UTC"
 msgstr "Tiempo en UTC"
 
@@ -778,20 +711,12 @@ msgstr "A %s por <var>este dispositivo</var>"
 msgid "To %s, %s in %s"
 msgstr "A %s, %s en %s"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr "A IP origen"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr "A puerto origen"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
 msgid "Traffic Rules"
 msgstr "Reglas de tráfico"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
 "for example to reject traffic between certain hosts or to open WAN ports on "
@@ -801,25 +726,25 @@ msgstr ""
 "diferentes zonas, por ejemplo, para rechazar el tráfico entre ciertos hosts "
 "o para abrir puertos WAN en el enrutador."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
 msgid "Tuesday"
 msgstr "Martes"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:107
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
 msgid "Unnamed forward"
 msgstr "Reenvío sin nombre"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:144
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
 msgid "Unnamed rule"
 msgstr "Regla sin nombre"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:99
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
 msgid "Unnamed zone"
 msgstr "Zona sin nombre"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
@@ -827,7 +752,7 @@ msgstr ""
 "Use esta opción para clasificar el tráfico de zona por raw, dispositivos de "
 "red no administrados <em>uci</em>."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -843,44 +768,44 @@ msgstr "Vía %s"
 msgid "Via %s at %s"
 msgstr "Vía %s a %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
 msgid "Wednesday"
 msgstr "Miércoles"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
 msgid "Week Days"
 msgstr "Días de la semana"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
 msgid "Zone ⇒ Forwardings"
 msgstr "Zona ⇒ Reenvíos"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
 msgid "Zones"
 msgstr "Zonas"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:329
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
 msgid "accept"
 msgstr "Aceptar"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:254
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:222
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
 msgid "any"
 msgstr "cualquiera"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
 msgid "any host"
@@ -894,7 +819,7 @@ msgstr "cualquier router IP"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr "cualquier zona"
@@ -904,13 +829,13 @@ msgstr "cualquier zona"
 msgid "day"
 msgstr "Día"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
 msgid "don't track"
 msgstr "No seguir"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
 msgid "drop"
 msgstr "Descartar"
 
@@ -941,9 +866,9 @@ msgstr "Puerto"
 msgid "ports"
 msgstr "Puertos"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:330
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
 msgid "reject"
 msgstr "Rechazar"
 
@@ -952,6 +877,12 @@ msgstr "Rechazar"
 msgid "second"
 msgstr "segundo"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr "Esta nueva zona"
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
@@ -962,6 +893,45 @@ msgstr "Tipo"
 msgid "types"
 msgstr "Tipos"
 
+#~ msgid "Add"
+#~ msgstr "Añadir"
+
+#~ msgid "Add and edit..."
+#~ msgstr "Añadir y editar..."
+
+#~ msgid "Do not rewrite"
+#~ msgstr "No reescribir"
+
+#~ msgid "External zone"
+#~ msgstr "Zona externa"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "Nueva regla SNAT"
+
+#~ msgid "New forward rule"
+#~ msgstr "Nueva regla de reenvío"
+
+#~ msgid "New input rule"
+#~ msgstr "Nueva regla de entrada"
+
+#~ msgid "New port forward"
+#~ msgstr "Nuevo reenvío de puerto"
+
+#~ msgid "New source NAT"
+#~ msgstr "Nuevo origen NAT"
+
+#~ msgid "Open ports on router"
+#~ msgstr "Abrir puertos en el router"
+
+#~ msgid "Other..."
+#~ msgstr "Otros..."
+
+#~ msgid "To source IP"
+#~ msgstr "A IP origen"
+
+#~ msgid "To source port"
+#~ msgstr "A puerto origen"
+
 #~ msgid "Output zone"
 #~ msgstr "Zona de salida"
 
diff --git a/applications/luci-app-firewall/po/fr/firewall.po b/applications/luci-app-firewall/po/fr/firewall.po
index 74af37802..7da22682b 100644
--- a/applications/luci-app-firewall/po/fr/firewall.po
+++ b/applications/luci-app-firewall/po/fr/firewall.po
@@ -13,7 +13,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Pootle 2.0.6\n"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
 msgid "%s in %s"
 msgstr ""
 
@@ -22,7 +22,7 @@ msgstr ""
 msgid "%s%s with %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
 msgid "%s, %s in %s"
 msgstr ""
 
@@ -55,89 +55,77 @@ msgstr ""
 msgid "Accept output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:325
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
 msgid "Action"
 msgstr "Action"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
 "traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: 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:84
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
 msgid "Advanced Settings"
 msgstr "Paramètres avancés"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
 msgid "Allow \"invalid\" traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Permettre la transmission des <em>zones source</em> :"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "Permettre la transmission vers les <em>zones destination</em> :"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
 msgid "Any"
 msgstr "N'importe lequel"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:341
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
 msgid "Any day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
 msgid "Automatic helper assignment"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Conntrack helpers"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid "Covered devices"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
 msgid "Covered networks"
 msgstr "Réseaux couverts"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered subnets"
 msgstr ""
 
@@ -152,17 +140,15 @@ msgid ""
 "each firewall restart, right after the default ruleset has been loaded."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
 msgid "Destination address"
 msgstr "Adresse de destination"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
 msgid "Destination port"
 msgstr "Port de destination"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:299
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
 msgid "Destination zone"
 msgstr "Zone de destination"
 
@@ -185,17 +171,12 @@ msgstr ""
 msgid "Discard output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
@@ -211,64 +192,58 @@ msgstr ""
 msgid "Do not track output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:42
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
 msgid "Drop invalid packets"
 msgstr "Supprimer les paquets invalides"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:148
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr "Activer"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
 msgid "Enable NAT Loopback"
 msgstr "Activer le NAT sur la boucle-locale"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
 msgid "Enable SYN-flood protection"
 msgstr "Activer la protection contre le SYN-flood"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
 msgid "Enable logging on this zone"
 msgstr "Activer les traces (logs) sur cette zone"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
 msgid "External IP address"
 msgstr "Adresse IP externe"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:222
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
 msgid "External port"
 msgstr "Port externe"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "Zone externe"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:266
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
 msgid "Extra arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid "Extra destination arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid "Extra source arguments"
 msgstr ""
 
@@ -284,32 +259,32 @@ msgstr "Pare-feu"
 msgid "Firewall - Custom Rules"
 msgstr "Pare-feu -- Règles personnalisées"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
 msgid "Firewall - Port Forwards"
 msgstr "Pare-feu -- Redirections de ports"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
 msgid "Firewall - Traffic Rules"
 msgstr "Pare-feu -- Règles de trafic"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
 msgid "Firewall - Zone Settings"
 msgstr "Pare-feu - Configuration des zones"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
 msgid "Force connection tracking"
 msgstr "Forcer le suivi des connexions"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
 msgid "Forward"
 msgstr "Transfert"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
 msgid "Forward to"
 msgstr "Transférer à"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
 msgid "Friday"
 msgstr ""
 
@@ -340,15 +315,15 @@ msgstr ""
 msgid "From %s on <var>this device</var> with source %s and %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:99
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:135
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:37
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
+#: 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
 msgid "General Settings"
 msgstr "Paramètres généraux"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
 msgid "Hardware flow offloading"
 msgstr ""
 
@@ -372,13 +347,13 @@ msgid "IPv4"
 msgstr "IPv4"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
 msgid "IPv4 and IPv6"
 msgstr "IPv4 et IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
 msgid "IPv4 only"
 msgstr "IPv4 seulement"
 
@@ -386,32 +361,29 @@ msgstr "IPv4 seulement"
 msgid "IPv6"
 msgstr "IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:187
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
 msgid "IPv6 only"
 msgstr "IPv6 seulement"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Input"
 msgstr "Entrée"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
 msgid "Internal IP address"
 msgstr "Adresse IP interne"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
 msgid "Internal port"
 msgstr "Port interne"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
 msgid "Internal zone"
 msgstr "Zone interne"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
 msgid "Limit log messages"
 msgstr "Limiter les messages de journalisation"
 
@@ -425,24 +397,24 @@ msgstr ""
 msgid "MACs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
 msgid "MSS clamping"
 msgstr "Contrainte du MSS"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
 msgid "Masquerading"
 msgstr "Masquage"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:124
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
 msgid "Match"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
 msgid "Match ICMP type"
 msgstr "Type ICMP correspondant"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
 msgid ""
 "Match incoming traffic directed at the given destination port or port range "
 "on this host"
@@ -450,22 +422,18 @@ msgstr ""
 "Prendre en compte le trafic dirigé vers le port de destination donné (ou la "
 "gamme de ports) sur cet hôte"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
 msgid "Monday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
 msgid "Month Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:120
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:168
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:98
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
 msgid "Name"
 msgstr "Nom"
 
@@ -473,66 +441,35 @@ msgstr "Nom"
 msgid "Network"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "Nouvelle règle SNAT"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "Nouvelle règle d'entrée"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "Nouvelle redirection de port"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "Nouvelle source NAT"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
 msgid "Only match incoming traffic from these MACs."
 msgstr "Montrer seulement le trafic entrant provenant de ces adresses MAC."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 msgid "Only match incoming traffic from this IP or range."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
 msgid ""
 "Only match incoming traffic originating from the given source port or port "
 "range on the client host"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "Ports ouverts sur le routeur"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Autre..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Output"
 msgstr "Sortie"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -541,12 +478,12 @@ msgid ""
 "all services."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
 msgid "Port Forwards"
 msgstr "Redirections de port"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
@@ -554,27 +491,25 @@ msgstr ""
 "La redirection de port permet aux ordinateurs distants sur Internet, de se "
 "connecter à un ordinateur ou service spécifié dans le réseau local privé."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
 msgid ""
 "Prevent the installation of <em>NOTRACK</em> rules which would bypass "
 "connection tracking."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:153
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:204
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
 msgid "Protocol"
 msgstr "Protocole"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: 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 ""
 "Rediriger le trafic entrant correspondant vers le port donné sur l'hôte "
 "interne"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr "Rediriger le trafic entrant correspondant vers l'hôte interne spécifié"
 
@@ -593,7 +528,7 @@ msgstr ""
 msgid "Refuse output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 
@@ -601,24 +536,24 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
 msgid "Restrict Masquerading to given destination subnets"
 msgstr ""
 "Restreindre la substitution d'adresses (Masquerade) à ces sous-réseaux "
 "destinataires"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
 msgid "Restrict Masquerading to given source subnets"
 msgstr ""
 "Restreindre la substitution d'adresses (Masquerade) à ces sous-réseaux "
 "sources"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:197
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
 msgid "Restrict to address family"
 msgstr "Restreindre à cette famille d'adresses"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
 msgid "Routing/NAT Offloading"
 msgstr ""
 
@@ -630,15 +565,15 @@ msgstr ""
 msgid "Rule is enabled"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
 msgid "Saturday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
 msgid "Software based offloading for routing/NAT"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
 msgid "Software flow offloading"
 msgstr ""
 
@@ -672,52 +607,50 @@ msgstr ""
 # msgid "Protocol"
 # msgstr ""
 #
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
 msgid "Source IP address"
 msgstr "Adresse IP source"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
 msgid "Source MAC address"
 msgstr "Adresse MAC source"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
 msgid "Source address"
 msgstr "Adresse source"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
 msgid "Source port"
 msgstr "Port source"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:262
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
 msgid "Source zone"
 msgstr "Zone source"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
 msgid "Start Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
 msgid "Start Time (hh.mm.ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
 msgid "Stop Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
 msgid "Stop Time (hh.mm.ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
 msgid "Sunday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
 msgid ""
 "The firewall creates zones over your network interfaces to control network "
 "traffic flow."
@@ -725,8 +658,8 @@ msgstr ""
 "Le pare-feu crée des zones sur les interfaces réseau pour contrôler le flux "
 "du trafic réseau."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:171
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:259
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -743,7 +676,7 @@ msgstr ""
 "transmission du LAN au WAN n'implique <em>pas</em> également l'autorisation "
 "de transmission du WAN au LAN."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
 #, fuzzy
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
@@ -759,15 +692,15 @@ msgstr ""
 "cette zone. Les <em>réseaux couverts</em> indiquent quels réseaux "
 "disponibles sont membre de cette zone."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
 msgid "Thursday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
 msgid "Time Restrictions"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
 msgid "Time in UTC"
 msgstr ""
 
@@ -787,51 +720,43 @@ msgstr ""
 msgid "To %s, %s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
 msgid "Traffic Rules"
 msgstr "Règles de trafic"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
 "for example to reject traffic between certain hosts or to open WAN ports on "
 "the router."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
 msgid "Tuesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:107
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
 msgid "Unnamed forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:144
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
 msgid "Unnamed rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:99
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
 msgid "Unnamed zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -845,45 +770,45 @@ msgstr ""
 msgid "Via %s at %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
 msgid "Wednesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
 msgid "Week Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
 msgid "Zone ⇒ Forwardings"
 msgstr "Zone ⇒ Transmissions"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
 msgid "Zones"
 msgstr "Zones"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:329
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
 msgid "accept"
 msgstr "accepter"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:254
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:222
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
 #, fuzzy
 msgid "any"
 msgstr "tous"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
 msgid "any host"
@@ -897,7 +822,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr ""
@@ -907,13 +832,13 @@ msgstr ""
 msgid "day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
 msgid "don't track"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
 msgid "drop"
 msgstr "ignorer"
 
@@ -944,9 +869,9 @@ msgstr ""
 msgid "ports"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:330
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
 msgid "reject"
 msgstr "rejeter"
 
@@ -955,6 +880,12 @@ msgstr "rejeter"
 msgid "second"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
@@ -965,6 +896,27 @@ msgstr ""
 msgid "types"
 msgstr ""
 
+#~ msgid "External zone"
+#~ msgstr "Zone externe"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "Nouvelle règle SNAT"
+
+#~ msgid "New input rule"
+#~ msgstr "Nouvelle règle d'entrée"
+
+#~ msgid "New port forward"
+#~ msgstr "Nouvelle redirection de port"
+
+#~ msgid "New source NAT"
+#~ msgstr "Nouvelle source NAT"
+
+#~ msgid "Open ports on router"
+#~ msgstr "Ports ouverts sur le routeur"
+
+#~ msgid "Other..."
+#~ msgstr "Autre..."
+
 #~ msgid "Destination IP address"
 #~ msgstr "Adresse IP de destination"
 
diff --git a/applications/luci-app-firewall/po/he/firewall.po b/applications/luci-app-firewall/po/he/firewall.po
index cccedc020..b5e2e9a8d 100644
--- a/applications/luci-app-firewall/po/he/firewall.po
+++ b/applications/luci-app-firewall/po/he/firewall.po
@@ -8,7 +8,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
 msgid "%s in %s"
 msgstr ""
 
@@ -17,7 +17,7 @@ msgstr ""
 msgid "%s%s with %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
 msgid "%s, %s in %s"
 msgstr ""
 
@@ -50,89 +50,77 @@ msgstr ""
 msgid "Accept output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:325
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
 msgid "Action"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
 "traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: 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:84
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
 msgid "Advanced Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
 msgid "Allow \"invalid\" traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
 msgid "Allow forward from <em>source zones</em>:"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
 msgid "Any"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:341
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
 msgid "Any day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
 msgid "Automatic helper assignment"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Conntrack helpers"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid "Covered devices"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
 msgid "Covered networks"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered subnets"
 msgstr ""
 
@@ -147,17 +135,15 @@ msgid ""
 "each firewall restart, right after the default ruleset has been loaded."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
 msgid "Destination address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
 msgid "Destination port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:299
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
 msgid "Destination zone"
 msgstr ""
 
@@ -180,17 +166,12 @@ msgstr ""
 msgid "Discard output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
@@ -206,64 +187,58 @@ msgstr ""
 msgid "Do not track output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:42
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
 msgid "Drop invalid packets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:148
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
 msgid "Enable NAT Loopback"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
 msgid "Enable SYN-flood protection"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
 msgid "Enable logging on this zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
 msgid "External IP address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:222
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
 msgid "External port"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:266
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
 msgid "Extra arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid "Extra destination arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid "Extra source arguments"
 msgstr ""
 
@@ -275,32 +250,32 @@ msgstr ""
 msgid "Firewall - Custom Rules"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
 msgid "Firewall - Port Forwards"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
 msgid "Firewall - Traffic Rules"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
 msgid "Firewall - Zone Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
 msgid "Force connection tracking"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
 msgid "Forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
 msgid "Forward to"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
 msgid "Friday"
 msgstr ""
 
@@ -331,15 +306,15 @@ msgstr ""
 msgid "From %s on <var>this device</var> with source %s and %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:99
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:135
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:37
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
+#: 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
 msgid "General Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
 msgid "Hardware flow offloading"
 msgstr ""
 
@@ -363,13 +338,13 @@ msgid "IPv4"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
 msgid "IPv4 and IPv6"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
 msgid "IPv4 only"
 msgstr ""
 
@@ -377,32 +352,29 @@ msgstr ""
 msgid "IPv6"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:187
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
 msgid "IPv6 only"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
 msgid "Internal IP address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
 msgid "Internal port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
 msgid "Internal zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
 msgid "Limit log messages"
 msgstr ""
 
@@ -416,45 +388,41 @@ msgstr ""
 msgid "MACs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
 msgid "MSS clamping"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
 msgid "Masquerading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:124
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
 msgid "Match"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
 msgid "Match ICMP type"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
 msgid ""
 "Match incoming traffic directed at the given destination port or port range "
 "on this host"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
 msgid "Monday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
 msgid "Month Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:120
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:168
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:98
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
 msgid "Name"
 msgstr ""
 
@@ -462,66 +430,35 @@ msgstr ""
 msgid "Network"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
 msgid "Only match incoming traffic from these MACs."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 msgid "Only match incoming traffic from this IP or range."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
 msgid ""
 "Only match incoming traffic originating from the given source port or port "
 "range on the client host"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -530,36 +467,34 @@ msgid ""
 "all services."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
 msgid "Port Forwards"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
 msgid ""
 "Prevent the installation of <em>NOTRACK</em> rules which would bypass "
 "connection tracking."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:153
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:204
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
 msgid "Protocol"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: 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 ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr ""
 
@@ -578,7 +513,7 @@ msgstr ""
 msgid "Refuse output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 
@@ -586,20 +521,20 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
 msgid "Restrict Masquerading to given destination subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
 msgid "Restrict Masquerading to given source subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:197
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
 msgid "Restrict to address family"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
 msgid "Routing/NAT Offloading"
 msgstr ""
 
@@ -611,71 +546,69 @@ msgstr ""
 msgid "Rule is enabled"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
 msgid "Saturday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
 msgid "Software based offloading for routing/NAT"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
 msgid "Software flow offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
 msgid "Source IP address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
 msgid "Source MAC address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
 msgid "Source address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
 msgid "Source port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:262
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
 msgid "Source zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
 msgid "Start Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
 msgid "Start Time (hh.mm.ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
 msgid "Stop Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
 msgid "Stop Time (hh.mm.ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
 msgid "Sunday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
 msgid ""
 "The firewall creates zones over your network interfaces to control network "
 "traffic flow."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:171
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:259
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -685,7 +618,7 @@ msgid ""
 "<em>not</em> imply a permission to forward from wan to lan as well."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -694,15 +627,15 @@ msgid ""
 "networks</em> specifies which available networks are members of this zone."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
 msgid "Thursday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
 msgid "Time Restrictions"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
 msgid "Time in UTC"
 msgstr ""
 
@@ -722,51 +655,43 @@ msgstr ""
 msgid "To %s, %s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
 msgid "Traffic Rules"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
 "for example to reject traffic between certain hosts or to open WAN ports on "
 "the router."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
 msgid "Tuesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:107
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
 msgid "Unnamed forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:144
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
 msgid "Unnamed rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:99
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
 msgid "Unnamed zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -780,44 +705,44 @@ msgstr ""
 msgid "Via %s at %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
 msgid "Wednesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
 msgid "Week Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
 msgid "Zone ⇒ Forwardings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
 msgid "Zones"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:329
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
 msgid "accept"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:254
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:222
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
 msgid "any"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
 msgid "any host"
@@ -831,7 +756,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr ""
@@ -841,13 +766,13 @@ msgstr ""
 msgid "day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
 msgid "don't track"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
 msgid "drop"
 msgstr ""
 
@@ -878,9 +803,9 @@ msgstr ""
 msgid "ports"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:330
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
 msgid "reject"
 msgstr ""
 
@@ -889,6 +814,12 @@ msgstr ""
 msgid "second"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
diff --git a/applications/luci-app-firewall/po/hu/firewall.po b/applications/luci-app-firewall/po/hu/firewall.po
index 5a235d787..000c19f3d 100644
--- a/applications/luci-app-firewall/po/hu/firewall.po
+++ b/applications/luci-app-firewall/po/hu/firewall.po
@@ -11,7 +11,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.6\n"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
 msgid "%s in %s"
 msgstr "%s %s-ban"
 
@@ -20,7 +20,7 @@ msgstr "%s %s-ban"
 msgid "%s%s with %s"
 msgstr "%s%s %s-el"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
 msgid "%s, %s in %s"
 msgstr "%s, %s %s-ben"
 
@@ -53,89 +53,77 @@ msgstr ""
 msgid "Accept output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:325
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
 msgid "Action"
 msgstr "Művelet"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "Hozzáadás"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "Hozzáadás és szerkesztés..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
 "traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: 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:84
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
 msgid "Advanced Settings"
 msgstr "Haladó beállítások"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
 msgid "Allow \"invalid\" traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Továbbítás engedélyezése ezekből a <em>forrás zónákból</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "Továbbítás engedélyezése ezekbe a <em>cél zónákba</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
 msgid "Any"
 msgstr "Bármelyik"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:341
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
 msgid "Any day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
 msgid "Automatic helper assignment"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Conntrack helpers"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid "Covered devices"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
 msgid "Covered networks"
 msgstr "Lefedett hálózatok"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered subnets"
 msgstr ""
 
@@ -154,17 +142,15 @@ msgstr ""
 "lehetőséget. A parancsok a tűzfal minden újraindításakor futtatásra "
 "kerülnek, közvetlenül az alapértelmezett szabálykészletek betöltése után."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
 msgid "Destination address"
 msgstr "Cél cím"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
 msgid "Destination port"
 msgstr "Cél port"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:299
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
 msgid "Destination zone"
 msgstr "Cél zóna"
 
@@ -187,17 +173,12 @@ msgstr ""
 msgid "Discard output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "Ne írja felül"
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
@@ -213,64 +194,58 @@ msgstr ""
 msgid "Do not track output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:42
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
 msgid "Drop invalid packets"
 msgstr "Érvénytelen csomagok eldobása"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:148
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr "Engedélyezés"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
 msgid "Enable NAT Loopback"
 msgstr "NAT visszacsatolás engedélyezése"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
 msgid "Enable SYN-flood protection"
 msgstr "SYN-flood védelem engedélyezése"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
 msgid "Enable logging on this zone"
 msgstr "Naplózás engeélyezése ezen a zónán"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
 msgid "External IP address"
 msgstr "Külső IP cím"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:222
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
 msgid "External port"
 msgstr "Külső port"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "Külső zóna"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:266
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
 msgid "Extra arguments"
 msgstr "További argumentumok"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid "Extra destination arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid "Extra source arguments"
 msgstr ""
 
@@ -282,32 +257,32 @@ msgstr "Tűzfal"
 msgid "Firewall - Custom Rules"
 msgstr "Tűzfal - Egyéni szabályok"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
 msgid "Firewall - Port Forwards"
 msgstr "Tűzfal - Port továbbítások"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
 msgid "Firewall - Traffic Rules"
 msgstr "Tűzfal - Forgalmi szabályok"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
 msgid "Firewall - Zone Settings"
 msgstr "Tűzfal - Zóna beállítások"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
 msgid "Force connection tracking"
 msgstr "Kapcsolat követés kényszerítése"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
 msgid "Forward"
 msgstr "Továbbítás"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
 msgid "Forward to"
 msgstr "Továbbítás ennek"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
 msgid "Friday"
 msgstr ""
 
@@ -338,15 +313,15 @@ msgstr ""
 msgid "From %s on <var>this device</var> with source %s and %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:99
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:135
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:37
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
+#: 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
 msgid "General Settings"
 msgstr "Általános beállítások"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
 msgid "Hardware flow offloading"
 msgstr ""
 
@@ -370,13 +345,13 @@ msgid "IPv4"
 msgstr "IPv4"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
 msgid "IPv4 and IPv6"
 msgstr "IPv4 és IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
 msgid "IPv4 only"
 msgstr "csak IPv4"
 
@@ -384,32 +359,29 @@ msgstr "csak IPv4"
 msgid "IPv6"
 msgstr "IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:187
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
 msgid "IPv6 only"
 msgstr "csak IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Input"
 msgstr "Bemenet"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
 msgid "Internal IP address"
 msgstr "Belső IP cím"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
 msgid "Internal port"
 msgstr "Belső port"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
 msgid "Internal zone"
 msgstr "Belső zóna"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
 msgid "Limit log messages"
 msgstr "Napló üzenetek korlátozása"
 
@@ -423,24 +395,24 @@ msgstr ""
 msgid "MACs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
 msgid "MSS clamping"
 msgstr "MSS clamping engegélyezése"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
 msgid "Masquerading"
 msgstr "Álcázás"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:124
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
 msgid "Match"
 msgstr "Szűrés"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
 msgid "Match ICMP type"
 msgstr "Szűrés ICMP típus alapján"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
 msgid ""
 "Match incoming traffic directed at the given destination port or port range "
 "on this host"
@@ -448,22 +420,18 @@ msgstr ""
 "Adott portra vagy port tartományra irányított bejövő forgalom szűrése ezen a "
 "gépen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
 msgid "Monday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
 msgid "Month Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:120
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:168
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:98
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
 msgid "Name"
 msgstr "Név"
 
@@ -471,43 +439,21 @@ msgstr "Név"
 msgid "Network"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "Új SNAT szabály"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "Új továbbítási szabály"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "Új bemeneti szabály"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "Új port továbbítás"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "Új forrás NAT"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr "Csak a megadott IP címre irányított bejövő forgalmat egyeztesse."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
 msgid "Only match incoming traffic from these MACs."
 msgstr "Csak a megadott MAC címekről érkező bejövő forgalmat egyeztesse."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 msgid "Only match incoming traffic from this IP or range."
 msgstr ""
 "Csak a megadott IP címről illetve IP címtartományból érkező bejövő forgalmat "
 "egyeztesse."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
 msgid ""
 "Only match incoming traffic originating from the given source port or port "
 "range on the client host"
@@ -515,27 +461,18 @@ msgstr ""
 "Csak az ügyfél gép megadott forrás portjáról illetve forrás port "
 "tartományába tartozó portról indított bejövő forgalmat egyeztesse."
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "Port megnyitása a routeren"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Egyéb..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Output"
 msgstr "Kimenet"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 "További argumentumok küldése az iptables részére. Használja körültekintően!"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -544,12 +481,12 @@ msgid ""
 "all services."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
 msgid "Port Forwards"
 msgstr "Port továbbítás"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
@@ -558,25 +495,23 @@ msgstr ""
 "privát helyi hálózat bizonyos számítógépéhez vagy szolgáltatásához történő "
 "csatlakozását."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
 msgid ""
 "Prevent the installation of <em>NOTRACK</em> rules which would bypass "
 "connection tracking."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:153
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:204
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: 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 "Átirányítja az egyező bejövő forgalmat a belső gép megadott portjához"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr "Átirányítja az egyező bejövő forgalmat a megadott belső géphez"
 
@@ -595,7 +530,7 @@ msgstr ""
 msgid "Refuse output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 
@@ -603,20 +538,20 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "Álcázás korlátozása a megadott cél alhálózatokra"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
 msgid "Restrict Masquerading to given source subnets"
 msgstr "Álcázás korlátozása a megadott forrás alhálózatokra"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:197
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
 msgid "Restrict to address family"
 msgstr "Korlátozás cím családra"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
 msgid "Routing/NAT Offloading"
 msgstr ""
 
@@ -628,64 +563,62 @@ msgstr ""
 msgid "Rule is enabled"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
 msgid "Saturday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
 msgid "Software based offloading for routing/NAT"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
 msgid "Software flow offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
 msgid "Source IP address"
 msgstr "Forrás IP cím"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
 msgid "Source MAC address"
 msgstr "Forrás MAC cím"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
 msgid "Source address"
 msgstr "Forrás cím"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
 msgid "Source port"
 msgstr "Forrás port"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:262
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
 msgid "Source zone"
 msgstr "Forrás zóna"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
 msgid "Start Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
 msgid "Start Time (hh.mm.ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
 msgid "Stop Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
 msgid "Stop Time (hh.mm.ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
 msgid "Sunday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
 msgid ""
 "The firewall creates zones over your network interfaces to control network "
 "traffic flow."
@@ -693,8 +626,8 @@ msgstr ""
 "A tűzfal zónákat határoz meg a hálózati interfészek fölött a hálózati "
 "forgalom áramlásának szabályozására."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:171
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:259
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -711,7 +644,7 @@ msgstr ""
 "LAN-ból WAN-ba <em>nem</em> jelenti azt, hogy a továbbítás WAN-ból LAN-ba is "
 "engedélyezett."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
 #, fuzzy
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
@@ -727,15 +660,15 @@ msgstr ""
 "<em>lefedett hálózatok</em> adják meg, hogy mely elérhető hálózatok tagjai "
 "ennek a zónának."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
 msgid "Thursday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
 msgid "Time Restrictions"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
 msgid "Time in UTC"
 msgstr ""
 
@@ -755,20 +688,12 @@ msgstr "%s-re a <var>eszközön</var>"
 msgid "To %s, %s in %s"
 msgstr "%s-re, %s %s-ben"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr "Forrás IP-re"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr "Forrás portra"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
 msgid "Traffic Rules"
 msgstr "Forgalmi szabályok"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
 "for example to reject traffic between certain hosts or to open WAN ports on "
@@ -778,31 +703,31 @@ msgstr ""
 "házirendet határozzák meg, például bizonyos gépek közötti forgalom "
 "megakadályozához vagy WAN portok megnyitásához a routeren."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
 msgid "Tuesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:107
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
 msgid "Unnamed forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:144
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
 msgid "Unnamed rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:99
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
 msgid "Unnamed zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -816,44 +741,44 @@ msgstr "%s-en át"
 msgid "Via %s at %s"
 msgstr "%s-en át %s-nél"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
 msgid "Wednesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
 msgid "Week Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
 msgid "Zone ⇒ Forwardings"
 msgstr "Zóna ⇒ Továbbítások"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
 msgid "Zones"
 msgstr "Zónák"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:329
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
 msgid "accept"
 msgstr "elfogadás"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:254
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:222
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
 msgid "any"
 msgstr "bármelyik"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
 msgid "any host"
@@ -867,7 +792,7 @@ msgstr "bármelyik router IP"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr "bármelyik zóna"
@@ -877,13 +802,13 @@ msgstr "bármelyik zóna"
 msgid "day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
 msgid "don't track"
 msgstr "ne kövesse"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
 msgid "drop"
 msgstr "eldobás"
 
@@ -914,9 +839,9 @@ msgstr ""
 msgid "ports"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:330
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
 msgid "reject"
 msgstr "visszautasítás"
 
@@ -925,6 +850,12 @@ msgstr "visszautasítás"
 msgid "second"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
@@ -935,6 +866,45 @@ msgstr ""
 msgid "types"
 msgstr ""
 
+#~ msgid "Add"
+#~ msgstr "Hozzáadás"
+
+#~ msgid "Add and edit..."
+#~ msgstr "Hozzáadás és szerkesztés..."
+
+#~ msgid "Do not rewrite"
+#~ msgstr "Ne írja felül"
+
+#~ msgid "External zone"
+#~ msgstr "Külső zóna"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "Új SNAT szabály"
+
+#~ msgid "New forward rule"
+#~ msgstr "Új továbbítási szabály"
+
+#~ msgid "New input rule"
+#~ msgstr "Új bemeneti szabály"
+
+#~ msgid "New port forward"
+#~ msgstr "Új port továbbítás"
+
+#~ msgid "New source NAT"
+#~ msgstr "Új forrás NAT"
+
+#~ msgid "Open ports on router"
+#~ msgstr "Port megnyitása a routeren"
+
+#~ msgid "Other..."
+#~ msgstr "Egyéb..."
+
+#~ msgid "To source IP"
+#~ msgstr "Forrás IP-re"
+
+#~ msgid "To source port"
+#~ msgstr "Forrás portra"
+
 #~ msgid "(Unnamed Entry)"
 #~ msgstr "(Névtelen bejegyzés)"
 
diff --git a/applications/luci-app-firewall/po/it/firewall.po b/applications/luci-app-firewall/po/it/firewall.po
index 5247eea37..aa522e2f2 100644
--- a/applications/luci-app-firewall/po/it/firewall.po
+++ b/applications/luci-app-firewall/po/it/firewall.po
@@ -13,7 +13,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.4\n"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
 msgid "%s in %s"
 msgstr ""
 
@@ -22,7 +22,7 @@ msgstr ""
 msgid "%s%s with %s"
 msgstr "%s%s con %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
 msgid "%s, %s in %s"
 msgstr ""
 
@@ -55,89 +55,77 @@ msgstr ""
 msgid "Accept output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:325
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
 msgid "Action"
 msgstr "Azione"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "Aggiungi"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "Aggiungi e modifica..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
 "traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: 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:84
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
 msgid "Advanced Settings"
 msgstr "Opzioni Avanzate"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
 msgid "Allow \"invalid\" traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Permetti routing da <em>zone di origine</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "Permetti rounting a <em>zone di destinazione</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
 msgid "Any"
 msgstr "Qualsiasi"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:341
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
 msgid "Any day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
 msgid "Automatic helper assignment"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Conntrack helpers"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid "Covered devices"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
 msgid "Covered networks"
 msgstr "Reti coperte"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered subnets"
 msgstr ""
 
@@ -156,17 +144,15 @@ msgstr ""
 "comandi sono eseguiti dopo ogni riavvio del firewall, giusto dopo le altre "
 "regole che sono state caricate."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
 msgid "Destination address"
 msgstr "Indirizzo di destinazione"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
 msgid "Destination port"
 msgstr "Porta di destinazione"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:299
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
 msgid "Destination zone"
 msgstr "Zona di destinazione"
 
@@ -189,17 +175,12 @@ msgstr ""
 msgid "Discard output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "Non riscrivere"
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
@@ -215,64 +196,58 @@ msgstr ""
 msgid "Do not track output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:42
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
 msgid "Drop invalid packets"
 msgstr "Scarta pacchetti invalidi"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:148
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr "Attiva"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
 msgid "Enable NAT Loopback"
 msgstr "Attiva NAT Loopback"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
 msgid "Enable SYN-flood protection"
 msgstr "Attiva protezione SYN-flood"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
 msgid "Enable logging on this zone"
 msgstr "Attiva registro su questa zona"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
 msgid "External IP address"
 msgstr "Indirizzo IP Esterno"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:222
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
 msgid "External port"
 msgstr "Porta Esterna"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "Zona Esterna"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:266
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
 msgid "Extra arguments"
 msgstr "Comandi extra"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid "Extra destination arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid "Extra source arguments"
 msgstr ""
 
@@ -284,32 +259,32 @@ msgstr "Firewall"
 msgid "Firewall - Custom Rules"
 msgstr "Firewall - Regole Personalizzate"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
 msgid "Firewall - Port Forwards"
 msgstr "Firewall - Inoltro Porte"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
 msgid "Firewall - Traffic Rules"
 msgstr "Firewall - Regole Traffico"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
 msgid "Firewall - Zone Settings"
 msgstr "Firewall - Opzioni delle Zone"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
 msgid "Force connection tracking"
 msgstr "Forza tracciamento connessione"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
 msgid "Forward"
 msgstr "Inoltra"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
 msgid "Forward to"
 msgstr "Inoltra a"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
 msgid "Friday"
 msgstr "Venerdì"
 
@@ -340,15 +315,15 @@ msgstr ""
 msgid "From %s on <var>this device</var> with source %s and %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:99
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:135
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:37
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
+#: 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
 msgid "General Settings"
 msgstr "Opzioni Generali"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
 msgid "Hardware flow offloading"
 msgstr ""
 
@@ -372,13 +347,13 @@ msgid "IPv4"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
 msgid "IPv4 and IPv6"
 msgstr "IPv4 e IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
 msgid "IPv4 only"
 msgstr "Solo IPv4"
 
@@ -386,32 +361,29 @@ msgstr "Solo IPv4"
 msgid "IPv6"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:187
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
 msgid "IPv6 only"
 msgstr "Solo IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Input"
 msgstr "Ingresso"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
 msgid "Internal IP address"
 msgstr "Indirizzo IP interno"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
 msgid "Internal port"
 msgstr "Porta interna"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
 msgid "Internal zone"
 msgstr "Zona Interna"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
 msgid "Limit log messages"
 msgstr "Limita messaggi del registro"
 
@@ -425,24 +397,24 @@ msgstr ""
 msgid "MACs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
 msgid "MSS clamping"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
 msgid "Masquerading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:124
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
 msgid "Match"
 msgstr "Corrispondenza"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
 msgid "Match ICMP type"
 msgstr "Corrispondenza tipo ICMP"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
 msgid ""
 "Match incoming traffic directed at the given destination port or port range "
 "on this host"
@@ -450,22 +422,18 @@ msgstr ""
 "Corrispondi traffico in entrata diretto alla porta o intervallo di porte "
 "dato su questo host"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
 msgid "Monday"
 msgstr "Lunedì"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
 msgid "Month Days"
 msgstr "Giorni del Mese"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:120
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:168
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:98
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
 msgid "Name"
 msgstr "Nome"
 
@@ -473,41 +441,19 @@ msgstr "Nome"
 msgid "Network"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "Nuova regola SNAT"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "Nuova regola di inoltro"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "Nuova regola di ingresso"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "Nuova porta di inoltro"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "Nuova sorgente NAT"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr "Corrispondi solo traffico in entrata diretto al dato indirizzo IP."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
 msgid "Only match incoming traffic from these MACs."
 msgstr "Corrispondi solo traffico in entrata da questi MAC."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 msgid "Only match incoming traffic from this IP or range."
 msgstr "Corrispondi solo traffico in entrata da questo IP o intervallo."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
 msgid ""
 "Only match incoming traffic originating from the given source port or port "
 "range on the client host"
@@ -515,26 +461,17 @@ msgstr ""
 "Corrispondi solo traffico in entrata originato dalla porta o intervallo di "
 "porte sorgenti su host cliente"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "Porte aperte sul router"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Altri..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr "Passa comandi addizionali a iptables. Usare con cura!"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -543,12 +480,12 @@ msgid ""
 "all services."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
 msgid "Port Forwards"
 msgstr "Inoltri Porta"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
@@ -556,25 +493,23 @@ msgstr ""
 "L'inoltro delle porte permette ai computer in remoto su Internet di "
 "connettersi a uno specifico computer o servizio presente nella LAN privata"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
 msgid ""
 "Prevent the installation of <em>NOTRACK</em> rules which would bypass "
 "connection tracking."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:153
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:204
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
 msgid "Protocol"
 msgstr "Protocollo"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: 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 "Reindirizza il traffico in entrata alla porta data su host interno"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr "Reindirizza il traffico in entrata allo specifico host interno"
 
@@ -593,7 +528,7 @@ msgstr ""
 msgid "Refuse output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 
@@ -601,20 +536,20 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr "Riavvia Firewall"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "Limita il Masquerading alle subnet di destinazione date"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
 msgid "Restrict Masquerading to given source subnets"
 msgstr "Limita il Masquerading alle subnet sorgente date"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:197
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
 msgid "Restrict to address family"
 msgstr "Limita agli indirizzi famiglia"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
 msgid "Routing/NAT Offloading"
 msgstr ""
 
@@ -626,15 +561,15 @@ msgstr ""
 msgid "Rule is enabled"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
 msgid "Saturday"
 msgstr "Sabato"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
 msgid "Software based offloading for routing/NAT"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
 msgid "Software flow offloading"
 msgstr ""
 
@@ -659,52 +594,50 @@ msgstr ""
 # msgstr ""
 # msgid "Protocol"
 # msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
 msgid "Source IP address"
 msgstr "Indirizzo IP di origine"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
 msgid "Source MAC address"
 msgstr "Indirizzo MAC di origine"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
 msgid "Source address"
 msgstr "Indirizzo di origine"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
 msgid "Source port"
 msgstr "Porta di origine"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:262
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
 msgid "Source zone"
 msgstr "Zona di origine"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
 msgid "Start Date (yyyy-mm-dd)"
 msgstr "Data di Inizio (yyyy-mm-dd)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
 msgid "Start Time (hh.mm.ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
 msgid "Stop Date (yyyy-mm-dd)"
 msgstr "Data di Stop (yyyy-mm-dd)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
 msgid "Stop Time (hh.mm.ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
 msgid "Sunday"
 msgstr "Domenica"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
 msgid ""
 "The firewall creates zones over your network interfaces to control network "
 "traffic flow."
@@ -712,8 +645,8 @@ msgstr ""
 "Il firewall crea delle zone nelle tue interfacce di rete per controllare il "
 "flusso del traffico."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:171
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:259
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -730,7 +663,7 @@ msgstr ""
 "alla wan <em>non</em> implica anche un permesso da inoltrare dalla wan alla "
 "lan."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -745,15 +678,15 @@ msgstr ""
 "differenti nella zona. Le <em>reti coperte</em> specificano quali reti "
 "disponibili sono membri di questa zona."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
 msgid "Thursday"
 msgstr "Giovedì"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
 msgid "Time Restrictions"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
 msgid "Time in UTC"
 msgstr "Orario in UTC"
 
@@ -773,20 +706,12 @@ msgstr "Verso %s su <var>questo dispositivo</var>"
 msgid "To %s, %s in %s"
 msgstr "Verso %s, %s in %s"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr "Verso IP sorgente"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr "Verso la porta sorgente"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
 msgid "Traffic Rules"
 msgstr "Regole di Traffico"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
 "for example to reject traffic between certain hosts or to open WAN ports on "
@@ -796,31 +721,31 @@ msgstr ""
 "tra zone differenti, per esempio per rifiutare il traffico tra certi host o "
 "per aprire porte WAN sul router."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
 msgid "Tuesday"
 msgstr "Martedì"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:107
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
 msgid "Unnamed forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:144
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
 msgid "Unnamed rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:99
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
 msgid "Unnamed zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -834,44 +759,44 @@ msgstr ""
 msgid "Via %s at %s"
 msgstr "Via %s a %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
 msgid "Wednesday"
 msgstr "Mercoledì"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
 msgid "Week Days"
 msgstr "Giorni della Settimana"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
 msgid "Zone ⇒ Forwardings"
 msgstr "Zona ⇒ Inoltri"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
 msgid "Zones"
 msgstr "Zone"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:329
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
 msgid "accept"
 msgstr "accetta"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:254
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:222
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
 msgid "any"
 msgstr "qualsiasi"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
 msgid "any host"
@@ -885,7 +810,7 @@ msgstr "qualsiasi router IP"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr "qualsiasi zona"
@@ -895,13 +820,13 @@ msgstr "qualsiasi zona"
 msgid "day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
 msgid "don't track"
 msgstr "non tracciare"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
 msgid "drop"
 msgstr "scarta"
 
@@ -932,9 +857,9 @@ msgstr ""
 msgid "ports"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:330
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
 msgid "reject"
 msgstr "rifiuta"
 
@@ -943,6 +868,12 @@ msgstr "rifiuta"
 msgid "second"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
@@ -953,6 +884,45 @@ msgstr ""
 msgid "types"
 msgstr ""
 
+#~ msgid "Add"
+#~ msgstr "Aggiungi"
+
+#~ msgid "Add and edit..."
+#~ msgstr "Aggiungi e modifica..."
+
+#~ msgid "Do not rewrite"
+#~ msgstr "Non riscrivere"
+
+#~ msgid "External zone"
+#~ msgstr "Zona Esterna"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "Nuova regola SNAT"
+
+#~ msgid "New forward rule"
+#~ msgstr "Nuova regola di inoltro"
+
+#~ msgid "New input rule"
+#~ msgstr "Nuova regola di ingresso"
+
+#~ msgid "New port forward"
+#~ msgstr "Nuova porta di inoltro"
+
+#~ msgid "New source NAT"
+#~ msgstr "Nuova sorgente NAT"
+
+#~ msgid "Open ports on router"
+#~ msgstr "Porte aperte sul router"
+
+#~ msgid "Other..."
+#~ msgstr "Altri..."
+
+#~ msgid "To source IP"
+#~ msgstr "Verso IP sorgente"
+
+#~ msgid "To source port"
+#~ msgstr "Verso la porta sorgente"
+
 #~ msgid "Destination IP address"
 #~ msgstr "Indirizzo IP destinazione"
 
diff --git a/applications/luci-app-firewall/po/ja/firewall.po b/applications/luci-app-firewall/po/ja/firewall.po
index 85870605d..85702e60d 100644
--- a/applications/luci-app-firewall/po/ja/firewall.po
+++ b/applications/luci-app-firewall/po/ja/firewall.po
@@ -13,7 +13,7 @@ msgstr ""
 "X-Generator: Poedit 2.2.3\n"
 "Language-Team: \n"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
 msgid "%s in %s"
 msgstr "%s (%s)"
 
@@ -22,7 +22,7 @@ msgstr "%s (%s)"
 msgid "%s%s with %s"
 msgstr "%s%s ,%s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
 msgid "%s, %s in %s"
 msgstr "%s, %s (%s)"
 
@@ -56,24 +56,12 @@ msgstr "入力を許可"
 msgid "Accept output"
 msgstr "出力を許可"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:325
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
 msgid "Action"
 msgstr "動作"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "追加"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "追加及び編集..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
@@ -83,7 +71,7 @@ msgstr ""
 "em> 引数です。（例: HTTPS 送信トラフィックのみにマッチさせる <code>-p tcp --"
 "dport 443</code>）"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -92,61 +80,61 @@ msgstr ""
 "em> 引数です。（例: HTTPS 受信トラフィックのみにマッチさせる <code>-p tcp --"
 "sport 443</code>）"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: 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:84
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
 msgid "Advanced Settings"
 msgstr "詳細設定"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
 msgid "Allow \"invalid\" traffic"
 msgstr "\"invalid\" トラフィックの許可"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "<em>送信元ゾーン</em>からの転送を許可する:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "<em>宛先ゾーン</em>への転送を許可する:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
 msgid "Any"
 msgstr "全て"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:341
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
 msgid "Any day"
 msgstr "全日"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
 msgid "Automatic helper assignment"
 msgstr "自動ヘルパー割り当て"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
 "トラフィックのプロトコルとポートに基づいて、 conntrack ヘルパーを自動的に割り"
 "当てます。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
 msgid "Conntrack Settings"
 msgstr "Conntrack 設定"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Conntrack helpers"
 msgstr "Conntrack ヘルパー"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid "Covered devices"
 msgstr "カバーされるデバイス"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
 msgid "Covered networks"
 msgstr "対象ネットワーク"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered subnets"
 msgstr "カバーされるサブネット"
 
@@ -165,17 +153,15 @@ msgstr ""
 "ドは、ファイアウォール機能の起動ごとに、標準のルールが読み込まれた後に実行さ"
 "れます。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
 msgid "Destination address"
 msgstr "宛先アドレス"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
 msgid "Destination port"
 msgstr "宛先ポート"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:299
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
 msgid "Destination zone"
 msgstr "宛先ゾーン"
 
@@ -198,7 +184,7 @@ msgstr "入力を破棄"
 msgid "Discard output"
 msgstr "出力を破棄"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
@@ -207,11 +193,6 @@ msgstr ""
 "追加ルールをインストールしません。これは、複雑で非対称なルートのセットアップ"
 "に必要となることがあります。"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "リライトしない"
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
@@ -227,64 +208,58 @@ msgstr "入力を追跡しない"
 msgid "Do not track output"
 msgstr "出力を追跡しない"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:42
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
 msgid "Drop invalid packets"
 msgstr "無効なパケットを遮断する"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:148
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr "有効"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
 msgid "Enable NAT Loopback"
 msgstr "NATループバックを有効にする"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
 msgid "Enable SYN-flood protection"
 msgstr "SYN-Floodプロテクションを有効にする"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
 msgid "Enable logging on this zone"
 msgstr "このゾーンのログ記録を有効にする"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr "実験的な機能です。 QoS/SQM との完全な互換性はありません。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr "ゾーン トラフィックのコネクション追跡ヘルパーを明示的に選択します。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
 msgid "External IP address"
 msgstr "外部IPアドレス"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:222
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
 msgid "External port"
 msgstr "外部ポート"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "外部ゾーン"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:266
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
 msgid "Extra arguments"
 msgstr "追加の引数"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid "Extra destination arguments"
 msgstr "追加の送信先引数"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
 msgid "Extra iptables arguments"
 msgstr "追加の iptables 引数"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid "Extra source arguments"
 msgstr "追加の送信元引数"
 
@@ -296,32 +271,32 @@ msgstr "ファイアウォール"
 msgid "Firewall - Custom Rules"
 msgstr "ファイアウォール - 手動設定ルール"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
 msgid "Firewall - Port Forwards"
 msgstr "ファイアウォール - ポートフォワーディング"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
 msgid "Firewall - Traffic Rules"
 msgstr "ファイアウォール - トラフィック・ルール"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
 msgid "Firewall - Zone Settings"
 msgstr "ファイアウォール - ゾーン設定"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
 msgid "Force connection tracking"
 msgstr "強制的にコネクション追跡を行う"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
 msgid "Forward"
 msgstr "転送"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
 msgid "Forward to"
 msgstr "転送先"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
 msgid "Friday"
 msgstr "金曜日"
 
@@ -352,15 +327,15 @@ msgstr "送信元 %s, %s (<var>デバイス</var>)"
 msgid "From %s on <var>this device</var> with source %s and %s"
 msgstr "送信元 %s, %s, %s (<var>デバイス</var>)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:99
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:135
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:37
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
+#: 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
 msgid "General Settings"
 msgstr "一般設定"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
 msgid "Hardware flow offloading"
 msgstr "ハードウェア フローオフロード"
 
@@ -384,13 +359,13 @@ msgid "IPv4"
 msgstr "IPv4"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
 msgid "IPv4 and IPv6"
 msgstr "IPv4及びIPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
 msgid "IPv4 only"
 msgstr "IPv4のみ"
 
@@ -398,32 +373,29 @@ msgstr "IPv4のみ"
 msgid "IPv6"
 msgstr "IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:187
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
 msgid "IPv6 only"
 msgstr "IPv6のみ"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Input"
 msgstr "受信"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
 msgid "Internal IP address"
 msgstr "内部IPアドレス"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
 msgid "Internal port"
 msgstr "内部ポート"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
 msgid "Internal zone"
 msgstr "内部ゾーン"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
 msgid "Limit log messages"
 msgstr "ログメッセージを制限"
 
@@ -437,24 +409,24 @@ msgstr "MAC"
 msgid "MACs"
 msgstr "MAC"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
 msgid "MSS clamping"
 msgstr "MSSクランプ"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
 msgid "Masquerading"
 msgstr "マスカレード"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:124
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
 msgid "Match"
 msgstr "対象"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
 msgid "Match ICMP type"
 msgstr "ICMPタイプの一致"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
 msgid ""
 "Match incoming traffic directed at the given destination port or port range "
 "on this host"
@@ -462,22 +434,18 @@ msgstr ""
 "設定された宛先ポート(またはポート範囲)に一致した受信トラフィックが対象になり"
 "ます"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
 msgid "Monday"
 msgstr "月曜日"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
 msgid "Month Days"
 msgstr "月間"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:120
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:168
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:98
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
 msgid "Name"
 msgstr "名前"
 
@@ -485,43 +453,21 @@ msgstr "名前"
 msgid "Network"
 msgstr "ネットワーク"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "SNATルールの新規作成"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "転送ルールの新規作成"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "受信ルールの新規作成"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "転送設定の新規作成"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "SNATルールの新規作成"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr "設定された宛先IPアドレスと一致した受信トラフィックが対象になります。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
 msgid "Only match incoming traffic from these MACs."
 msgstr "設定されたMACアドレスと一致した受信したトラフィックが対象になります。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 msgid "Only match incoming traffic from this IP or range."
 msgstr ""
 "設定されたIPアドレス (または範囲) と一致した受信したトラフィックが対象になり"
 "ます。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
 msgid ""
 "Only match incoming traffic originating from the given source port or port "
 "range on the client host"
@@ -529,28 +475,19 @@ msgstr ""
 "設定されたクライアントホストの送信元ポート(またはポート範囲)からの受信トラ"
 "フィックと一致したトラフィックのみを対象にします。"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "ポートの開放"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "その他のプロトコル"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Output"
 msgstr "送信"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 "iptablesにパススルーする追加の引数を設定してください。ただし、注意して設定し"
 "てください!"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -564,12 +501,12 @@ msgstr ""
 "し、全サービスを外部に晒す恐れがあることに、特段の注意を払い使用されなければ"
 "なりません。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
 msgid "Port Forwards"
 msgstr "ポートフォワーディング"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
@@ -578,7 +515,7 @@ msgstr ""
 "ベートなネットワーク上の、特定のコンピュータやサービスへのアクセスを可能にし"
 "ます。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
 msgid ""
 "Prevent the installation of <em>NOTRACK</em> rules which would bypass "
 "connection tracking."
@@ -586,20 +523,18 @@ msgstr ""
 "コネクション追跡をバイパスさせる <em>NOTRACK</em> ルールのインストールを防ぎ"
 "ます。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:153
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:204
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
 msgid "Protocol"
 msgstr "プロトコル"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: 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 ""
 "ルールに一致した受信トラフィックを、内部ホストの設定されたポートへ転送します"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr "ルールに一致した受信トラフィックを、設定された内部ホストへ転送します"
 
@@ -618,7 +553,7 @@ msgstr "入力を拒否"
 msgid "Refuse output"
 msgstr "出力を拒否"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 "ハードウェア NAT サポートが必要です。 mt7621 のみにおいて実装されています。"
@@ -627,20 +562,20 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr "ファイアウォールの再起動"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "設定された宛先サブネットへのマスカレードを制限する"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
 msgid "Restrict Masquerading to given source subnets"
 msgstr "設定された送信元サブネットへのマスカレードを制限する"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:197
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
 msgid "Restrict to address family"
 msgstr "アドレスファミリの制限"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
 msgid "Routing/NAT Offloading"
 msgstr "ルーティング/NAT オフロード"
 
@@ -652,64 +587,62 @@ msgstr "ルールは無効です"
 msgid "Rule is enabled"
 msgstr "ルールは有効です"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
 msgid "Saturday"
 msgstr "土曜日"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
 msgid "Software based offloading for routing/NAT"
 msgstr "ルーティング/NAT のための、ソフトウェアベースのオフロードです。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
 msgid "Software flow offloading"
 msgstr "ソフトウェア フローオフロード"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
 msgid "Source IP address"
 msgstr "送信元IPアドレス"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
 msgid "Source MAC address"
 msgstr "送信元MACアドレス"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
 msgid "Source address"
 msgstr "送信元アドレス"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
 msgid "Source port"
 msgstr "送信元ポート"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:262
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
 msgid "Source zone"
 msgstr "送信元ゾーン"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
 msgid "Start Date (yyyy-mm-dd)"
 msgstr "開始日 (yyyy-mm-dd)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
 msgid "Start Time (hh.mm.ss)"
 msgstr "開始時刻 (hh.mm.ss)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
 msgid "Stop Date (yyyy-mm-dd)"
 msgstr "停止日 (yyyy-mm-dd)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
 msgid "Stop Time (hh.mm.ss)"
 msgstr "停止時刻 (hh.mm.ss)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
 msgid "Sunday"
 msgstr "日曜日"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
 msgid ""
 "The firewall creates zones over your network interfaces to control network "
 "traffic flow."
@@ -717,8 +650,8 @@ msgstr ""
 "ファイアウォール機能は、各ネットワークインターフェース上にゾーンを作成してト"
 "ラフィックの制御を行います。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:171
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:259
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -734,7 +667,7 @@ msgstr ""
 "向</em>であり、例えばlanからwanへの転送設定は、wanからlanへの転送を<em>許可し"
 "ません。</em>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -748,15 +681,15 @@ msgstr ""
 "準のポリシーになります。<em>対象ネットワーク</em>は、どのネットワーク設定がこ"
 "のゾーンに属するかを設定します。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
 msgid "Thursday"
 msgstr "木曜日"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
 msgid "Time Restrictions"
 msgstr "時間制限"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
 msgid "Time in UTC"
 msgstr "UTC時刻を使用"
 
@@ -776,20 +709,12 @@ msgstr "宛先 %s (<var>デバイス</var>)"
 msgid "To %s, %s in %s"
 msgstr "宛先 %s, %s (%s)"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr "変換後送信元IP"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr "変換後送信元ポート"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
 msgid "Traffic Rules"
 msgstr "トラフィック・ルール"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
 "for example to reject traffic between certain hosts or to open WAN ports on "
@@ -799,25 +724,25 @@ msgstr ""
 "します。例えば、特定のホスト間や、ルーターのWANポートへのトラフィックの拒否を"
 "設定することができます。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
 msgid "Tuesday"
 msgstr "火曜日"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:107
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
 msgid "Unnamed forward"
 msgstr "名称未設定の転送"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:144
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
 msgid "Unnamed rule"
 msgstr "名称未設定のルール"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:99
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
 msgid "Unnamed zone"
 msgstr "名称未設定のゾーン"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
@@ -825,7 +750,7 @@ msgstr ""
 "生の、または非 <em>uci</em> 管理下にあるデバイスによるゾーン トラフィックの区"
 "分にこのオプションを使用します。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -841,44 +766,44 @@ msgstr "経由 %s"
 msgid "Via %s at %s"
 msgstr "経由 %s , %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
 msgid "Wednesday"
 msgstr "水曜日"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
 msgid "Week Days"
 msgstr "曜日"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
 msgid "Zone ⇒ Forwardings"
 msgstr "ゾーン ⇒ 転送"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
 msgid "Zones"
 msgstr "ゾーン"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:329
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
 msgid "accept"
 msgstr "許可"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:254
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:222
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
 msgid "any"
 msgstr "全て"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
 msgid "any host"
@@ -892,7 +817,7 @@ msgstr "全てのルーターIP"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr "全てのゾーン"
@@ -902,13 +827,13 @@ msgstr "全てのゾーン"
 msgid "day"
 msgstr "日"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
 msgid "don't track"
 msgstr "コネクション追跡を行わない"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
 msgid "drop"
 msgstr "破棄"
 
@@ -939,9 +864,9 @@ msgstr "ポート"
 msgid "ports"
 msgstr "ポート"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:330
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
 msgid "reject"
 msgstr "拒否"
 
@@ -950,6 +875,12 @@ msgstr "拒否"
 msgid "second"
 msgstr "秒"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
@@ -959,3 +890,42 @@ msgstr "タイプ"
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
 msgid "types"
 msgstr "タイプ"
+
+#~ msgid "Add"
+#~ msgstr "追加"
+
+#~ msgid "Add and edit..."
+#~ msgstr "追加及び編集..."
+
+#~ msgid "Do not rewrite"
+#~ msgstr "リライトしない"
+
+#~ msgid "External zone"
+#~ msgstr "外部ゾーン"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "SNATルールの新規作成"
+
+#~ msgid "New forward rule"
+#~ msgstr "転送ルールの新規作成"
+
+#~ msgid "New input rule"
+#~ msgstr "受信ルールの新規作成"
+
+#~ msgid "New port forward"
+#~ msgstr "転送設定の新規作成"
+
+#~ msgid "New source NAT"
+#~ msgstr "SNATルールの新規作成"
+
+#~ msgid "Open ports on router"
+#~ msgstr "ポートの開放"
+
+#~ msgid "Other..."
+#~ msgstr "その他のプロトコル"
+
+#~ msgid "To source IP"
+#~ msgstr "変換後送信元IP"
+
+#~ msgid "To source port"
+#~ msgstr "変換後送信元ポート"
diff --git a/applications/luci-app-firewall/po/ko/firewall.po b/applications/luci-app-firewall/po/ko/firewall.po
index 2346b9556..c916d1122 100644
--- a/applications/luci-app-firewall/po/ko/firewall.po
+++ b/applications/luci-app-firewall/po/ko/firewall.po
@@ -13,7 +13,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Pootle 2.0.6\n"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
 msgid "%s in %s"
 msgstr ""
 
@@ -22,7 +22,7 @@ msgstr ""
 msgid "%s%s with %s"
 msgstr "%s%s ,%s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
 msgid "%s, %s in %s"
 msgstr ""
 
@@ -55,89 +55,77 @@ msgstr ""
 msgid "Accept output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:325
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
 msgid "Action"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "추가 후 수정..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
 "traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: 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:84
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
 msgid "Advanced Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
 msgid "Allow \"invalid\" traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "<em>Source zone</em> 로부터의 forward 허용:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "<em>Destination zone</em> 으로 forward 허용:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
 msgid "Any"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:341
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
 msgid "Any day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
 msgid "Automatic helper assignment"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Conntrack helpers"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid "Covered devices"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
 msgid "Covered networks"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered subnets"
 msgstr ""
 
@@ -155,17 +143,15 @@ msgstr ""
 "수 있도록 합니다.  입력된 명령어들은 매 방화벽 재시작시 실행되는데 default "
 "ruleset 이 load 된 후 시점입니다."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
 msgid "Destination address"
 msgstr "Destination 주소"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
 msgid "Destination port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:299
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
 msgid "Destination zone"
 msgstr ""
 
@@ -188,17 +174,12 @@ msgstr ""
 msgid "Discard output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
@@ -214,64 +195,58 @@ msgstr ""
 msgid "Do not track output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:42
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
 msgid "Drop invalid packets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:148
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr "활성화"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
 msgid "Enable NAT Loopback"
 msgstr "NAT Loopback 활성화"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
 msgid "Enable SYN-flood protection"
 msgstr "SYN-flood protection 활성화"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
 msgid "Enable logging on this zone"
 msgstr "zone 의 logging 활성화"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
 msgid "External IP address"
 msgstr "외부 IP 주소"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:222
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
 msgid "External port"
 msgstr "외부 port"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "외부 zone"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:266
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
 msgid "Extra arguments"
 msgstr "추가 argument"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid "Extra destination arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid "Extra source arguments"
 msgstr ""
 
@@ -283,32 +258,32 @@ msgstr "방화벽"
 msgid "Firewall - Custom Rules"
 msgstr "방화벽 - Custom Rules"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
 msgid "Firewall - Port Forwards"
 msgstr "방화벽 - Port Forwards"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
 msgid "Firewall - Traffic Rules"
 msgstr "방화벽 - Traffic Rules"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
 msgid "Firewall - Zone Settings"
 msgstr "방화벽 - Zone 설정"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
 msgid "Force connection tracking"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
 msgid "Forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
 msgid "Forward to"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
 msgid "Friday"
 msgstr "금요일"
 
@@ -339,15 +314,15 @@ msgstr ""
 msgid "From %s on <var>this device</var> with source %s and %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:99
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:135
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:37
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
+#: 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
 msgid "General Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
 msgid "Hardware flow offloading"
 msgstr ""
 
@@ -371,13 +346,13 @@ msgid "IPv4"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
 msgid "IPv4 and IPv6"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
 msgid "IPv4 only"
 msgstr ""
 
@@ -385,32 +360,29 @@ msgstr ""
 msgid "IPv6"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:187
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
 msgid "IPv6 only"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
 msgid "Internal IP address"
 msgstr "내부 IP 주소"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
 msgid "Internal port"
 msgstr "내부 port"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
 msgid "Internal zone"
 msgstr "내부 zone"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
 msgid "Limit log messages"
 msgstr ""
 
@@ -424,45 +396,41 @@ msgstr ""
 msgid "MACs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
 msgid "MSS clamping"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
 msgid "Masquerading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:124
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
 msgid "Match"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
 msgid "Match ICMP type"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
 msgid ""
 "Match incoming traffic directed at the given destination port or port range "
 "on this host"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
 msgid "Monday"
 msgstr "월요일"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
 msgid "Month Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:120
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:168
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:98
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
 msgid "Name"
 msgstr "이름"
 
@@ -470,66 +438,35 @@ msgstr "이름"
 msgid "Network"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "새로운 SNAT rule"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "새로운 forward rule"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "새로운 input rule"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "새로운 port forward"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "새로운 source NAT"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
 msgid "Only match incoming traffic from these MACs."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 msgid "Only match incoming traffic from this IP or range."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
 msgid ""
 "Only match incoming traffic originating from the given source port or port "
 "range on the client host"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr "iptables 명령에 추가 인자들을 더합니다.  조심해 사용하세요!"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -538,12 +475,12 @@ msgid ""
 "all services."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
 msgid "Port Forwards"
 msgstr "Port Forward"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
@@ -551,25 +488,23 @@ msgstr ""
 "Port forwarding 기능은 인터넷 상의 원격 컴퓨터가 내부 LAN 에 속한 특정 컴퓨터"
 "나 서비스에 접속할 수 있도록 합니다."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
 msgid ""
 "Prevent the installation of <em>NOTRACK</em> rules which would bypass "
 "connection tracking."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:153
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:204
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
 msgid "Protocol"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: 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 ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr ""
 
@@ -588,7 +523,7 @@ msgstr ""
 msgid "Refuse output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 
@@ -596,20 +531,20 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "주어진 destination subnet 으로 Masquerading 제한"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
 msgid "Restrict Masquerading to given source subnets"
 msgstr "주어진 source subnet 으로 Masquerading 제한"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:197
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
 msgid "Restrict to address family"
 msgstr "Address family 제한"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
 msgid "Routing/NAT Offloading"
 msgstr ""
 
@@ -621,64 +556,62 @@ msgstr ""
 msgid "Rule is enabled"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
 msgid "Saturday"
 msgstr "토요일"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
 msgid "Software based offloading for routing/NAT"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
 msgid "Software flow offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
 msgid "Source IP address"
 msgstr "Source IP 주소"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
 msgid "Source MAC address"
 msgstr "Source MAC 주소"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
 msgid "Source address"
 msgstr "Source 주소"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
 msgid "Source port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:262
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
 msgid "Source zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
 msgid "Start Date (yyyy-mm-dd)"
 msgstr "시작 날짜 (yyyy-mm-dd)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
 msgid "Start Time (hh.mm.ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
 msgid "Stop Date (yyyy-mm-dd)"
 msgstr "종료 날짜 (yyyy-mm-dd)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
 msgid "Stop Time (hh.mm.ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
 msgid "Sunday"
 msgstr "일요일"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
 msgid ""
 "The firewall creates zones over your network interfaces to control network "
 "traffic flow."
@@ -686,8 +619,8 @@ msgstr ""
 "방화벽 기능을 이용하여 네트워크 인터페이스와 연결된 zone 을 생성할 수 있고 이"
 "를 이용하여 네트워크 traffic flow 를 제어할 수 있습니다."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:171
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:259
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -703,7 +636,7 @@ msgstr ""
 "<em>unidirectional</em> 인데, 예를 들어 LAN 에서 WAN 으로의 forward 규칙이 "
 "WAN 에서 LAN 으로의 forward 를 허락하는 것이 아닙니다."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
 #, fuzzy
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
@@ -718,15 +651,15 @@ msgstr ""
 "를 오가는 forward traffic 에 대한 정책을 뜻합니다. <em>Covered networks</em> "
 "에서는 zone 의 영향을 받을 네트워크들을 지정할 수 있습니다."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
 msgid "Thursday"
 msgstr "목요일"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
 msgid "Time Restrictions"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
 msgid "Time in UTC"
 msgstr "UTC 기준시"
 
@@ -746,20 +679,12 @@ msgstr ""
 msgid "To %s, %s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
 msgid "Traffic Rules"
 msgstr "Traffic Rule"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
 "for example to reject traffic between certain hosts or to open WAN ports on "
@@ -769,31 +694,31 @@ msgstr ""
 "다. 예를 들어 특정 host 들 사이의 트래픽을 차단하거나 공유기의 WAN port 를 "
 "open 할때 사용됩니다."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
 msgid "Tuesday"
 msgstr "화요일"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:107
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
 msgid "Unnamed forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:144
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
 msgid "Unnamed rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:99
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
 msgid "Unnamed zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -807,44 +732,44 @@ msgstr ""
 msgid "Via %s at %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
 msgid "Wednesday"
 msgstr "수요일"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
 msgid "Week Days"
 msgstr "주일"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
 msgid "Zone ⇒ Forwardings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
 msgid "Zones"
 msgstr "Zone 내역"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:329
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
 msgid "accept"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:254
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:222
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
 msgid "any"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
 msgid "any host"
@@ -858,7 +783,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr ""
@@ -868,13 +793,13 @@ msgstr ""
 msgid "day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
 msgid "don't track"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
 msgid "drop"
 msgstr ""
 
@@ -905,9 +830,9 @@ msgstr ""
 msgid "ports"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:330
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
 msgid "reject"
 msgstr ""
 
@@ -916,6 +841,12 @@ msgstr ""
 msgid "second"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
@@ -926,6 +857,27 @@ msgstr ""
 msgid "types"
 msgstr ""
 
+#~ msgid "Add and edit..."
+#~ msgstr "추가 후 수정..."
+
+#~ msgid "External zone"
+#~ msgstr "외부 zone"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "새로운 SNAT rule"
+
+#~ msgid "New forward rule"
+#~ msgstr "새로운 forward rule"
+
+#~ msgid "New input rule"
+#~ msgstr "새로운 input rule"
+
+#~ msgid "New port forward"
+#~ msgstr "새로운 port forward"
+
+#~ msgid "New source NAT"
+#~ msgstr "새로운 source NAT"
+
 #~ msgid "Destination IP address"
 #~ msgstr "Destination IP 주소"
 
diff --git a/applications/luci-app-firewall/po/ms/firewall.po b/applications/luci-app-firewall/po/ms/firewall.po
index cab21a0ff..56a0f053e 100644
--- a/applications/luci-app-firewall/po/ms/firewall.po
+++ b/applications/luci-app-firewall/po/ms/firewall.po
@@ -7,7 +7,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
 msgid "%s in %s"
 msgstr ""
 
@@ -16,7 +16,7 @@ msgstr ""
 msgid "%s%s with %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
 msgid "%s, %s in %s"
 msgstr ""
 
@@ -49,89 +49,77 @@ msgstr ""
 msgid "Accept output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:325
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
 msgid "Action"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
 "traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: 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:84
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
 msgid "Advanced Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
 msgid "Allow \"invalid\" traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
 msgid "Allow forward from <em>source zones</em>:"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
 msgid "Any"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:341
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
 msgid "Any day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
 msgid "Automatic helper assignment"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Conntrack helpers"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid "Covered devices"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
 msgid "Covered networks"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered subnets"
 msgstr ""
 
@@ -146,17 +134,15 @@ msgid ""
 "each firewall restart, right after the default ruleset has been loaded."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
 msgid "Destination address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
 msgid "Destination port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:299
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
 msgid "Destination zone"
 msgstr ""
 
@@ -179,17 +165,12 @@ msgstr ""
 msgid "Discard output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
@@ -205,64 +186,58 @@ msgstr ""
 msgid "Do not track output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:42
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
 msgid "Drop invalid packets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:148
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
 msgid "Enable NAT Loopback"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
 msgid "Enable SYN-flood protection"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
 msgid "Enable logging on this zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
 msgid "External IP address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:222
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
 msgid "External port"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:266
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
 msgid "Extra arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid "Extra destination arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid "Extra source arguments"
 msgstr ""
 
@@ -274,32 +249,32 @@ msgstr ""
 msgid "Firewall - Custom Rules"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
 msgid "Firewall - Port Forwards"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
 msgid "Firewall - Traffic Rules"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
 msgid "Firewall - Zone Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
 msgid "Force connection tracking"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
 msgid "Forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
 msgid "Forward to"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
 msgid "Friday"
 msgstr ""
 
@@ -330,15 +305,15 @@ msgstr ""
 msgid "From %s on <var>this device</var> with source %s and %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:99
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:135
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:37
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
+#: 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
 msgid "General Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
 msgid "Hardware flow offloading"
 msgstr ""
 
@@ -362,13 +337,13 @@ msgid "IPv4"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
 msgid "IPv4 and IPv6"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
 msgid "IPv4 only"
 msgstr ""
 
@@ -376,32 +351,29 @@ msgstr ""
 msgid "IPv6"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:187
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
 msgid "IPv6 only"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
 msgid "Internal IP address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
 msgid "Internal port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
 msgid "Internal zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
 msgid "Limit log messages"
 msgstr ""
 
@@ -415,45 +387,41 @@ msgstr ""
 msgid "MACs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
 msgid "MSS clamping"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
 msgid "Masquerading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:124
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
 msgid "Match"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
 msgid "Match ICMP type"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
 msgid ""
 "Match incoming traffic directed at the given destination port or port range "
 "on this host"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
 msgid "Monday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
 msgid "Month Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:120
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:168
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:98
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
 msgid "Name"
 msgstr ""
 
@@ -461,66 +429,35 @@ msgstr ""
 msgid "Network"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
 msgid "Only match incoming traffic from these MACs."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 msgid "Only match incoming traffic from this IP or range."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
 msgid ""
 "Only match incoming traffic originating from the given source port or port "
 "range on the client host"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -529,36 +466,34 @@ msgid ""
 "all services."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
 msgid "Port Forwards"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
 msgid ""
 "Prevent the installation of <em>NOTRACK</em> rules which would bypass "
 "connection tracking."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:153
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:204
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
 msgid "Protocol"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: 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 ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr ""
 
@@ -577,7 +512,7 @@ msgstr ""
 msgid "Refuse output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 
@@ -585,20 +520,20 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
 msgid "Restrict Masquerading to given destination subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
 msgid "Restrict Masquerading to given source subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:197
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
 msgid "Restrict to address family"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
 msgid "Routing/NAT Offloading"
 msgstr ""
 
@@ -610,71 +545,69 @@ msgstr ""
 msgid "Rule is enabled"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
 msgid "Saturday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
 msgid "Software based offloading for routing/NAT"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
 msgid "Software flow offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
 msgid "Source IP address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
 msgid "Source MAC address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
 msgid "Source address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
 msgid "Source port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:262
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
 msgid "Source zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
 msgid "Start Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
 msgid "Start Time (hh.mm.ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
 msgid "Stop Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
 msgid "Stop Time (hh.mm.ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
 msgid "Sunday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
 msgid ""
 "The firewall creates zones over your network interfaces to control network "
 "traffic flow."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:171
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:259
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -684,7 +617,7 @@ msgid ""
 "<em>not</em> imply a permission to forward from wan to lan as well."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -693,15 +626,15 @@ msgid ""
 "networks</em> specifies which available networks are members of this zone."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
 msgid "Thursday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
 msgid "Time Restrictions"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
 msgid "Time in UTC"
 msgstr ""
 
@@ -721,51 +654,43 @@ msgstr ""
 msgid "To %s, %s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
 msgid "Traffic Rules"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
 "for example to reject traffic between certain hosts or to open WAN ports on "
 "the router."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
 msgid "Tuesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:107
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
 msgid "Unnamed forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:144
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
 msgid "Unnamed rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:99
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
 msgid "Unnamed zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -779,44 +704,44 @@ msgstr ""
 msgid "Via %s at %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
 msgid "Wednesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
 msgid "Week Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
 msgid "Zone ⇒ Forwardings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
 msgid "Zones"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:329
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
 msgid "accept"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:254
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:222
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
 msgid "any"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
 msgid "any host"
@@ -830,7 +755,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr ""
@@ -840,13 +765,13 @@ msgstr ""
 msgid "day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
 msgid "don't track"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
 msgid "drop"
 msgstr ""
 
@@ -877,9 +802,9 @@ msgstr ""
 msgid "ports"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:330
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
 msgid "reject"
 msgstr ""
 
@@ -888,6 +813,12 @@ msgstr ""
 msgid "second"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
diff --git a/applications/luci-app-firewall/po/no/firewall.po b/applications/luci-app-firewall/po/no/firewall.po
index 91c01a4e9..625a6a363 100644
--- a/applications/luci-app-firewall/po/no/firewall.po
+++ b/applications/luci-app-firewall/po/no/firewall.po
@@ -8,7 +8,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.6\n"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
 msgid "%s in %s"
 msgstr "%s i %s"
 
@@ -17,7 +17,7 @@ msgstr "%s i %s"
 msgid "%s%s with %s"
 msgstr "%s%s med %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
 msgid "%s, %s in %s"
 msgstr "%s, %s i %s"
 
@@ -50,89 +50,77 @@ msgstr ""
 msgid "Accept output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:325
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
 msgid "Action"
 msgstr "Handling"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "Legg til"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "Legg til og redigere..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
 "traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: 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:84
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
 msgid "Advanced Settings"
 msgstr "Avanserte Innstillinger"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
 msgid "Allow \"invalid\" traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Tillat videresending fra <em>kilde soner</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "Tillat videresending til <em>destinasjon soner</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
 msgid "Any"
 msgstr "Enhver"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:341
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
 msgid "Any day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
 msgid "Automatic helper assignment"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Conntrack helpers"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid "Covered devices"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
 msgid "Covered networks"
 msgstr "Gjeldene nettverk"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered subnets"
 msgstr ""
 
@@ -150,17 +138,15 @@ msgstr ""
 "som ikke dekkes av brannmurens standardoppsett. Kommandoene utføres etter "
 "hver omstart av brannmuren, rett etter at standard regelsett er lastet."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
 msgid "Destination address"
 msgstr "Destinasjon adresse"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
 msgid "Destination port"
 msgstr "Destinasjon port"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:299
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
 msgid "Destination zone"
 msgstr "Destinasjon sone"
 
@@ -183,17 +169,12 @@ msgstr ""
 msgid "Discard output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "Ikke omskriv"
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
@@ -209,64 +190,58 @@ msgstr ""
 msgid "Do not track output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:42
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
 msgid "Drop invalid packets"
 msgstr "Forkast ugyldige pakker"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:148
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr "Aktiver"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
 msgid "Enable NAT Loopback"
 msgstr "Aktiver NAT <abbr title=\"Loopback\">Tilbakekobling</abbr>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
 msgid "Enable SYN-flood protection"
 msgstr "Aktiver SYN-flood beskyttelse"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
 msgid "Enable logging on this zone"
 msgstr "Aktiver logging av denne sonen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
 msgid "External IP address"
 msgstr "Ekstern IP adressse"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:222
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
 msgid "External port"
 msgstr "Ekstern port"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "Ekstern sone"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:266
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
 msgid "Extra arguments"
 msgstr "Ekstra argumenter"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid "Extra destination arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid "Extra source arguments"
 msgstr ""
 
@@ -278,33 +253,33 @@ msgstr "Brannmur"
 msgid "Firewall - Custom Rules"
 msgstr "Brannmur - Egendefinerte Regler"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
 msgid "Firewall - Port Forwards"
 msgstr "Brannmur - Port Videresending"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
 msgid "Firewall - Traffic Rules"
 msgstr "Brannmur - Trafikk Regler"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
 msgid "Firewall - Zone Settings"
 msgstr "Brannmur - Sone Innstillinger"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
 msgid "Force connection tracking"
 msgstr ""
 "Bruk <abbr title=\\\"connection tracking\\\">forbindelse sporing</abbr>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
 msgid "Forward"
 msgstr "Videresend"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
 msgid "Forward to"
 msgstr "Videresend til"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
 msgid "Friday"
 msgstr ""
 
@@ -335,15 +310,15 @@ msgstr ""
 msgid "From %s on <var>this device</var> with source %s and %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:99
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:135
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:37
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
+#: 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
 msgid "General Settings"
 msgstr "Generelle Innstillinger"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
 msgid "Hardware flow offloading"
 msgstr ""
 
@@ -367,13 +342,13 @@ msgid "IPv4"
 msgstr "IPv4"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
 msgid "IPv4 and IPv6"
 msgstr "IPv4 og IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
 msgid "IPv4 only"
 msgstr "Kun IPv4"
 
@@ -381,32 +356,29 @@ msgstr "Kun IPv4"
 msgid "IPv6"
 msgstr "IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:187
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
 msgid "IPv6 only"
 msgstr "Kun IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Input"
 msgstr "Inndata"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
 msgid "Internal IP address"
 msgstr "Intern IP adresse"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
 msgid "Internal port"
 msgstr "Intern port"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
 msgid "Internal zone"
 msgstr "Intern sone"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
 msgid "Limit log messages"
 msgstr "Begrens logging"
 
@@ -420,24 +392,24 @@ msgstr ""
 msgid "MACs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
 msgid "MSS clamping"
 msgstr "MSS Kontroll (Clamping)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
 msgid "Masquerading"
 msgstr "Masquerading"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:124
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
 msgid "Match"
 msgstr "Match"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
 msgid "Match ICMP type"
 msgstr "Match ICMP type"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
 msgid ""
 "Match incoming traffic directed at the given destination port or port range "
 "on this host"
@@ -445,22 +417,18 @@ msgstr ""
 "Match innkommende trafikk rettet mot den oppgitte destinasjonsport eller "
 "portområdet på denne verten"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
 msgid "Monday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
 msgid "Month Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:120
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:168
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:98
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
 msgid "Name"
 msgstr "Navn"
 
@@ -468,41 +436,19 @@ msgstr "Navn"
 msgid "Network"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "Ny SNAT regel"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "Ny videresending regel"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "Ny inndata regel"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "Ny port videresending"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "Ny kilde NAT"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr "Match kun innkommende trafikk rettet mot den oppgitt IP adresse."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
 msgid "Only match incoming traffic from these MACs."
 msgstr "Match kun innkommende trafikk fra disse MAC adresser."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 msgid "Only match incoming traffic from this IP or range."
 msgstr "Match kun innkommende trafikk fra denne IP eller IP område."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
 msgid ""
 "Only match incoming traffic originating from the given source port or port "
 "range on the client host"
@@ -510,26 +456,17 @@ msgstr ""
 "Match kun innkommende trafikk som kommer fra den oppgitte kildeport eller "
 "fra portområdet til klienten"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "Åpne porter på ruteren"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Andre..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Output"
 msgstr "Utdata"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr "Sender flere argumenter til iptables. Bruk med forsiktighet!"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -538,12 +475,12 @@ msgid ""
 "all services."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
 msgid "Port Forwards"
 msgstr "Port Videresendinger"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
@@ -551,27 +488,25 @@ msgstr ""
 "Port videresending tillater at eksterne datamaskiner på Internett kan koble "
 "seg til en bestemt maskin eller tjeneste innenfor det private LAN."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
 msgid ""
 "Prevent the installation of <em>NOTRACK</em> rules which would bypass "
 "connection tracking."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:153
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:204
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: 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 ""
 "Viderekoble matchet innkommende trafikk til den oppgitte porten på intern "
 "vert"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr "Viderekoble matchet innkommende trafikk til den angitte interne vert"
 
@@ -590,7 +525,7 @@ msgstr ""
 msgid "Refuse output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 
@@ -598,20 +533,20 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "Begrens Masquerading til oppgitt destinasjons subnett"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
 msgid "Restrict Masquerading to given source subnets"
 msgstr "Begrens Masqeuerading til oppgitt kilde subnett"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:197
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
 msgid "Restrict to address family"
 msgstr "Begrens til adresse familie"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
 msgid "Routing/NAT Offloading"
 msgstr ""
 
@@ -623,64 +558,62 @@ msgstr ""
 msgid "Rule is enabled"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
 msgid "Saturday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
 msgid "Software based offloading for routing/NAT"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
 msgid "Software flow offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
 msgid "Source IP address"
 msgstr "Kilde IP adresse"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
 msgid "Source MAC address"
 msgstr "Kilde MAC adresse"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
 msgid "Source address"
 msgstr "Kilde adresse"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
 msgid "Source port"
 msgstr "Kilde port"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:262
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
 msgid "Source zone"
 msgstr "Kilde sone"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
 msgid "Start Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
 msgid "Start Time (hh.mm.ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
 msgid "Stop Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
 msgid "Stop Time (hh.mm.ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
 msgid "Sunday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
 msgid ""
 "The firewall creates zones over your network interfaces to control network "
 "traffic flow."
@@ -688,8 +621,8 @@ msgstr ""
 "Brannmuren skaper soner over nettverkets grensesnitt for å styre "
 "nettverkstrafikken."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:171
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:259
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -705,7 +638,7 @@ msgstr ""
 "ved videresending er <em>enveis</em>, d.v.s at videresending fra LAN til WAN "
 "<em>ikke</em> automatisk også tillater videresending fra WAN til LAN."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
 #, fuzzy
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
@@ -721,15 +654,15 @@ msgstr ""
 "spesifiserer hvilken av de tilgjengelige nettverk som er medlem av denne "
 "sone."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
 msgid "Thursday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
 msgid "Time Restrictions"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
 msgid "Time in UTC"
 msgstr ""
 
@@ -749,20 +682,12 @@ msgstr "Til %s på <var>denne enheten</var>"
 msgid "To %s, %s in %s"
 msgstr "Til %s, %s i %s"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr "Til kilde IP"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr "Til kilde port"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
 msgid "Traffic Rules"
 msgstr "Trafikk Regler"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
 "for example to reject traffic between certain hosts or to open WAN ports on "
@@ -772,31 +697,31 @@ msgstr ""
 "for eksempel for å avvise trafikk mellom visse verter eller for å åpne WAN "
 "porter på ruteren."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
 msgid "Tuesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:107
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
 msgid "Unnamed forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:144
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
 msgid "Unnamed rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:99
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
 msgid "Unnamed zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -810,44 +735,44 @@ msgstr "Via %s"
 msgid "Via %s at %s"
 msgstr "Via %s på %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
 msgid "Wednesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
 msgid "Week Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
 msgid "Zone ⇒ Forwardings"
 msgstr "Sone = Videresendinger"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
 msgid "Zones"
 msgstr "Soner"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:329
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
 msgid "accept"
 msgstr "godta"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:254
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:222
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
 msgid "any"
 msgstr "enhver"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
 msgid "any host"
@@ -861,7 +786,7 @@ msgstr "enhver ruter IP"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr "enhver sone"
@@ -871,13 +796,13 @@ msgstr "enhver sone"
 msgid "day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
 msgid "don't track"
 msgstr "ikke track"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
 msgid "drop"
 msgstr "forkast"
 
@@ -908,9 +833,9 @@ msgstr ""
 msgid "ports"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:330
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
 msgid "reject"
 msgstr "avslå"
 
@@ -919,6 +844,12 @@ msgstr "avslå"
 msgid "second"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
@@ -929,6 +860,45 @@ msgstr ""
 msgid "types"
 msgstr ""
 
+#~ msgid "Add"
+#~ msgstr "Legg til"
+
+#~ msgid "Add and edit..."
+#~ msgstr "Legg til og redigere..."
+
+#~ msgid "Do not rewrite"
+#~ msgstr "Ikke omskriv"
+
+#~ msgid "External zone"
+#~ msgstr "Ekstern sone"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "Ny SNAT regel"
+
+#~ msgid "New forward rule"
+#~ msgstr "Ny videresending regel"
+
+#~ msgid "New input rule"
+#~ msgstr "Ny inndata regel"
+
+#~ msgid "New port forward"
+#~ msgstr "Ny port videresending"
+
+#~ msgid "New source NAT"
+#~ msgstr "Ny kilde NAT"
+
+#~ msgid "Open ports on router"
+#~ msgstr "Åpne porter på ruteren"
+
+#~ msgid "Other..."
+#~ msgstr "Andre..."
+
+#~ msgid "To source IP"
+#~ msgstr "Til kilde IP"
+
+#~ msgid "To source port"
+#~ msgstr "Til kilde port"
+
 #~ msgid "(Unnamed Entry)"
 #~ msgstr "(oppføring uten navn)"
 
diff --git a/applications/luci-app-firewall/po/pl/firewall.po b/applications/luci-app-firewall/po/pl/firewall.po
index 94b6e924f..5c96d57b7 100644
--- a/applications/luci-app-firewall/po/pl/firewall.po
+++ b/applications/luci-app-firewall/po/pl/firewall.po
@@ -14,7 +14,7 @@ msgstr ""
 "|| n%100>=20) ? 1 : 2);\n"
 "X-Generator: Pootle 2.0.6\n"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
 msgid "%s in %s"
 msgstr "%s w %s"
 
@@ -23,7 +23,7 @@ msgstr "%s w %s"
 msgid "%s%s with %s"
 msgstr "%s%s z %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
 msgid "%s, %s in %s"
 msgstr "%s, %s w %s"
 
@@ -57,89 +57,77 @@ msgstr ""
 msgid "Accept output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:325
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
 msgid "Action"
 msgstr "Działanie"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "Dodaj"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "Dodaj i edytuj..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
 "traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: 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:84
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
 msgid "Advanced Settings"
 msgstr "Ustawienia zaawansowane"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
 msgid "Allow \"invalid\" traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Zezwól na przekazywanie z <em>source zones</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "Zezwól na przekazywanie do <em>destination zones</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
 msgid "Any"
 msgstr "Każdy"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:341
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
 msgid "Any day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
 msgid "Automatic helper assignment"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Conntrack helpers"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid "Covered devices"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
 msgid "Covered networks"
 msgstr "Objęte sieci"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered subnets"
 msgstr ""
 
@@ -157,17 +145,15 @@ msgstr ""
 "są objęte składnią zapory. Polecenia wykonywane są po każdym restarcie "
 "zapory, zaraz po załadowaniu zestawu reguł domyślnych."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
 msgid "Destination address"
 msgstr "Adres docelowy"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
 msgid "Destination port"
 msgstr "Port docelowy"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:299
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
 msgid "Destination zone"
 msgstr "Strefa docelowa"
 
@@ -190,17 +176,12 @@ msgstr ""
 msgid "Discard output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "Nie przepisuj"
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
@@ -216,64 +197,58 @@ msgstr ""
 msgid "Do not track output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:42
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
 msgid "Drop invalid packets"
 msgstr "Porzuć wadliwe pakiety"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:148
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr "Włącz"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
 msgid "Enable NAT Loopback"
 msgstr "Włącz NAT Loopback"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
 msgid "Enable SYN-flood protection"
 msgstr "Włącz ochronę przed atakiem SYN-flood"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
 msgid "Enable logging on this zone"
 msgstr "Włącz logowanie na tej strefy"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
 msgid "External IP address"
 msgstr "Zewnętrzne adresy IP"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:222
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
 msgid "External port"
 msgstr "Port zewnętrzny"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "Strefa zewnętrzna"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:266
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
 msgid "Extra arguments"
 msgstr "Dodatkowe argumenty"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid "Extra destination arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid "Extra source arguments"
 msgstr ""
 
@@ -288,32 +263,32 @@ msgstr "Zapora"
 msgid "Firewall - Custom Rules"
 msgstr "Zapora - Reguły własne"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
 msgid "Firewall - Port Forwards"
 msgstr "Zapora - Przekazywanie portów"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
 msgid "Firewall - Traffic Rules"
 msgstr "Zapora - Reguły ruchu"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
 msgid "Firewall - Zone Settings"
 msgstr "Zapora - Ustawienia strefy"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
 msgid "Force connection tracking"
 msgstr "Wymuś śledzenie połączeń"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
 msgid "Forward"
 msgstr "Przekazuj"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
 msgid "Forward to"
 msgstr "Przekazuj do"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
 msgid "Friday"
 msgstr ""
 
@@ -344,15 +319,15 @@ msgstr ""
 msgid "From %s on <var>this device</var> with source %s and %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:99
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:135
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:37
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
+#: 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
 msgid "General Settings"
 msgstr "Ustawienia ogólne"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
 msgid "Hardware flow offloading"
 msgstr ""
 
@@ -376,13 +351,13 @@ msgid "IPv4"
 msgstr "IPv4"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
 msgid "IPv4 and IPv6"
 msgstr "IPv4 i IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
 msgid "IPv4 only"
 msgstr "Tylko IPv4"
 
@@ -390,32 +365,29 @@ msgstr "Tylko IPv4"
 msgid "IPv6"
 msgstr "IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:187
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
 msgid "IPv6 only"
 msgstr "Tylko IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Input"
 msgstr "Ruch przychodzący"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
 msgid "Internal IP address"
 msgstr "Wewnętrzny adres IP"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
 msgid "Internal port"
 msgstr "Wewnętrzny port"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
 msgid "Internal zone"
 msgstr "Strefa wewnętrzna"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
 msgid "Limit log messages"
 msgstr "Ograniczenie logowania"
 
@@ -429,24 +401,24 @@ msgstr ""
 msgid "MACs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
 msgid "MSS clamping"
 msgstr "Dostosuj MSS"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
 msgid "Masquerading"
 msgstr "Maskarada"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:124
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
 msgid "Match"
 msgstr "Dopasuj"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
 msgid "Match ICMP type"
 msgstr "Dopasuj typ ICMP"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
 msgid ""
 "Match incoming traffic directed at the given destination port or port range "
 "on this host"
@@ -454,22 +426,18 @@ msgstr ""
 "Dopasuj ruch przychodzący do danego portu docelowego lub zakresu portów na "
 "tym hoście"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
 msgid "Monday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
 msgid "Month Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:120
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:168
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:98
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
 msgid "Name"
 msgstr "Nazwa"
 
@@ -477,41 +445,19 @@ msgstr "Nazwa"
 msgid "Network"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "Nowa reguła SNAT"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "Nowa reguła przekazywania (forward)"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "Nowa reguła wejściowa (input)"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "Nowe przekierowanie portu"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "Nowy NAT źródłowy"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr "Dopasuj tylko przychodzący ruch skierowany do danego adresu IP."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
 msgid "Only match incoming traffic from these MACs."
 msgstr "Dopasuj tylko ruch z tych adresów MAC."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 msgid "Only match incoming traffic from this IP or range."
 msgstr "Dopasuj tylko ruch przychodzący z tego adresu IP lub zakresu adresów."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
 msgid ""
 "Only match incoming traffic originating from the given source port or port "
 "range on the client host"
@@ -519,27 +465,18 @@ msgstr ""
 "Dopasuj tylko ruch przychodzący z podanego portu źródłowego lub zakresu "
 "portów na hoście klienta"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "Otwarte porty na routerze"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Inne..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Output"
 msgstr "Wyjście (Output)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 "Przekazuje dodatkowe argumenty do iptables. Zachowaj szczególną ostrożność!"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -548,12 +485,12 @@ msgid ""
 "all services."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
 msgid "Port Forwards"
 msgstr "Przekierowania portów"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
@@ -561,27 +498,25 @@ msgstr ""
 "Przekierowanie portów pozwala komputerom z internetu na połączenia z "
 "komputerami z sieci LAN."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
 msgid ""
 "Prevent the installation of <em>NOTRACK</em> rules which would bypass "
 "connection tracking."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:153
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:204
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
 msgid "Protocol"
 msgstr "Protokół"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: 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 ""
 "Przekieruj ruch przychodzący na podany port do wskazanego hosta w sieci "
 "wewnętrznej"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr "Przekieruj ruch przychodzący do wskazanego hosta w sieci wewnętrznej"
 
@@ -600,7 +535,7 @@ msgstr ""
 msgid "Refuse output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 
@@ -608,22 +543,22 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "Ogranicz maskaradę do wskazanych sieci docelowych"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
 msgid "Restrict Masquerading to given source subnets"
 msgstr "Ogranicz maskaradę do wskazanych sieci źródłowych"
 
 # Wstawiłem rodzinę gdyż gdzieś wcześniej było tak opisane ale klasa pasuje mi tu bardziej.
 # Obsy - niestety ale "rodzina". W gui dotyczy to wyboru IPv4/IPv6, więc "rodzina" a nie klasa.
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:197
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
 msgid "Restrict to address family"
 msgstr "Ogranicz do rodziny adresów"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
 msgid "Routing/NAT Offloading"
 msgstr ""
 
@@ -635,64 +570,62 @@ msgstr ""
 msgid "Rule is enabled"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
 msgid "Saturday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
 msgid "Software based offloading for routing/NAT"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
 msgid "Software flow offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
 msgid "Source IP address"
 msgstr "Źródłowy adres IP"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
 msgid "Source MAC address"
 msgstr "Źródłowy adres MAC"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
 msgid "Source address"
 msgstr "Adres źródłowy"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
 msgid "Source port"
 msgstr "Port źródłowy"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:262
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
 msgid "Source zone"
 msgstr "Strefa źródłowa"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
 msgid "Start Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
 msgid "Start Time (hh.mm.ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
 msgid "Stop Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
 msgid "Stop Time (hh.mm.ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
 msgid "Sunday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
 msgid ""
 "The firewall creates zones over your network interfaces to control network "
 "traffic flow."
@@ -700,8 +633,8 @@ msgstr ""
 "Firewall tworzy strefy z Twoich interfejsów sieciowych, aby kontrolować ruch "
 "sieciowy."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:171
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:259
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -717,7 +650,7 @@ msgstr ""
 "przekazywania jest <em>jednokierunkowa</em>, np. przekazywanie z sieci LAN "
 "do WAN <em>nie</em> implikuje pozwolenia na przekazywanie z sieci WAN do LAN."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
 #, fuzzy
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
@@ -732,15 +665,15 @@ msgstr ""
 "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:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
 msgid "Thursday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
 msgid "Time Restrictions"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
 msgid "Time in UTC"
 msgstr ""
 
@@ -760,20 +693,12 @@ msgstr "Do %s na <var>tym urządzeniu</var>"
 msgid "To %s, %s in %s"
 msgstr "Do %s, %s w %s"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr "Do źródłowego IP"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr "Do źródłowego portu"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
 msgid "Traffic Rules"
 msgstr "Reguły ruchu sieciowego"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
 "for example to reject traffic between certain hosts or to open WAN ports on "
@@ -783,31 +708,31 @@ msgstr ""
 "między strefami, na przykład aby odrzucać ruch między konkretnymi hostami "
 "albo otworzyć porty WAN routera."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
 msgid "Tuesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:107
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
 msgid "Unnamed forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:144
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
 msgid "Unnamed rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:99
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
 msgid "Unnamed zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -821,44 +746,44 @@ msgstr "Przez %s"
 msgid "Via %s at %s"
 msgstr "Przez %s w %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
 msgid "Wednesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
 msgid "Week Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
 msgid "Zone ⇒ Forwardings"
 msgstr "Strefa ⇒ Przekazywanie"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
 msgid "Zones"
 msgstr "Strefy"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:329
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
 msgid "accept"
 msgstr "akceptuj"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:254
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:222
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
 msgid "any"
 msgstr "dowolny"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
 msgid "any host"
@@ -872,7 +797,7 @@ msgstr "dowolne IP routera"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr "dowolna strefa"
@@ -882,13 +807,13 @@ msgstr "dowolna strefa"
 msgid "day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
 msgid "don't track"
 msgstr "nie śledź"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
 msgid "drop"
 msgstr "porzucaj"
 
@@ -919,9 +844,9 @@ msgstr ""
 msgid "ports"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:330
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
 msgid "reject"
 msgstr "odrzucaj"
 
@@ -930,6 +855,12 @@ msgstr "odrzucaj"
 msgid "second"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
@@ -940,6 +871,45 @@ msgstr ""
 msgid "types"
 msgstr ""
 
+#~ msgid "Add"
+#~ msgstr "Dodaj"
+
+#~ msgid "Add and edit..."
+#~ msgstr "Dodaj i edytuj..."
+
+#~ msgid "Do not rewrite"
+#~ msgstr "Nie przepisuj"
+
+#~ msgid "External zone"
+#~ msgstr "Strefa zewnętrzna"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "Nowa reguła SNAT"
+
+#~ msgid "New forward rule"
+#~ msgstr "Nowa reguła przekazywania (forward)"
+
+#~ msgid "New input rule"
+#~ msgstr "Nowa reguła wejściowa (input)"
+
+#~ msgid "New port forward"
+#~ msgstr "Nowe przekierowanie portu"
+
+#~ msgid "New source NAT"
+#~ msgstr "Nowy NAT źródłowy"
+
+#~ msgid "Open ports on router"
+#~ msgstr "Otwarte porty na routerze"
+
+#~ msgid "Other..."
+#~ msgstr "Inne..."
+
+#~ msgid "To source IP"
+#~ msgstr "Do źródłowego IP"
+
+#~ msgid "To source port"
+#~ msgstr "Do źródłowego portu"
+
 #~ msgid "(Unnamed Entry)"
 #~ msgstr "(Nienazwany wpis)"
 
diff --git a/applications/luci-app-firewall/po/pt-br/firewall.po b/applications/luci-app-firewall/po/pt-br/firewall.po
index 4f415d7ab..692640254 100644
--- a/applications/luci-app-firewall/po/pt-br/firewall.po
+++ b/applications/luci-app-firewall/po/pt-br/firewall.po
@@ -13,7 +13,7 @@ msgstr ""
 "X-Generator: Poedit 2.1.1\n"
 "Language-Team: \n"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
 msgid "%s in %s"
 msgstr "%s in %s"
 
@@ -22,7 +22,7 @@ msgstr "%s in %s"
 msgid "%s%s with %s"
 msgstr "%s%s com %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
 msgid "%s, %s in %s"
 msgstr "%s, %s em %s"
 
@@ -55,89 +55,77 @@ msgstr "Aceitar a entrada"
 msgid "Accept output"
 msgstr "Aceitar a saída"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:325
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
 msgid "Action"
 msgstr "Ação"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "Adicionar"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "Adicionar e editar..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
 "traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: 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:84
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
 msgid "Advanced Settings"
 msgstr "Configurações Avançadas"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
 msgid "Allow \"invalid\" traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Permite o encaminhamento da <em>zona de origem</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "Permite o encaminhamento para a <em>zona de destino</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
 msgid "Any"
 msgstr "Qualquer"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:341
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
 msgid "Any day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
 msgid "Automatic helper assignment"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Conntrack helpers"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid "Covered devices"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
 msgid "Covered networks"
 msgstr "Redes cobertas"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered subnets"
 msgstr ""
 
@@ -155,17 +143,15 @@ msgstr ""
 "cobertos por esta ferramenta. Os comandos serão executados após cada "
 "reinício do firewall, logo após a carga do conjunto de regras padrão."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
 msgid "Destination address"
 msgstr "Endereço de destino"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
 msgid "Destination port"
 msgstr "Porta de destino"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:299
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
 msgid "Destination zone"
 msgstr "Zona de destino"
 
@@ -188,17 +174,12 @@ msgstr "Descartar a entrada"
 msgid "Discard output"
 msgstr "Descartar a saída"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "Não sobrescreva"
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
@@ -214,65 +195,59 @@ msgstr "Não rastrear a entrada"
 msgid "Do not track output"
 msgstr "Não rastrear a saída"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:42
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
 msgid "Drop invalid packets"
 msgstr "Descartar pacotes inválidos"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:148
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr "Habilitar"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
 msgid "Enable NAT Loopback"
 msgstr "Habilite o Loopback do NAT"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
 msgid "Enable SYN-flood protection"
 msgstr "Habilite proteção contra SYN-flood"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
 msgid "Enable logging on this zone"
 msgstr "Habilite o registro nesta zona"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 "Funcionalidade experimental. Ela não é totalmente compatível com QoS/SQM."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
 msgid "External IP address"
 msgstr "Endereço IP externo"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:222
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
 msgid "External port"
 msgstr "Porta Externa"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "Zona externa"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:266
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
 msgid "Extra arguments"
 msgstr "Argumentos extras"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid "Extra destination arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid "Extra source arguments"
 msgstr ""
 
@@ -284,32 +259,32 @@ msgstr "Firewall"
 msgid "Firewall - Custom Rules"
 msgstr "Firewall - Regras personalizadas"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
 msgid "Firewall - Port Forwards"
 msgstr "Firewall - Encaminhamento de Portas"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
 msgid "Firewall - Traffic Rules"
 msgstr "Firewall - Regras de Tráfego"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
 msgid "Firewall - Zone Settings"
 msgstr "Firewall - Configurações de Zona"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
 msgid "Force connection tracking"
 msgstr "Force o rastreamento da conexão"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
 msgid "Forward"
 msgstr "Encaminhar"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
 msgid "Forward to"
 msgstr "Encaminhar para"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
 msgid "Friday"
 msgstr "Sexta-feira"
 
@@ -340,15 +315,15 @@ msgstr "De %s <var>neste dispositivo</var> com origem %s"
 msgid "From %s on <var>this device</var> with source %s and %s"
 msgstr "De %s <var>neste dispositivo</var> com origem %s e %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:99
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:135
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:37
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
+#: 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
 msgid "General Settings"
 msgstr "Configurações Gerais"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
 msgid "Hardware flow offloading"
 msgstr "Aceleração de fluxo de dados via Hardware"
 
@@ -372,13 +347,13 @@ msgid "IPv4"
 msgstr "IPv4"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
 msgid "IPv4 and IPv6"
 msgstr "IPv4 e IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
 msgid "IPv4 only"
 msgstr "Somente IPv4"
 
@@ -386,32 +361,29 @@ msgstr "Somente IPv4"
 msgid "IPv6"
 msgstr "IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:187
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
 msgid "IPv6 only"
 msgstr "Somente IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Input"
 msgstr "Entrada"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
 msgid "Internal IP address"
 msgstr "Endereço IP interno"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
 msgid "Internal port"
 msgstr "Porta Interna"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
 msgid "Internal zone"
 msgstr "Zona interna"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
 msgid "Limit log messages"
 msgstr "Limita as mensagens de registro"
 
@@ -425,24 +397,24 @@ msgstr "MAC"
 msgid "MACs"
 msgstr "MACs"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
 msgid "MSS clamping"
 msgstr "Ajuste do MSS"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
 msgid "Masquerading"
 msgstr "Mascaramento"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:124
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
 msgid "Match"
 msgstr "Casa"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
 msgid "Match ICMP type"
 msgstr "Casa com ICMP tipo"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
 msgid ""
 "Match incoming traffic directed at the given destination port or port range "
 "on this host"
@@ -450,22 +422,18 @@ msgstr ""
 "Casa o tráfego entrante direcionado para uma porta ou faixa de portas de "
 "destino específica neste computador"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
 msgid "Monday"
 msgstr "Segunda-Feira"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
 msgid "Month Days"
 msgstr "Dias do mês"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:120
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:168
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:98
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
 msgid "Name"
 msgstr "Nome"
 
@@ -473,42 +441,20 @@ msgstr "Nome"
 msgid "Network"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "Nova regra de SNAT"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "Nova regra de encaminhamento"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "Nova regra de entrada"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "Novo encaminhamento de porta"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "Nova origem NAT"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
 "Somente case o tráfego entrante direcionado para o endereço IP fornecido."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
 msgid "Only match incoming traffic from these MACs."
 msgstr "Somente case o tráfego entrante destes endereços MAC."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 msgid "Only match incoming traffic from this IP or range."
 msgstr "Somente case o tráfego entrante desta faixa de endereços IP."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
 msgid ""
 "Only match incoming traffic originating from the given source port or port "
 "range on the client host"
@@ -516,26 +462,17 @@ msgstr ""
 "Somente case o tráfego entrante vindo da porta de origem fornecida ou "
 "intervalo de portas no equipamento cliente"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "Abrir portas no roteador"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Outro..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Output"
 msgstr "Saída"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr "Passa argumentos adicionais para o iptables. Use com cuidado!"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -544,12 +481,12 @@ msgid ""
 "all services."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
 msgid "Port Forwards"
 msgstr "Encaminhamentos de Porta"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
@@ -557,26 +494,24 @@ msgstr ""
 "O encaminhamento de portas permite que computadores remotos na Internet "
 "conectem a um computador ou serviço específico dentro da rede local privada."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
 msgid ""
 "Prevent the installation of <em>NOTRACK</em> rules which would bypass "
 "connection tracking."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:153
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:204
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: 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 ""
 "Redireciona tráfego entrante para a porta especificada no computador interno"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr "Redireciona tráfego entrante para o computador interno especificado"
 
@@ -595,7 +530,7 @@ msgstr "Recusar entrada"
 msgid "Refuse output"
 msgstr "Recusar saída"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr "Requer suporte de NAT em hardware. Implementado ao menos para mt7621"
 
@@ -603,20 +538,20 @@ msgstr "Requer suporte de NAT em hardware. Implementado ao menos para mt7621"
 msgid "Restart Firewall"
 msgstr "Reiniciar o Firewall"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "Restringe o mascaramento para uma subrede de destino específica"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
 msgid "Restrict Masquerading to given source subnets"
 msgstr "Restringe o mascaramento para uma subrede de origem específica"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:197
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
 msgid "Restrict to address family"
 msgstr "Restringe para uma família de endereços"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
 msgid "Routing/NAT Offloading"
 msgstr "Aceleração de Roteamento/NAT"
 
@@ -628,64 +563,62 @@ msgstr "A regra está desabilitada"
 msgid "Rule is enabled"
 msgstr "A regra está habilitada"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
 msgid "Saturday"
 msgstr "Sábado"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
 msgid "Software based offloading for routing/NAT"
 msgstr "Aceleração de roteamento/NAT baseada em Software"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
 msgid "Software flow offloading"
 msgstr "Aceleração de fluxo de dados via Software"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
 msgid "Source IP address"
 msgstr "Endereço IP de origem"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
 msgid "Source MAC address"
 msgstr "Endereço MAC de origem"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
 msgid "Source address"
 msgstr "Endereço de origem"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
 msgid "Source port"
 msgstr "Porta de origem"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:262
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
 msgid "Source zone"
 msgstr "Zona de origem"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
 msgid "Start Date (yyyy-mm-dd)"
 msgstr "Dia inicial (aaaa-mm-dd)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
 msgid "Start Time (hh.mm.ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
 msgid "Stop Date (yyyy-mm-dd)"
 msgstr "Dia final (aaaa-mm-dd)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
 msgid "Stop Time (hh.mm.ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
 msgid "Sunday"
 msgstr "Domingo"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
 msgid ""
 "The firewall creates zones over your network interfaces to control network "
 "traffic flow."
@@ -693,8 +626,8 @@ msgstr ""
 "O firewall cria zonas sobre as interfaces de rede para controlar o fluxo do "
 "tráfego de rede."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:171
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:259
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -710,7 +643,7 @@ msgstr ""
 "encaminhamento é <em>unidirecional</em>, ex: um encaminhamento da LAN para "
 "WAN <em>não</em> implica na permissão de encaminhar da WAN para LAN."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -725,15 +658,15 @@ msgstr ""
 "<em>Redes Cobertas</em> especificam que redes disponíveis são membros desta "
 "zona."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
 msgid "Thursday"
 msgstr "Quita-feira"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
 msgid "Time Restrictions"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
 msgid "Time in UTC"
 msgstr "Hora em UTC"
 
@@ -753,20 +686,12 @@ msgstr "Para %s <var>neste dispositivo</var>"
 msgid "To %s, %s in %s"
 msgstr "Para %s, %s em %s"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr "Para o endereço IP de origem"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr "Para a porta de origem"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
 msgid "Traffic Rules"
 msgstr "Regras de tráfego"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
 "for example to reject traffic between certain hosts or to open WAN ports on "
@@ -776,31 +701,31 @@ msgstr ""
 "diferentes zonas. Por exemplo, rejeitar o tráfego entre certos equipamentos "
 "ou abrir portas WAN no roteador."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
 msgid "Tuesday"
 msgstr "Terça-feira"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:107
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
 msgid "Unnamed forward"
 msgstr "Encaminhamento sem nome"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:144
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
 msgid "Unnamed rule"
 msgstr "Regra sem nome"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:99
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
 msgid "Unnamed zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -814,44 +739,44 @@ msgstr "Via %s"
 msgid "Via %s at %s"
 msgstr "Via %s at %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
 msgid "Wednesday"
 msgstr "Quarta-feira"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
 msgid "Week Days"
 msgstr "Dias da semana"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
 msgid "Zone ⇒ Forwardings"
 msgstr "Zona ⇒ Encaminhamentos"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
 msgid "Zones"
 msgstr "Zonas"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:329
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
 msgid "accept"
 msgstr "aceitar"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:254
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:222
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
 msgid "any"
 msgstr "qualquer"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
 msgid "any host"
@@ -865,7 +790,7 @@ msgstr "qualquer endereço IP do roteador"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr "qualquer zona"
@@ -875,13 +800,13 @@ msgstr "qualquer zona"
 msgid "day"
 msgstr "dia"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
 msgid "don't track"
 msgstr "não rastrear"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
 msgid "drop"
 msgstr "descartar"
 
@@ -912,9 +837,9 @@ msgstr "porta"
 msgid "ports"
 msgstr "portas"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:330
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
 msgid "reject"
 msgstr "rejeitar"
 
@@ -923,6 +848,12 @@ msgstr "rejeitar"
 msgid "second"
 msgstr "segundo"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
@@ -933,6 +864,45 @@ msgstr "tipo"
 msgid "types"
 msgstr "tipos"
 
+#~ msgid "Add"
+#~ msgstr "Adicionar"
+
+#~ msgid "Add and edit..."
+#~ msgstr "Adicionar e editar..."
+
+#~ msgid "Do not rewrite"
+#~ msgstr "Não sobrescreva"
+
+#~ msgid "External zone"
+#~ msgstr "Zona externa"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "Nova regra de SNAT"
+
+#~ msgid "New forward rule"
+#~ msgstr "Nova regra de encaminhamento"
+
+#~ msgid "New input rule"
+#~ msgstr "Nova regra de entrada"
+
+#~ msgid "New port forward"
+#~ msgstr "Novo encaminhamento de porta"
+
+#~ msgid "New source NAT"
+#~ msgstr "Nova origem NAT"
+
+#~ msgid "Open ports on router"
+#~ msgstr "Abrir portas no roteador"
+
+#~ msgid "Other..."
+#~ msgstr "Outro..."
+
+#~ msgid "To source IP"
+#~ msgstr "Para o endereço IP de origem"
+
+#~ msgid "To source port"
+#~ msgstr "Para a porta de origem"
+
 #~ msgid "Output zone"
 #~ msgstr "Zona de saída"
 
diff --git a/applications/luci-app-firewall/po/pt/firewall.po b/applications/luci-app-firewall/po/pt/firewall.po
index 8dde627c0..281c6b17b 100644
--- a/applications/luci-app-firewall/po/pt/firewall.po
+++ b/applications/luci-app-firewall/po/pt/firewall.po
@@ -13,7 +13,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.6\n"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
 msgid "%s in %s"
 msgstr "%s em %s"
 
@@ -22,7 +22,7 @@ msgstr "%s em %s"
 msgid "%s%s with %s"
 msgstr "%s%s with %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
 msgid "%s, %s in %s"
 msgstr "%s, %s em %s"
 
@@ -55,89 +55,77 @@ msgstr ""
 msgid "Accept output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:325
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
 msgid "Action"
 msgstr "Acção"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "Adicionar"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "Adicionar e editar..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
 "traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: 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:84
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
 msgid "Advanced Settings"
 msgstr "Definições Avançadas"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
 msgid "Allow \"invalid\" traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Permitir encaminhamento de <em>zonas de origem</em>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "Permitir encaminhamento para <em>zonas de destino</em>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
 msgid "Any"
 msgstr "Qualquer"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:341
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
 msgid "Any day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
 msgid "Automatic helper assignment"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Conntrack helpers"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid "Covered devices"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
 msgid "Covered networks"
 msgstr "Redes abrangidas"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered subnets"
 msgstr ""
 
@@ -156,17 +144,15 @@ msgstr ""
 "comandos são executados a seguir ao reinicio da firewall, logo a seguir ao "
 "conjunto de regras predefinidas serem carregadas."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
 msgid "Destination address"
 msgstr "Endereço de destino"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
 msgid "Destination port"
 msgstr "Porta de destino"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:299
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
 msgid "Destination zone"
 msgstr "Zona de destino"
 
@@ -189,17 +175,12 @@ msgstr ""
 msgid "Discard output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "Não re-escrever"
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
@@ -215,64 +196,58 @@ msgstr ""
 msgid "Do not track output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:42
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
 msgid "Drop invalid packets"
 msgstr "Cancelar pacotes inválidos"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:148
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr "Ativar"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
 msgid "Enable NAT Loopback"
 msgstr "Ativar NAT Loopback"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
 msgid "Enable SYN-flood protection"
 msgstr "Ativar a Proteção SYN-flood"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
 msgid "Enable logging on this zone"
 msgstr "Ativar registo nesta zona"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
 msgid "External IP address"
 msgstr "Endereço IP externo"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:222
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
 msgid "External port"
 msgstr "Porta externa"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "Zona externa"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:266
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
 msgid "Extra arguments"
 msgstr "Argumentos extra"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid "Extra destination arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid "Extra source arguments"
 msgstr ""
 
@@ -284,32 +259,32 @@ msgstr "Firewall"
 msgid "Firewall - Custom Rules"
 msgstr "Firewall - Regras Personalizadas"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
 msgid "Firewall - Port Forwards"
 msgstr "Firewall - Encaminhamento de Portas"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
 msgid "Firewall - Traffic Rules"
 msgstr "Firewall - Regras de Tráfego"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
 msgid "Firewall - Zone Settings"
 msgstr "Firewall - Definições de Zona"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
 msgid "Force connection tracking"
 msgstr "Forçar rasto de ligação"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
 msgid "Forward"
 msgstr "Encaminhar"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
 msgid "Forward to"
 msgstr "Encaminhar para"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
 msgid "Friday"
 msgstr ""
 
@@ -340,15 +315,15 @@ msgstr ""
 msgid "From %s on <var>this device</var> with source %s and %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:99
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:135
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:37
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
+#: 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
 msgid "General Settings"
 msgstr "Definições Gerais"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
 msgid "Hardware flow offloading"
 msgstr ""
 
@@ -372,13 +347,13 @@ msgid "IPv4"
 msgstr "IPv4"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
 msgid "IPv4 and IPv6"
 msgstr "IPv4 e IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
 msgid "IPv4 only"
 msgstr "Só IPv4"
 
@@ -386,32 +361,29 @@ msgstr "Só IPv4"
 msgid "IPv6"
 msgstr "IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:187
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
 msgid "IPv6 only"
 msgstr "Só IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Input"
 msgstr "Entrada"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
 msgid "Internal IP address"
 msgstr "Endereço IP interno"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
 msgid "Internal port"
 msgstr "Porta interna"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
 msgid "Internal zone"
 msgstr "Zona Interna"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
 msgid "Limit log messages"
 msgstr "Limitar registo de mensagens"
 
@@ -425,25 +397,25 @@ msgstr ""
 msgid "MACs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
 #, fuzzy
 msgid "MSS clamping"
 msgstr "MSS-Correction"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
 msgid "Masquerading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:124
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
 msgid "Match"
 msgstr "Corresponder"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
 msgid "Match ICMP type"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
 msgid ""
 "Match incoming traffic directed at the given destination port or port range "
 "on this host"
@@ -451,22 +423,18 @@ msgstr ""
 "O tráfego de entrada corresponde a uma dada porta de destino ou intervalo de "
 "portas neste host"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
 msgid "Monday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
 msgid "Month Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:120
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:168
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:98
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
 msgid "Name"
 msgstr "Nome"
 
@@ -474,41 +442,19 @@ msgstr "Nome"
 msgid "Network"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "Nova regra SNAT"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "Nova regra de encaminhamento"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "Nova regra de entrada"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "Novo encaminhamento de porta"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "Nova origem de NAT"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr "Só se tráfego de entrada corresponder ao endereço IP fornecido."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
 msgid "Only match incoming traffic from these MACs."
 msgstr "Só se o tráfego de entrada corresponder a um destes MACs."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 msgid "Only match incoming traffic from this IP or range."
 msgstr "Só se o tráfego de entrada corresponder a este IP ou intervalo."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
 msgid ""
 "Only match incoming traffic originating from the given source port or port "
 "range on the client host"
@@ -516,26 +462,17 @@ msgstr ""
 "Só se o tráfego de entrada corresponder à porta de origem fornecida ou de um "
 "intervalo de portas no host cliente"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "Abrir portas no router"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Outro..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Output"
 msgstr "Saída"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr "Passa argumentos adicionais para o iptables. Usar com cuidado!"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -544,12 +481,12 @@ msgid ""
 "all services."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
 msgid "Port Forwards"
 msgstr "Encaminhamento de Portas"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
@@ -557,27 +494,25 @@ msgstr ""
 "O Encaminhamento de Portas permite que computadores remotos na internet se "
 "liguem a um computador ou serviço especifico na rede privada (LAN)."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
 msgid ""
 "Prevent the installation of <em>NOTRACK</em> rules which would bypass "
 "connection tracking."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:153
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:204
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: 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 ""
 "Redirecionar a entrada de trafego correspondente à porta fornecida no host "
 "interno"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr "Redirecionar o tráfego de entrada correspondente para o host interno"
 
@@ -596,7 +531,7 @@ msgstr ""
 msgid "Refuse output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 
@@ -604,20 +539,20 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
 msgid "Restrict Masquerading to given destination subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
 msgid "Restrict Masquerading to given source subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:197
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
 msgid "Restrict to address family"
 msgstr "Restringir a família de endereços"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
 msgid "Routing/NAT Offloading"
 msgstr ""
 
@@ -629,64 +564,62 @@ msgstr ""
 msgid "Rule is enabled"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
 msgid "Saturday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
 msgid "Software based offloading for routing/NAT"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
 msgid "Software flow offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
 msgid "Source IP address"
 msgstr "Endereço IP de origem"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
 msgid "Source MAC address"
 msgstr "Endereço MAC de origem"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
 msgid "Source address"
 msgstr "Endereço de origem"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
 msgid "Source port"
 msgstr "Porta de origem"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:262
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
 msgid "Source zone"
 msgstr "Zona de origem"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
 msgid "Start Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
 msgid "Start Time (hh.mm.ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
 msgid "Stop Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
 msgid "Stop Time (hh.mm.ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
 msgid "Sunday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
 msgid ""
 "The firewall creates zones over your network interfaces to control network "
 "traffic flow."
@@ -694,8 +627,8 @@ msgstr ""
 "A firewall cria zonas sobre as interfaces de rede para controlar o fluxo do "
 "tráfego."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:171
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:259
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -705,7 +638,7 @@ msgid ""
 "<em>not</em> imply a permission to forward from wan to lan as well."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -714,15 +647,15 @@ msgid ""
 "networks</em> specifies which available networks are members of this zone."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
 msgid "Thursday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
 msgid "Time Restrictions"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
 msgid "Time in UTC"
 msgstr ""
 
@@ -742,20 +675,12 @@ msgstr "Para %s em <var>este dispositivo</var>"
 msgid "To %s, %s in %s"
 msgstr "Para %s, %s em %s"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr "Para o IP de origem"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr "Para a porta de origem"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
 msgid "Traffic Rules"
 msgstr "Regras de Tráfego"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
 "for example to reject traffic between certain hosts or to open WAN ports on "
@@ -765,31 +690,31 @@ msgstr ""
 "diferentes zonas, por exemplo, para rejeitar trafego entre certos hosts ou "
 "para abrir portas WAN no router."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
 msgid "Tuesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:107
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
 msgid "Unnamed forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:144
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
 msgid "Unnamed rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:99
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
 msgid "Unnamed zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -803,44 +728,44 @@ msgstr "Via %s"
 msgid "Via %s at %s"
 msgstr "Via %s no %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
 msgid "Wednesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
 msgid "Week Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
 msgid "Zone ⇒ Forwardings"
 msgstr "Zona ⇒ Encaminhamentos"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
 msgid "Zones"
 msgstr "Zonas"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:329
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
 msgid "accept"
 msgstr "aceitar"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:254
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:222
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
 msgid "any"
 msgstr "qualquer"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
 msgid "any host"
@@ -854,7 +779,7 @@ msgstr "qualquer IP do router"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr "qualquer zona"
@@ -864,13 +789,13 @@ msgstr "qualquer zona"
 msgid "day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
 msgid "don't track"
 msgstr "não seguir"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
 msgid "drop"
 msgstr "drop"
 
@@ -901,9 +826,9 @@ msgstr ""
 msgid "ports"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:330
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
 msgid "reject"
 msgstr "rejeitar"
 
@@ -912,6 +837,12 @@ msgstr "rejeitar"
 msgid "second"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
@@ -922,6 +853,45 @@ msgstr ""
 msgid "types"
 msgstr ""
 
+#~ msgid "Add"
+#~ msgstr "Adicionar"
+
+#~ msgid "Add and edit..."
+#~ msgstr "Adicionar e editar..."
+
+#~ msgid "Do not rewrite"
+#~ msgstr "Não re-escrever"
+
+#~ msgid "External zone"
+#~ msgstr "Zona externa"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "Nova regra SNAT"
+
+#~ msgid "New forward rule"
+#~ msgstr "Nova regra de encaminhamento"
+
+#~ msgid "New input rule"
+#~ msgstr "Nova regra de entrada"
+
+#~ msgid "New port forward"
+#~ msgstr "Novo encaminhamento de porta"
+
+#~ msgid "New source NAT"
+#~ msgstr "Nova origem de NAT"
+
+#~ msgid "Open ports on router"
+#~ msgstr "Abrir portas no router"
+
+#~ msgid "Other..."
+#~ msgstr "Outro..."
+
+#~ msgid "To source IP"
+#~ msgstr "Para o IP de origem"
+
+#~ msgid "To source port"
+#~ msgstr "Para a porta de origem"
+
 #~ msgid "(Unnamed Entry)"
 #~ msgstr "(Entrada Sem Nome)"
 
diff --git a/applications/luci-app-firewall/po/ro/firewall.po b/applications/luci-app-firewall/po/ro/firewall.po
index 92c8b8a9a..30d3d89e5 100644
--- a/applications/luci-app-firewall/po/ro/firewall.po
+++ b/applications/luci-app-firewall/po/ro/firewall.po
@@ -12,7 +12,7 @@ msgstr ""
 "20)) ? 1 : 2);;\n"
 "X-Generator: Pootle 2.0.6\n"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
 msgid "%s in %s"
 msgstr "%s în %s"
 
@@ -21,7 +21,7 @@ msgstr "%s în %s"
 msgid "%s%s with %s"
 msgstr "%s%s cu %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
 msgid "%s, %s in %s"
 msgstr "%s, %s în %s"
 
@@ -54,89 +54,77 @@ msgstr ""
 msgid "Accept output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:325
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
 msgid "Action"
 msgstr "Acţiune"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "Adaugă"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "Adaugă şi editează..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
 "traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: 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:84
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
 msgid "Advanced Settings"
 msgstr "Setări avansate"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
 msgid "Allow \"invalid\" traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Permite trecerea din <em>zonele sursa</em>."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "Permite trecerea catre <em>zonele sursa</em>."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
 msgid "Any"
 msgstr "Oricare"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:341
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
 msgid "Any day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
 msgid "Automatic helper assignment"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Conntrack helpers"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid "Covered devices"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
 msgid "Covered networks"
 msgstr "Retele acoperite"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered subnets"
 msgstr ""
 
@@ -151,17 +139,15 @@ msgid ""
 "each firewall restart, right after the default ruleset has been loaded."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
 msgid "Destination address"
 msgstr "Destinaţie adresă"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
 msgid "Destination port"
 msgstr "Portul destinatie"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:299
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
 msgid "Destination zone"
 msgstr "Zona destinatie"
 
@@ -184,17 +170,12 @@ msgstr ""
 msgid "Discard output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "Nu rescrie"
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
@@ -210,64 +191,58 @@ msgstr ""
 msgid "Do not track output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:42
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
 msgid "Drop invalid packets"
 msgstr "Descarcă pachetele invalide"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:148
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr "Activează"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
 msgid "Enable NAT Loopback"
 msgstr "Activează loopback NAT"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
 msgid "Enable SYN-flood protection"
 msgstr "Activează protecţia SYN-flood"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
 msgid "Enable logging on this zone"
 msgstr "Activeaza log in aceasta zona"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
 msgid "External IP address"
 msgstr "Adresă IP externă"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:222
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
 msgid "External port"
 msgstr "Port extern"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "Zonă externă"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:266
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
 msgid "Extra arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid "Extra destination arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid "Extra source arguments"
 msgstr ""
 
@@ -279,32 +254,32 @@ msgstr "Firewall"
 msgid "Firewall - Custom Rules"
 msgstr "Firewall - Reguli particularizate"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
 msgid "Firewall - Port Forwards"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
 msgid "Firewall - Traffic Rules"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
 msgid "Firewall - Zone Settings"
 msgstr "Setari zona la firewall"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
 msgid "Force connection tracking"
 msgstr "Forteaza urmarirea conexiunilor"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
 msgid "Forward"
 msgstr "Forward"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
 msgid "Forward to"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
 msgid "Friday"
 msgstr ""
 
@@ -335,15 +310,15 @@ msgstr ""
 msgid "From %s on <var>this device</var> with source %s and %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:99
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:135
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:37
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
+#: 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
 msgid "General Settings"
 msgstr "Setari generale"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
 msgid "Hardware flow offloading"
 msgstr ""
 
@@ -367,13 +342,13 @@ msgid "IPv4"
 msgstr "IPv4"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
 msgid "IPv4 and IPv6"
 msgstr "IPv4 şi IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
 msgid "IPv4 only"
 msgstr "doar IPv4"
 
@@ -381,32 +356,29 @@ msgstr "doar IPv4"
 msgid "IPv6"
 msgstr "IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:187
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
 msgid "IPv6 only"
 msgstr "doar IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Input"
 msgstr "Intrare"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
 msgid "Internal IP address"
 msgstr "Adresa IP interna"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
 msgid "Internal port"
 msgstr "Port intern"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
 msgid "Internal zone"
 msgstr "Zonă internă"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
 msgid "Limit log messages"
 msgstr "Limitează mesaje în log"
 
@@ -420,45 +392,41 @@ msgstr ""
 msgid "MACs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
 msgid "MSS clamping"
 msgstr "Ajustare MSS"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
 msgid "Masquerading"
 msgstr "Translatare"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:124
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
 msgid "Match"
 msgstr "Potrivire"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
 msgid "Match ICMP type"
 msgstr "Potriveste pe tipul de ICMP"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
 msgid ""
 "Match incoming traffic directed at the given destination port or port range "
 "on this host"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
 msgid "Monday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
 msgid "Month Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:120
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:168
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:98
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
 msgid "Name"
 msgstr "Nume"
 
@@ -466,66 +434,35 @@ msgstr "Nume"
 msgid "Network"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "Regulă nouă SNAT"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
 msgid "Only match incoming traffic from these MACs."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 msgid "Only match incoming traffic from this IP or range."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
 msgid ""
 "Only match incoming traffic originating from the given source port or port "
 "range on the client host"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Altele..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Output"
 msgstr "Ieşire"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -534,36 +471,34 @@ msgid ""
 "all services."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
 msgid "Port Forwards"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
 msgid ""
 "Prevent the installation of <em>NOTRACK</em> rules which would bypass "
 "connection tracking."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:153
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:204
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
 msgid "Protocol"
 msgstr "Protocol"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: 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 ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr ""
 
@@ -582,7 +517,7 @@ msgstr ""
 msgid "Refuse output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 
@@ -590,20 +525,20 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
 msgid "Restrict Masquerading to given destination subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
 msgid "Restrict Masquerading to given source subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:197
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
 msgid "Restrict to address family"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
 msgid "Routing/NAT Offloading"
 msgstr ""
 
@@ -615,71 +550,69 @@ msgstr ""
 msgid "Rule is enabled"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
 msgid "Saturday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
 msgid "Software based offloading for routing/NAT"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
 msgid "Software flow offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
 msgid "Source IP address"
 msgstr "Sursă adresă IP"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
 msgid "Source MAC address"
 msgstr "Sursă adresă MAC"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
 msgid "Source address"
 msgstr "Adresa sursa"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
 msgid "Source port"
 msgstr "Port sursa"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:262
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
 msgid "Source zone"
 msgstr "Zona sursa"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
 msgid "Start Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
 msgid "Start Time (hh.mm.ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
 msgid "Stop Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
 msgid "Stop Time (hh.mm.ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
 msgid "Sunday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
 msgid ""
 "The firewall creates zones over your network interfaces to control network "
 "traffic flow."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:171
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:259
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -689,7 +622,7 @@ msgid ""
 "<em>not</em> imply a permission to forward from wan to lan as well."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -698,15 +631,15 @@ msgid ""
 "networks</em> specifies which available networks are members of this zone."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
 msgid "Thursday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
 msgid "Time Restrictions"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
 msgid "Time in UTC"
 msgstr ""
 
@@ -726,51 +659,43 @@ msgstr ""
 msgid "To %s, %s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
 msgid "Traffic Rules"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
 "for example to reject traffic between certain hosts or to open WAN ports on "
 "the router."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
 msgid "Tuesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:107
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
 msgid "Unnamed forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:144
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
 msgid "Unnamed rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:99
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
 msgid "Unnamed zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -784,44 +709,44 @@ msgstr ""
 msgid "Via %s at %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
 msgid "Wednesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
 msgid "Week Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
 msgid "Zone ⇒ Forwardings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
 msgid "Zones"
 msgstr "Zone"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:329
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
 msgid "accept"
 msgstr "accept"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:254
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:222
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
 msgid "any"
 msgstr "oricare"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
 msgid "any host"
@@ -835,7 +760,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr ""
@@ -845,13 +770,13 @@ msgstr ""
 msgid "day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
 msgid "don't track"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
 msgid "drop"
 msgstr ""
 
@@ -882,9 +807,9 @@ msgstr ""
 msgid "ports"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:330
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
 msgid "reject"
 msgstr ""
 
@@ -893,6 +818,12 @@ msgstr ""
 msgid "second"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
@@ -903,6 +834,24 @@ msgstr ""
 msgid "types"
 msgstr ""
 
+#~ msgid "Add"
+#~ msgstr "Adaugă"
+
+#~ msgid "Add and edit..."
+#~ msgstr "Adaugă şi editează..."
+
+#~ msgid "Do not rewrite"
+#~ msgstr "Nu rescrie"
+
+#~ msgid "External zone"
+#~ msgstr "Zonă externă"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "Regulă nouă SNAT"
+
+#~ msgid "Other..."
+#~ msgstr "Altele..."
+
 #~ msgid "(Unnamed Entry)"
 #~ msgstr "(Intrare fără nume)"
 
diff --git a/applications/luci-app-firewall/po/ru/firewall.po b/applications/luci-app-firewall/po/ru/firewall.po
index ab747e19a..ca8dc439c 100644
--- a/applications/luci-app-firewall/po/ru/firewall.po
+++ b/applications/luci-app-firewall/po/ru/firewall.po
@@ -15,7 +15,7 @@ msgstr ""
 "Project-Info: Это технический перевод, не дословный. Главное-удобный русский "
 "интерфейс, все проверялось в графическом режиме, совместим с другими apps\n"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
 msgid "%s in %s"
 msgstr "%s в %s"
 
@@ -24,7 +24,7 @@ msgstr "%s в %s"
 msgid "%s%s with %s"
 msgstr "%s%s с %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
 msgid "%s, %s in %s"
 msgstr "%s, %s в %s"
 
@@ -57,24 +57,12 @@ msgstr "Принимать входящий трафик"
 msgid "Accept output"
 msgstr "Принимать исходящий трафик"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:325
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
 msgid "Action"
 msgstr "Действие"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "Добавить"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "Добавить и редактировать..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
@@ -84,70 +72,70 @@ msgstr ""
 "назначения, например <code>-p tcp --dport 443</code> для соответствия только "
 "исходящему HTTPS трафику."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
 msgstr ""
-"Дополнительные аргументы <em>iptables</em> для классификации трафика зоны источника, "
-"например <code>-p tcp --sport 443</code> для соответствия только входящему HTTPS "
-"трафику."
+"Дополнительные аргументы <em>iptables</em> для классификации трафика зоны "
+"источника, например <code>-p tcp --sport 443</code> для соответствия только "
+"входящему HTTPS трафику."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: 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:84
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
 msgid "Advanced Settings"
 msgstr "Дополнительные настройки"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
 msgid "Allow \"invalid\" traffic"
 msgstr "Разрешить «недействительный» трафик"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Разрешить перенаправление из <em>'зон источников'</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "Разрешить перенаправление в <em>'зоны назначения'</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
 msgid "Any"
 msgstr "Любой"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:341
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
 msgid "Any day"
 msgstr "Любой день"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
 msgid "Automatic helper assignment"
 msgstr "Автоматическое назначение помощников"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
-"Автоматическое назначение помощников отслеживания соединений (conntrack) на основе "
-"протокола и порта трафика."
+"Автоматическое назначение помощников отслеживания соединений (conntrack) на "
+"основе протокола и порта трафика."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
 msgid "Conntrack Settings"
 msgstr "Отслеживание соединений (conntrack)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Conntrack helpers"
 msgstr "Помощники отслеживания соединений"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid "Covered devices"
 msgstr "Охватываемые устройства"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
 msgid "Covered networks"
 msgstr "Охватываемые сети"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered subnets"
 msgstr "Охватываемые подсети"
 
@@ -166,17 +154,15 @@ msgstr ""
 "каждой перезагрузки межсетевого экрана, сразу после загрузки набора правил "
 "по умолчанию."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
 msgid "Destination address"
 msgstr "Адрес назначения"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
 msgid "Destination port"
 msgstr "Порт назначения"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:299
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
 msgid "Destination zone"
 msgstr "Зона назначения"
 
@@ -199,19 +185,14 @@ msgstr "Отклонять входящий трафик"
 msgid "Discard output"
 msgstr "Отклонять исходящий трафик"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
 msgstr ""
-"Не устанавливать дополнительные правила для отклонения перенаправляемого трафика с "
-"состоянием <em>недействительный</em> (<em>invalid</em>). Это может потребоваться для "
-"сложных настроек асимметричной маршрутизации."
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "Не перезаписывать"
+"Не устанавливать дополнительные правила для отклонения перенаправляемого "
+"трафика с состоянием <em>недействительный</em> (<em>invalid</em>). Это может "
+"потребоваться для сложных настроек асимметричной маршрутизации."
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
@@ -228,66 +209,60 @@ msgstr "Не отслеживать входящий трафик"
 msgid "Do not track output"
 msgstr "Не отслеживать исходящий трафик"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:42
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
 msgid "Drop invalid packets"
 msgstr "Отбрасывать некорректные пакеты"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:148
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr "Включить"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
 msgid "Enable NAT Loopback"
 msgstr "Включить NAT Loopback"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
 msgid "Enable SYN-flood protection"
 msgstr "Включить защиту от SYN-flood атак"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
 msgid "Enable logging on this zone"
 msgstr "Включить журналирование в этой зоне"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr "Экспериментальный функционал. Не полностью совместим с QoS/SQM."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
-"Явно определяет допустимые варианты помощников (helpers) отслеживания соединений "
-"(connection tracking) трафика в зоне."
+"Явно определяет допустимые варианты помощников (helpers) отслеживания "
+"соединений (connection tracking) трафика в зоне."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
 msgid "External IP address"
 msgstr "Внешний IP-адрес"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:222
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
 msgid "External port"
 msgstr "Внешний порт"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "Внешняя зона"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:266
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
 msgid "Extra arguments"
 msgstr "Дополнительные аргументы"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid "Extra destination arguments"
 msgstr "Дополнительные аргументы для назначения"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
 msgid "Extra iptables arguments"
 msgstr "Дополнительные аргументы iptables"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid "Extra source arguments"
 msgstr "Дополнительные аргументы для источника"
 
@@ -299,32 +274,32 @@ msgstr "Межсетевой экран"
 msgid "Firewall - Custom Rules"
 msgstr "Межсетевой экран - Пользовательские правила"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
 msgid "Firewall - Port Forwards"
 msgstr "Межсетевой экран - Перенаправление портов"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
 msgid "Firewall - Traffic Rules"
 msgstr "Межсетевой экран - Правила для трафика"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
 msgid "Firewall - Zone Settings"
 msgstr "Межсетевой экран - Настройка зон"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
 msgid "Force connection tracking"
 msgstr "Принудительно включать отслеживание соединений"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
 msgid "Forward"
 msgstr "Перенаправление"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
 msgid "Forward to"
 msgstr "Перенаправлять на"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
 msgid "Friday"
 msgstr "Пятница"
 
@@ -355,15 +330,15 @@ msgstr "Из %s в <var>это устройство</var> с источнико
 msgid "From %s on <var>this device</var> with source %s and %s"
 msgstr "Из %s в <var>это устройство</var> с источниками %s and %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:99
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:135
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:37
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
+#: 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
 msgid "General Settings"
 msgstr "Основные настройки"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
 msgid "Hardware flow offloading"
 msgstr "Аппаратный flow offloading"
 
@@ -387,13 +362,13 @@ msgid "IPv4"
 msgstr "IPv4"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
 msgid "IPv4 and IPv6"
 msgstr "IPv4 и IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
 msgid "IPv4 only"
 msgstr "Только IPv4"
 
@@ -401,32 +376,29 @@ msgstr "Только IPv4"
 msgid "IPv6"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:187
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
 msgid "IPv6 only"
 msgstr "Только IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Input"
 msgstr "Входящий трафик"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
 msgid "Internal IP address"
 msgstr "Внутренний IP-адрес"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
 msgid "Internal port"
 msgstr "Внутренний порт"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
 msgid "Internal zone"
 msgstr "Внутренняя зона"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
 msgid "Limit log messages"
 msgstr "Ограничить журнал сообщений"
 
@@ -440,24 +412,24 @@ msgstr "MAC-адрес"
 msgid "MACs"
 msgstr "MAC-адреса"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
 msgid "MSS clamping"
 msgstr "Ограничение MSS"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
 msgid "Masquerading"
 msgstr "Маскарадинг"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:124
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
 msgid "Match"
 msgstr "Входящий трафик"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
 msgid "Match ICMP type"
 msgstr "Соответствовать ICMP типу"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
 msgid ""
 "Match incoming traffic directed at the given destination port or port range "
 "on this host"
@@ -465,22 +437,18 @@ msgstr ""
 "Порт или диапазон портов, входящие подключения на который будут "
 "перенаправляться на внутренний порт внутреннего IP-адреса (см. ниже)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
 msgid "Monday"
 msgstr "Понедельник"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
 msgid "Month Days"
 msgstr "Дни месяца"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:120
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:168
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:98
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
 msgid "Name"
 msgstr "Имя"
 
@@ -488,44 +456,22 @@ msgstr "Имя"
 msgid "Network"
 msgstr "Сеть"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "Новое правило SNAT"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "Новое правило перенаправления"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "Новое правило для входящего трафика"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "Новое перенаправление порта"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "Новый SNAT"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
 "Применять правило только для входящих подключений на указанный IP-адрес"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
 msgid "Only match incoming traffic from these MACs."
 msgstr "Применять правило только для входящего трафика от этих MAC-адресов."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 msgid "Only match incoming traffic from this IP or range."
 msgstr ""
 "Применять правило только для входящего трафика от этого IP-адреса или "
 "диапазона адресов."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
 msgid ""
 "Only match incoming traffic originating from the given source port or port "
 "range on the client host"
@@ -533,28 +479,19 @@ msgstr ""
 "Применять правило только для входящего трафика от указанного порта или "
 "диапазона портов клиентского хоста"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "Открыть порты на маршрутизаторе"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Другое..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Output"
 msgstr "Исходящий трафик"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 "Передаёт дополнительные аргументы таблице iptables. Используйте с "
 "осторожностью!"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -562,18 +499,18 @@ msgid ""
 "invalid values could render the firewall ruleset broken, completely exposing "
 "all services."
 msgstr ""
-"Передача аргументов iptables в правилах классификации входящего и исходящего трафика "
-"позволяет сопоставлять пакеты, основанные на других критериях, нежели чем интерфейсы "
-"или подсети. Эти опции следует использовать с особой осторожностью, так как неверные "
-"значения могут привести к нарушению работы правил межсетевого экрана, полностью "
-"открывая доступ ко всем службам системы."
+"Передача аргументов iptables в правилах классификации входящего и исходящего "
+"трафика позволяет сопоставлять пакеты, основанные на других критериях, "
+"нежели чем интерфейсы или подсети. Эти опции следует использовать с особой "
+"осторожностью, так как неверные значения могут привести к нарушению работы "
+"правил межсетевого экрана, полностью открывая доступ ко всем службам системы."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
 msgid "Port Forwards"
 msgstr "Перенаправление портов"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
@@ -581,7 +518,7 @@ msgstr ""
 "Перенаправленные портов позволяет удалённым компьютерам из Интернета "
 "соединяться с компьютером или службой внутри частной локальной сети."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
 msgid ""
 "Prevent the installation of <em>NOTRACK</em> rules which would bypass "
 "connection tracking."
@@ -589,21 +526,19 @@ msgstr ""
 "Предотвратить установку <em>NOTRACK</em> правил, которые позволяют обходить "
 "отслеживание соединений (connection tracking)."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:153
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:204
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
 msgid "Protocol"
 msgstr "Протокол"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: 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 ""
 "Перенаправлять трафик на указанный порт или диапазон портов внутреннего IP-"
 "адреса"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr "Перенаправлять трафик на указанный IP-адрес"
 
@@ -622,7 +557,7 @@ msgstr "Сбрасывать входящий трафик"
 msgid "Refuse output"
 msgstr "Сбрасывать исходящий трафик"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 "Требуется аппаратная поддержка NAT. Реализовано, по крайней мере, для mt7621"
@@ -631,20 +566,20 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr "Перезапустить межсетевой экран"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "Использовать маскарадинг только для указанных подсетей-получателей"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
 msgid "Restrict Masquerading to given source subnets"
 msgstr "Использовать маскарадинг только для указанных подсетей-отправителей"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:197
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
 msgid "Restrict to address family"
 msgstr "Использовать протокол"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
 msgid "Routing/NAT Offloading"
 msgstr "Маршрутизация/NAT offloading"
 
@@ -656,71 +591,69 @@ msgstr "Правило отключено"
 msgid "Rule is enabled"
 msgstr "Правило включено"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
 msgid "Saturday"
 msgstr "Суббота"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
 msgid "Software based offloading for routing/NAT"
 msgstr "Программная реализация offloading для маршрутизации/NAT"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
 msgid "Software flow offloading"
 msgstr "Программный flow offloading"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
 msgid "Source IP address"
 msgstr "IP-адрес источника"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
 msgid "Source MAC address"
 msgstr "MAC-адрес источника"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
 msgid "Source address"
 msgstr "Адрес источника"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
 msgid "Source port"
 msgstr "Порт источника"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:262
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
 msgid "Source zone"
 msgstr "Зона источника"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
 msgid "Start Date (yyyy-mm-dd)"
 msgstr "Дата начала (год-мес-день)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
 msgid "Start Time (hh.mm.ss)"
 msgstr "Время начала (чч.мм.сс)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
 msgid "Stop Date (yyyy-mm-dd)"
 msgstr "Дата окончания (год-мес-день)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
 msgid "Stop Time (hh.mm.ss)"
 msgstr "Время окончания (чч.мм.сс)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
 msgid "Sunday"
 msgstr "Воскресенье"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
 msgid ""
 "The firewall creates zones over your network interfaces to control network "
 "traffic flow."
 msgstr "Межсетевой экран создает зоны в вашей сети для контроля трафика."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:171
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:259
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -737,7 +670,7 @@ msgstr ""
 "перенаправление из lan в wan <em>'не'</em> допускает перенаправление трафика "
 "из wan в lan."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -752,15 +685,15 @@ msgstr ""
 "различными сетями внутри зоны. <em>'Использовать сети'</em> указывает, какие "
 "доступные сети являются членами этой зоны."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
 msgid "Thursday"
 msgstr "Четверг"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
 msgid "Time Restrictions"
 msgstr "Временные ограничения"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
 msgid "Time in UTC"
 msgstr "Время UTC"
 
@@ -780,20 +713,12 @@ msgstr "К %s на <var>этом устройстве</var>"
 msgid "To %s, %s in %s"
 msgstr "К %s, %s в %s"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr "К IP-адресу источника"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr "К порту источника"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
 msgid "Traffic Rules"
 msgstr "Правила для трафика"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
 "for example to reject traffic between certain hosts or to open WAN ports on "
@@ -803,25 +728,25 @@ msgstr ""
 "зонами, например, запрет трафика между некоторыми хостами или открытие WAN-"
 "портов маршрутизатора."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
 msgid "Tuesday"
 msgstr "Вторник"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:107
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
 msgid "Unnamed forward"
 msgstr "Перенаправление без имени"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:144
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
 msgid "Unnamed rule"
 msgstr "Правило без имени"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:99
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
 msgid "Unnamed zone"
 msgstr "Зона без имени"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
@@ -829,13 +754,13 @@ msgstr ""
 "Используйте эту опцию для классификации трафика зоны по сетевым устройствам, "
 "управляемым не через <em>uci</em>."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
 msgstr ""
-"Используйте эту опцию для классификации трафика зоны по источнику или подсети "
-"назначения вместо сети или устройств."
+"Используйте эту опцию для классификации трафика зоны по источнику или "
+"подсети назначения вместо сети или устройств."
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:72
 msgid "Via %s"
@@ -845,44 +770,44 @@ msgstr "Через %s"
 msgid "Via %s at %s"
 msgstr "Через %s, %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
 msgid "Wednesday"
 msgstr "Среда"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
 msgid "Week Days"
 msgstr "Дни недели"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
 msgid "Zone ⇒ Forwardings"
 msgstr "Зона ⇒ Перенаправления"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
 msgid "Zones"
 msgstr "Зоны"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:329
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
 msgid "accept"
 msgstr "принимать"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:254
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:222
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
 msgid "any"
 msgstr "любой"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
 msgid "any host"
@@ -896,7 +821,7 @@ msgstr "любой IP-адрес маршрутизатора"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr "любой зоны"
@@ -906,13 +831,13 @@ msgstr "любой зоны"
 msgid "day"
 msgstr "день"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
 msgid "don't track"
 msgstr "не отслеживать"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
 msgid "drop"
 msgstr "не обрабатывать"
 
@@ -943,9 +868,9 @@ msgstr "порт"
 msgid "ports"
 msgstr "порты"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:330
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
 msgid "reject"
 msgstr "отвергать"
 
@@ -954,6 +879,12 @@ msgstr "отвергать"
 msgid "second"
 msgstr "секунда"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
@@ -964,5 +895,44 @@ msgstr "тип"
 msgid "types"
 msgstr "типы"
 
+#~ msgid "Add"
+#~ msgstr "Добавить"
+
+#~ msgid "Add and edit..."
+#~ msgstr "Добавить и редактировать..."
+
+#~ msgid "Do not rewrite"
+#~ msgstr "Не перезаписывать"
+
+#~ msgid "External zone"
+#~ msgstr "Внешняя зона"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "Новое правило SNAT"
+
+#~ msgid "New forward rule"
+#~ msgstr "Новое правило перенаправления"
+
+#~ msgid "New input rule"
+#~ msgstr "Новое правило для входящего трафика"
+
+#~ msgid "New port forward"
+#~ msgstr "Новое перенаправление порта"
+
+#~ msgid "New source NAT"
+#~ msgstr "Новый SNAT"
+
+#~ msgid "Open ports on router"
+#~ msgstr "Открыть порты на маршрутизаторе"
+
+#~ msgid "Other..."
+#~ msgstr "Другое..."
+
+#~ msgid "To source IP"
+#~ msgstr "К IP-адресу источника"
+
+#~ msgid "To source port"
+#~ msgstr "К порту источника"
+
 #~ msgid "Output zone"
 #~ msgstr "Исходящая зона"
diff --git a/applications/luci-app-firewall/po/sk/firewall.po b/applications/luci-app-firewall/po/sk/firewall.po
index 9cc480774..40ea67f27 100644
--- a/applications/luci-app-firewall/po/sk/firewall.po
+++ b/applications/luci-app-firewall/po/sk/firewall.po
@@ -8,7 +8,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
 msgid "%s in %s"
 msgstr ""
 
@@ -17,7 +17,7 @@ msgstr ""
 msgid "%s%s with %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
 msgid "%s, %s in %s"
 msgstr ""
 
@@ -50,89 +50,77 @@ msgstr ""
 msgid "Accept output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:325
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
 msgid "Action"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
 "traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: 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:84
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
 msgid "Advanced Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
 msgid "Allow \"invalid\" traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
 msgid "Allow forward from <em>source zones</em>:"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
 msgid "Any"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:341
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
 msgid "Any day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
 msgid "Automatic helper assignment"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Conntrack helpers"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid "Covered devices"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
 msgid "Covered networks"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered subnets"
 msgstr ""
 
@@ -147,17 +135,15 @@ msgid ""
 "each firewall restart, right after the default ruleset has been loaded."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
 msgid "Destination address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
 msgid "Destination port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:299
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
 msgid "Destination zone"
 msgstr ""
 
@@ -180,17 +166,12 @@ msgstr ""
 msgid "Discard output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
@@ -206,64 +187,58 @@ msgstr ""
 msgid "Do not track output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:42
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
 msgid "Drop invalid packets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:148
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
 msgid "Enable NAT Loopback"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
 msgid "Enable SYN-flood protection"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
 msgid "Enable logging on this zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
 msgid "External IP address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:222
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
 msgid "External port"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:266
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
 msgid "Extra arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid "Extra destination arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid "Extra source arguments"
 msgstr ""
 
@@ -275,32 +250,32 @@ msgstr ""
 msgid "Firewall - Custom Rules"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
 msgid "Firewall - Port Forwards"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
 msgid "Firewall - Traffic Rules"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
 msgid "Firewall - Zone Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
 msgid "Force connection tracking"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
 msgid "Forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
 msgid "Forward to"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
 msgid "Friday"
 msgstr ""
 
@@ -331,15 +306,15 @@ msgstr ""
 msgid "From %s on <var>this device</var> with source %s and %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:99
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:135
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:37
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
+#: 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
 msgid "General Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
 msgid "Hardware flow offloading"
 msgstr ""
 
@@ -363,13 +338,13 @@ msgid "IPv4"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
 msgid "IPv4 and IPv6"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
 msgid "IPv4 only"
 msgstr ""
 
@@ -377,32 +352,29 @@ msgstr ""
 msgid "IPv6"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:187
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
 msgid "IPv6 only"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
 msgid "Internal IP address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
 msgid "Internal port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
 msgid "Internal zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
 msgid "Limit log messages"
 msgstr ""
 
@@ -416,45 +388,41 @@ msgstr ""
 msgid "MACs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
 msgid "MSS clamping"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
 msgid "Masquerading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:124
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
 msgid "Match"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
 msgid "Match ICMP type"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
 msgid ""
 "Match incoming traffic directed at the given destination port or port range "
 "on this host"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
 msgid "Monday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
 msgid "Month Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:120
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:168
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:98
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
 msgid "Name"
 msgstr ""
 
@@ -462,66 +430,35 @@ msgstr ""
 msgid "Network"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
 msgid "Only match incoming traffic from these MACs."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 msgid "Only match incoming traffic from this IP or range."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
 msgid ""
 "Only match incoming traffic originating from the given source port or port "
 "range on the client host"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -530,36 +467,34 @@ msgid ""
 "all services."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
 msgid "Port Forwards"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
 msgid ""
 "Prevent the installation of <em>NOTRACK</em> rules which would bypass "
 "connection tracking."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:153
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:204
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
 msgid "Protocol"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: 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 ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr ""
 
@@ -578,7 +513,7 @@ msgstr ""
 msgid "Refuse output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 
@@ -586,20 +521,20 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
 msgid "Restrict Masquerading to given destination subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
 msgid "Restrict Masquerading to given source subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:197
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
 msgid "Restrict to address family"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
 msgid "Routing/NAT Offloading"
 msgstr ""
 
@@ -611,71 +546,69 @@ msgstr ""
 msgid "Rule is enabled"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
 msgid "Saturday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
 msgid "Software based offloading for routing/NAT"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
 msgid "Software flow offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
 msgid "Source IP address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
 msgid "Source MAC address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
 msgid "Source address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
 msgid "Source port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:262
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
 msgid "Source zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
 msgid "Start Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
 msgid "Start Time (hh.mm.ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
 msgid "Stop Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
 msgid "Stop Time (hh.mm.ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
 msgid "Sunday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
 msgid ""
 "The firewall creates zones over your network interfaces to control network "
 "traffic flow."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:171
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:259
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -685,7 +618,7 @@ msgid ""
 "<em>not</em> imply a permission to forward from wan to lan as well."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -694,15 +627,15 @@ msgid ""
 "networks</em> specifies which available networks are members of this zone."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
 msgid "Thursday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
 msgid "Time Restrictions"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
 msgid "Time in UTC"
 msgstr ""
 
@@ -722,51 +655,43 @@ msgstr ""
 msgid "To %s, %s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
 msgid "Traffic Rules"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
 "for example to reject traffic between certain hosts or to open WAN ports on "
 "the router."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
 msgid "Tuesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:107
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
 msgid "Unnamed forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:144
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
 msgid "Unnamed rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:99
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
 msgid "Unnamed zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -780,44 +705,44 @@ msgstr ""
 msgid "Via %s at %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
 msgid "Wednesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
 msgid "Week Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
 msgid "Zone ⇒ Forwardings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
 msgid "Zones"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:329
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
 msgid "accept"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:254
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:222
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
 msgid "any"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
 msgid "any host"
@@ -831,7 +756,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr ""
@@ -841,13 +766,13 @@ msgstr ""
 msgid "day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
 msgid "don't track"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
 msgid "drop"
 msgstr ""
 
@@ -878,9 +803,9 @@ msgstr ""
 msgid "ports"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:330
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
 msgid "reject"
 msgstr ""
 
@@ -889,6 +814,12 @@ msgstr ""
 msgid "second"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
diff --git a/applications/luci-app-firewall/po/sv/firewall.po b/applications/luci-app-firewall/po/sv/firewall.po
index b36b4cda1..d885c0398 100644
--- a/applications/luci-app-firewall/po/sv/firewall.po
+++ b/applications/luci-app-firewall/po/sv/firewall.po
@@ -9,7 +9,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
 msgid "%s in %s"
 msgstr "%s i %s"
 
@@ -18,7 +18,7 @@ msgstr "%s i %s"
 msgid "%s%s with %s"
 msgstr "%s%s med %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
 msgid "%s, %s in %s"
 msgstr "%2, %s i %s"
 
@@ -51,89 +51,77 @@ msgstr ""
 msgid "Accept output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:325
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
 msgid "Action"
 msgstr "Åtgärd"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "Lägg till"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "Lägg till och redigera..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
 "traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: 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:84
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
 msgid "Advanced Settings"
 msgstr "Avancerade inställningar"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
 msgid "Allow \"invalid\" traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Tillåt vidarebefordring från <em>källzonerna</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "Till vidarebefordring till <em>destinationszonerna:</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
 msgid "Any"
 msgstr "Alla"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:341
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
 msgid "Any day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
 msgid "Automatic helper assignment"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Conntrack helpers"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid "Covered devices"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
 msgid "Covered networks"
 msgstr "Nätverk som omfattas"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered subnets"
 msgstr ""
 
@@ -148,17 +136,15 @@ msgid ""
 "each firewall restart, right after the default ruleset has been loaded."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
 msgid "Destination address"
 msgstr "Destinationens adress"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
 msgid "Destination port"
 msgstr "Destinationsport"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:299
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
 msgid "Destination zone"
 msgstr "Destinationens zon"
 
@@ -181,17 +167,12 @@ msgstr ""
 msgid "Discard output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "Skriv inte om igen"
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
@@ -207,64 +188,58 @@ msgstr ""
 msgid "Do not track output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:42
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
 msgid "Drop invalid packets"
 msgstr "Släpp ogiltiga paket"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:148
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr "Aktivera"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
 msgid "Enable NAT Loopback"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
 msgid "Enable SYN-flood protection"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
 msgid "Enable logging on this zone"
 msgstr "Aktivera loggning i den här zonen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
 msgid "External IP address"
 msgstr "Extern IP-adress"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:222
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
 msgid "External port"
 msgstr "Extern port"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "Extern zon"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:266
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
 msgid "Extra arguments"
 msgstr "Extra argument"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid "Extra destination arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid "Extra source arguments"
 msgstr ""
 
@@ -276,32 +251,32 @@ msgstr "Brandvägg"
 msgid "Firewall - Custom Rules"
 msgstr "Brandvägg - Anpassade regler"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
 msgid "Firewall - Port Forwards"
 msgstr "Brandvägg - Vidarebefordring av port"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
 msgid "Firewall - Traffic Rules"
 msgstr "Brandvägg - Trafikregler"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
 msgid "Firewall - Zone Settings"
 msgstr "Brandvägg - Zoninställningar"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
 msgid "Force connection tracking"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
 msgid "Forward"
 msgstr "Vidarebefordra"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
 msgid "Forward to"
 msgstr "Vidarebefordra till"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
 msgid "Friday"
 msgstr "Fredag"
 
@@ -332,15 +307,15 @@ msgstr ""
 msgid "From %s on <var>this device</var> with source %s and %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:99
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:135
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:37
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
+#: 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
 msgid "General Settings"
 msgstr "Generella inställningar"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
 msgid "Hardware flow offloading"
 msgstr ""
 
@@ -364,13 +339,13 @@ msgid "IPv4"
 msgstr "IPv4"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
 msgid "IPv4 and IPv6"
 msgstr "IPv4 och IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
 msgid "IPv4 only"
 msgstr "Endast IPv4"
 
@@ -378,32 +353,29 @@ msgstr "Endast IPv4"
 msgid "IPv6"
 msgstr "IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:187
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
 msgid "IPv6 only"
 msgstr "Endast IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Input"
 msgstr "Inmatning"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
 msgid "Internal IP address"
 msgstr "Intern IP-adress"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
 msgid "Internal port"
 msgstr "Intern port"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
 msgid "Internal zone"
 msgstr "Intern zon"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
 msgid "Limit log messages"
 msgstr "Begränsa loggmeddelanden"
 
@@ -417,24 +389,24 @@ msgstr ""
 msgid "MACs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
 msgid "MSS clamping"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
 msgid "Masquerading"
 msgstr "Maskering"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:124
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
 msgid "Match"
 msgstr "Matcha"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
 msgid "Match ICMP type"
 msgstr "Matchar ICMP-typ"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
 msgid ""
 "Match incoming traffic directed at the given destination port or port range "
 "on this host"
@@ -442,22 +414,18 @@ msgstr ""
 "Matcha inkommande trafik dirigerad till den angivna destinationsporten eller "
 "portens räckvidd på den här värden"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
 msgid "Monday"
 msgstr "MÃ¥ndag"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
 msgid "Month Days"
 msgstr "Dagar i månaden"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:120
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:168
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:98
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
 msgid "Name"
 msgstr "Namn"
 
@@ -465,67 +433,36 @@ msgstr "Namn"
 msgid "Network"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "Ny SNAT-regel"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "Ny regel för vidarebefordring"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "Ny inmatningsregel"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "Ny vidarebefordring av port"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "Ny käll-NAT"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
 msgid "Only match incoming traffic from these MACs."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 msgid "Only match incoming traffic from this IP or range."
 msgstr ""
 "Matcha endast inkommande trafik från den här IP-adressen eller räckvidden."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
 msgid ""
 "Only match incoming traffic originating from the given source port or port "
 "range on the client host"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "Öppna portar i router"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Andra..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Output"
 msgstr "Utmatning"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -534,36 +471,34 @@ msgid ""
 "all services."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
 msgid "Port Forwards"
 msgstr "Vidarebefordringar av port"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
 msgid ""
 "Prevent the installation of <em>NOTRACK</em> rules which would bypass "
 "connection tracking."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:153
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:204
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: 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 ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr ""
 
@@ -582,7 +517,7 @@ msgstr ""
 msgid "Refuse output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 
@@ -590,20 +525,20 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr "Starta om brandvägg"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
 msgid "Restrict Masquerading to given destination subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
 msgid "Restrict Masquerading to given source subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:197
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
 msgid "Restrict to address family"
 msgstr "Begränsa till adressfamilj"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
 msgid "Routing/NAT Offloading"
 msgstr ""
 
@@ -615,71 +550,69 @@ msgstr ""
 msgid "Rule is enabled"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
 msgid "Saturday"
 msgstr "Lördag"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
 msgid "Software based offloading for routing/NAT"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
 msgid "Software flow offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
 msgid "Source IP address"
 msgstr "IP-adress för källa"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
 msgid "Source MAC address"
 msgstr "MAC-adress för källa"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
 msgid "Source address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
 msgid "Source port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:262
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
 msgid "Source zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
 msgid "Start Date (yyyy-mm-dd)"
 msgstr "Startdatum (åååå-mm-dd)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
 msgid "Start Time (hh.mm.ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
 msgid "Stop Date (yyyy-mm-dd)"
 msgstr "Stopptid (åååå-mm-dd)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
 msgid "Stop Time (hh.mm.ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
 msgid "Sunday"
 msgstr "Söndag"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
 msgid ""
 "The firewall creates zones over your network interfaces to control network "
 "traffic flow."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:171
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:259
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -689,7 +622,7 @@ msgid ""
 "<em>not</em> imply a permission to forward from wan to lan as well."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -698,15 +631,15 @@ msgid ""
 "networks</em> specifies which available networks are members of this zone."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
 msgid "Time Restrictions"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
 msgid "Time in UTC"
 msgstr "Tid enligt UTC"
 
@@ -726,51 +659,43 @@ msgstr "Till %s på <var>den här enheten</var>"
 msgid "To %s, %s in %s"
 msgstr "Till %s, %s i %s"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
 msgid "Traffic Rules"
 msgstr "Trafikregler"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
 "for example to reject traffic between certain hosts or to open WAN ports on "
 "the router."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
 msgid "Tuesday"
 msgstr "Tisdag"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:107
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
 msgid "Unnamed forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:144
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
 msgid "Unnamed rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:99
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
 msgid "Unnamed zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -784,44 +709,44 @@ msgstr "Via %s"
 msgid "Via %s at %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
 msgid "Week Days"
 msgstr "Veckodagar"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
 msgid "Zone ⇒ Forwardings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
 msgid "Zones"
 msgstr "Zoner"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:329
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
 msgid "accept"
 msgstr "acceptera"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:254
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:222
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
 msgid "any"
 msgstr "alla"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
 msgid "any host"
@@ -835,7 +760,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr "alla zoner"
@@ -845,13 +770,13 @@ msgstr "alla zoner"
 msgid "day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
 msgid "don't track"
 msgstr "spåra inte"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
 msgid "drop"
 msgstr "släpp"
 
@@ -882,9 +807,9 @@ msgstr ""
 msgid "ports"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:330
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
 msgid "reject"
 msgstr "neka"
 
@@ -893,6 +818,12 @@ msgstr "neka"
 msgid "second"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
@@ -903,6 +834,39 @@ msgstr ""
 msgid "types"
 msgstr ""
 
+#~ msgid "Add"
+#~ msgstr "Lägg till"
+
+#~ msgid "Add and edit..."
+#~ msgstr "Lägg till och redigera..."
+
+#~ msgid "Do not rewrite"
+#~ msgstr "Skriv inte om igen"
+
+#~ msgid "External zone"
+#~ msgstr "Extern zon"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "Ny SNAT-regel"
+
+#~ msgid "New forward rule"
+#~ msgstr "Ny regel för vidarebefordring"
+
+#~ msgid "New input rule"
+#~ msgstr "Ny inmatningsregel"
+
+#~ msgid "New port forward"
+#~ msgstr "Ny vidarebefordring av port"
+
+#~ msgid "New source NAT"
+#~ msgstr "Ny käll-NAT"
+
+#~ msgid "Open ports on router"
+#~ msgstr "Öppna portar i router"
+
+#~ msgid "Other..."
+#~ msgstr "Andra..."
+
 #~ msgid "(Unnamed Entry)"
 #~ msgstr "(Namnlös post)"
 
diff --git a/applications/luci-app-firewall/po/templates/firewall.pot b/applications/luci-app-firewall/po/templates/firewall.pot
index d645720a7..492d8aa8e 100644
--- a/applications/luci-app-firewall/po/templates/firewall.pot
+++ b/applications/luci-app-firewall/po/templates/firewall.pot
@@ -1,7 +1,7 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=UTF-8"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
 msgid "%s in %s"
 msgstr ""
 
@@ -10,7 +10,7 @@ msgstr ""
 msgid "%s%s with %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
 msgid "%s, %s in %s"
 msgstr ""
 
@@ -43,89 +43,77 @@ msgstr ""
 msgid "Accept output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:325
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
 msgid "Action"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
 "traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: 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:84
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
 msgid "Advanced Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
 msgid "Allow \"invalid\" traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
 msgid "Allow forward from <em>source zones</em>:"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
 msgid "Any"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:341
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
 msgid "Any day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
 msgid "Automatic helper assignment"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Conntrack helpers"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid "Covered devices"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
 msgid "Covered networks"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered subnets"
 msgstr ""
 
@@ -140,17 +128,15 @@ msgid ""
 "each firewall restart, right after the default ruleset has been loaded."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
 msgid "Destination address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
 msgid "Destination port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:299
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
 msgid "Destination zone"
 msgstr ""
 
@@ -173,17 +159,12 @@ msgstr ""
 msgid "Discard output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
@@ -199,64 +180,58 @@ msgstr ""
 msgid "Do not track output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:42
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
 msgid "Drop invalid packets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:148
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
 msgid "Enable NAT Loopback"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
 msgid "Enable SYN-flood protection"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
 msgid "Enable logging on this zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
 msgid "External IP address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:222
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
 msgid "External port"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:266
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
 msgid "Extra arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid "Extra destination arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid "Extra source arguments"
 msgstr ""
 
@@ -268,32 +243,32 @@ msgstr ""
 msgid "Firewall - Custom Rules"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
 msgid "Firewall - Port Forwards"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
 msgid "Firewall - Traffic Rules"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
 msgid "Firewall - Zone Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
 msgid "Force connection tracking"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
 msgid "Forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
 msgid "Forward to"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
 msgid "Friday"
 msgstr ""
 
@@ -324,15 +299,15 @@ msgstr ""
 msgid "From %s on <var>this device</var> with source %s and %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:99
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:135
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:37
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
+#: 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
 msgid "General Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
 msgid "Hardware flow offloading"
 msgstr ""
 
@@ -356,13 +331,13 @@ msgid "IPv4"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
 msgid "IPv4 and IPv6"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
 msgid "IPv4 only"
 msgstr ""
 
@@ -370,32 +345,29 @@ msgstr ""
 msgid "IPv6"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:187
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
 msgid "IPv6 only"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
 msgid "Internal IP address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
 msgid "Internal port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
 msgid "Internal zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
 msgid "Limit log messages"
 msgstr ""
 
@@ -409,45 +381,41 @@ msgstr ""
 msgid "MACs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
 msgid "MSS clamping"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
 msgid "Masquerading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:124
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
 msgid "Match"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
 msgid "Match ICMP type"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
 msgid ""
 "Match incoming traffic directed at the given destination port or port range "
 "on this host"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
 msgid "Monday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
 msgid "Month Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:120
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:168
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:98
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
 msgid "Name"
 msgstr ""
 
@@ -455,66 +423,35 @@ msgstr ""
 msgid "Network"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
 msgid "Only match incoming traffic from these MACs."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 msgid "Only match incoming traffic from this IP or range."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
 msgid ""
 "Only match incoming traffic originating from the given source port or port "
 "range on the client host"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -523,36 +460,34 @@ msgid ""
 "all services."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
 msgid "Port Forwards"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
 msgid ""
 "Prevent the installation of <em>NOTRACK</em> rules which would bypass "
 "connection tracking."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:153
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:204
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
 msgid "Protocol"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: 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 ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr ""
 
@@ -571,7 +506,7 @@ msgstr ""
 msgid "Refuse output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 
@@ -579,20 +514,20 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
 msgid "Restrict Masquerading to given destination subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
 msgid "Restrict Masquerading to given source subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:197
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
 msgid "Restrict to address family"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
 msgid "Routing/NAT Offloading"
 msgstr ""
 
@@ -604,71 +539,69 @@ msgstr ""
 msgid "Rule is enabled"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
 msgid "Saturday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
 msgid "Software based offloading for routing/NAT"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
 msgid "Software flow offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
 msgid "Source IP address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
 msgid "Source MAC address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
 msgid "Source address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
 msgid "Source port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:262
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
 msgid "Source zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
 msgid "Start Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
 msgid "Start Time (hh.mm.ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
 msgid "Stop Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
 msgid "Stop Time (hh.mm.ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
 msgid "Sunday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
 msgid ""
 "The firewall creates zones over your network interfaces to control network "
 "traffic flow."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:171
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:259
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -678,7 +611,7 @@ msgid ""
 "<em>not</em> imply a permission to forward from wan to lan as well."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -687,15 +620,15 @@ msgid ""
 "networks</em> specifies which available networks are members of this zone."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
 msgid "Thursday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
 msgid "Time Restrictions"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
 msgid "Time in UTC"
 msgstr ""
 
@@ -715,51 +648,43 @@ msgstr ""
 msgid "To %s, %s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
 msgid "Traffic Rules"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
 "for example to reject traffic between certain hosts or to open WAN ports on "
 "the router."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
 msgid "Tuesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:107
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
 msgid "Unnamed forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:144
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
 msgid "Unnamed rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:99
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
 msgid "Unnamed zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -773,44 +698,44 @@ msgstr ""
 msgid "Via %s at %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
 msgid "Wednesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
 msgid "Week Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
 msgid "Zone ⇒ Forwardings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
 msgid "Zones"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:329
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
 msgid "accept"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:254
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:222
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
 msgid "any"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
 msgid "any host"
@@ -824,7 +749,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr ""
@@ -834,13 +759,13 @@ msgstr ""
 msgid "day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
 msgid "don't track"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
 msgid "drop"
 msgstr ""
 
@@ -871,9 +796,9 @@ msgstr ""
 msgid "ports"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:330
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
 msgid "reject"
 msgstr ""
 
@@ -882,6 +807,12 @@ msgstr ""
 msgid "second"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
diff --git a/applications/luci-app-firewall/po/tr/firewall.po b/applications/luci-app-firewall/po/tr/firewall.po
index 5dc20d7ac..111330637 100644
--- a/applications/luci-app-firewall/po/tr/firewall.po
+++ b/applications/luci-app-firewall/po/tr/firewall.po
@@ -8,7 +8,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
 msgid "%s in %s"
 msgstr ""
 
@@ -17,7 +17,7 @@ msgstr ""
 msgid "%s%s with %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
 msgid "%s, %s in %s"
 msgstr ""
 
@@ -50,89 +50,77 @@ msgstr ""
 msgid "Accept output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:325
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
 msgid "Action"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
 "traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: 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:84
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
 msgid "Advanced Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
 msgid "Allow \"invalid\" traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
 msgid "Allow forward from <em>source zones</em>:"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
 msgid "Any"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:341
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
 msgid "Any day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
 msgid "Automatic helper assignment"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Conntrack helpers"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid "Covered devices"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
 msgid "Covered networks"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered subnets"
 msgstr ""
 
@@ -147,17 +135,15 @@ msgid ""
 "each firewall restart, right after the default ruleset has been loaded."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
 msgid "Destination address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
 msgid "Destination port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:299
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
 msgid "Destination zone"
 msgstr ""
 
@@ -180,17 +166,12 @@ msgstr ""
 msgid "Discard output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
@@ -206,64 +187,58 @@ msgstr ""
 msgid "Do not track output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:42
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
 msgid "Drop invalid packets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:148
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
 msgid "Enable NAT Loopback"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
 msgid "Enable SYN-flood protection"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
 msgid "Enable logging on this zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
 msgid "External IP address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:222
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
 msgid "External port"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:266
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
 msgid "Extra arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid "Extra destination arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid "Extra source arguments"
 msgstr ""
 
@@ -275,32 +250,32 @@ msgstr ""
 msgid "Firewall - Custom Rules"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
 msgid "Firewall - Port Forwards"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
 msgid "Firewall - Traffic Rules"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
 msgid "Firewall - Zone Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
 msgid "Force connection tracking"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
 msgid "Forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
 msgid "Forward to"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
 msgid "Friday"
 msgstr ""
 
@@ -331,15 +306,15 @@ msgstr ""
 msgid "From %s on <var>this device</var> with source %s and %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:99
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:135
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:37
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
+#: 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
 msgid "General Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
 msgid "Hardware flow offloading"
 msgstr ""
 
@@ -363,13 +338,13 @@ msgid "IPv4"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
 msgid "IPv4 and IPv6"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
 msgid "IPv4 only"
 msgstr ""
 
@@ -377,32 +352,29 @@ msgstr ""
 msgid "IPv6"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:187
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
 msgid "IPv6 only"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
 msgid "Internal IP address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
 msgid "Internal port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
 msgid "Internal zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
 msgid "Limit log messages"
 msgstr ""
 
@@ -416,45 +388,41 @@ msgstr ""
 msgid "MACs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
 msgid "MSS clamping"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
 msgid "Masquerading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:124
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
 msgid "Match"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
 msgid "Match ICMP type"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
 msgid ""
 "Match incoming traffic directed at the given destination port or port range "
 "on this host"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
 msgid "Monday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
 msgid "Month Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:120
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:168
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:98
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
 msgid "Name"
 msgstr ""
 
@@ -462,66 +430,35 @@ msgstr ""
 msgid "Network"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
 msgid "Only match incoming traffic from these MACs."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 msgid "Only match incoming traffic from this IP or range."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
 msgid ""
 "Only match incoming traffic originating from the given source port or port "
 "range on the client host"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -530,36 +467,34 @@ msgid ""
 "all services."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
 msgid "Port Forwards"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
 msgid ""
 "Prevent the installation of <em>NOTRACK</em> rules which would bypass "
 "connection tracking."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:153
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:204
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
 msgid "Protocol"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: 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 ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr ""
 
@@ -578,7 +513,7 @@ msgstr ""
 msgid "Refuse output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 
@@ -586,20 +521,20 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
 msgid "Restrict Masquerading to given destination subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
 msgid "Restrict Masquerading to given source subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:197
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
 msgid "Restrict to address family"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
 msgid "Routing/NAT Offloading"
 msgstr ""
 
@@ -611,71 +546,69 @@ msgstr ""
 msgid "Rule is enabled"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
 msgid "Saturday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
 msgid "Software based offloading for routing/NAT"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
 msgid "Software flow offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
 msgid "Source IP address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
 msgid "Source MAC address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
 msgid "Source address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
 msgid "Source port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:262
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
 msgid "Source zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
 msgid "Start Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
 msgid "Start Time (hh.mm.ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
 msgid "Stop Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
 msgid "Stop Time (hh.mm.ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
 msgid "Sunday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
 msgid ""
 "The firewall creates zones over your network interfaces to control network "
 "traffic flow."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:171
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:259
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -685,7 +618,7 @@ msgid ""
 "<em>not</em> imply a permission to forward from wan to lan as well."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -694,15 +627,15 @@ msgid ""
 "networks</em> specifies which available networks are members of this zone."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
 msgid "Thursday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
 msgid "Time Restrictions"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
 msgid "Time in UTC"
 msgstr ""
 
@@ -722,51 +655,43 @@ msgstr ""
 msgid "To %s, %s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
 msgid "Traffic Rules"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
 "for example to reject traffic between certain hosts or to open WAN ports on "
 "the router."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
 msgid "Tuesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:107
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
 msgid "Unnamed forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:144
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
 msgid "Unnamed rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:99
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
 msgid "Unnamed zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -780,44 +705,44 @@ msgstr ""
 msgid "Via %s at %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
 msgid "Wednesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
 msgid "Week Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
 msgid "Zone ⇒ Forwardings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
 msgid "Zones"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:329
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
 msgid "accept"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:254
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:222
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
 msgid "any"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
 msgid "any host"
@@ -831,7 +756,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr ""
@@ -841,13 +766,13 @@ msgstr ""
 msgid "day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
 msgid "don't track"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
 msgid "drop"
 msgstr ""
 
@@ -878,9 +803,9 @@ msgstr ""
 msgid "ports"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:330
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
 msgid "reject"
 msgstr ""
 
@@ -889,6 +814,12 @@ msgstr ""
 msgid "second"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
diff --git a/applications/luci-app-firewall/po/uk/firewall.po b/applications/luci-app-firewall/po/uk/firewall.po
index 17810618e..8dd0b5a0a 100644
--- a/applications/luci-app-firewall/po/uk/firewall.po
+++ b/applications/luci-app-firewall/po/uk/firewall.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"PO-Revision-Date: 2019-07-30 02:30+0300\n"
+"PO-Revision-Date: 2019-09-21 22:10+0300\n"
 "Last-Translator: Yurii <yuripet@gmail.com>\n"
 "Language-Team: none\n"
 "Language: uk\n"
@@ -9,7 +9,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
 msgid "%s in %s"
 msgstr "%s у %s"
 
@@ -18,7 +18,7 @@ msgstr "%s у %s"
 msgid "%s%s with %s"
 msgstr "%s%s із %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
 msgid "%s, %s in %s"
 msgstr "%s, %s у %s"
 
@@ -51,102 +51,90 @@ msgstr "Приймати вхідний"
 msgid "Accept output"
 msgstr "Приймати вихідний"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:325
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
 msgid "Action"
 msgstr "Дія"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "Додати"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "Додати та редагувати..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
 "traffic."
 msgstr ""
 "Додаткові аргументи raw <em>iptables</em> для класифікації трафіку "
-"призначення зони, наприклад, <code>-p tcp --dport 443</code>, щоб "
-"зіставляти лише вихідний трафік HTTPS."
+"призначення зони, наприклад, <code>-p tcp --dport 443</code>, щоб зіставляти "
+"лише вихідний трафік HTTPS."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
 msgstr ""
-"Додаткові аргументи raw <em>iptables</em> для класифікації трафіку "
-"джерела зони, наприклад, <code>-p tcp --sport 443</code>, щоб "
-"зіставляти лише вхідний трафік HTTPS."
+"Додаткові аргументи raw <em>iptables</em> для класифікації трафіку джерела "
+"зони, наприклад, <code>-p tcp --sport 443</code>, щоб зіставляти лише "
+"вхідний трафік HTTPS."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: 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:84
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
 msgid "Advanced Settings"
 msgstr "Розширені настройки"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
 msgid "Allow \"invalid\" traffic"
 msgstr "Дозволити \"неправильний\" трафік"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Дозволити переспрямовування від <em>зон джерела</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "Дозволити переспрямовування до <em>зон призначення</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
 msgid "Any"
 msgstr "Будь-який"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:341
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
 msgid "Any day"
 msgstr "Будь-який день"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
 msgid "Automatic helper assignment"
 msgstr "Автоматичне призначення помічника"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
-"Автоматично призначати помічників відслідковування з'єднань (<abbr "
-"title=\"Connection tracking\">Conntrack</abbr>) на підставі протоколу та "
-"порту трафіку"
+"Автоматично призначати помічників відслідковування з'єднань (<abbr title="
+"\"Connection tracking\">Conntrack</abbr>) на підставі протоколу та порту "
+"трафіку"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
 msgid "Conntrack Settings"
 msgstr ""
-"Параметри відслідковування з'єднань (<abbr title=\"Connection tracking\">""
-"Conntrack</abbr>)"
+"Параметри відслідковування з'єднань (<abbr title=\"Connection tracking"
+"\">Conntrack</abbr>)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Conntrack helpers"
 msgstr ""
-"Помічники відслідковування з'єднань (<abbr title=\"Connection tracking\">"
-"Conntrack</abbr>)"
+"Помічники відслідковування з'єднань (<abbr title=\"Connection tracking"
+"\">Conntrack</abbr>)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid "Covered devices"
 msgstr "Охоплені пристрої"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
 msgid "Covered networks"
 msgstr "Охоплені мережі"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered subnets"
 msgstr "Охоплені підмережі"
 
@@ -165,17 +153,15 @@ msgstr ""
 "виконуються після кожного перезавантаження брандмауера, відразу після "
 "завантаження типового набору правил."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
 msgid "Destination address"
 msgstr "Адреса призначення"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
 msgid "Destination port"
 msgstr "Порт призначення"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:299
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
 msgid "Destination zone"
 msgstr "Зона призначення"
 
@@ -198,19 +184,14 @@ msgstr "Відкидати вхідний"
 msgid "Discard output"
 msgstr "Відкидати вихідний"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
 msgstr ""
-"Не встановлювати додаткові правила для відхилення переспрямованого трафіку зі "
-"станом відслідковування з'єднань <em>invalid</em>. Це може знадобитися для "
-"складних налаштувань асиметричного маршруту."
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "Не перезаписувати"
+"Не встановлювати додаткові правила для відхилення переспрямованого трафіку "
+"зі станом відслідковування з'єднань <em>invalid</em>. Це може знадобитися "
+"для складних налаштувань асиметричного маршруту."
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
@@ -227,64 +208,60 @@ msgstr "Не відслідковувати вхідний"
 msgid "Do not track output"
 msgstr "Не відслідковувати вихідний"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:42
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
 msgid "Drop invalid packets"
 msgstr "Відкидати помилкові пакети"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:148
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr "Увімкнути"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
 msgid "Enable NAT Loopback"
 msgstr "Увімкнути NAT Loopback"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
 msgid "Enable SYN-flood protection"
 msgstr "Увімкнути захист від SYN-flood"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
 msgid "Enable logging on this zone"
 msgstr "Увімкнути реєстрування у цій зоні"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr "Експериментальна функція. Не повністю сумісно з QoS / SQM."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
-msgstr "В явному вигляді дозволені помічники відслідковування з'єднань для трафіку зони"
+msgstr ""
+"В явному вигляді дозволені помічники відслідковування з'єднань для трафіку "
+"зони"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
 msgid "External IP address"
 msgstr "Зовнішня IP-адреса"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:222
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
 msgid "External port"
 msgstr "Зовнішній порт"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "Зовнішня зона"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:266
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
 msgid "Extra arguments"
 msgstr "Додаткові аргументи"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid "Extra destination arguments"
 msgstr "Додаткові аргументи для призначення"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
 msgid "Extra iptables arguments"
 msgstr "Додаткові аргументи iptables"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid "Extra source arguments"
 msgstr "Додаткові аргументи для джерела"
 
@@ -296,32 +273,32 @@ msgstr "Брандмауер"
 msgid "Firewall - Custom Rules"
 msgstr "Брандмауер — Настроювані правила"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
 msgid "Firewall - Port Forwards"
 msgstr "Брандмауер — Переспрямовування портів"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
 msgid "Firewall - Traffic Rules"
 msgstr "Брандмауер — Правила трафіка"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
 msgid "Firewall - Zone Settings"
 msgstr "Брандмауер — Параметри зон"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
 msgid "Force connection tracking"
 msgstr "Примусове відслідковування з'єднань"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
 msgid "Forward"
 msgstr "Переспрямовування"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
 msgid "Forward to"
 msgstr "переспрямовування до"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
 msgid "Friday"
 msgstr "П'ятниця"
 
@@ -352,15 +329,15 @@ msgstr "Від %s на <var>цьому пристрої</var> з джерело
 msgid "From %s on <var>this device</var> with source %s and %s"
 msgstr "Від %s на <var>цьому пристрої</var> з джерелом %s та %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:99
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:135
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:37
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
+#: 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
 msgid "General Settings"
 msgstr "Загальні параметри"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
 msgid "Hardware flow offloading"
 msgstr "Апаратні засоби розвантаження потоку"
 
@@ -384,13 +361,13 @@ msgid "IPv4"
 msgstr "IPv4"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
 msgid "IPv4 and IPv6"
 msgstr "IPv4 та IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
 msgid "IPv4 only"
 msgstr "Лише IPv4"
 
@@ -398,32 +375,29 @@ msgstr "Лише IPv4"
 msgid "IPv6"
 msgstr "IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:187
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
 msgid "IPv6 only"
 msgstr "Лише IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Input"
 msgstr "Вхідний"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
 msgid "Internal IP address"
 msgstr "Внутрішня IP-адреса"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
 msgid "Internal port"
 msgstr "Внутрішній порт"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
 msgid "Internal zone"
 msgstr "Внутрішня зона"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
 msgid "Limit log messages"
 msgstr "Обмеження повідомлень журналу"
 
@@ -437,24 +411,24 @@ msgstr "MAC-адреса"
 msgid "MACs"
 msgstr "MAC-адреси"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
 msgid "MSS clamping"
 msgstr "Затискання MSS"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
 msgid "Masquerading"
 msgstr "Підміна"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:124
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
 msgid "Match"
 msgstr "Зіставляти"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
 msgid "Match ICMP type"
 msgstr "Зіставляти ICMP типу"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
 msgid ""
 "Match incoming traffic directed at the given destination port or port range "
 "on this host"
@@ -462,22 +436,18 @@ msgstr ""
 "Зіставляти вхідний трафік, спрямований на заданий порт призначення або "
 "діапазон портів цього вузла."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
 msgid "Monday"
 msgstr "Понеділок"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
 msgid "Month Days"
 msgstr "Дні місяця"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:120
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:168
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:98
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
 msgid "Name"
 msgstr "Ім'я"
 
@@ -485,41 +455,19 @@ msgstr "Ім'я"
 msgid "Network"
 msgstr "Мережа"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "Нове правило SNAT"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "Нове правило переспрямовування"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "Нове вхідне правило"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "Нове переспрямовування порту"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "Новий NAT джерела"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr "Зіставляти тільки вхідний трафік, спрямований на задану IP-адресу."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
 msgid "Only match incoming traffic from these MACs."
 msgstr "Зіставляти тільки вхідний трафік від цих MAC-адрес."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 msgid "Only match incoming traffic from this IP or range."
 msgstr "Зіставляти тільки вхідний трафік від цього IP чи діапазону."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
 msgid ""
 "Only match incoming traffic originating from the given source port or port "
 "range on the client host"
@@ -527,27 +475,18 @@ msgstr ""
 "Зіставляти тільки вхідний трафік, що виникає на заданому порту джерела або "
 "діапазоні портів вузла клієнта."
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "Відкрити порти на роутері"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Інше..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Output"
 msgstr "Вихідний"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 "Передача додаткових аргументів для IPTables. Використовуйте з обережністю!"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -556,17 +495,17 @@ msgid ""
 "all services."
 msgstr ""
 "Передавання аргументів raw iptables до правил класифікації вихідного трафіку "
-"та трафіку призначення дозволяє зіставляти пакети на підставі інших критеріїв, "
-"ніж інтерфейси чи підмережі. Ці параметри слід використовувати з особливою "
-"обережністю, оскільки невірні значення можуть призвести до порушення набору "
-"правил брандмауера, повністю відкриваючи всі служби."
+"та трафіку призначення дозволяє зіставляти пакети на підставі інших "
+"критеріїв, ніж інтерфейси чи підмережі. Ці параметри слід використовувати з "
+"особливою обережністю, оскільки невірні значення можуть призвести до "
+"порушення набору правил брандмауера, повністю відкриваючи всі служби."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
 msgid "Port Forwards"
 msgstr "Переспрямовування портів"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
@@ -574,7 +513,7 @@ msgstr ""
 "Переспрямовування портів дозволяє віддаленим комп'ютерам з Інтернету "
 "підключатися до певного комп'ютера або служби у приватній мережі."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
 msgid ""
 "Prevent the installation of <em>NOTRACK</em> rules which would bypass "
 "connection tracking."
@@ -582,20 +521,18 @@ msgstr ""
 "Запобігати встановленню правил NOTRACK, які могли б обійти відслідковування "
 "з'єднань."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:153
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:204
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
 msgid "Protocol"
 msgstr "Протокол"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: 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 ""
 "Переспрямувати відповідний вхідний трафік на заданий порт внутрішнього вузла"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr "Переспрямувати відповідний вхідний трафік на заданий внутрішній вузол"
 
@@ -614,7 +551,7 @@ msgstr "Відхиляти вхідний"
 msgid "Refuse output"
 msgstr "Відхиляти вихідний"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr "Необхідна апаратна підтримка NAT. Упроваджено принаймні для mt7621"
 
@@ -622,20 +559,20 @@ msgstr "Необхідна апаратна підтримка NAT. Упрова
 msgid "Restart Firewall"
 msgstr "Перезавантажити брандмауер"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "Обмежити підміну заданими підмережами призначення"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
 msgid "Restrict Masquerading to given source subnets"
 msgstr "Обмежити підміну заданими підмережами джерела"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:197
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
 msgid "Restrict to address family"
 msgstr "Обмежити сімейство протоколів"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
 msgid "Routing/NAT Offloading"
 msgstr "Розвантаження маршрутизації/NAT"
 
@@ -647,64 +584,62 @@ msgstr "Правило вимкнено"
 msgid "Rule is enabled"
 msgstr "Правило ввімкнено"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
 msgid "Saturday"
 msgstr "Субота"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
 msgid "Software based offloading for routing/NAT"
 msgstr "Програмне розвантаження для маршрутизації/NAT"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
 msgid "Software flow offloading"
 msgstr "Програмне розвантаження потоку"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
 msgid "Source IP address"
 msgstr "IP-адреса джерела"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
 msgid "Source MAC address"
 msgstr "MAC-адреса джерела"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
 msgid "Source address"
 msgstr "Адреса джерела"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
 msgid "Source port"
 msgstr "Порт джерела"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:262
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
 msgid "Source zone"
 msgstr "Зона джерела"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
 msgid "Start Date (yyyy-mm-dd)"
 msgstr "Дата початку (рррр-мм-дд)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
 msgid "Start Time (hh.mm.ss)"
 msgstr "Час початку (гг:хх:сс)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
 msgid "Stop Date (yyyy-mm-dd)"
 msgstr "Дата зупинки (рррр-мм-дд)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
 msgid "Stop Time (hh.mm.ss)"
 msgstr "Час зупинки (гг:хх:сс)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
 msgid "Sunday"
 msgstr "Неділя"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
 msgid ""
 "The firewall creates zones over your network interfaces to control network "
 "traffic flow."
@@ -712,8 +647,8 @@ msgstr ""
 "Брандмауер створює зони поверх ваших мережевих інтерфейсів для управління "
 "потоком мережевого трафіку."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:171
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:259
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -730,7 +665,7 @@ msgstr ""
 "від LAN до WAN <em>не</em> означає, що є також дозвіл спрямовувати від WAN "
 "до LAN."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -744,15 +679,15 @@ msgstr ""
 "трафіку між різними мережами в межах зони. Пункт <em>Покриті мережі</em> "
 "визначає, які доступні мережі є членами цієї зони."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
 msgid "Thursday"
 msgstr "Четвер"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
 msgid "Time Restrictions"
 msgstr "Часові обмеження"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
 msgid "Time in UTC"
 msgstr "Час в UTC"
 
@@ -772,20 +707,12 @@ msgstr "%s на <var>цього пристрою</var>"
 msgid "To %s, %s in %s"
 msgstr "%s, %s у %s"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr "До IP джерела"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr "До порту джерела"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
 msgid "Traffic Rules"
 msgstr "Правила трафіка"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
 "for example to reject traffic between certain hosts or to open WAN ports on "
@@ -795,25 +722,25 @@ msgstr ""
 "різними зонами, наприклад, відхиляти трафік між певними вузлами або відкрити "
 "порти WAN на маршрутизаторі."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
 msgid "Tuesday"
 msgstr "Вівторок"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:107
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
 msgid "Unnamed forward"
 msgstr "Переспрямовування без назви"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:144
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
 msgid "Unnamed rule"
 msgstr "Правило без назви"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:99
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
 msgid "Unnamed zone"
 msgstr "Зона без назви"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
@@ -821,7 +748,7 @@ msgstr ""
 "Використовуйте цей параметр для класифікації трафіку зон за мережевими "
 "пристроями <em>raw</em>, які не управляються через <em>uci</em>."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -837,44 +764,44 @@ msgstr "Через %s"
 msgid "Via %s at %s"
 msgstr "Через %s на %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
 msgid "Wednesday"
 msgstr "Середа"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
 msgid "Week Days"
 msgstr "Дні тижня"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
 msgid "Zone ⇒ Forwardings"
 msgstr "Зона ⇒ Переспрямовування"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
 msgid "Zones"
 msgstr "Зони"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:329
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
 msgid "accept"
 msgstr "приймати"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:254
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:222
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
 msgid "any"
 msgstr "будь-який"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
 msgid "any host"
@@ -888,7 +815,7 @@ msgstr "будь-який IP роутера"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr "будь-якій зоні"
@@ -898,13 +825,13 @@ msgstr "будь-якій зоні"
 msgid "day"
 msgstr "день"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
 msgid "don't track"
 msgstr "не відстеж."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
 msgid "drop"
 msgstr "опускати"
 
@@ -935,9 +862,9 @@ msgstr "порт"
 msgid "ports"
 msgstr "порти"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:330
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
 msgid "reject"
 msgstr "відкидати"
 
@@ -946,6 +873,12 @@ msgstr "відкидати"
 msgid "second"
 msgstr "секунду"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr "ця нова зона"
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
diff --git a/applications/luci-app-firewall/po/vi/firewall.po b/applications/luci-app-firewall/po/vi/firewall.po
index 7e0d12639..31868bac6 100644
--- a/applications/luci-app-firewall/po/vi/firewall.po
+++ b/applications/luci-app-firewall/po/vi/firewall.po
@@ -13,7 +13,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
 msgid "%s in %s"
 msgstr ""
 
@@ -22,7 +22,7 @@ msgstr ""
 msgid "%s%s with %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
 msgid "%s, %s in %s"
 msgstr ""
 
@@ -55,89 +55,77 @@ msgstr ""
 msgid "Accept output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:325
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
 msgid "Action"
 msgstr "Action"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
 "traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: 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:84
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
 msgid "Advanced Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
 msgid "Allow \"invalid\" traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
 msgid "Allow forward from <em>source zones</em>:"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
 msgid "Any"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:341
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
 msgid "Any day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
 msgid "Automatic helper assignment"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Conntrack helpers"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid "Covered devices"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
 msgid "Covered networks"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered subnets"
 msgstr ""
 
@@ -152,17 +140,15 @@ msgid ""
 "each firewall restart, right after the default ruleset has been loaded."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
 msgid "Destination address"
 msgstr "Địa chỉ điểm đến"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
 msgid "Destination port"
 msgstr "Cổng điểm đến"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:299
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
 #, fuzzy
 msgid "Destination zone"
 msgstr "Điểm đến"
@@ -186,17 +172,12 @@ msgstr ""
 msgid "Discard output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr ""
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
@@ -212,65 +193,59 @@ msgstr ""
 msgid "Do not track output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:42
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
 msgid "Drop invalid packets"
 msgstr "Bỏ qua nhưng gói không hợp lý"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:148
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
 msgid "Enable NAT Loopback"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
 #, fuzzy
 msgid "Enable SYN-flood protection"
 msgstr "SYN-flood bảo vệ "
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
 msgid "Enable logging on this zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
 msgid "External IP address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:222
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
 msgid "External port"
 msgstr "External port"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:266
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
 msgid "Extra arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid "Extra destination arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid "Extra source arguments"
 msgstr ""
 
@@ -282,32 +257,32 @@ msgstr "Firewall"
 msgid "Firewall - Custom Rules"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
 msgid "Firewall - Port Forwards"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
 msgid "Firewall - Traffic Rules"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
 msgid "Firewall - Zone Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
 msgid "Force connection tracking"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
 msgid "Forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
 msgid "Forward to"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
 msgid "Friday"
 msgstr ""
 
@@ -338,15 +313,15 @@ msgstr ""
 msgid "From %s on <var>this device</var> with source %s and %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:99
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:135
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:37
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
+#: 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
 msgid "General Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
 msgid "Hardware flow offloading"
 msgstr ""
 
@@ -370,13 +345,13 @@ msgid "IPv4"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
 msgid "IPv4 and IPv6"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
 msgid "IPv4 only"
 msgstr ""
 
@@ -384,34 +359,31 @@ msgstr ""
 msgid "IPv6"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:187
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
 msgid "IPv6 only"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Input"
 msgstr "Input"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
 #, fuzzy
 msgid "Internal IP address"
 msgstr "Internal address"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
 #, fuzzy
 msgid "Internal port"
 msgstr "External port"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
 msgid "Internal zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
 msgid "Limit log messages"
 msgstr ""
 
@@ -425,46 +397,42 @@ msgstr ""
 msgid "MACs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
 #, fuzzy
 msgid "MSS clamping"
 msgstr "MSS Clamping"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
 msgid "Masquerading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:124
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
 msgid "Match"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
 msgid "Match ICMP type"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
 msgid ""
 "Match incoming traffic directed at the given destination port or port range "
 "on this host"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
 msgid "Monday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
 msgid "Month Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:120
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:168
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:98
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
 msgid "Name"
 msgstr ""
 
@@ -472,66 +440,35 @@ msgstr ""
 msgid "Network"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
 msgid "Only match incoming traffic from these MACs."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 msgid "Only match incoming traffic from this IP or range."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
 msgid ""
 "Only match incoming traffic originating from the given source port or port "
 "range on the client host"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Output"
 msgstr "Output"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -540,36 +477,34 @@ msgid ""
 "all services."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
 msgid "Port Forwards"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
 msgid ""
 "Prevent the installation of <em>NOTRACK</em> rules which would bypass "
 "connection tracking."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:153
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:204
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
 msgid "Protocol"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: 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 ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr ""
 
@@ -588,7 +523,7 @@ msgstr ""
 msgid "Refuse output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 
@@ -596,20 +531,20 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
 msgid "Restrict Masquerading to given destination subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
 msgid "Restrict Masquerading to given source subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:197
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
 msgid "Restrict to address family"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
 msgid "Routing/NAT Offloading"
 msgstr ""
 
@@ -621,67 +556,65 @@ msgstr ""
 msgid "Rule is enabled"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
 msgid "Saturday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
 msgid "Software based offloading for routing/NAT"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
 msgid "Software flow offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
 #, fuzzy
 msgid "Source IP address"
 msgstr "Đỉa chỉ MAC nguồn"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
 msgid "Source MAC address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
 #, fuzzy
 msgid "Source address"
 msgstr "Đỉa chỉ MAC nguồn"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
 msgid "Source port"
 msgstr "Cổng nguồn"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:262
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
 #, fuzzy
 msgid "Source zone"
 msgstr "Cổng nguồn"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
 msgid "Start Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
 msgid "Start Time (hh.mm.ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
 msgid "Stop Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
 msgid "Stop Time (hh.mm.ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
 msgid "Sunday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
 msgid ""
 "The firewall creates zones over your network interfaces to control network "
 "traffic flow."
@@ -689,8 +622,8 @@ msgstr ""
 "The firewall tạo zones trên giao diện mạng lưới để điều triển sự dòng lưu "
 "thông của mạng."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:171
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:259
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -700,7 +633,7 @@ msgid ""
 "<em>not</em> imply a permission to forward from wan to lan as well."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -709,15 +642,15 @@ msgid ""
 "networks</em> specifies which available networks are members of this zone."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
 msgid "Thursday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
 msgid "Time Restrictions"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
 msgid "Time in UTC"
 msgstr ""
 
@@ -737,51 +670,43 @@ msgstr ""
 msgid "To %s, %s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
 msgid "Traffic Rules"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
 "for example to reject traffic between certain hosts or to open WAN ports on "
 "the router."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
 msgid "Tuesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:107
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
 msgid "Unnamed forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:144
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
 msgid "Unnamed rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:99
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
 msgid "Unnamed zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -795,44 +720,44 @@ msgstr ""
 msgid "Via %s at %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
 msgid "Wednesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
 msgid "Week Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
 msgid "Zone ⇒ Forwardings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
 msgid "Zones"
 msgstr "Zones"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:329
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
 msgid "accept"
 msgstr "chấp nhận"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:254
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:222
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
 msgid "any"
 msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
 msgid "any host"
@@ -846,7 +771,7 @@ msgstr ""
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr ""
@@ -856,13 +781,13 @@ msgstr ""
 msgid "day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
 msgid "don't track"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
 msgid "drop"
 msgstr "drop"
 
@@ -893,9 +818,9 @@ msgstr ""
 msgid "ports"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:330
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
 msgid "reject"
 msgstr "Không chấp nhận"
 
@@ -904,6 +829,12 @@ msgstr "Không chấp nhận"
 msgid "second"
 msgstr ""
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
diff --git a/applications/luci-app-firewall/po/zh-cn/firewall.po b/applications/luci-app-firewall/po/zh-cn/firewall.po
index 13e4f0aee..28cd88b5c 100644
--- a/applications/luci-app-firewall/po/zh-cn/firewall.po
+++ b/applications/luci-app-firewall/po/zh-cn/firewall.po
@@ -11,7 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2018-08-08 08:28+0800\n"
 "X-Generator: Gtranslator 2.91.7\n"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
 msgid "%s in %s"
 msgstr "%s 位于 %s"
 
@@ -20,7 +20,7 @@ msgstr "%s 位于 %s"
 msgid "%s%s with %s"
 msgstr "%s%s 和 %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
 msgid "%s, %s in %s"
 msgstr "%s, %s 位于 %s"
 
@@ -53,89 +53,77 @@ msgstr "接受入站"
 msgid "Accept output"
 msgstr "接受出站"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:325
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
 msgid "Action"
 msgstr "动作"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "添加"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "添加并编辑…"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
 "traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: 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:84
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
 msgid "Advanced Settings"
 msgstr "高级设置"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
 msgid "Allow \"invalid\" traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "允许从<em>源区域</em>转发："
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "允许转发到<em>目标区域</em>："
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
 msgid "Any"
 msgstr "任何"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:341
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
 msgid "Any day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
 msgid "Automatic helper assignment"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Conntrack helpers"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid "Covered devices"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
 msgid "Covered networks"
 msgstr "覆盖网络"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered subnets"
 msgstr ""
 
@@ -152,17 +140,15 @@ msgstr ""
 "自定义规则允许您执行不属于防火墙框架的任意 iptables 命令。每次重启防火墙时，"
 "在默认的规则运行后这些命令将立即执行。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
 msgid "Destination address"
 msgstr "目标地址"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
 msgid "Destination port"
 msgstr "目标端口"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:299
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
 msgid "Destination zone"
 msgstr "目标区域"
 
@@ -185,17 +171,12 @@ msgstr "丢弃入站"
 msgid "Discard output"
 msgstr "丢弃出站"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "不重写"
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
@@ -211,64 +192,58 @@ msgstr "不跟踪入站"
 msgid "Do not track output"
 msgstr "不跟踪出站"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:42
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
 msgid "Drop invalid packets"
 msgstr "丢弃无效数据包"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:148
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr "启用"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
 msgid "Enable NAT Loopback"
 msgstr "启用 NAT 环回"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
 msgid "Enable SYN-flood protection"
 msgstr "启用 SYN-flood 防御"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
 msgid "Enable logging on this zone"
 msgstr "启用此区域的日志记录"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr "实验特性。与 QoS/SQM 不完全兼容。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
 msgid "External IP address"
 msgstr "外部 IP 地址"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:222
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
 msgid "External port"
 msgstr "外部端口"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "外部区域"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:266
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
 msgid "Extra arguments"
 msgstr "附加参数"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid "Extra destination arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid "Extra source arguments"
 msgstr ""
 
@@ -280,32 +255,32 @@ msgstr "防火墙"
 msgid "Firewall - Custom Rules"
 msgstr "防火墙 - 自定义规则"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
 msgid "Firewall - Port Forwards"
 msgstr "防火墙 - 端口转发"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
 msgid "Firewall - Traffic Rules"
 msgstr "防火墙 - 通信规则"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
 msgid "Firewall - Zone Settings"
 msgstr "防火墙 - 区域设置"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
 msgid "Force connection tracking"
 msgstr "强制连接追踪"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
 msgid "Forward"
 msgstr "转发"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
 msgid "Forward to"
 msgstr "转发到"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
 msgid "Friday"
 msgstr "星期五"
 
@@ -336,15 +311,15 @@ msgstr "来自 %s 位于<var>本设备</var>源于 %s"
 msgid "From %s on <var>this device</var> with source %s and %s"
 msgstr "来自 %s 位于<var>本设备</var>源端口 %s 源 MAC %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:99
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:135
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:37
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
+#: 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
 msgid "General Settings"
 msgstr "基本设置"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
 msgid "Hardware flow offloading"
 msgstr "硬件流量分载"
 
@@ -368,13 +343,13 @@ msgid "IPv4"
 msgstr "IPv4"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
 msgid "IPv4 and IPv6"
 msgstr "IPv4 和 IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
 msgid "IPv4 only"
 msgstr "仅 IPv4"
 
@@ -382,32 +357,29 @@ msgstr "仅 IPv4"
 msgid "IPv6"
 msgstr "IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:187
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
 msgid "IPv6 only"
 msgstr "仅 IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Input"
 msgstr "入站数据"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
 msgid "Internal IP address"
 msgstr "内部 IP 地址"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
 msgid "Internal port"
 msgstr "内部端口"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
 msgid "Internal zone"
 msgstr "内部区域"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
 msgid "Limit log messages"
 msgstr "限制日志信息"
 
@@ -421,45 +393,41 @@ msgstr "MAC"
 msgid "MACs"
 msgstr "MAC"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
 msgid "MSS clamping"
 msgstr "MSS 钳制"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
 msgid "Masquerading"
 msgstr "IP 动态伪装"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:124
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
 msgid "Match"
 msgstr "匹配规则"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
 msgid "Match ICMP type"
 msgstr "匹配 ICMP 类型"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
 msgid ""
 "Match incoming traffic directed at the given destination port or port range "
 "on this host"
 msgstr "匹配指向此主机上指定目标端口或目标端口范围的入站流量。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
 msgid "Monday"
 msgstr "星期一"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
 msgid "Month Days"
 msgstr "日期"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:120
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:168
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:98
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
 msgid "Name"
 msgstr "名字"
 
@@ -467,66 +435,35 @@ msgstr "名字"
 msgid "Network"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "新建 SNAT 规则"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "新建转发规则"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "新建进入规则"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "新建端口转发"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "新建 Source NAT"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr "仅匹配指定目的 IP 地址的入站流量。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
 msgid "Only match incoming traffic from these MACs."
 msgstr "仅匹配来自这些 MAC 的入站流量。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 msgid "Only match incoming traffic from this IP or range."
 msgstr "仅匹配来自此 IP 或 IP 范围的入站流量。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
 msgid ""
 "Only match incoming traffic originating from the given source port or port "
 "range on the client host"
 msgstr "仅匹配源自客户端主机上给定源端口或源端口范围的入站流量。"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "打开路由器端口"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "其它..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Output"
 msgstr "出站数据"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr "传递到 iptables 的额外参数。小心使用！"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -535,37 +472,35 @@ msgid ""
 "all services."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
 msgid "Port Forwards"
 msgstr "端口转发"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
 msgstr ""
 "端口转发允许 Internet 上的远程计算机连接到内部网络中的特定计算机或服务。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
 msgid ""
 "Prevent the installation of <em>NOTRACK</em> rules which would bypass "
 "connection tracking."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:153
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:204
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
 msgid "Protocol"
 msgstr "协议"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: 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 "重定向匹配的入站流量到内部主机的端口"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr "重定向匹配的入站流量到指定的内部主机"
 
@@ -584,7 +519,7 @@ msgstr "拒绝入站"
 msgid "Refuse output"
 msgstr "拒绝出站"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr "需要硬件 NAT 支持。目前 mt7621 已实现"
 
@@ -592,20 +527,20 @@ msgstr "需要硬件 NAT 支持。目前 mt7621 已实现"
 msgid "Restart Firewall"
 msgstr "重启防火墙"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "要限制 IP 动态伪装的目标子网"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
 msgid "Restrict Masquerading to given source subnets"
 msgstr "要限制 IP 动态伪装的源子网"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:197
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
 msgid "Restrict to address family"
 msgstr "限制地址"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
 msgid "Routing/NAT Offloading"
 msgstr "Routing/NAT 分载"
 
@@ -617,71 +552,69 @@ msgstr "规则已禁用"
 msgid "Rule is enabled"
 msgstr "规则已启用"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
 msgid "Saturday"
 msgstr "星期六"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
 msgid "Software based offloading for routing/NAT"
 msgstr "基于软件的 Routing/NAT 分载"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
 msgid "Software flow offloading"
 msgstr "软件流量分载"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
 msgid "Source IP address"
 msgstr "源 IP 地址"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
 msgid "Source MAC address"
 msgstr "源 MAC 地址"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
 msgid "Source address"
 msgstr "源地址"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
 msgid "Source port"
 msgstr "源端口"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:262
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
 msgid "Source zone"
 msgstr "源区域"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
 msgid "Start Date (yyyy-mm-dd)"
 msgstr "开始日期（yyyy-mm-dd）"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
 msgid "Start Time (hh.mm.ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
 msgid "Stop Date (yyyy-mm-dd)"
 msgstr "停止日期（yyyy-mm-dd）"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
 msgid "Stop Time (hh.mm.ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
 msgid "Sunday"
 msgstr "星期日"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
 msgid ""
 "The firewall creates zones over your network interfaces to control network "
 "traffic flow."
 msgstr "防火墙通过在网络接口上创建区域来控制网络流量。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:171
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:259
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -695,7 +628,7 @@ msgstr ""
 "strong> 的区域的需转发流量。转发规则的作用是<em>单向</em>的，例如：一条允许"
 "从 lan 到 wan 的转发规则并不隐含有允许相反方向从 wan 到 lan 的流量转发。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -707,15 +640,15 @@ msgstr ""
 "域入站和出站流量的默认策略，<em>转发</em>选项描述该区域内不同网络之间的流量转"
 "发策略。<em>覆盖网络</em>指定从属于这个区域的网络。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
 msgid "Thursday"
 msgstr "星期四"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
 msgid "Time Restrictions"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
 msgid "Time in UTC"
 msgstr "UTC 时间"
 
@@ -735,20 +668,12 @@ msgstr "到 %s 位于<var>本设备</var>"
 msgid "To %s, %s in %s"
 msgstr "到 %s, %s 位于 %s"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr "到源 IP"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr "到源端口"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
 msgid "Traffic Rules"
 msgstr "通信规则"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
 "for example to reject traffic between certain hosts or to open WAN ports on "
@@ -757,31 +682,31 @@ msgstr ""
 "通信规则定义了不同区域间的数据包传输策略，例如：拒绝一些主机之间的通信，开放"
 "路由器 WAN 上的端口。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
 msgid "Tuesday"
 msgstr "星期二"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:107
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
 msgid "Unnamed forward"
 msgstr "未命名转发"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:144
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
 msgid "Unnamed rule"
 msgstr "未命名规则"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:99
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
 msgid "Unnamed zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -795,44 +720,44 @@ msgstr "通过 %s"
 msgid "Via %s at %s"
 msgstr "通过 %s 在 %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
 msgid "Wednesday"
 msgstr "星期三"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
 msgid "Week Days"
 msgstr "星期"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
 msgid "Zone ⇒ Forwardings"
 msgstr "区域 ⇒ 转发"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
 msgid "Zones"
 msgstr "区域"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:329
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
 msgid "accept"
 msgstr "接受"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:254
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:222
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
 msgid "any"
 msgstr "所有"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
 msgid "any host"
@@ -846,7 +771,7 @@ msgstr "所有路由 IP"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr "所有区域"
@@ -856,13 +781,13 @@ msgstr "所有区域"
 msgid "day"
 msgstr "日"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
 msgid "don't track"
 msgstr "不跟踪"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
 msgid "drop"
 msgstr "丢弃"
 
@@ -893,9 +818,9 @@ msgstr "端口"
 msgid "ports"
 msgstr "端口"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:330
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
 msgid "reject"
 msgstr "拒绝"
 
@@ -904,6 +829,12 @@ msgstr "拒绝"
 msgid "second"
 msgstr "秒"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
@@ -914,6 +845,45 @@ msgstr "类型"
 msgid "types"
 msgstr "类型"
 
+#~ msgid "Add"
+#~ msgstr "添加"
+
+#~ msgid "Add and edit..."
+#~ msgstr "添加并编辑…"
+
+#~ msgid "Do not rewrite"
+#~ msgstr "不重写"
+
+#~ msgid "External zone"
+#~ msgstr "外部区域"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "新建 SNAT 规则"
+
+#~ msgid "New forward rule"
+#~ msgstr "新建转发规则"
+
+#~ msgid "New input rule"
+#~ msgstr "新建进入规则"
+
+#~ msgid "New port forward"
+#~ msgstr "新建端口转发"
+
+#~ msgid "New source NAT"
+#~ msgstr "新建 Source NAT"
+
+#~ msgid "Open ports on router"
+#~ msgstr "打开路由器端口"
+
+#~ msgid "Other..."
+#~ msgstr "其它..."
+
+#~ msgid "To source IP"
+#~ msgstr "到源 IP"
+
+#~ msgid "To source port"
+#~ msgstr "到源端口"
+
 #~ msgid "Output zone"
 #~ msgstr "出站区域"
 
diff --git a/applications/luci-app-firewall/po/zh-tw/firewall.po b/applications/luci-app-firewall/po/zh-tw/firewall.po
index 1e236c78a..9754bc7a5 100644
--- a/applications/luci-app-firewall/po/zh-tw/firewall.po
+++ b/applications/luci-app-firewall/po/zh-tw/firewall.po
@@ -11,7 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2018-08-08 08:28+0800\n"
 "X-Generator: Gtranslator 2.91.7\n"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
 msgid "%s in %s"
 msgstr "%s 位於 %s"
 
@@ -20,7 +20,7 @@ msgstr "%s 位於 %s"
 msgid "%s%s with %s"
 msgstr "%s%s 和 %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
 msgid "%s, %s in %s"
 msgstr "%s, %s 位於 %s"
 
@@ -53,89 +53,77 @@ msgstr "接受入站"
 msgid "Accept output"
 msgstr "接受出站"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:325
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
 msgid "Action"
 msgstr "動作"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "新增"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "新增並編輯…"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone destination "
 "traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
 "traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid ""
 "Additional raw <em>iptables</em> arguments to classify zone source traffic, "
 "e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: 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:84
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
 msgid "Advanced Settings"
 msgstr "高階設定"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
 msgid "Allow \"invalid\" traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "允許從<em>源區域</em>轉發："
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "允許轉發到<em>目標區域</em>："
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
 msgid "Any"
 msgstr "任何"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:341
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
 msgid "Any day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
 msgid "Automatic helper assignment"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
 msgid ""
 "Automatically assign conntrack helpers based on traffic protocol and port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
 msgid "Conntrack Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Conntrack helpers"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid "Covered devices"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
 msgid "Covered networks"
 msgstr "覆蓋網路"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid "Covered subnets"
 msgstr ""
 
@@ -152,17 +140,15 @@ msgstr ""
 "自訂規則允許您執行不屬於防火牆框架的任意 iptables 指令。每次重啟防火牆時，在"
 "預設的規則執行後這些指令將立即執行。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
 msgid "Destination address"
 msgstr "目標位址"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
 msgid "Destination port"
 msgstr "目標埠"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:299
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
 msgid "Destination zone"
 msgstr "目標區域"
 
@@ -185,17 +171,12 @@ msgstr "丟棄入站"
 msgid "Discard output"
 msgstr "丟棄出站"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
 msgid ""
 "Do not install extra rules to reject forwarded traffic with conntrack state "
 "<em>invalid</em>. This may be required for complex asymmetric route setups."
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "不重寫"
-
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
@@ -211,64 +192,58 @@ msgstr "不跟蹤入站"
 msgid "Do not track output"
 msgstr "不跟蹤出站"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:42
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
 msgid "Drop invalid packets"
 msgstr "丟棄無效資料包"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:148
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr "啟用"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
 msgid "Enable NAT Loopback"
 msgstr "啟用 NAT 環回"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
 msgid "Enable SYN-flood protection"
 msgstr "啟用 SYN-flood 防禦"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
 msgid "Enable logging on this zone"
 msgstr "啟用此區域的日誌記錄"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr "實驗特性。與 QoS/SQM 不完全相容。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
 msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
 msgid "External IP address"
 msgstr "外部 IP 位址"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:222
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
 msgid "External port"
 msgstr "外部埠"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "外部區域"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:266
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
 msgid "Extra arguments"
 msgstr "附加引數"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
 msgid "Extra destination arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
 msgid "Extra iptables arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
 msgid "Extra source arguments"
 msgstr ""
 
@@ -280,32 +255,32 @@ msgstr "防火牆"
 msgid "Firewall - Custom Rules"
 msgstr "防火牆 - 自訂規則"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
 msgid "Firewall - Port Forwards"
 msgstr "防火牆 - 埠轉發"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
 msgid "Firewall - Traffic Rules"
 msgstr "防火牆 - 通訊規則"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
 msgid "Firewall - Zone Settings"
 msgstr "防火牆 - 區域設定"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
 msgid "Force connection tracking"
 msgstr "強制連線追蹤"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
 msgid "Forward"
 msgstr "轉發"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
 msgid "Forward to"
 msgstr "轉發到"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
 msgid "Friday"
 msgstr "星期五"
 
@@ -336,15 +311,15 @@ msgstr "來自 %s 位於<var>本裝置</var>源於 %s"
 msgid "From %s on <var>this device</var> with source %s and %s"
 msgstr "來自 %s 位於<var>本裝置</var>源埠 %s 源 MAC %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:99
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:135
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:37
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
+#: 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
 msgid "General Settings"
 msgstr "基本設定"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
 msgid "Hardware flow offloading"
 msgstr "硬體流量分載"
 
@@ -368,13 +343,13 @@ msgid "IPv4"
 msgstr "IPv4"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
 msgid "IPv4 and IPv6"
 msgstr "IPv4 和 IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
 msgid "IPv4 only"
 msgstr "僅 IPv4"
 
@@ -382,32 +357,29 @@ msgstr "僅 IPv4"
 msgid "IPv6"
 msgstr "IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:187
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
 msgid "IPv6 only"
 msgstr "僅 IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
 msgid "Input"
 msgstr "入站資料"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
 msgid "Internal IP address"
 msgstr "內部 IP 位址"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
 msgid "Internal port"
 msgstr "內部埠"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
 msgid "Internal zone"
 msgstr "內部區域"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
 msgid "Limit log messages"
 msgstr "限制日誌資訊"
 
@@ -421,45 +393,41 @@ msgstr "MAC"
 msgid "MACs"
 msgstr "MAC"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
 msgid "MSS clamping"
 msgstr "MSS 鉗制"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
 msgid "Masquerading"
 msgstr "IP 動態偽裝"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:124
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
 msgid "Match"
 msgstr "匹配規則"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
 msgid "Match ICMP type"
 msgstr "匹配 ICMP 型別"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
 msgid ""
 "Match incoming traffic directed at the given destination port or port range "
 "on this host"
 msgstr "匹配指向此主機上指定目標埠或目標埠範圍的入站流量。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
 msgid "Monday"
 msgstr "星期一"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
 msgid "Month Days"
 msgstr "日期"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:120
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:168
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:98
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
 msgid "Name"
 msgstr "名字"
 
@@ -467,66 +435,35 @@ msgstr "名字"
 msgid "Network"
 msgstr ""
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "新建 SNAT 規則"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "新建轉發規則"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "新建進入規則"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "新建埠轉發"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "新建 Source NAT"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr "僅匹配指定目的 IP 位址的入站流量。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
 msgid "Only match incoming traffic from these MACs."
 msgstr "僅匹配來自這些 MAC 的入站流量。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
 msgid "Only match incoming traffic from this IP or range."
 msgstr "僅匹配來自此 IP 或 IP 範圍的入站流量。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
 msgid ""
 "Only match incoming traffic originating from the given source port or port "
 "range on the client host"
 msgstr "僅匹配源自客戶端主機上給定源埠或源埠範圍的入站流量。"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "開啟路由器埠"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "其它..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
 msgid "Output"
 msgstr "出站資料"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr "傳遞到 iptables 的額外引數。小心使用！"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
 msgid ""
 "Passing raw iptables arguments to source and destination traffic "
 "classification rules allows to match packets based on other criteria than "
@@ -535,36 +472,34 @@ msgid ""
 "all services."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
 msgid "Port Forwards"
 msgstr "埠轉發"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
 msgstr "埠轉發允許 Internet 上的遠端計算機連線到內部網路中的特定計算機或服務。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
 msgid ""
 "Prevent the installation of <em>NOTRACK</em> rules which would bypass "
 "connection tracking."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:153
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:204
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
 msgid "Protocol"
 msgstr "協議"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: 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 "重定向匹配的入站流量到內部主機的埠"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr "重定向匹配的入站流量到指定的內部主機"
 
@@ -583,7 +518,7 @@ msgstr "拒絕入站"
 msgid "Refuse output"
 msgstr "拒絕出站"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr "需要硬體 NAT 支援。目前 mt7621 已實現"
 
@@ -591,20 +526,20 @@ msgstr "需要硬體 NAT 支援。目前 mt7621 已實現"
 msgid "Restart Firewall"
 msgstr "重啟防火牆"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "要限制 IP 動態偽裝的目標子網"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
 msgid "Restrict Masquerading to given source subnets"
 msgstr "要限制 IP 動態偽裝的源子網"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:197
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
 msgid "Restrict to address family"
 msgstr "限制位址"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
 msgid "Routing/NAT Offloading"
 msgstr "Routing/NAT 分載"
 
@@ -616,71 +551,69 @@ msgstr "規則已禁用"
 msgid "Rule is enabled"
 msgstr "規則已啟用"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
 msgid "Saturday"
 msgstr "星期六"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
 msgid "Software based offloading for routing/NAT"
 msgstr "基於軟體的 Routing/NAT 分載"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
 msgid "Software flow offloading"
 msgstr "軟體流量分載"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
 msgid "Source IP address"
 msgstr "源 IP 位址"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
 msgid "Source MAC address"
 msgstr "源 MAC 位址"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
 msgid "Source address"
 msgstr "源位址"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
 msgid "Source port"
 msgstr "源埠"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:262
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
 msgid "Source zone"
 msgstr "源區域"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
 msgid "Start Date (yyyy-mm-dd)"
 msgstr "開始日期（yyyy-mm-dd）"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
 msgid "Start Time (hh.mm.ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
 msgid "Stop Date (yyyy-mm-dd)"
 msgstr "停止日期（yyyy-mm-dd）"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
 msgid "Stop Time (hh.mm.ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
 msgid "Sunday"
 msgstr "星期日"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
 msgid ""
 "The firewall creates zones over your network interfaces to control network "
 "traffic flow."
 msgstr "防火牆通過在網路介面上建立區域來控制網路流量。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:171
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:259
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -694,7 +627,7 @@ msgstr ""
 "strong> 的區域的需轉發流量。轉發規則的作用是<em>單向</em>的，例如：一條允許"
 "從 lan 到 wan 的轉發規則並不隱含有允許相反方向從 wan 到 lan 的流量轉發。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -706,15 +639,15 @@ msgstr ""
 "域入站和出站流量的預設策略，<em>轉發</em>選項描述該區域內不同網路之間的流量轉"
 "發策略。<em>覆蓋網路</em>指定從屬於這個區域的網路。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
 msgid "Thursday"
 msgstr "星期四"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
 msgid "Time Restrictions"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
 msgid "Time in UTC"
 msgstr "UTC 時間"
 
@@ -734,20 +667,12 @@ msgstr "到 %s 位於<var>本裝置</var>"
 msgid "To %s, %s in %s"
 msgstr "到 %s, %s 位於 %s"
 
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr "到源 IP"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr "到源埠"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
 msgid "Traffic Rules"
 msgstr "通訊規則"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
 "for example to reject traffic between certain hosts or to open WAN ports on "
@@ -756,31 +681,31 @@ msgstr ""
 "通訊規則定義了不同區域間的資料包傳輸策略，例如：拒絕一些主機之間的通訊，開放"
 "路由器 WAN 上的埠。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
 msgid "Tuesday"
 msgstr "星期二"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:107
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
 msgid "Unnamed forward"
 msgstr "未命名轉發"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:144
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
 msgid "Unnamed rule"
 msgstr "未命名規則"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:99
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
 msgid "Unnamed zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
 msgid ""
 "Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
 "network devices."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
 msgid ""
 "Use this option to classify zone traffic by source or destination subnet "
 "instead of networks or devices."
@@ -794,44 +719,44 @@ msgstr "通過 %s"
 msgid "Via %s at %s"
 msgstr "通過 %s 在 %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
 msgid "Wednesday"
 msgstr "星期三"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
 msgid "Week Days"
 msgstr "星期"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
 msgid "Zone ⇒ Forwardings"
 msgstr "區域 ⇒ 轉發"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
 msgid "Zones"
 msgstr "區域"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:329
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
 msgid "accept"
 msgstr "接受"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:254
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:222
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
 msgid "any"
 msgstr "所有"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
 msgid "any host"
@@ -845,7 +770,7 @@ msgstr "所有路由 IP"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr "所有區域"
@@ -855,13 +780,13 @@ msgstr "所有區域"
 msgid "day"
 msgstr "日"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
 msgid "don't track"
 msgstr "不跟蹤"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
 msgid "drop"
 msgstr "丟棄"
 
@@ -892,9 +817,9 @@ msgstr "埠"
 msgid "ports"
 msgstr "埠"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:330
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
 msgid "reject"
 msgstr "拒絕"
 
@@ -903,6 +828,12 @@ msgstr "拒絕"
 msgid "second"
 msgstr "秒"
 
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
@@ -913,6 +844,45 @@ msgstr "型別"
 msgid "types"
 msgstr "型別"
 
+#~ msgid "Add"
+#~ msgstr "新增"
+
+#~ msgid "Add and edit..."
+#~ msgstr "新增並編輯…"
+
+#~ msgid "Do not rewrite"
+#~ msgstr "不重寫"
+
+#~ msgid "External zone"
+#~ msgstr "外部區域"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "新建 SNAT 規則"
+
+#~ msgid "New forward rule"
+#~ msgstr "新建轉發規則"
+
+#~ msgid "New input rule"
+#~ msgstr "新建進入規則"
+
+#~ msgid "New port forward"
+#~ msgstr "新建埠轉發"
+
+#~ msgid "New source NAT"
+#~ msgstr "新建 Source NAT"
+
+#~ msgid "Open ports on router"
+#~ msgstr "開啟路由器埠"
+
+#~ msgid "Other..."
+#~ msgstr "其它..."
+
+#~ msgid "To source IP"
+#~ msgstr "到源 IP"
+
+#~ msgid "To source port"
+#~ msgstr "到源埠"
+
 #~ msgid "Output zone"
 #~ 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 23f0cf4b4..7df9dac84 100644
--- a/applications/luci-app-mjpg-streamer/po/es/mjpg-streamer.po
+++ b/applications/luci-app-mjpg-streamer/po/es/mjpg-streamer.po
@@ -3,12 +3,12 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Project-Id-Version: \n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
+"PO-Revision-Date: 2019-09-17 23:33-0300\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.2.1\n"
-"Last-Translator: \n"
+"X-Generator: Poedit 2.2.3\n"
+"Last-Translator: Franco Castillo <castillofrancodamian@gmail.com>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Language: es\n"
 
@@ -130,11 +130,13 @@ msgstr "Control led"
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:222
 msgid "Link newest picture to fixed file name"
-msgstr ""
+msgstr "Vincula la imagen más reciente al nombre de archivo fijo"
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:222
 msgid "Link the last picture in ringbuffer to fixed named file provided."
 msgstr ""
+"Enlace la última imagen en ringbuffer a un archivo con nombre fijo "
+"proporcionado."
 
 #: applications/luci-app-mjpg-streamer/luasrc/controller/mjpg-streamer.lua:12
 msgid "MJPG-streamer"
diff --git a/applications/luci-app-mwan3/po/es/mwan3.po b/applications/luci-app-mwan3/po/es/mwan3.po
index 2592a2f68..014a271da 100644
--- a/applications/luci-app-mwan3/po/es/mwan3.po
+++ b/applications/luci-app-mwan3/po/es/mwan3.po
@@ -3,12 +3,12 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Project-Id-Version: \n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
+"PO-Revision-Date: 2019-09-17 23:36-0300\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.2.1\n"
-"Last-Translator: \n"
+"X-Generator: Poedit 2.2.3\n"
+"Last-Translator: Franco Castillo <castillofrancodamian@gmail.com>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Language: es\n"
 
@@ -778,7 +778,7 @@ msgstr "Intervalo de actualización"
 
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:37
 msgid "View the content of /etc/protocols for protocol description"
-msgstr "Ver el contenido de /etc/protocol para la descripción del protocolo."
+msgstr "Ver el contenido de /etc/protocol para la descripción del protocolo"
 
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:19
 msgid "WARNING: %d interfaces are configured exceeding the maximum of %d!"
@@ -854,7 +854,7 @@ msgstr "agujero negro (caída)"
 
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:241
 msgid "connected (mwan3)"
-msgstr ""
+msgstr "conectado (mwan3)"
 
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua:82
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua:30
@@ -864,15 +864,15 @@ msgstr "predeterminado (usar tabla de enrutamiento principal)"
 
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:242
 msgid "disconnected (mwan3)"
-msgstr ""
+msgstr "desconectado (mwan3)"
 
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:240
 msgid "ifdown (netifd)"
-msgstr ""
+msgstr "Interfaz abajo (netifd)"
 
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:239
 msgid "ifup (netifd)"
-msgstr ""
+msgstr "Interfaz arriba (netifd)"
 
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua:84
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua:28
diff --git a/applications/luci-app-ntpc/po/es/ntpc.po b/applications/luci-app-ntpc/po/es/ntpc.po
index bfeeac6e1..f953d8e2a 100644
--- a/applications/luci-app-ntpc/po/es/ntpc.po
+++ b/applications/luci-app-ntpc/po/es/ntpc.po
@@ -1,21 +1,21 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-04-14 13:24+0200\n"
-"PO-Revision-Date: 2012-11-25 11:14+0200\n"
-"Last-Translator: José Vicente <josevteg@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2019-09-17 23:38-0300\n"
+"Last-Translator: Franco Castillo <castillofrancodamian@gmail.com>\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: Pootle 2.0.6\n"
+"X-Generator: Poedit 2.2.3\n"
+"Language-Team: \n"
 
 #: applications/luci-app-ntpc/luasrc/model/cbi/ntpc/ntpc.lua:21
 msgid "Clock Adjustment"
-msgstr "Ajuste del Reloj"
+msgstr "Configuración del reloj"
 
 #: applications/luci-app-ntpc/luasrc/model/cbi/ntpc/ntpc.lua:17
 msgid "Count of time measurements"
@@ -34,7 +34,7 @@ msgstr "General"
 #: applications/luci-app-ntpc/luasrc/model/cbi/ntpc/ntpc.lua:34
 #: applications/luci-app-ntpc/luasrc/model/cbi/ntpc/ntpcmini.lua:23
 msgid "Hostname"
-msgstr "Nombre de la máquina"
+msgstr "Nombre de host"
 
 #: applications/luci-app-ntpc/luasrc/model/cbi/ntpc/ntpc.lua:25
 msgid "Offset frequency"
diff --git a/applications/luci-app-ocserv/luasrc/controller/ocserv.lua b/applications/luci-app-ocserv/luasrc/controller/ocserv.lua
index 79c6ddb78..f41b48103 100644
--- a/applications/luci-app-ocserv/luasrc/controller/ocserv.lua
+++ b/applications/luci-app-ocserv/luasrc/controller/ocserv.lua
@@ -10,24 +10,24 @@ function index()
 
 	local page
 
-	page = entry({"admin", "services", "ocserv"}, alias("admin", "services", "ocserv", "main"),
+	page = entry({"admin", "vpn", "ocserv"}, alias("admin", "vpn", "ocserv", "main"),
 		_("OpenConnect VPN"))
 	page.dependent = true
 	
-	page = entry({"admin", "services", "ocserv", "main"},
+	page = entry({"admin", "vpn", "ocserv", "main"},
 		cbi("ocserv/main"),
 		_("Server Settings"), 200)
 	page.dependent = true
 
-	page = entry({"admin", "services", "ocserv", "users"},
+	page = entry({"admin", "vpn", "ocserv", "users"},
 		cbi("ocserv/users"),
 		_("User Settings"), 300)
 	page.dependent = true
 
-	entry({"admin", "services", "ocserv", "status"},
+	entry({"admin", "vpn", "ocserv", "status"},
 		call("ocserv_status")).leaf = true
 
-	entry({"admin", "services", "ocserv", "disconnect"},
+	entry({"admin", "vpn", "ocserv", "disconnect"},
 		post("ocserv_disconnect")).leaf = true
 
 end
diff --git a/applications/luci-app-ocserv/luasrc/view/ocserv_status.htm b/applications/luci-app-ocserv/luasrc/view/ocserv_status.htm
index 9c69514b9..d00084a0b 100644
--- a/applications/luci-app-ocserv/luasrc/view/ocserv_status.htm
+++ b/applications/luci-app-ocserv/luasrc/view/ocserv_status.htm
@@ -1,7 +1,7 @@
 <script type="text/javascript">//<![CDATA[
 
 	function ocserv_disconnect(idx) {
-		(new XHR()).post('<%=url('admin/services/ocserv/disconnect')%>/' + idx, { token: '<%=token%>' },
+		(new XHR()).post('<%=url('admin/vpn/ocserv/disconnect')%>/' + idx, { token: '<%=token%>' },
 			function(x)
 			{
 				var tb = document.getElementById('ocserv_status_table');
@@ -11,7 +11,7 @@
 		);
 	}
 
-	XHR.poll(-1, '<%=url('admin/services/ocserv/status')%>', null,
+	XHR.poll(-1, '<%=url('admin/vpn/ocserv/status')%>', null,
 		function(x, st)
 		{
 			var tb = document.getElementById('ocserv_status_table');
diff --git a/applications/luci-app-olsr-services/po/es/olsr-services.po b/applications/luci-app-olsr-services/po/es/olsr-services.po
index 31ed81167..81da4d875 100644
--- a/applications/luci-app-olsr-services/po/es/olsr-services.po
+++ b/applications/luci-app-olsr-services/po/es/olsr-services.po
@@ -21,8 +21,8 @@ msgid ""
 "No services can be shown, because olsrd is not running or the olsrd-"
 "nameservice Plugin is not loaded."
 msgstr ""
-"No se pueden mostrar servicios, porque olsrd no se está ejecutando "
-"o el complemento olsrd-nameservice no está cargado."
+"No se pueden mostrar servicios, porque olsrd no se está ejecutando o el "
+"complemento olsrd-nameservice no está cargado."
 
 #: applications/luci-app-olsr-services/luasrc/view/freifunk-services/services.htm:131
 #: applications/luci-app-olsr-services/luasrc/view/freifunk-services/services.htm:163
diff --git a/applications/luci-app-openvpn/luasrc/controller/openvpn.lua b/applications/luci-app-openvpn/luasrc/controller/openvpn.lua
index c9a932d87..55c29d1c2 100644
--- a/applications/luci-app-openvpn/luasrc/controller/openvpn.lua
+++ b/applications/luci-app-openvpn/luasrc/controller/openvpn.lua
@@ -5,11 +5,11 @@
 module("luci.controller.openvpn", package.seeall)
 
 function index()
-	entry( {"admin", "services", "openvpn"}, cbi("openvpn"), _("OpenVPN") )
-	entry( {"admin", "services", "openvpn", "basic"},    cbi("openvpn-basic"),    nil ).leaf = true
-	entry( {"admin", "services", "openvpn", "advanced"}, cbi("openvpn-advanced"), nil ).leaf = true
-	entry( {"admin", "services", "openvpn", "file"},     form("openvpn-file"),    nil ).leaf = true
-	entry( {"admin", "services", "openvpn", "upload"},   call("ovpn_upload"))
+	entry( {"admin", "vpn", "openvpn"}, cbi("openvpn"), _("OpenVPN") )
+	entry( {"admin", "vpn", "openvpn", "basic"},    cbi("openvpn-basic"),    nil ).leaf = true
+	entry( {"admin", "vpn", "openvpn", "advanced"}, cbi("openvpn-advanced"), nil ).leaf = true
+	entry( {"admin", "vpn", "openvpn", "file"},     form("openvpn-file"),    nil ).leaf = true
+	entry( {"admin", "vpn", "openvpn", "upload"},   call("ovpn_upload"))
 end
 
 function ovpn_upload()
@@ -50,5 +50,5 @@ function ovpn_upload()
 			end
 		end
 	end
-	http.redirect(luci.dispatcher.build_url('admin/services/openvpn'))
+	http.redirect(luci.dispatcher.build_url('admin/vpn/openvpn'))
 end
diff --git a/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua
index 2bf36cb27..1971400b8 100644
--- a/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua
+++ b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua
@@ -676,13 +676,37 @@ local knownParams = {
 			"key_method",
 			{ 1, 2 },
 			translate("Enable TLS and assume client role") },
-		{ Value,
+		{ DynamicList,
 			"tls_cipher",
-			"DHE-RSA-AES256-SHA:DHE-DSS-AES256-SHA:AES256-SHA:EDH-RSA-DES-CBC3-SHA:EDH-DSS-DES-CBC3-SHA:DES-CBC3-SHA:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA:AES128-SHA:RC4-SHA:RC4-MD5:EDH-RSA-DES-CBC-SHA:EDH-DSS-DES-CBC-SHA:DES-CBC-SHA:EXP-EDH-RSA-DES-CBC-SHA:EXP-EDH-DSS-DES-CBC-SHA:EXP-DES-CBC-SHA:EXP-RC2-CBC-MD5:EXP-RC4-MD5",
+			{
+				"DHE-RSA-AES256-SHA",
+				"DHE-DSS-AES256-SHA",
+				"AES256-SHA",
+				"EDH-RSA-DES-CBC3-SHA",
+				"EDH-DSS-DES-CBC3-SHA",
+				"DES-CBC3-SHA",
+				"DHE-RSA-AES128-SHA",
+				"DHE-DSS-AES128-SHA",
+				"AES128-SHA",
+				"RC4-SHA",
+				"RC4-MD5",
+				"EDH-RSA-DES-CBC-SHA",
+				"EDH-DSS-DES-CBC-SHA",
+				"DES-CBC-SHA",
+				"EXP-EDH-RSA-DES-CBC-SHA",
+				"EXP-EDH-DSS-DES-CBC-SHA",
+				"EXP-DES-CBC-SHA",
+				"EXP-RC2-CBC-MD5",
+				"EXP-RC4-MD5"
+			},
 			translate("TLS cipher") },
-		{ Value,
+		{ DynamicList,
 			"tls_ciphersuites",
-			"TLS_AES_256_GCM_SHA384:TLS_AES_128_GCM_SHA256:TLS_CHACHA20_POLY1305_SHA256",
+			{
+				"TLS_AES_256_GCM_SHA384",
+				"TLS_AES_128_GCM_SHA256",
+				"TLS_CHACHA20_POLY1305_SHA256"
+			},
 			translate("TLS 1.3 or newer cipher") },
 		{ Value,
 			"tls_timeout",
@@ -776,7 +800,7 @@ local cts = { }
 local params = { }
 
 local m = Map("openvpn")
-m.redirect = luci.dispatcher.build_url("admin", "services", "openvpn")
+m.redirect = luci.dispatcher.build_url("admin", "vpn", "openvpn")
 m.apply_on_parse = true
 
 local p = m:section( SimpleSection )
diff --git a/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua
index 132c4d8f9..86a76d5c8 100644
--- a/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua
+++ b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua
@@ -95,7 +95,7 @@ local basicParams = {
 
 
 local m = Map("openvpn")
-m.redirect = luci.dispatcher.build_url("admin", "services", "openvpn")
+m.redirect = luci.dispatcher.build_url("admin", "vpn", "openvpn")
 m.apply_on_parse = true
 
 local p = m:section( SimpleSection )
diff --git a/applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua
index 41266d860..9164f7f60 100644
--- a/applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua
+++ b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua
@@ -18,9 +18,9 @@ local cfg = s:option(DummyValue, "config")
 function cfg.cfgvalue(self, section)
 	local file_cfg = self.map:get(section, "config")
 	if file_cfg then
-		s.extedit = luci.dispatcher.build_url("admin", "services", "openvpn", "file", "%s")
+		s.extedit = luci.dispatcher.build_url("admin", "vpn", "openvpn", "file", "%s")
 	else
-		s.extedit = luci.dispatcher.build_url("admin", "services", "openvpn", "basic", "%s")
+		s.extedit = luci.dispatcher.build_url("admin", "vpn", "openvpn", "basic", "%s")
 	end
 end
 
@@ -117,7 +117,7 @@ end
 local updown = s:option( Button, "_updown", translate("Start/Stop") )
 updown._state = false
 updown.redirect = luci.dispatcher.build_url(
-	"admin", "services", "openvpn"
+	"admin", "vpn", "openvpn"
 )
 function updown.cbid(self, section)
 	local pid = s.getPID(section)
diff --git a/applications/luci-app-openvpn/luasrc/view/openvpn/cbi-select-input-add.htm b/applications/luci-app-openvpn/luasrc/view/openvpn/cbi-select-input-add.htm
index e75bfda90..3e83df20a 100644
--- a/applications/luci-app-openvpn/luasrc/view/openvpn/cbi-select-input-add.htm
+++ b/applications/luci-app-openvpn/luasrc/view/openvpn/cbi-select-input-add.htm
@@ -54,7 +54,7 @@
 		if (form)
 		{
 			form.enctype = 'multipart/form-data';
-			form.action  = '<%=url('admin/services/openvpn/upload')%>';
+			form.action  = '<%=url('admin/vpn/openvpn/upload')%>';
 			form.submit();
 		}
 	}
diff --git a/applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm b/applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm
index c1fe05215..7d88b844a 100644
--- a/applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm
+++ b/applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm
@@ -8,21 +8,21 @@
 
 <div class="cbi-section">
 	<h3>
-		<a href="<%=url('admin/services/openvpn')%>"><%:Overview%></a> &#187;
+		<a href="<%=url('admin/vpn/openvpn')%>"><%:Overview%></a> &#187;
 		<%=luci.i18n.translatef("Instance \"%s\"", self.instance)%>
 	</h3>
 	<% if self.mode == "basic" then %>
-		<a href="<%=url('admin/services/openvpn/advanced', self.instance, "Service")%>"><%:Switch to advanced configuration%> &#187;</a><p/>
+		<a href="<%=url('admin/vpn/openvpn/advanced', self.instance, "Service")%>"><%:Switch to advanced configuration%> &#187;</a><p/>
 		<hr />
 	<% elseif self.mode == "advanced" then %>
-		<a href="<%=url('admin/services/openvpn/basic', self.instance)%>"><%:Switch to basic configuration%> &#187;</a><p/>
+		<a href="<%=url('admin/vpn/openvpn/basic', self.instance)%>"><%:Switch to basic configuration%> &#187;</a><p/>
 		<hr />
 		<%:Configuration category%>:
 		<% for i, c in ipairs(self.categories) do %>
 			<% if c == self.category then %>
 				<strong><%=translate(c)%></strong>
 			<% else %>
-				<a href="<%=luci.dispatcher.build_url("admin", "services", "openvpn", "advanced", self.instance, c)%>"><%=translate(c)%></a>
+				<a href="<%=luci.dispatcher.build_url("admin", "vpn", "openvpn", "advanced", self.instance, c)%>"><%=translate(c)%></a>
 			<% end %>
 			<% if next(self.categories, i) then %>|<% end %>
 		<% end %>
diff --git a/applications/luci-app-openvpn/po/ca/openvpn.po b/applications/luci-app-openvpn/po/ca/openvpn.po
index f47a31036..73e04866a 100644
--- a/applications/luci-app-openvpn/po/ca/openvpn.po
+++ b/applications/luci-app-openvpn/po/ca/openvpn.po
@@ -13,8 +13,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.6\n"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:822
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:825
 msgid "%s"
 msgstr "%s"
 
@@ -38,7 +38,7 @@ msgstr "Afegeix ruta després d'establir connexió"
 msgid "Add template based configuration"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
 msgid "Additional authentication over TLS"
 msgstr "Autenticació addicional sobre TLS"
 
@@ -51,7 +51,7 @@ msgstr "Permet tràfic client a client"
 msgid "Allow multiple clients with same certificate"
 msgstr "Permet múltiples clients amb el mateix certificat"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
 msgid "Allow only one session"
 msgstr "Permet només una sessió"
 
@@ -108,7 +108,7 @@ msgstr "Canvia la prioritat del procés"
 msgid "Change to directory before initialization"
 msgstr "Canvia el directori abans de la inicialització"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:774
 msgid "Check peer certificate against a CRL"
 msgstr "Comprova el certificat de peer contra un CRL"
 
@@ -193,7 +193,7 @@ msgstr "No executis ifconfig"
 msgid "Don't add routes automatically"
 msgstr "No afegeixis rutes automàticament"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
 msgid "Don't cache --askpass or --auth-user-pass passwords"
 msgstr "No desis a la memòria cau contrasenyes --askpass o --auth-user-pass"
 
@@ -271,7 +271,7 @@ msgstr "Activa la interfície de gestió a <em>IP</em> <em>port</em>"
 msgid "Enabled"
 msgstr "Activat"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
 msgid "Encrypt and authenticate all control channel packets with the key"
 msgstr ""
 
@@ -299,11 +299,11 @@ msgid ""
 "added to OpenVPN's internal routing table"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
 msgid "Exit on TLS negotiation failure"
 msgstr "Surt en fallar la negociació TLS"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
 msgid "Get PEM password from controlling tty before we daemonize"
 msgstr "Aconsegueix contrasenya PEM de controlar tty abans de dimonitzar"
 
@@ -347,7 +347,7 @@ msgstr "Mantingues l'adreça IP remota al reiniciar"
 msgid "Keep tun/tap device open on restart"
 msgstr "Mantingues el dispositiu tun/tap obert al reiniciar"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
 msgid "Key transition window"
 msgstr "Finestra de transició de clau"
 
@@ -389,7 +389,7 @@ msgstr "Número de línies per historial de fitxer de registre"
 msgid "OVPN configuration file upload"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
 msgid "Only accept connections from given X509 name"
 msgstr "Accepta connexions només d'un cert nom X509"
 
@@ -500,15 +500,15 @@ msgstr "Nom de màquina remot o adreça IP"
 msgid "Remote ping timeout"
 msgstr "Temps d'espera màxim de ping remot"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
 msgid "Renegotiate data chan. key after bytes"
 msgstr "Renegocia clau de canal de dades després de bytes"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
 msgid "Renegotiate data chan. key after packets"
 msgstr "Renegocia clau de canal de dades després de paquets"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
 msgid "Renegotiate data chan. key after seconds"
 msgstr "Renegocia clau de canal de dades després de segons"
 
@@ -516,11 +516,11 @@ msgstr "Renegocia clau de canal de dades després de segons"
 msgid "Replay protection sliding window size"
 msgstr "Mida de la finestra lliscant de protecció de reproducció"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
 msgid "Require explicit designation on certificate"
 msgstr "Requereix una designació explícita al certificat"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
 msgid "Require explicit key usage on certificate"
 msgstr "Requereix ús de clau explícit al certificat"
 
@@ -528,11 +528,11 @@ msgstr "Requereix ús de clau explícit al certificat"
 msgid "Restart after remote ping timeout"
 msgstr "Reinicia després d'excedir el temps d'espera de ping remot"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:794
 msgid "Restrict the allowed ciphers to be negotiated"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
 msgid "Retransmit timeout on TLS control channel"
 msgstr "Temps d'espera de retransmissió en canal de control TLS"
 
@@ -713,11 +713,11 @@ msgstr "Port TCP/UDP per local (defecte=1194)"
 msgid "TCP/UDP port # for remote (default=1194)"
 msgstr "Port TCP/UDP per remot (defecte=1194)"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
 msgid "TLS 1.3 or newer cipher"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
 msgid "TLS cipher"
 msgstr "Xifrador TLS"
 
@@ -744,16 +744,16 @@ msgid ""
 "configuration."
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:782
 msgid "The highest supported TLS version"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:786
 #: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:73
 msgid "The key direction for 'tls-auth' and 'secret' options"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:778
 msgid "The lowest supported TLS version"
 msgstr ""
 
@@ -763,11 +763,11 @@ msgid ""
 "LuCI (&ge; 100 KB)."
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:790
 msgid "This completely disables cipher negotiation"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
 msgid "Timeframe for key exchange"
 msgstr "Calendari per intercanvi de claus"
 
diff --git a/applications/luci-app-openvpn/po/cs/openvpn.po b/applications/luci-app-openvpn/po/cs/openvpn.po
index f4dc19908..b9a1dc81f 100644
--- a/applications/luci-app-openvpn/po/cs/openvpn.po
+++ b/applications/luci-app-openvpn/po/cs/openvpn.po
@@ -11,8 +11,8 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Generator: Pootle 2.0.6\n"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:822
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:825
 msgid "%s"
 msgstr "%s"
 
@@ -36,7 +36,7 @@ msgstr "Přidat trasu po navázání spojení"
 msgid "Add template based configuration"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
 msgid "Additional authentication over TLS"
 msgstr "Dodatečné ověření přes TLS"
 
@@ -49,7 +49,7 @@ msgstr "Povolit provoz typu klient-klient"
 msgid "Allow multiple clients with same certificate"
 msgstr "Povolit více klientů se stejným certifikátem"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
 msgid "Allow only one session"
 msgstr "Povolit pouze jedno sezení"
 
@@ -103,7 +103,7 @@ msgstr "Změnit prioritu procesu"
 msgid "Change to directory before initialization"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:774
 msgid "Check peer certificate against a CRL"
 msgstr ""
 
@@ -188,7 +188,7 @@ msgstr ""
 msgid "Don't add routes automatically"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
 msgid "Don't cache --askpass or --auth-user-pass passwords"
 msgstr ""
 
@@ -266,7 +266,7 @@ msgstr ""
 msgid "Enabled"
 msgstr "Povoleno"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
 msgid "Encrypt and authenticate all control channel packets with the key"
 msgstr ""
 
@@ -294,11 +294,11 @@ msgid ""
 "added to OpenVPN's internal routing table"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
 msgid "Exit on TLS negotiation failure"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
 msgid "Get PEM password from controlling tty before we daemonize"
 msgstr ""
 
@@ -342,7 +342,7 @@ msgstr ""
 msgid "Keep tun/tap device open on restart"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
 msgid "Key transition window"
 msgstr ""
 
@@ -384,7 +384,7 @@ msgstr ""
 msgid "OVPN configuration file upload"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
 msgid "Only accept connections from given X509 name"
 msgstr ""
 
@@ -495,15 +495,15 @@ msgstr ""
 msgid "Remote ping timeout"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
 msgid "Renegotiate data chan. key after bytes"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
 msgid "Renegotiate data chan. key after packets"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
 msgid "Renegotiate data chan. key after seconds"
 msgstr ""
 
@@ -511,11 +511,11 @@ msgstr ""
 msgid "Replay protection sliding window size"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
 msgid "Require explicit designation on certificate"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
 msgid "Require explicit key usage on certificate"
 msgstr ""
 
@@ -523,11 +523,11 @@ msgstr ""
 msgid "Restart after remote ping timeout"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:794
 msgid "Restrict the allowed ciphers to be negotiated"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
 msgid "Retransmit timeout on TLS control channel"
 msgstr ""
 
@@ -707,11 +707,11 @@ msgstr ""
 msgid "TCP/UDP port # for remote (default=1194)"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
 msgid "TLS 1.3 or newer cipher"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
 msgid "TLS cipher"
 msgstr "TLS Å¡ifra"
 
@@ -738,16 +738,16 @@ msgid ""
 "configuration."
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:782
 msgid "The highest supported TLS version"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:786
 #: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:73
 msgid "The key direction for 'tls-auth' and 'secret' options"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:778
 msgid "The lowest supported TLS version"
 msgstr ""
 
@@ -757,11 +757,11 @@ msgid ""
 "LuCI (&ge; 100 KB)."
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:790
 msgid "This completely disables cipher negotiation"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
 msgid "Timeframe for key exchange"
 msgstr ""
 
diff --git a/applications/luci-app-openvpn/po/de/openvpn.po b/applications/luci-app-openvpn/po/de/openvpn.po
index 279b5d817..dc9ff8195 100644
--- a/applications/luci-app-openvpn/po/de/openvpn.po
+++ b/applications/luci-app-openvpn/po/de/openvpn.po
@@ -13,8 +13,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.6\n"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:822
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:825
 msgid "%s"
 msgstr "%s"
 
@@ -38,7 +38,7 @@ msgstr "Netzwerkrouten nach Verbindungsaufbau einrichten"
 msgid "Add template based configuration"
 msgstr "Hinzufügen einer vorlagenbasierten Konfiguration"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
 msgid "Additional authentication over TLS"
 msgstr "Erweiterte Authentifikation über TLS"
 
@@ -51,7 +51,7 @@ msgstr "Netzwerkverkehr zwischen Teilnehmern zulassen"
 msgid "Allow multiple clients with same certificate"
 msgstr "Mehrere Teilnehmer mit selbem Zertifikat erlauben"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
 msgid "Allow only one session"
 msgstr "Nur eine einzige Verbindung zulassen"
 
@@ -106,7 +106,7 @@ msgstr "Prozess-Priorität anpassen"
 msgid "Change to directory before initialization"
 msgstr "<em>Vor</em> der Initialisierung in Verzeichnis wechseln"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:774
 msgid "Check peer certificate against a CRL"
 msgstr "Teilnehmerzertifikat mit Sperrliste abgleichen"
 
@@ -191,13 +191,14 @@ msgstr "Schnittstellenkonfiguration nicht durchführen"
 msgid "Don't add routes automatically"
 msgstr "Netzwerkrouten nicht automatisch einrichten"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
 msgid "Don't cache --askpass or --auth-user-pass passwords"
 msgstr "Authentifikationsdaten nicht zwischenspeichern"
 
 #: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:244
 msgid "Don't drop incoming tun packets with same destination as host"
-msgstr "Eingehende Tun-Pakete mit dem gleichen Ziel wie der Host nicht verwerfen"
+msgstr ""
+"Eingehende Tun-Pakete mit dem gleichen Ziel wie der Host nicht verwerfen"
 
 #: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:386
 msgid "Don't inherit global push options"
@@ -269,9 +270,11 @@ msgstr "Administratorschnittstelle aktivieren"
 msgid "Enabled"
 msgstr "Einschalten"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
 msgid "Encrypt and authenticate all control channel packets with the key"
-msgstr "Verschlüsseln und authentifizieren aller Kontrollkanalpakete mit dem Schlüssel"
+msgstr ""
+"Verschlüsseln und authentifizieren aller Kontrollkanalpakete mit dem "
+"Schlüssel"
 
 #: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:622
 msgid "Encryption cipher for packets"
@@ -301,11 +304,11 @@ msgstr ""
 "Wird im Servermodus ausgeführt, wann immer eine IPv4-Adresse/Route oder MAC-"
 "Adresse zur internen Routingtabelle von OpenVPN hinzugefügt wird"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
 msgid "Exit on TLS negotiation failure"
 msgstr "Terminieren nach fehlgeschlagenem Schlüsselaustausch"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
 msgid "Get PEM password from controlling tty before we daemonize"
 msgstr "PEM-Passwort von Konsole abfragen"
 
@@ -351,7 +354,7 @@ msgstr "IP-Adresse der Gegenstelle bei Neustarts beibehalten"
 msgid "Keep tun/tap device open on restart"
 msgstr "TUN/TAP Schnittelle bei Neustarts offen halten"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
 msgid "Key transition window"
 msgstr "Maximaler Zeitraum für Schlüsselwechsel"
 
@@ -393,7 +396,7 @@ msgstr "Anzahl der Zeilen im Protokoll-Zwischenspeicher"
 msgid "OVPN configuration file upload"
 msgstr "OVPN-Konfigurationsdatei hochladen"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
 msgid "Only accept connections from given X509 name"
 msgstr "Nur Verbindungen vom angegebenem X.509 Name zulassen"
 
@@ -505,15 +508,15 @@ msgstr "Entfernter Rechnername oder IP-Adresse"
 msgid "Remote ping timeout"
 msgstr "Ping-Timeout für Gegenstellen"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
 msgid "Renegotiate data chan. key after bytes"
 msgstr "Schlüssel nach maximale Verkehrsmenge neu aushandeln"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
 msgid "Renegotiate data chan. key after packets"
 msgstr "Schlüssel nach maximaler Anzahl von Paketen neu aushandeln"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
 msgid "Renegotiate data chan. key after seconds"
 msgstr "Schlüssel nach maximaler Verbindungsdauer neu aushandeln"
 
@@ -521,11 +524,11 @@ msgstr "Schlüssel nach maximaler Verbindungsdauer neu aushandeln"
 msgid "Replay protection sliding window size"
 msgstr "Fenstergröße für \"Replay\"-Schutz"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
 msgid "Require explicit designation on certificate"
 msgstr "Verwendungszweck von Zertifikaten überprüfen"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
 msgid "Require explicit key usage on certificate"
 msgstr "Zertifikat explizit auf einfachen Verwendungszweck prüfen"
 
@@ -533,11 +536,11 @@ msgstr "Zertifikat explizit auf einfachen Verwendungszweck prüfen"
 msgid "Restart after remote ping timeout"
 msgstr "Neu Starten nach Ping-Timeout an Gegenstellen"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:794
 msgid "Restrict the allowed ciphers to be negotiated"
 msgstr "Einschränkung der zulässigen zu verhandelnden Verschlüsselungen"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
 msgid "Retransmit timeout on TLS control channel"
 msgstr "TLS Timeout"
 
@@ -721,11 +724,11 @@ msgstr "Lokaler TCP oder UDP Port"
 msgid "TCP/UDP port # for remote (default=1194)"
 msgstr "TCP oder UDP Port der Gegenstelle"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
 msgid "TLS 1.3 or newer cipher"
 msgstr "TLS 1.3 (oder neuer) Verschlüsselungsalgorithmus"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
 msgid "TLS cipher"
 msgstr "TLS Verschlüsselungsalgorithmus"
 
@@ -754,16 +757,16 @@ msgstr ""
 "Die OVPN-Konfigurationsdatei (%s) konnte nicht gefunden werden, bitte "
 "überprüfen Sie Ihre Konfiguration."
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:782
 msgid "The highest supported TLS version"
 msgstr "Die höchste unterstützte TLS-Version"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:786
 #: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:73
 msgid "The key direction for 'tls-auth' and 'secret' options"
 msgstr "Schlüssel-Richtung für die Optionen 'tls-auth' und 'secret'"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:778
 msgid "The lowest supported TLS version"
 msgstr "Die niedrigste unterstützte TLS-Version"
 
@@ -775,11 +778,11 @@ msgstr ""
 "Die Größe der OVPN-Konfigurationsdatei (%s) ist zu groß für die Online-"
 "Bearbeitung in der LuCI (&ge; 100KB)."
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:790
 msgid "This completely disables cipher negotiation"
 msgstr "Vollständig Deaktivierung der Chiffren-Verhandlung"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
 msgid "Timeframe for key exchange"
 msgstr "Maximaler Zeitraum für Schlüsselaustausch"
 
diff --git a/applications/luci-app-openvpn/po/el/openvpn.po b/applications/luci-app-openvpn/po/el/openvpn.po
index 359739618..7f3b70c7d 100644
--- a/applications/luci-app-openvpn/po/el/openvpn.po
+++ b/applications/luci-app-openvpn/po/el/openvpn.po
@@ -13,8 +13,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.4\n"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:822
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:825
 msgid "%s"
 msgstr "%s"
 
@@ -38,7 +38,7 @@ msgstr ""
 msgid "Add template based configuration"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
 msgid "Additional authentication over TLS"
 msgstr ""
 
@@ -51,7 +51,7 @@ msgstr ""
 msgid "Allow multiple clients with same certificate"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
 msgid "Allow only one session"
 msgstr ""
 
@@ -107,7 +107,7 @@ msgstr ""
 msgid "Change to directory before initialization"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:774
 msgid "Check peer certificate against a CRL"
 msgstr ""
 
@@ -192,7 +192,7 @@ msgstr ""
 msgid "Don't add routes automatically"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
 msgid "Don't cache --askpass or --auth-user-pass passwords"
 msgstr ""
 
@@ -270,7 +270,7 @@ msgstr ""
 msgid "Enabled"
 msgstr "Ενεργοποιημένο"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
 msgid "Encrypt and authenticate all control channel packets with the key"
 msgstr ""
 
@@ -298,11 +298,11 @@ msgid ""
 "added to OpenVPN's internal routing table"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
 msgid "Exit on TLS negotiation failure"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
 msgid "Get PEM password from controlling tty before we daemonize"
 msgstr ""
 
@@ -347,7 +347,7 @@ msgstr ""
 msgid "Keep tun/tap device open on restart"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
 msgid "Key transition window"
 msgstr ""
 
@@ -389,7 +389,7 @@ msgstr ""
 msgid "OVPN configuration file upload"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
 msgid "Only accept connections from given X509 name"
 msgstr ""
 
@@ -500,15 +500,15 @@ msgstr "Όνομα απομακρυσμένου μηχανήματος ή διε
 msgid "Remote ping timeout"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
 msgid "Renegotiate data chan. key after bytes"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
 msgid "Renegotiate data chan. key after packets"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
 msgid "Renegotiate data chan. key after seconds"
 msgstr ""
 
@@ -516,11 +516,11 @@ msgstr ""
 msgid "Replay protection sliding window size"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
 msgid "Require explicit designation on certificate"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
 msgid "Require explicit key usage on certificate"
 msgstr ""
 
@@ -528,11 +528,11 @@ msgstr ""
 msgid "Restart after remote ping timeout"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:794
 msgid "Restrict the allowed ciphers to be negotiated"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
 msgid "Retransmit timeout on TLS control channel"
 msgstr ""
 
@@ -712,11 +712,11 @@ msgstr "TCP/UDP αριθμός θύρας για το τοπικό (εξ'ορι
 msgid "TCP/UDP port # for remote (default=1194)"
 msgstr "TCP/UDP αριθμός θύρας για τον απομακρυσμένο (εξ'ορισμού=1194)"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
 msgid "TLS 1.3 or newer cipher"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
 msgid "TLS cipher"
 msgstr ""
 
@@ -743,16 +743,16 @@ msgid ""
 "configuration."
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:782
 msgid "The highest supported TLS version"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:786
 #: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:73
 msgid "The key direction for 'tls-auth' and 'secret' options"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:778
 msgid "The lowest supported TLS version"
 msgstr ""
 
@@ -762,11 +762,11 @@ msgid ""
 "LuCI (&ge; 100 KB)."
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:790
 msgid "This completely disables cipher negotiation"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
 msgid "Timeframe for key exchange"
 msgstr ""
 
diff --git a/applications/luci-app-openvpn/po/en/openvpn.po b/applications/luci-app-openvpn/po/en/openvpn.po
index 61925d476..ca818a437 100644
--- a/applications/luci-app-openvpn/po/en/openvpn.po
+++ b/applications/luci-app-openvpn/po/en/openvpn.po
@@ -13,8 +13,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.4\n"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:822
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:825
 msgid "%s"
 msgstr ""
 
@@ -38,7 +38,7 @@ msgstr "Add route after establishing connection"
 msgid "Add template based configuration"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
 msgid "Additional authentication over TLS"
 msgstr "Additional authentication over TLS"
 
@@ -51,7 +51,7 @@ msgstr "Allow client-to-client traffic"
 msgid "Allow multiple clients with same certificate"
 msgstr "Allow multiple clients with same certificate"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
 msgid "Allow only one session"
 msgstr "Allow only one session"
 
@@ -106,7 +106,7 @@ msgstr "Change process priority"
 msgid "Change to directory before initialization"
 msgstr "Change to directory before initialization"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:774
 msgid "Check peer certificate against a CRL"
 msgstr "Check peer certificate against a CRL"
 
@@ -191,7 +191,7 @@ msgstr "Don't actually execute ifconfig"
 msgid "Don't add routes automatically"
 msgstr "Don't add routes automatically"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
 msgid "Don't cache --askpass or --auth-user-pass passwords"
 msgstr "Don't cache --askpass or --auth-user-pass passwords"
 
@@ -269,7 +269,7 @@ msgstr "Enable management interface on <em>IP</em> <em>port</em>"
 msgid "Enabled"
 msgstr "Enabled"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
 msgid "Encrypt and authenticate all control channel packets with the key"
 msgstr "Encrypt and authenticate all control channel packets with the key"
 
@@ -297,11 +297,11 @@ msgid ""
 "added to OpenVPN's internal routing table"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
 msgid "Exit on TLS negotiation failure"
 msgstr "Exit on TLS negotiation failure"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
 msgid "Get PEM password from controlling tty before we daemonize"
 msgstr "Get PEM password from controlling tty before we daemonize"
 
@@ -345,7 +345,7 @@ msgstr "Keep remote IP address on restart"
 msgid "Keep tun/tap device open on restart"
 msgstr "Keep tun/tap device open on restart"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
 msgid "Key transition window"
 msgstr "Key transition window"
 
@@ -387,7 +387,7 @@ msgstr "Number of lines for log file history"
 msgid "OVPN configuration file upload"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
 msgid "Only accept connections from given X509 name"
 msgstr "Only accept connections from given X509 name"
 
@@ -498,15 +498,15 @@ msgstr "Remote host name or ip address"
 msgid "Remote ping timeout"
 msgstr "Remote ping timeout"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
 msgid "Renegotiate data chan. key after bytes"
 msgstr "Renegotiate data chan. key after bytes"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
 msgid "Renegotiate data chan. key after packets"
 msgstr "Renegotiate data chan. key after packets"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
 msgid "Renegotiate data chan. key after seconds"
 msgstr "Renegotiate data chan. key after seconds"
 
@@ -514,11 +514,11 @@ msgstr "Renegotiate data chan. key after seconds"
 msgid "Replay protection sliding window size"
 msgstr "Replay protection sliding window size"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
 msgid "Require explicit designation on certificate"
 msgstr "Require explicit designation on certificate"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
 msgid "Require explicit key usage on certificate"
 msgstr "Require explicit key usage on certificate"
 
@@ -526,11 +526,11 @@ msgstr "Require explicit key usage on certificate"
 msgid "Restart after remote ping timeout"
 msgstr "Restart after remote ping timeout"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:794
 msgid "Restrict the allowed ciphers to be negotiated"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
 msgid "Retransmit timeout on TLS control channel"
 msgstr "Retransmit timeout on TLS control channel"
 
@@ -710,11 +710,11 @@ msgstr "TCP/UDP port # for local (default=1194)"
 msgid "TCP/UDP port # for remote (default=1194)"
 msgstr "TCP/UDP port # for remote (default=1194)"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
 msgid "TLS 1.3 or newer cipher"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
 msgid "TLS cipher"
 msgstr "TLS cipher"
 
@@ -741,16 +741,16 @@ msgid ""
 "configuration."
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:782
 msgid "The highest supported TLS version"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:786
 #: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:73
 msgid "The key direction for 'tls-auth' and 'secret' options"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:778
 msgid "The lowest supported TLS version"
 msgstr ""
 
@@ -760,11 +760,11 @@ msgid ""
 "LuCI (&ge; 100 KB)."
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:790
 msgid "This completely disables cipher negotiation"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
 msgid "Timeframe for key exchange"
 msgstr "Timeframe for key exchange"
 
diff --git a/applications/luci-app-openvpn/po/es/openvpn.po b/applications/luci-app-openvpn/po/es/openvpn.po
index e1f22acb6..fb625987e 100644
--- a/applications/luci-app-openvpn/po/es/openvpn.po
+++ b/applications/luci-app-openvpn/po/es/openvpn.po
@@ -13,8 +13,8 @@ msgstr ""
 "X-Generator: Poedit 2.2.1\n"
 "Language-Team: \n"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:822
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:825
 msgid "%s"
 msgstr "%s"
 
@@ -38,7 +38,7 @@ msgstr "Añadir la ruta tras establecer la conexión"
 msgid "Add template based configuration"
 msgstr "Agregar configuración basada en plantillas"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
 msgid "Additional authentication over TLS"
 msgstr "Autentificación adicional con TLS"
 
@@ -51,7 +51,7 @@ msgstr "Permitir el tráfico cliente-a-cliente"
 msgid "Allow multiple clients with same certificate"
 msgstr "Permitir múltiples clientes con el mismo certificado"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
 msgid "Allow only one session"
 msgstr "Permitir sólo una sesión"
 
@@ -105,7 +105,7 @@ msgstr "Cambiar la prioridad del proceso"
 msgid "Change to directory before initialization"
 msgstr "Cambiar a este directorio antes de inicializar"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:774
 msgid "Check peer certificate against a CRL"
 msgstr "Comprobar certificados contra un CRL"
 
@@ -190,7 +190,7 @@ msgstr "No ejecutar ifconfig"
 msgid "Don't add routes automatically"
 msgstr "No añadir rutas automáticamente"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
 msgid "Don't cache --askpass or --auth-user-pass passwords"
 msgstr "No guardar las contraseñas --askpass o --auth-user-pass"
 
@@ -269,7 +269,7 @@ msgstr "Habilitar la interfaz de administración en <em>IP</em> <em>puerto</em>"
 msgid "Enabled"
 msgstr "habilitado"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
 msgid "Encrypt and authenticate all control channel packets with the key"
 msgstr ""
 "Cifre y autentique todos los paquetes del canal de control con la clave"
@@ -302,11 +302,11 @@ msgstr ""
 "Ejecutado en modo servidor cuando una ruta, dirección IPv4 o dirección MAC "
 "se añade a la tabla de rutas interna de OpenVPN"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
 msgid "Exit on TLS negotiation failure"
 msgstr "Salir si falla la negociación"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
 msgid "Get PEM password from controlling tty before we daemonize"
 msgstr "Obtener la clave PEM del tty de control antes de demonizar"
 
@@ -352,7 +352,7 @@ msgstr "Mantener la dirección IP remota al reiniciar"
 msgid "Keep tun/tap device open on restart"
 msgstr "Mantener el dispositivo TUN/TAP abierto al reiniciar"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
 msgid "Key transition window"
 msgstr "Ventana de transición de clave"
 
@@ -394,7 +394,7 @@ msgstr "Líneas en el archivo de registro histórico"
 msgid "OVPN configuration file upload"
 msgstr "Carga del archivo de configuración OVPN"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
 msgid "Only accept connections from given X509 name"
 msgstr "Aceptar solo conexiones desde este nombre X509"
 
@@ -507,15 +507,15 @@ msgstr "Nombre de máquina remota o dirección IP"
 msgid "Remote ping timeout"
 msgstr "Tiempo de espera de ping remoto"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
 msgid "Renegotiate data chan. key after bytes"
 msgstr "Bytes tras los que renegociar la clave del canal del datos"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
 msgid "Renegotiate data chan. key after packets"
 msgstr "Paquetes tras los que renegociar la clave del canal del datos"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
 msgid "Renegotiate data chan. key after seconds"
 msgstr "Segundos tras los que renegociar la clave del canal del datos"
 
@@ -523,11 +523,11 @@ msgstr "Segundos tras los que renegociar la clave del canal del datos"
 msgid "Replay protection sliding window size"
 msgstr "Tamaño de la ventana deslizante de la protección de reproducción"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
 msgid "Require explicit designation on certificate"
 msgstr "Designación explícita de certificado"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
 msgid "Require explicit key usage on certificate"
 msgstr "Clave de uso explícita de certificado"
 
@@ -535,11 +535,11 @@ msgstr "Clave de uso explícita de certificado"
 msgid "Restart after remote ping timeout"
 msgstr "Reiniciar después de tiempo de espera de ping remoto"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:794
 msgid "Restrict the allowed ciphers to be negotiated"
 msgstr "Restringir los cifrados permitidos para ser negociados"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
 msgid "Retransmit timeout on TLS control channel"
 msgstr "Espera de retransmisión en el canal de control TLS"
 
@@ -721,11 +721,11 @@ msgstr "Número de puerto TCP/UDP para local (default=1194)"
 msgid "TCP/UDP port # for remote (default=1194)"
 msgstr "Número de puerto TCP/UDP para remoto (default=1194)"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
 msgid "TLS 1.3 or newer cipher"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
 msgid "TLS cipher"
 msgstr "Cifrado TLS"
 
@@ -755,16 +755,16 @@ msgstr ""
 "No se pudo encontrar el archivo de configuración OVPN (%s), verifique su "
 "configuración."
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:782
 msgid "The highest supported TLS version"
 msgstr "La versión TLS más alta soportada"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:786
 #: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:73
 msgid "The key direction for 'tls-auth' and 'secret' options"
 msgstr "La dirección clave para las opciones 'tls-auth' y 'secret'"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:778
 msgid "The lowest supported TLS version"
 msgstr "La versión TLS más baja soportada"
 
@@ -776,11 +776,11 @@ msgstr ""
 "El tamaño del archivo de configuración OVPN (%s) es demasiado grande para la "
 "edición en línea en LuCI (&ge; 100 KB)."
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:790
 msgid "This completely disables cipher negotiation"
 msgstr "Esto deshabilita completamente la negociación de cifrado."
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
 msgid "Timeframe for key exchange"
 msgstr "Tiempo de intercambio de clave"
 
diff --git a/applications/luci-app-openvpn/po/fr/openvpn.po b/applications/luci-app-openvpn/po/fr/openvpn.po
index 243bcdf48..8a58a74f4 100644
--- a/applications/luci-app-openvpn/po/fr/openvpn.po
+++ b/applications/luci-app-openvpn/po/fr/openvpn.po
@@ -13,8 +13,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Pootle 2.0.6\n"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:822
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:825
 msgid "%s"
 msgstr "%s"
 
@@ -38,7 +38,7 @@ msgstr "Ajouter un routage après l'établissement de la connexion"
 msgid "Add template based configuration"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
 msgid "Additional authentication over TLS"
 msgstr "Authentification supplémentaire par dessus TLS"
 
@@ -51,7 +51,7 @@ msgstr "Autoriser le trafic entre clients"
 msgid "Allow multiple clients with same certificate"
 msgstr "Permettre à plusieurs clients d'utiliser le même certificat"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
 msgid "Allow only one session"
 msgstr "Autoriser seulement une session"
 
@@ -109,7 +109,7 @@ msgstr "Modifier la priorité du processus"
 msgid "Change to directory before initialization"
 msgstr "Aller dans ce répertorie avant l'initialisation"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:774
 msgid "Check peer certificate against a CRL"
 msgstr ""
 "Confronter le certificat du distant à une liste des certificats révoqués "
@@ -198,7 +198,7 @@ msgstr "Ne pas exécuter réellement ifconfig"
 msgid "Don't add routes automatically"
 msgstr "Ne pas ajouter de routes automatiquement"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
 msgid "Don't cache --askpass or --auth-user-pass passwords"
 msgstr ""
 "Ne pas copier en cache les mots de passe des options --askpass ou --auth-"
@@ -278,7 +278,7 @@ msgstr "Activer l'interface de gestion sur <em>IP</em> <em>port</em>"
 msgid "Enabled"
 msgstr "Activé"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
 msgid "Encrypt and authenticate all control channel packets with the key"
 msgstr ""
 
@@ -311,11 +311,11 @@ msgstr ""
 "Lancé en mode serveur à chaque fois qu'une adresse/route IPv4 ou une adresse "
 "MAC est ajoutée à la table de routage interne d'OpenVPN"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
 msgid "Exit on TLS negotiation failure"
 msgstr "Arrêter suite à l'échec de la négociation TLS"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
 msgid "Get PEM password from controlling tty before we daemonize"
 msgstr ""
 "Obtenir le mot de passe du certificat depuis le terminal avant de passer en "
@@ -363,7 +363,7 @@ msgstr "Conserver l'adresse IP distante lors du redémarrage"
 msgid "Keep tun/tap device open on restart"
 msgstr "Conserver le périphérique tun/tap ouvert au redémarrage"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
 msgid "Key transition window"
 msgstr ""
 
@@ -405,7 +405,7 @@ msgstr "Nombre de lignes de l'historique du fichier-journal"
 msgid "OVPN configuration file upload"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
 msgid "Only accept connections from given X509 name"
 msgstr "Accepte seulement des connexions du nom X509 donné"
 
@@ -518,15 +518,15 @@ msgstr "Nom ou adresse IP de l'hôte distant"
 msgid "Remote ping timeout"
 msgstr "Délai de ping du distant"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
 msgid "Renegotiate data chan. key after bytes"
 msgstr "Renégocier la clé du canal de données après tant d'octets"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
 msgid "Renegotiate data chan. key after packets"
 msgstr "Renégocier la clé du canal de données après tant de paquets"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
 msgid "Renegotiate data chan. key after seconds"
 msgstr ""
 "Renégocier la clé du canal de données après tant de temps (en secondes)"
@@ -535,11 +535,11 @@ msgstr ""
 msgid "Replay protection sliding window size"
 msgstr "Taille de la fenêtre glissante pour la protection anti-rejeu"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
 msgid "Require explicit designation on certificate"
 msgstr "Exiger l'appellation explicite sur le certificat"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
 msgid "Require explicit key usage on certificate"
 msgstr "Exiger l'utilisation explicite de la clé sur le certificat"
 
@@ -547,11 +547,11 @@ msgstr "Exiger l'utilisation explicite de la clé sur le certificat"
 msgid "Restart after remote ping timeout"
 msgstr "Redémarrer aprés le dépassement du délai de ping du distant"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:794
 msgid "Restrict the allowed ciphers to be negotiated"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
 msgid "Retransmit timeout on TLS control channel"
 msgstr "Renvoyer l'expiration du délai sur le canal de contrôle TLS"
 
@@ -732,11 +732,11 @@ msgstr "Numéro de port TCP/UDP pour l'hôte local (par défaut 1194)"
 msgid "TCP/UDP port # for remote (default=1194)"
 msgstr "Numéro de port TCP/UDP pour l'hôte distant (par défaut 1194)"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
 msgid "TLS 1.3 or newer cipher"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
 msgid "TLS cipher"
 msgstr "Méthode de chiffrement TLS"
 
@@ -763,16 +763,16 @@ msgid ""
 "configuration."
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:782
 msgid "The highest supported TLS version"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:786
 #: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:73
 msgid "The key direction for 'tls-auth' and 'secret' options"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:778
 msgid "The lowest supported TLS version"
 msgstr ""
 
@@ -782,11 +782,11 @@ msgid ""
 "LuCI (&ge; 100 KB)."
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:790
 msgid "This completely disables cipher negotiation"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
 msgid "Timeframe for key exchange"
 msgstr "Période d'un échange de clés"
 
diff --git a/applications/luci-app-openvpn/po/he/openvpn.po b/applications/luci-app-openvpn/po/he/openvpn.po
index ff4022e9d..a58e8c4c6 100644
--- a/applications/luci-app-openvpn/po/he/openvpn.po
+++ b/applications/luci-app-openvpn/po/he/openvpn.po
@@ -9,8 +9,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:822
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:825
 msgid "%s"
 msgstr ""
 
@@ -34,7 +34,7 @@ msgstr ""
 msgid "Add template based configuration"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
 msgid "Additional authentication over TLS"
 msgstr ""
 
@@ -47,7 +47,7 @@ msgstr ""
 msgid "Allow multiple clients with same certificate"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
 msgid "Allow only one session"
 msgstr ""
 
@@ -101,7 +101,7 @@ msgstr ""
 msgid "Change to directory before initialization"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:774
 msgid "Check peer certificate against a CRL"
 msgstr ""
 
@@ -186,7 +186,7 @@ msgstr ""
 msgid "Don't add routes automatically"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
 msgid "Don't cache --askpass or --auth-user-pass passwords"
 msgstr ""
 
@@ -264,7 +264,7 @@ msgstr ""
 msgid "Enabled"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
 msgid "Encrypt and authenticate all control channel packets with the key"
 msgstr ""
 
@@ -292,11 +292,11 @@ msgid ""
 "added to OpenVPN's internal routing table"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
 msgid "Exit on TLS negotiation failure"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
 msgid "Get PEM password from controlling tty before we daemonize"
 msgstr ""
 
@@ -340,7 +340,7 @@ msgstr ""
 msgid "Keep tun/tap device open on restart"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
 msgid "Key transition window"
 msgstr ""
 
@@ -382,7 +382,7 @@ msgstr ""
 msgid "OVPN configuration file upload"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
 msgid "Only accept connections from given X509 name"
 msgstr ""
 
@@ -493,15 +493,15 @@ msgstr ""
 msgid "Remote ping timeout"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
 msgid "Renegotiate data chan. key after bytes"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
 msgid "Renegotiate data chan. key after packets"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
 msgid "Renegotiate data chan. key after seconds"
 msgstr ""
 
@@ -509,11 +509,11 @@ msgstr ""
 msgid "Replay protection sliding window size"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
 msgid "Require explicit designation on certificate"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
 msgid "Require explicit key usage on certificate"
 msgstr ""
 
@@ -521,11 +521,11 @@ msgstr ""
 msgid "Restart after remote ping timeout"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:794
 msgid "Restrict the allowed ciphers to be negotiated"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
 msgid "Retransmit timeout on TLS control channel"
 msgstr ""
 
@@ -705,11 +705,11 @@ msgstr ""
 msgid "TCP/UDP port # for remote (default=1194)"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
 msgid "TLS 1.3 or newer cipher"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
 msgid "TLS cipher"
 msgstr ""
 
@@ -736,16 +736,16 @@ msgid ""
 "configuration."
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:782
 msgid "The highest supported TLS version"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:786
 #: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:73
 msgid "The key direction for 'tls-auth' and 'secret' options"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:778
 msgid "The lowest supported TLS version"
 msgstr ""
 
@@ -755,11 +755,11 @@ msgid ""
 "LuCI (&ge; 100 KB)."
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:790
 msgid "This completely disables cipher negotiation"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
 msgid "Timeframe for key exchange"
 msgstr ""
 
diff --git a/applications/luci-app-openvpn/po/hu/openvpn.po b/applications/luci-app-openvpn/po/hu/openvpn.po
index 51d2218df..b0688085a 100644
--- a/applications/luci-app-openvpn/po/hu/openvpn.po
+++ b/applications/luci-app-openvpn/po/hu/openvpn.po
@@ -11,8 +11,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.6\n"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:822
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:825
 msgid "%s"
 msgstr "%s"
 
@@ -36,7 +36,7 @@ msgstr "Útvonal hozzáadása a kapcsolat létrejötte után"
 msgid "Add template based configuration"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
 msgid "Additional authentication over TLS"
 msgstr "További hitelesítés TLS-en keresztül"
 
@@ -49,7 +49,7 @@ msgstr "Ügyfél-ügyfél közötti kapcsolat engedélyezése"
 msgid "Allow multiple clients with same certificate"
 msgstr "Több ügyfél engedélyezése ugyanazzal a tanúsítvánnyal"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
 msgid "Allow only one session"
 msgstr "Csak egy munkafolyamat engedélyezése"
 
@@ -105,7 +105,7 @@ msgstr "Folyamat prioritásának módosítása"
 msgid "Change to directory before initialization"
 msgstr "Váltás a könyvtárra inicializáslás előtt"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:774
 msgid "Check peer certificate against a CRL"
 msgstr "Kliens tanúsítvány összevetése a tiltólistával."
 
@@ -190,7 +190,7 @@ msgstr ""
 msgid "Don't add routes automatically"
 msgstr "Ne adjon hozzá útvonalakat automatikusan "
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
 msgid "Don't cache --askpass or --auth-user-pass passwords"
 msgstr ""
 
@@ -268,7 +268,7 @@ msgstr ""
 msgid "Enabled"
 msgstr "Engedélyezve"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
 msgid "Encrypt and authenticate all control channel packets with the key"
 msgstr ""
 
@@ -296,11 +296,11 @@ msgid ""
 "added to OpenVPN's internal routing table"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
 msgid "Exit on TLS negotiation failure"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
 msgid "Get PEM password from controlling tty before we daemonize"
 msgstr ""
 
@@ -344,7 +344,7 @@ msgstr "Távoli IP cím megtartása újraindításkor"
 msgid "Keep tun/tap device open on restart"
 msgstr "tun/tap eszközök nyitva tartása újraindításkor"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
 msgid "Key transition window"
 msgstr ""
 
@@ -386,7 +386,7 @@ msgstr "Naplófájl történet sorainak száma"
 msgid "OVPN configuration file upload"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
 msgid "Only accept connections from given X509 name"
 msgstr ""
 
@@ -497,15 +497,15 @@ msgstr "Távoli gép név vagy IP cím"
 msgid "Remote ping timeout"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
 msgid "Renegotiate data chan. key after bytes"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
 msgid "Renegotiate data chan. key after packets"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
 msgid "Renegotiate data chan. key after seconds"
 msgstr ""
 
@@ -513,11 +513,11 @@ msgstr ""
 msgid "Replay protection sliding window size"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
 msgid "Require explicit designation on certificate"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
 msgid "Require explicit key usage on certificate"
 msgstr ""
 
@@ -525,11 +525,11 @@ msgstr ""
 msgid "Restart after remote ping timeout"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:794
 msgid "Restrict the allowed ciphers to be negotiated"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
 msgid "Retransmit timeout on TLS control channel"
 msgstr ""
 
@@ -709,11 +709,11 @@ msgstr ""
 msgid "TCP/UDP port # for remote (default=1194)"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
 msgid "TLS 1.3 or newer cipher"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
 msgid "TLS cipher"
 msgstr "TLS titkosító"
 
@@ -740,16 +740,16 @@ msgid ""
 "configuration."
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:782
 msgid "The highest supported TLS version"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:786
 #: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:73
 msgid "The key direction for 'tls-auth' and 'secret' options"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:778
 msgid "The lowest supported TLS version"
 msgstr ""
 
@@ -759,11 +759,11 @@ msgid ""
 "LuCI (&ge; 100 KB)."
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:790
 msgid "This completely disables cipher negotiation"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
 msgid "Timeframe for key exchange"
 msgstr ""
 
diff --git a/applications/luci-app-openvpn/po/it/openvpn.po b/applications/luci-app-openvpn/po/it/openvpn.po
index f15ec1549..9a29cec9f 100644
--- a/applications/luci-app-openvpn/po/it/openvpn.po
+++ b/applications/luci-app-openvpn/po/it/openvpn.po
@@ -13,8 +13,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.4\n"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:822
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:825
 msgid "%s"
 msgstr "%s"
 
@@ -38,7 +38,7 @@ msgstr "Aggiungi rotte dopo aver stabilito la connessione"
 msgid "Add template based configuration"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
 msgid "Additional authentication over TLS"
 msgstr "Autenticazione addizionale over TLS"
 
@@ -51,7 +51,7 @@ msgstr "Permetti traffico client-client"
 msgid "Allow multiple clients with same certificate"
 msgstr "Permetti più client con lo stesso certificato"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
 msgid "Allow only one session"
 msgstr "Permetti solo una sessione"
 
@@ -105,7 +105,7 @@ msgstr "Cambia priorità del processo"
 msgid "Change to directory before initialization"
 msgstr "Cambia cartella prima dell'inizializzazione"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:774
 msgid "Check peer certificate against a CRL"
 msgstr "Verifica il certificato del nodo su una CRL"
 
@@ -190,7 +190,7 @@ msgstr "Non eseguire realmente ifconfig"
 msgid "Don't add routes automatically"
 msgstr "Non aggiungere rotte automaticamente"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
 msgid "Don't cache --askpass or --auth-user-pass passwords"
 msgstr "Non tenere in memoria le password di --askpass o di --auth-user-pass"
 
@@ -268,7 +268,7 @@ msgstr "Abilita l'interfaccia di controllo su <em>IP</em> <em>port</em>"
 msgid "Enabled"
 msgstr "Abilitato"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
 msgid "Encrypt and authenticate all control channel packets with the key"
 msgstr ""
 "Crittografa e autentica tutti i pacchetti del canale di controllo con la "
@@ -298,11 +298,11 @@ msgid ""
 "added to OpenVPN's internal routing table"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
 msgid "Exit on TLS negotiation failure"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
 msgid "Get PEM password from controlling tty before we daemonize"
 msgstr ""
 
@@ -346,7 +346,7 @@ msgstr "Mantieni l'IP remoto al riavvio"
 msgid "Keep tun/tap device open on restart"
 msgstr "Mantienti il device tun/tap aperto al riavvio"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
 msgid "Key transition window"
 msgstr ""
 
@@ -388,7 +388,7 @@ msgstr ""
 msgid "OVPN configuration file upload"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
 msgid "Only accept connections from given X509 name"
 msgstr ""
 
@@ -499,15 +499,15 @@ msgstr ""
 msgid "Remote ping timeout"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
 msgid "Renegotiate data chan. key after bytes"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
 msgid "Renegotiate data chan. key after packets"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
 msgid "Renegotiate data chan. key after seconds"
 msgstr ""
 
@@ -515,11 +515,11 @@ msgstr ""
 msgid "Replay protection sliding window size"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
 msgid "Require explicit designation on certificate"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
 msgid "Require explicit key usage on certificate"
 msgstr ""
 
@@ -527,11 +527,11 @@ msgstr ""
 msgid "Restart after remote ping timeout"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:794
 msgid "Restrict the allowed ciphers to be negotiated"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
 msgid "Retransmit timeout on TLS control channel"
 msgstr ""
 
@@ -711,11 +711,11 @@ msgstr ""
 msgid "TCP/UDP port # for remote (default=1194)"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
 msgid "TLS 1.3 or newer cipher"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
 msgid "TLS cipher"
 msgstr ""
 
@@ -742,16 +742,16 @@ msgid ""
 "configuration."
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:782
 msgid "The highest supported TLS version"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:786
 #: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:73
 msgid "The key direction for 'tls-auth' and 'secret' options"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:778
 msgid "The lowest supported TLS version"
 msgstr ""
 
@@ -761,11 +761,11 @@ msgid ""
 "LuCI (&ge; 100 KB)."
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:790
 msgid "This completely disables cipher negotiation"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
 msgid "Timeframe for key exchange"
 msgstr ""
 
diff --git a/applications/luci-app-openvpn/po/ja/openvpn.po b/applications/luci-app-openvpn/po/ja/openvpn.po
index e8f5403fe..685cc7229 100644
--- a/applications/luci-app-openvpn/po/ja/openvpn.po
+++ b/applications/luci-app-openvpn/po/ja/openvpn.po
@@ -13,8 +13,8 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Pootle 2.0.4\n"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:822
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:825
 msgid "%s"
 msgstr "%s"
 
@@ -38,7 +38,7 @@ msgstr ""
 msgid "Add template based configuration"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
 msgid "Additional authentication over TLS"
 msgstr ""
 
@@ -51,7 +51,7 @@ msgstr "クライアント間通信を許可する"
 msgid "Allow multiple clients with same certificate"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
 msgid "Allow only one session"
 msgstr "1つのセッションのみを許可する"
 
@@ -105,7 +105,7 @@ msgstr ""
 msgid "Change to directory before initialization"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:774
 msgid "Check peer certificate against a CRL"
 msgstr ""
 
@@ -190,7 +190,7 @@ msgstr ""
 msgid "Don't add routes automatically"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
 msgid "Don't cache --askpass or --auth-user-pass passwords"
 msgstr ""
 
@@ -268,7 +268,7 @@ msgstr ""
 msgid "Enabled"
 msgstr "有効"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
 msgid "Encrypt and authenticate all control channel packets with the key"
 msgstr ""
 
@@ -296,11 +296,11 @@ msgid ""
 "added to OpenVPN's internal routing table"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
 msgid "Exit on TLS negotiation failure"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
 msgid "Get PEM password from controlling tty before we daemonize"
 msgstr ""
 
@@ -344,7 +344,7 @@ msgstr ""
 msgid "Keep tun/tap device open on restart"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
 msgid "Key transition window"
 msgstr ""
 
@@ -386,7 +386,7 @@ msgstr ""
 msgid "OVPN configuration file upload"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
 msgid "Only accept connections from given X509 name"
 msgstr ""
 
@@ -497,15 +497,15 @@ msgstr ""
 msgid "Remote ping timeout"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
 msgid "Renegotiate data chan. key after bytes"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
 msgid "Renegotiate data chan. key after packets"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
 msgid "Renegotiate data chan. key after seconds"
 msgstr ""
 
@@ -513,11 +513,11 @@ msgstr ""
 msgid "Replay protection sliding window size"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
 msgid "Require explicit designation on certificate"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
 msgid "Require explicit key usage on certificate"
 msgstr ""
 
@@ -525,11 +525,11 @@ msgstr ""
 msgid "Restart after remote ping timeout"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:794
 msgid "Restrict the allowed ciphers to be negotiated"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
 msgid "Retransmit timeout on TLS control channel"
 msgstr ""
 
@@ -709,11 +709,11 @@ msgstr "TCP/UDP ポート (ローカル, 標準設定=1194)"
 msgid "TCP/UDP port # for remote (default=1194)"
 msgstr "TCP/UDP ポート (リモート, 標準設定=1194)"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
 msgid "TLS 1.3 or newer cipher"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
 msgid "TLS cipher"
 msgstr "TLS 暗号化方式"
 
@@ -740,16 +740,16 @@ msgid ""
 "configuration."
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:782
 msgid "The highest supported TLS version"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:786
 #: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:73
 msgid "The key direction for 'tls-auth' and 'secret' options"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:778
 msgid "The lowest supported TLS version"
 msgstr ""
 
@@ -759,11 +759,11 @@ msgid ""
 "LuCI (&ge; 100 KB)."
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:790
 msgid "This completely disables cipher negotiation"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
 msgid "Timeframe for key exchange"
 msgstr ""
 
diff --git a/applications/luci-app-openvpn/po/ms/openvpn.po b/applications/luci-app-openvpn/po/ms/openvpn.po
index 0ffe3fb72..a5891c488 100644
--- a/applications/luci-app-openvpn/po/ms/openvpn.po
+++ b/applications/luci-app-openvpn/po/ms/openvpn.po
@@ -8,8 +8,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:822
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:825
 msgid "%s"
 msgstr ""
 
@@ -33,7 +33,7 @@ msgstr ""
 msgid "Add template based configuration"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
 msgid "Additional authentication over TLS"
 msgstr ""
 
@@ -46,7 +46,7 @@ msgstr ""
 msgid "Allow multiple clients with same certificate"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
 msgid "Allow only one session"
 msgstr ""
 
@@ -100,7 +100,7 @@ msgstr ""
 msgid "Change to directory before initialization"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:774
 msgid "Check peer certificate against a CRL"
 msgstr ""
 
@@ -185,7 +185,7 @@ msgstr ""
 msgid "Don't add routes automatically"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
 msgid "Don't cache --askpass or --auth-user-pass passwords"
 msgstr ""
 
@@ -263,7 +263,7 @@ msgstr ""
 msgid "Enabled"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
 msgid "Encrypt and authenticate all control channel packets with the key"
 msgstr ""
 
@@ -291,11 +291,11 @@ msgid ""
 "added to OpenVPN's internal routing table"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
 msgid "Exit on TLS negotiation failure"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
 msgid "Get PEM password from controlling tty before we daemonize"
 msgstr ""
 
@@ -339,7 +339,7 @@ msgstr ""
 msgid "Keep tun/tap device open on restart"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
 msgid "Key transition window"
 msgstr ""
 
@@ -381,7 +381,7 @@ msgstr ""
 msgid "OVPN configuration file upload"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
 msgid "Only accept connections from given X509 name"
 msgstr ""
 
@@ -492,15 +492,15 @@ msgstr ""
 msgid "Remote ping timeout"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
 msgid "Renegotiate data chan. key after bytes"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
 msgid "Renegotiate data chan. key after packets"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
 msgid "Renegotiate data chan. key after seconds"
 msgstr ""
 
@@ -508,11 +508,11 @@ msgstr ""
 msgid "Replay protection sliding window size"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
 msgid "Require explicit designation on certificate"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
 msgid "Require explicit key usage on certificate"
 msgstr ""
 
@@ -520,11 +520,11 @@ msgstr ""
 msgid "Restart after remote ping timeout"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:794
 msgid "Restrict the allowed ciphers to be negotiated"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
 msgid "Retransmit timeout on TLS control channel"
 msgstr ""
 
@@ -704,11 +704,11 @@ msgstr ""
 msgid "TCP/UDP port # for remote (default=1194)"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
 msgid "TLS 1.3 or newer cipher"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
 msgid "TLS cipher"
 msgstr ""
 
@@ -735,16 +735,16 @@ msgid ""
 "configuration."
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:782
 msgid "The highest supported TLS version"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:786
 #: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:73
 msgid "The key direction for 'tls-auth' and 'secret' options"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:778
 msgid "The lowest supported TLS version"
 msgstr ""
 
@@ -754,11 +754,11 @@ msgid ""
 "LuCI (&ge; 100 KB)."
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:790
 msgid "This completely disables cipher negotiation"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
 msgid "Timeframe for key exchange"
 msgstr ""
 
diff --git a/applications/luci-app-openvpn/po/no/openvpn.po b/applications/luci-app-openvpn/po/no/openvpn.po
index ff4022e9d..a58e8c4c6 100644
--- a/applications/luci-app-openvpn/po/no/openvpn.po
+++ b/applications/luci-app-openvpn/po/no/openvpn.po
@@ -9,8 +9,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:822
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:825
 msgid "%s"
 msgstr ""
 
@@ -34,7 +34,7 @@ msgstr ""
 msgid "Add template based configuration"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
 msgid "Additional authentication over TLS"
 msgstr ""
 
@@ -47,7 +47,7 @@ msgstr ""
 msgid "Allow multiple clients with same certificate"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
 msgid "Allow only one session"
 msgstr ""
 
@@ -101,7 +101,7 @@ msgstr ""
 msgid "Change to directory before initialization"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:774
 msgid "Check peer certificate against a CRL"
 msgstr ""
 
@@ -186,7 +186,7 @@ msgstr ""
 msgid "Don't add routes automatically"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
 msgid "Don't cache --askpass or --auth-user-pass passwords"
 msgstr ""
 
@@ -264,7 +264,7 @@ msgstr ""
 msgid "Enabled"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
 msgid "Encrypt and authenticate all control channel packets with the key"
 msgstr ""
 
@@ -292,11 +292,11 @@ msgid ""
 "added to OpenVPN's internal routing table"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
 msgid "Exit on TLS negotiation failure"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
 msgid "Get PEM password from controlling tty before we daemonize"
 msgstr ""
 
@@ -340,7 +340,7 @@ msgstr ""
 msgid "Keep tun/tap device open on restart"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
 msgid "Key transition window"
 msgstr ""
 
@@ -382,7 +382,7 @@ msgstr ""
 msgid "OVPN configuration file upload"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
 msgid "Only accept connections from given X509 name"
 msgstr ""
 
@@ -493,15 +493,15 @@ msgstr ""
 msgid "Remote ping timeout"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
 msgid "Renegotiate data chan. key after bytes"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
 msgid "Renegotiate data chan. key after packets"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
 msgid "Renegotiate data chan. key after seconds"
 msgstr ""
 
@@ -509,11 +509,11 @@ msgstr ""
 msgid "Replay protection sliding window size"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
 msgid "Require explicit designation on certificate"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
 msgid "Require explicit key usage on certificate"
 msgstr ""
 
@@ -521,11 +521,11 @@ msgstr ""
 msgid "Restart after remote ping timeout"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:794
 msgid "Restrict the allowed ciphers to be negotiated"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
 msgid "Retransmit timeout on TLS control channel"
 msgstr ""
 
@@ -705,11 +705,11 @@ msgstr ""
 msgid "TCP/UDP port # for remote (default=1194)"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
 msgid "TLS 1.3 or newer cipher"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
 msgid "TLS cipher"
 msgstr ""
 
@@ -736,16 +736,16 @@ msgid ""
 "configuration."
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:782
 msgid "The highest supported TLS version"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:786
 #: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:73
 msgid "The key direction for 'tls-auth' and 'secret' options"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:778
 msgid "The lowest supported TLS version"
 msgstr ""
 
@@ -755,11 +755,11 @@ msgid ""
 "LuCI (&ge; 100 KB)."
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:790
 msgid "This completely disables cipher negotiation"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
 msgid "Timeframe for key exchange"
 msgstr ""
 
diff --git a/applications/luci-app-openvpn/po/pl/openvpn.po b/applications/luci-app-openvpn/po/pl/openvpn.po
index 1bfc504e3..bf850b91e 100644
--- a/applications/luci-app-openvpn/po/pl/openvpn.po
+++ b/applications/luci-app-openvpn/po/pl/openvpn.po
@@ -12,8 +12,8 @@ msgstr ""
 "|| n%100>=20) ? 1 : 2);\n"
 "X-Generator: Pootle 2.0.6\n"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:822
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:825
 msgid "%s"
 msgstr "%s"
 
@@ -37,7 +37,7 @@ msgstr "Dodaj trasę po nawiązaniu połączenia"
 msgid "Add template based configuration"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
 msgid "Additional authentication over TLS"
 msgstr "Dodatkowe uwierzytelnianie poprzez TLS"
 
@@ -50,7 +50,7 @@ msgstr "Zezwól na łączność klient-klient"
 msgid "Allow multiple clients with same certificate"
 msgstr "Zezwól na łączenie wielu klientów z tym samym certyfikatem."
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
 msgid "Allow only one session"
 msgstr "Zezwól tylko na jedną sesję"
 
@@ -106,7 +106,7 @@ msgstr "Zmień priorytet procesu"
 msgid "Change to directory before initialization"
 msgstr "Przejdź do katalogu przed inicjalizacją"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:774
 msgid "Check peer certificate against a CRL"
 msgstr "Sprawdź certyfikat peera na obecność w CRL"
 
@@ -191,7 +191,7 @@ msgstr "Nie uruchamiaj obecnie ifconfig"
 msgid "Don't add routes automatically"
 msgstr "Nie dodawaj tras (routes) automatycznie"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
 msgid "Don't cache --askpass or --auth-user-pass passwords"
 msgstr "Nie cacheuj haseł --askpass lub --auth-user-pass"
 
@@ -269,7 +269,7 @@ msgstr "Włącz interfejs zarządzalny na <em>IP</em> <em>port</em>"
 msgid "Enabled"
 msgstr "Włączone"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
 msgid "Encrypt and authenticate all control channel packets with the key"
 msgstr ""
 
@@ -301,11 +301,11 @@ msgstr ""
 "Wykonane w trybie serwera, gdy adres IPv4, trasa lub adres MAC są dodane do "
 "wewnętrznej tablicy routingu w OpenVPN"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
 msgid "Exit on TLS negotiation failure"
 msgstr "Wyjdź przy niepowodzeniu negocjacji TLS"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
 msgid "Get PEM password from controlling tty before we daemonize"
 msgstr "Uzyskaj hasło PEM z kontroli tty przed demonizacją"
 
@@ -351,7 +351,7 @@ msgstr "Zachowaj zdalny adres IP przy restarcie"
 msgid "Keep tun/tap device open on restart"
 msgstr "Utrzymaj urządzenie tun/tap po restarcie jako otwarte"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
 msgid "Key transition window"
 msgstr "Okno zmiany klucza"
 
@@ -393,7 +393,7 @@ msgstr "Liczba linii w pliku dziennika historii"
 msgid "OVPN configuration file upload"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
 msgid "Only accept connections from given X509 name"
 msgstr "Akceptuj tylko połączenia z podanej nazwy X509"
 
@@ -505,15 +505,15 @@ msgstr "Nazwa lub IP zdalnego hosta"
 msgid "Remote ping timeout"
 msgstr "Zdalny ping upłynął czas"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
 msgid "Renegotiate data chan. key after bytes"
 msgstr "Renegocjacja danych charakteru klucza po bajtach"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
 msgid "Renegotiate data chan. key after packets"
 msgstr "Renegocjacja danych charakteru klucza po pakietach"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
 msgid "Renegotiate data chan. key after seconds"
 msgstr "Renegocjacja danych charakteru klucza po sekundach"
 
@@ -521,11 +521,11 @@ msgstr "Renegocjacja danych charakteru klucza po sekundach"
 msgid "Replay protection sliding window size"
 msgstr "Powtórzenie osłony okna rozmiaru"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
 msgid "Require explicit designation on certificate"
 msgstr "Potrzebna Podpis na Certyfikacie"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
 msgid "Require explicit key usage on certificate"
 msgstr "Potrzebna klucza używanego w certyfikacie"
 
@@ -533,11 +533,11 @@ msgstr "Potrzebna klucza używanego w certyfikacie"
 msgid "Restart after remote ping timeout"
 msgstr "restart po zdalnym ping upływie czasu"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:794
 msgid "Restrict the allowed ciphers to be negotiated"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
 msgid "Retransmit timeout on TLS control channel"
 msgstr "Retransmisja po upływie czasu TLS na kanale kontrolnym"
 
@@ -724,11 +724,11 @@ msgstr "Numer portu TCP/UDP dla lokalnego (domyślnie=1194)"
 msgid "TCP/UDP port # for remote (default=1194)"
 msgstr "Numer portu TCP/UDP dla zdalnego (domyślnie=1194)"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
 msgid "TLS 1.3 or newer cipher"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
 msgid "TLS cipher"
 msgstr "Kodowanie TLS"
 
@@ -755,16 +755,16 @@ msgid ""
 "configuration."
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:782
 msgid "The highest supported TLS version"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:786
 #: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:73
 msgid "The key direction for 'tls-auth' and 'secret' options"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:778
 msgid "The lowest supported TLS version"
 msgstr ""
 
@@ -774,11 +774,11 @@ msgid ""
 "LuCI (&ge; 100 KB)."
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:790
 msgid "This completely disables cipher negotiation"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
 msgid "Timeframe for key exchange"
 msgstr ""
 
diff --git a/applications/luci-app-openvpn/po/pt-br/openvpn.po b/applications/luci-app-openvpn/po/pt-br/openvpn.po
index 4efb08a2f..3c3ad3f05 100644
--- a/applications/luci-app-openvpn/po/pt-br/openvpn.po
+++ b/applications/luci-app-openvpn/po/pt-br/openvpn.po
@@ -13,8 +13,8 @@ msgstr ""
 "X-Generator: Poedit 2.1.1\n"
 "Language-Team: \n"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:822
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:825
 msgid "%s"
 msgstr "%s"
 
@@ -38,7 +38,7 @@ msgstr "Adicionar rota após estabelecimento da conexão"
 msgid "Add template based configuration"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
 msgid "Additional authentication over TLS"
 msgstr "Autenticação adicional por TLS"
 
@@ -51,7 +51,7 @@ msgstr "Permitir tráfego entre os clientes"
 msgid "Allow multiple clients with same certificate"
 msgstr "Permitir múltiplos clientes com o mesmo certificado"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
 msgid "Allow only one session"
 msgstr "Permitir apenas uma sessão"
 
@@ -107,7 +107,7 @@ msgstr "Alterar prioridade do processo"
 msgid "Change to directory before initialization"
 msgstr "Mudar para o diretório antes da iniciação"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:774
 msgid "Check peer certificate against a CRL"
 msgstr "Verificar certificado do parceiro conta uma CRL"
 
@@ -192,7 +192,7 @@ msgstr "Não executar ifconfig de verdade"
 msgid "Don't add routes automatically"
 msgstr "Não adicionar rotas automaticamente"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
 msgid "Don't cache --askpass or --auth-user-pass passwords"
 msgstr "Não colocar em cache as senhas do --askpass ou --auth-user-pass "
 
@@ -270,7 +270,7 @@ msgstr "Ativar o interface de gestão em <em>IP</em> <em>porta</em>"
 msgid "Enabled"
 msgstr "Ativado"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
 msgid "Encrypt and authenticate all control channel packets with the key"
 msgstr "Cifre e autentique todos os pacotes do canal de controle com a chave"
 
@@ -302,11 +302,11 @@ msgstr ""
 "Executado em modo servidor quando um endereço/rota IPv4 é adicionao na "
 "tabela de roteamento interna do OpenVPN"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
 msgid "Exit on TLS negotiation failure"
 msgstr "Fechar quando existir falha na negociacao TLS"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
 msgid "Get PEM password from controlling tty before we daemonize"
 msgstr "Obter password PEM do terminal de controlo antes de passar a daemon"
 
@@ -352,7 +352,7 @@ msgstr "Manter o endereço IP remoto entre os reinícios"
 msgid "Keep tun/tap device open on restart"
 msgstr "Manter o dispositivo tun/tap aberto entre os reinícios"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
 msgid "Key transition window"
 msgstr "Janela para transição de chaves"
 
@@ -394,7 +394,7 @@ msgstr "Número de linhas para o histórico do registo"
 msgid "OVPN configuration file upload"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
 msgid "Only accept connections from given X509 name"
 msgstr "Aceitar conexões apenas de um dado nome X509"
 
@@ -505,15 +505,15 @@ msgstr "Nome do equipamento ou endereço IP remoto"
 msgid "Remote ping timeout"
 msgstr "Tempo limite do ping remoto"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
 msgid "Renegotiate data chan. key after bytes"
 msgstr "Renegociar chave do canal de dados após n bytes"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
 msgid "Renegotiate data chan. key after packets"
 msgstr "Renegociar chave do canal de dados após n pacotes"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
 msgid "Renegotiate data chan. key after seconds"
 msgstr "Renegociar chave do canal de dados após n segundos"
 
@@ -521,11 +521,11 @@ msgstr "Renegociar chave do canal de dados após n segundos"
 msgid "Replay protection sliding window size"
 msgstr "Tamanho da janela de proteção conta replay"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
 msgid "Require explicit designation on certificate"
 msgstr "Requerer designação específica no certificado"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
 msgid "Require explicit key usage on certificate"
 msgstr "Requerer que o uso da chave seja explicitado no certificado"
 
@@ -533,11 +533,11 @@ msgstr "Requerer que o uso da chave seja explicitado no certificado"
 msgid "Restart after remote ping timeout"
 msgstr "Reiniciar após estouro do tempo do ping remoto"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:794
 msgid "Restrict the allowed ciphers to be negotiated"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
 msgid "Retransmit timeout on TLS control channel"
 msgstr "Estouro de tempo de retransmissão no canal de controle TLS"
 
@@ -717,11 +717,11 @@ msgstr "Porta TCP/UDP para local (padrão=1194)"
 msgid "TCP/UDP port # for remote (default=1194)"
 msgstr "Porta TCP/UDP para remoto (padrão=1194)"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
 msgid "TLS 1.3 or newer cipher"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
 msgid "TLS cipher"
 msgstr "Cifra TLS"
 
@@ -748,16 +748,16 @@ msgid ""
 "configuration."
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:782
 msgid "The highest supported TLS version"
 msgstr "A mais alta versão suporta do TLS"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:786
 #: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:73
 msgid "The key direction for 'tls-auth' and 'secret' options"
 msgstr "A direção da chave para as opções 'tls-auth' e 'secret'"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:778
 msgid "The lowest supported TLS version"
 msgstr "A mais baixa versão suporta do TLS"
 
@@ -767,11 +767,11 @@ msgid ""
 "LuCI (&ge; 100 KB)."
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:790
 msgid "This completely disables cipher negotiation"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
 msgid "Timeframe for key exchange"
 msgstr "Janela temporal para troca de chaves"
 
diff --git a/applications/luci-app-openvpn/po/pt/openvpn.po b/applications/luci-app-openvpn/po/pt/openvpn.po
index ed017714b..f396d573b 100644
--- a/applications/luci-app-openvpn/po/pt/openvpn.po
+++ b/applications/luci-app-openvpn/po/pt/openvpn.po
@@ -13,8 +13,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.6\n"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:822
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:825
 msgid "%s"
 msgstr "%s"
 
@@ -38,7 +38,7 @@ msgstr "Adicionar rota após estabelecimento da ligação"
 msgid "Add template based configuration"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
 msgid "Additional authentication over TLS"
 msgstr "Autenticação adicional por TLS"
 
@@ -51,7 +51,7 @@ msgstr "Permitir tráfego cliente-a-cliente"
 msgid "Allow multiple clients with same certificate"
 msgstr "Permitir multiplos clientes com o mesmo certificado"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
 msgid "Allow only one session"
 msgstr "Permitir apenas uma sessão"
 
@@ -107,7 +107,7 @@ msgstr "Alterar prioridade do processo"
 msgid "Change to directory before initialization"
 msgstr "Mudar para o directório antes da inicialização"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:774
 msgid "Check peer certificate against a CRL"
 msgstr "Verificar certificado do remoto conta uma CRL"
 
@@ -192,7 +192,7 @@ msgstr "Não executar ifconfig"
 msgid "Don't add routes automatically"
 msgstr "Não adicionar rotas automaticamente"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
 msgid "Don't cache --askpass or --auth-user-pass passwords"
 msgstr "Não colocar em cache as passwords --askpass ou --auth-user-pass "
 
@@ -270,7 +270,7 @@ msgstr "Activar o interface de gestão em <em>IP</em> <em>porta</em>"
 msgid "Enabled"
 msgstr "Activado"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
 msgid "Encrypt and authenticate all control channel packets with the key"
 msgstr ""
 
@@ -302,11 +302,11 @@ msgstr ""
 "Executado em modo de servidor quando um endereço IPv4/rota ou endereço MAC é "
 "adicionado à tabela interna de roteamento do OpernVPN."
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
 msgid "Exit on TLS negotiation failure"
 msgstr "Fechar quando existir falha na negociação TLS"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
 msgid "Get PEM password from controlling tty before we daemonize"
 msgstr "Obter password PEM do terminal de controlo antes de passar a daemon"
 
@@ -352,7 +352,7 @@ msgstr "Manter o endereço IP remoto entre reinicios"
 msgid "Keep tun/tap device open on restart"
 msgstr "Manter o dispositivo tun/tap aberto entre reinicios"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
 msgid "Key transition window"
 msgstr "Janela para transição de chaves"
 
@@ -394,7 +394,7 @@ msgstr "Numero de linhas para o historico do registo"
 msgid "OVPN configuration file upload"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
 msgid "Only accept connections from given X509 name"
 msgstr "Aceitar ligações apenas de um dado nome X509"
 
@@ -505,15 +505,15 @@ msgstr "Hostname endereço IP remoto"
 msgid "Remote ping timeout"
 msgstr "Timeout do ping remoto"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
 msgid "Renegotiate data chan. key after bytes"
 msgstr "Renegociar chave do canal de dados após n bytes "
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
 msgid "Renegotiate data chan. key after packets"
 msgstr "Renegociar chave do canal de dados após n pacotes"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
 msgid "Renegotiate data chan. key after seconds"
 msgstr "Renegociar chave do canal de dados após n segundos"
 
@@ -521,11 +521,11 @@ msgstr "Renegociar chave do canal de dados após n segundos"
 msgid "Replay protection sliding window size"
 msgstr "Tamanho da janela de protecção conta replay"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
 msgid "Require explicit designation on certificate"
 msgstr "Requerer designação específica no certificado"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
 msgid "Require explicit key usage on certificate"
 msgstr "Requerer utilização explicita de utilização de chave no certificado"
 
@@ -533,11 +533,11 @@ msgstr "Requerer utilização explicita de utilização de chave no certificado"
 msgid "Restart after remote ping timeout"
 msgstr "Reiniciar após timeout do ping remoto"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:794
 msgid "Restrict the allowed ciphers to be negotiated"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
 msgid "Retransmit timeout on TLS control channel"
 msgstr "Timeout de retransmissão no canal de controlo TLS"
 
@@ -717,11 +717,11 @@ msgstr "Porta TCP/UDP para local (predefinição=1194)"
 msgid "TCP/UDP port # for remote (default=1194)"
 msgstr "Porta TCP/UDP para remoto (predefinição=1194)"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
 msgid "TLS 1.3 or newer cipher"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
 msgid "TLS cipher"
 msgstr "Cifra TLS"
 
@@ -748,16 +748,16 @@ msgid ""
 "configuration."
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:782
 msgid "The highest supported TLS version"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:786
 #: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:73
 msgid "The key direction for 'tls-auth' and 'secret' options"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:778
 msgid "The lowest supported TLS version"
 msgstr ""
 
@@ -767,11 +767,11 @@ msgid ""
 "LuCI (&ge; 100 KB)."
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:790
 msgid "This completely disables cipher negotiation"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
 msgid "Timeframe for key exchange"
 msgstr "Janela temporal para troca de chaves"
 
diff --git a/applications/luci-app-openvpn/po/ro/openvpn.po b/applications/luci-app-openvpn/po/ro/openvpn.po
index 45ff97e43..5c562d26a 100644
--- a/applications/luci-app-openvpn/po/ro/openvpn.po
+++ b/applications/luci-app-openvpn/po/ro/openvpn.po
@@ -10,8 +10,8 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
 "20)) ? 1 : 2;\n"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:822
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:825
 msgid "%s"
 msgstr ""
 
@@ -35,7 +35,7 @@ msgstr ""
 msgid "Add template based configuration"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
 msgid "Additional authentication over TLS"
 msgstr ""
 
@@ -48,7 +48,7 @@ msgstr ""
 msgid "Allow multiple clients with same certificate"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
 msgid "Allow only one session"
 msgstr ""
 
@@ -102,7 +102,7 @@ msgstr ""
 msgid "Change to directory before initialization"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:774
 msgid "Check peer certificate against a CRL"
 msgstr ""
 
@@ -187,7 +187,7 @@ msgstr ""
 msgid "Don't add routes automatically"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
 msgid "Don't cache --askpass or --auth-user-pass passwords"
 msgstr ""
 
@@ -265,7 +265,7 @@ msgstr ""
 msgid "Enabled"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
 msgid "Encrypt and authenticate all control channel packets with the key"
 msgstr ""
 
@@ -293,11 +293,11 @@ msgid ""
 "added to OpenVPN's internal routing table"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
 msgid "Exit on TLS negotiation failure"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
 msgid "Get PEM password from controlling tty before we daemonize"
 msgstr ""
 
@@ -341,7 +341,7 @@ msgstr ""
 msgid "Keep tun/tap device open on restart"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
 msgid "Key transition window"
 msgstr ""
 
@@ -383,7 +383,7 @@ msgstr ""
 msgid "OVPN configuration file upload"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
 msgid "Only accept connections from given X509 name"
 msgstr ""
 
@@ -494,15 +494,15 @@ msgstr ""
 msgid "Remote ping timeout"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
 msgid "Renegotiate data chan. key after bytes"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
 msgid "Renegotiate data chan. key after packets"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
 msgid "Renegotiate data chan. key after seconds"
 msgstr ""
 
@@ -510,11 +510,11 @@ msgstr ""
 msgid "Replay protection sliding window size"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
 msgid "Require explicit designation on certificate"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
 msgid "Require explicit key usage on certificate"
 msgstr ""
 
@@ -522,11 +522,11 @@ msgstr ""
 msgid "Restart after remote ping timeout"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:794
 msgid "Restrict the allowed ciphers to be negotiated"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
 msgid "Retransmit timeout on TLS control channel"
 msgstr ""
 
@@ -706,11 +706,11 @@ msgstr ""
 msgid "TCP/UDP port # for remote (default=1194)"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
 msgid "TLS 1.3 or newer cipher"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
 msgid "TLS cipher"
 msgstr ""
 
@@ -737,16 +737,16 @@ msgid ""
 "configuration."
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:782
 msgid "The highest supported TLS version"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:786
 #: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:73
 msgid "The key direction for 'tls-auth' and 'secret' options"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:778
 msgid "The lowest supported TLS version"
 msgstr ""
 
@@ -756,11 +756,11 @@ msgid ""
 "LuCI (&ge; 100 KB)."
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:790
 msgid "This completely disables cipher negotiation"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
 msgid "Timeframe for key exchange"
 msgstr ""
 
diff --git a/applications/luci-app-openvpn/po/ru/openvpn.po b/applications/luci-app-openvpn/po/ru/openvpn.po
index 2186c1e06..410a9ba69 100644
--- a/applications/luci-app-openvpn/po/ru/openvpn.po
+++ b/applications/luci-app-openvpn/po/ru/openvpn.po
@@ -15,8 +15,8 @@ msgstr ""
 "Project-Info: Это технический перевод, не дословный. Главное-удобный русский интерфейс, "
 "все проверялось в графическом режиме, совместим с другими apps\n"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:822
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:825
 msgid "%s"
 msgstr "%s"
 
@@ -40,7 +40,7 @@ msgstr "Добавить маршрут после установки соеди
 msgid "Add template based configuration"
 msgstr "Добавить конфигурацию на основе шаблона"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
 msgid "Additional authentication over TLS"
 msgstr "Дополнительная аутентификация используя TLS"
 
@@ -54,7 +54,7 @@ msgid "Allow multiple clients with same certificate"
 msgstr ""
 "Разрешить одновременное подключение нескольких клиентов с одним сертификатом"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
 msgid "Allow only one session"
 msgstr "Разрешить только одну сессию"
 
@@ -111,7 +111,7 @@ msgstr "Изменить приоритет процесса после иниц
 msgid "Change to directory before initialization"
 msgstr "Перейти в указанную папку перед инициализацией"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:774
 msgid "Check peer certificate against a CRL"
 msgstr "Проверить сертификат узла на соответствие файлу CRL в формате PEM"
 
@@ -207,7 +207,7 @@ msgstr ""
 "Не добавлять маршруты автоматически. Вместо этого передавать маршруты в '-"
 "route-up' скрипт используя переменные окружения"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
 msgid "Don't cache --askpass or --auth-user-pass passwords"
 msgstr ""
 "Не кэшировать пароли '-askpass' или '-auth-user-pass' в виртуальной памяти"
@@ -306,7 +306,7 @@ msgstr ""
 msgid "Enabled"
 msgstr "Включено"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
 msgid "Encrypt and authenticate all control channel packets with the key"
 msgstr ""
 "Шифрование и проверка подлинности всех пакетов каналов управления с помощью "
@@ -340,11 +340,11 @@ msgstr ""
 "Выполнять в режиме сервера '-mode server' каждый раз, когда адрес/маршрут "
 "IPv4 или MAC-адрес добавлен в таблицу маршрутизации OpenVPN"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
 msgid "Exit on TLS negotiation failure"
 msgstr "Выйти при ошибке согласования использования протокола TLS"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
 msgid "Get PEM password from controlling tty before we daemonize"
 msgstr "Получить PEM пароль от управления tty, прежде чем включить демон"
 
@@ -393,7 +393,7 @@ msgstr "Не изменять удалённый IP-адрес при перез
 msgid "Keep tun/tap device open on restart"
 msgstr "Сохранять виртуальное устройство tun/tap запущенным при перезагрузке"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
 msgid "Key transition window"
 msgstr "Окно передачи ключей"
 
@@ -435,7 +435,7 @@ msgstr "Количество строк в файле журнала"
 msgid "OVPN configuration file upload"
 msgstr "Загрузка конфигурационного файла OVPN"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
 msgid "Only accept connections from given X509 name"
 msgstr "Принимать только соединения от имени указанного сертификата X509"
 
@@ -556,19 +556,19 @@ msgstr "Имя удалённого хоста или IP-адрес"
 msgid "Remote ping timeout"
 msgstr "Время ожидания удаленного пинг-запроса"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
 msgid "Renegotiate data chan. key after bytes"
 msgstr ""
 "Повторное согласование ключа канала данных после отправки или получения n "
 "байт (по умолчанию отключено)"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
 msgid "Renegotiate data chan. key after packets"
 msgstr ""
 "Повторное согласование ключа канала данных после отправки и получения n "
 "пакетов (по умолчанию отключено)"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
 msgid "Renegotiate data chan. key after seconds"
 msgstr ""
 "Повторное согласование ключа канала данных через n секунд (по умолчанию 3600)"
@@ -579,11 +579,11 @@ msgstr ""
 "Использовать защиту от повтора - скользящее окно размером 'n' с интервалом "
 "времени 't' секунд"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
 msgid "Require explicit designation on certificate"
 msgstr "Требовать явного указания в сертификате"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
 msgid "Require explicit key usage on certificate"
 msgstr "Требовать явного использования ключа в сертификате"
 
@@ -591,11 +591,11 @@ msgstr "Требовать явного использования ключа в
 msgid "Restart after remote ping timeout"
 msgstr "Перезапуск после таймаута ожидания удаленного пинг-запроса"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:794
 msgid "Restrict the allowed ciphers to be negotiated"
 msgstr "Ограничить разрешенные шифры согласования"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
 msgid "Retransmit timeout on TLS control channel"
 msgstr ""
 "Пакет ретранслирует тайм-аут на канале управления протокола TLS, если нет "
@@ -794,11 +794,11 @@ msgstr "Номер локального TCP/UDP порта (1194 по умолч
 msgid "TCP/UDP port # for remote (default=1194)"
 msgstr "Номер удалённого TCP/UDP порта (1194 по умолчанию)"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
 msgid "TLS 1.3 or newer cipher"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
 msgid "TLS cipher"
 msgstr "Алгоритм шифрования TLS"
 
@@ -825,16 +825,16 @@ msgid ""
 "configuration."
 msgstr "OPVN файл (%s) не найден, проверьте вашу конфигурацию."
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:782
 msgid "The highest supported TLS version"
 msgstr "Самая высокая поддерживаемая версия протокола TLS"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:786
 #: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:73
 msgid "The key direction for 'tls-auth' and 'secret' options"
 msgstr "Указать ключ для параметров 'tls-auth' и 'secret'"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:778
 msgid "The lowest supported TLS version"
 msgstr "Самая низкая поддерживаемая версия протокола TLS"
 
@@ -846,11 +846,11 @@ msgstr ""
 "Размер OPVN файла (%s) слишком большой для онлайн редактирования в LuCI (&ge "
 "100 Кб)"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:790
 msgid "This completely disables cipher negotiation"
 msgstr "Отключение механизма согласования шифров"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
 msgid "Timeframe for key exchange"
 msgstr "Временные рамки для обмена ключами"
 
diff --git a/applications/luci-app-openvpn/po/sk/openvpn.po b/applications/luci-app-openvpn/po/sk/openvpn.po
index 485ecad62..839b2ae56 100644
--- a/applications/luci-app-openvpn/po/sk/openvpn.po
+++ b/applications/luci-app-openvpn/po/sk/openvpn.po
@@ -8,8 +8,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:822
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:825
 msgid "%s"
 msgstr ""
 
@@ -33,7 +33,7 @@ msgstr ""
 msgid "Add template based configuration"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
 msgid "Additional authentication over TLS"
 msgstr ""
 
@@ -46,7 +46,7 @@ msgstr ""
 msgid "Allow multiple clients with same certificate"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
 msgid "Allow only one session"
 msgstr ""
 
@@ -100,7 +100,7 @@ msgstr ""
 msgid "Change to directory before initialization"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:774
 msgid "Check peer certificate against a CRL"
 msgstr ""
 
@@ -185,7 +185,7 @@ msgstr ""
 msgid "Don't add routes automatically"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
 msgid "Don't cache --askpass or --auth-user-pass passwords"
 msgstr ""
 
@@ -263,7 +263,7 @@ msgstr ""
 msgid "Enabled"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
 msgid "Encrypt and authenticate all control channel packets with the key"
 msgstr ""
 
@@ -291,11 +291,11 @@ msgid ""
 "added to OpenVPN's internal routing table"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
 msgid "Exit on TLS negotiation failure"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
 msgid "Get PEM password from controlling tty before we daemonize"
 msgstr ""
 
@@ -339,7 +339,7 @@ msgstr ""
 msgid "Keep tun/tap device open on restart"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
 msgid "Key transition window"
 msgstr ""
 
@@ -381,7 +381,7 @@ msgstr ""
 msgid "OVPN configuration file upload"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
 msgid "Only accept connections from given X509 name"
 msgstr ""
 
@@ -492,15 +492,15 @@ msgstr ""
 msgid "Remote ping timeout"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
 msgid "Renegotiate data chan. key after bytes"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
 msgid "Renegotiate data chan. key after packets"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
 msgid "Renegotiate data chan. key after seconds"
 msgstr ""
 
@@ -508,11 +508,11 @@ msgstr ""
 msgid "Replay protection sliding window size"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
 msgid "Require explicit designation on certificate"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
 msgid "Require explicit key usage on certificate"
 msgstr ""
 
@@ -520,11 +520,11 @@ msgstr ""
 msgid "Restart after remote ping timeout"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:794
 msgid "Restrict the allowed ciphers to be negotiated"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
 msgid "Retransmit timeout on TLS control channel"
 msgstr ""
 
@@ -704,11 +704,11 @@ msgstr ""
 msgid "TCP/UDP port # for remote (default=1194)"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
 msgid "TLS 1.3 or newer cipher"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
 msgid "TLS cipher"
 msgstr ""
 
@@ -735,16 +735,16 @@ msgid ""
 "configuration."
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:782
 msgid "The highest supported TLS version"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:786
 #: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:73
 msgid "The key direction for 'tls-auth' and 'secret' options"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:778
 msgid "The lowest supported TLS version"
 msgstr ""
 
@@ -754,11 +754,11 @@ msgid ""
 "LuCI (&ge; 100 KB)."
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:790
 msgid "This completely disables cipher negotiation"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
 msgid "Timeframe for key exchange"
 msgstr ""
 
diff --git a/applications/luci-app-openvpn/po/sv/openvpn.po b/applications/luci-app-openvpn/po/sv/openvpn.po
index ec7a65933..c0c59ef23 100644
--- a/applications/luci-app-openvpn/po/sv/openvpn.po
+++ b/applications/luci-app-openvpn/po/sv/openvpn.po
@@ -9,8 +9,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:822
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:825
 msgid "%s"
 msgstr "%s"
 
@@ -34,7 +34,7 @@ msgstr ""
 msgid "Add template based configuration"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
 msgid "Additional authentication over TLS"
 msgstr "Ytterligare autentisering via TLS"
 
@@ -47,7 +47,7 @@ msgstr "Tillåt klient-till-klienttraffik"
 msgid "Allow multiple clients with same certificate"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
 msgid "Allow only one session"
 msgstr ""
 
@@ -101,7 +101,7 @@ msgstr ""
 msgid "Change to directory before initialization"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:774
 msgid "Check peer certificate against a CRL"
 msgstr ""
 
@@ -186,7 +186,7 @@ msgstr ""
 msgid "Don't add routes automatically"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
 msgid "Don't cache --askpass or --auth-user-pass passwords"
 msgstr ""
 
@@ -264,7 +264,7 @@ msgstr ""
 msgid "Enabled"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
 msgid "Encrypt and authenticate all control channel packets with the key"
 msgstr ""
 
@@ -292,11 +292,11 @@ msgid ""
 "added to OpenVPN's internal routing table"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
 msgid "Exit on TLS negotiation failure"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
 msgid "Get PEM password from controlling tty before we daemonize"
 msgstr ""
 
@@ -340,7 +340,7 @@ msgstr ""
 msgid "Keep tun/tap device open on restart"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
 msgid "Key transition window"
 msgstr ""
 
@@ -382,7 +382,7 @@ msgstr ""
 msgid "OVPN configuration file upload"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
 msgid "Only accept connections from given X509 name"
 msgstr ""
 
@@ -493,15 +493,15 @@ msgstr ""
 msgid "Remote ping timeout"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
 msgid "Renegotiate data chan. key after bytes"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
 msgid "Renegotiate data chan. key after packets"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
 msgid "Renegotiate data chan. key after seconds"
 msgstr ""
 
@@ -509,11 +509,11 @@ msgstr ""
 msgid "Replay protection sliding window size"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
 msgid "Require explicit designation on certificate"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
 msgid "Require explicit key usage on certificate"
 msgstr ""
 
@@ -521,11 +521,11 @@ msgstr ""
 msgid "Restart after remote ping timeout"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:794
 msgid "Restrict the allowed ciphers to be negotiated"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
 msgid "Retransmit timeout on TLS control channel"
 msgstr ""
 
@@ -705,11 +705,11 @@ msgstr ""
 msgid "TCP/UDP port # for remote (default=1194)"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
 msgid "TLS 1.3 or newer cipher"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
 msgid "TLS cipher"
 msgstr ""
 
@@ -736,16 +736,16 @@ msgid ""
 "configuration."
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:782
 msgid "The highest supported TLS version"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:786
 #: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:73
 msgid "The key direction for 'tls-auth' and 'secret' options"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:778
 msgid "The lowest supported TLS version"
 msgstr ""
 
@@ -755,11 +755,11 @@ msgid ""
 "LuCI (&ge; 100 KB)."
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:790
 msgid "This completely disables cipher negotiation"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
 msgid "Timeframe for key exchange"
 msgstr ""
 
diff --git a/applications/luci-app-openvpn/po/templates/openvpn.pot b/applications/luci-app-openvpn/po/templates/openvpn.pot
index b43be441f..231b48f5c 100644
--- a/applications/luci-app-openvpn/po/templates/openvpn.pot
+++ b/applications/luci-app-openvpn/po/templates/openvpn.pot
@@ -1,8 +1,8 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=UTF-8"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:822
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:825
 msgid "%s"
 msgstr ""
 
@@ -26,7 +26,7 @@ msgstr ""
 msgid "Add template based configuration"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
 msgid "Additional authentication over TLS"
 msgstr ""
 
@@ -39,7 +39,7 @@ msgstr ""
 msgid "Allow multiple clients with same certificate"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
 msgid "Allow only one session"
 msgstr ""
 
@@ -93,7 +93,7 @@ msgstr ""
 msgid "Change to directory before initialization"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:774
 msgid "Check peer certificate against a CRL"
 msgstr ""
 
@@ -178,7 +178,7 @@ msgstr ""
 msgid "Don't add routes automatically"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
 msgid "Don't cache --askpass or --auth-user-pass passwords"
 msgstr ""
 
@@ -256,7 +256,7 @@ msgstr ""
 msgid "Enabled"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
 msgid "Encrypt and authenticate all control channel packets with the key"
 msgstr ""
 
@@ -284,11 +284,11 @@ msgid ""
 "added to OpenVPN's internal routing table"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
 msgid "Exit on TLS negotiation failure"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
 msgid "Get PEM password from controlling tty before we daemonize"
 msgstr ""
 
@@ -332,7 +332,7 @@ msgstr ""
 msgid "Keep tun/tap device open on restart"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
 msgid "Key transition window"
 msgstr ""
 
@@ -374,7 +374,7 @@ msgstr ""
 msgid "OVPN configuration file upload"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
 msgid "Only accept connections from given X509 name"
 msgstr ""
 
@@ -485,15 +485,15 @@ msgstr ""
 msgid "Remote ping timeout"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
 msgid "Renegotiate data chan. key after bytes"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
 msgid "Renegotiate data chan. key after packets"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
 msgid "Renegotiate data chan. key after seconds"
 msgstr ""
 
@@ -501,11 +501,11 @@ msgstr ""
 msgid "Replay protection sliding window size"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
 msgid "Require explicit designation on certificate"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
 msgid "Require explicit key usage on certificate"
 msgstr ""
 
@@ -513,11 +513,11 @@ msgstr ""
 msgid "Restart after remote ping timeout"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:794
 msgid "Restrict the allowed ciphers to be negotiated"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
 msgid "Retransmit timeout on TLS control channel"
 msgstr ""
 
@@ -697,11 +697,11 @@ msgstr ""
 msgid "TCP/UDP port # for remote (default=1194)"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
 msgid "TLS 1.3 or newer cipher"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
 msgid "TLS cipher"
 msgstr ""
 
@@ -728,16 +728,16 @@ msgid ""
 "configuration."
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:782
 msgid "The highest supported TLS version"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:786
 #: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:73
 msgid "The key direction for 'tls-auth' and 'secret' options"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:778
 msgid "The lowest supported TLS version"
 msgstr ""
 
@@ -747,11 +747,11 @@ msgid ""
 "LuCI (&ge; 100 KB)."
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:790
 msgid "This completely disables cipher negotiation"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
 msgid "Timeframe for key exchange"
 msgstr ""
 
diff --git a/applications/luci-app-openvpn/po/tr/openvpn.po b/applications/luci-app-openvpn/po/tr/openvpn.po
index 29cf48a6d..d176b674b 100644
--- a/applications/luci-app-openvpn/po/tr/openvpn.po
+++ b/applications/luci-app-openvpn/po/tr/openvpn.po
@@ -8,8 +8,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:822
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:825
 msgid "%s"
 msgstr ""
 
@@ -33,7 +33,7 @@ msgstr ""
 msgid "Add template based configuration"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
 msgid "Additional authentication over TLS"
 msgstr ""
 
@@ -46,7 +46,7 @@ msgstr ""
 msgid "Allow multiple clients with same certificate"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
 msgid "Allow only one session"
 msgstr ""
 
@@ -100,7 +100,7 @@ msgstr ""
 msgid "Change to directory before initialization"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:774
 msgid "Check peer certificate against a CRL"
 msgstr ""
 
@@ -185,7 +185,7 @@ msgstr ""
 msgid "Don't add routes automatically"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
 msgid "Don't cache --askpass or --auth-user-pass passwords"
 msgstr ""
 
@@ -263,7 +263,7 @@ msgstr ""
 msgid "Enabled"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
 msgid "Encrypt and authenticate all control channel packets with the key"
 msgstr ""
 
@@ -291,11 +291,11 @@ msgid ""
 "added to OpenVPN's internal routing table"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
 msgid "Exit on TLS negotiation failure"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
 msgid "Get PEM password from controlling tty before we daemonize"
 msgstr ""
 
@@ -339,7 +339,7 @@ msgstr ""
 msgid "Keep tun/tap device open on restart"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
 msgid "Key transition window"
 msgstr ""
 
@@ -381,7 +381,7 @@ msgstr ""
 msgid "OVPN configuration file upload"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
 msgid "Only accept connections from given X509 name"
 msgstr ""
 
@@ -492,15 +492,15 @@ msgstr ""
 msgid "Remote ping timeout"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
 msgid "Renegotiate data chan. key after bytes"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
 msgid "Renegotiate data chan. key after packets"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
 msgid "Renegotiate data chan. key after seconds"
 msgstr ""
 
@@ -508,11 +508,11 @@ msgstr ""
 msgid "Replay protection sliding window size"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
 msgid "Require explicit designation on certificate"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
 msgid "Require explicit key usage on certificate"
 msgstr ""
 
@@ -520,11 +520,11 @@ msgstr ""
 msgid "Restart after remote ping timeout"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:794
 msgid "Restrict the allowed ciphers to be negotiated"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
 msgid "Retransmit timeout on TLS control channel"
 msgstr ""
 
@@ -704,11 +704,11 @@ msgstr ""
 msgid "TCP/UDP port # for remote (default=1194)"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
 msgid "TLS 1.3 or newer cipher"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
 msgid "TLS cipher"
 msgstr ""
 
@@ -735,16 +735,16 @@ msgid ""
 "configuration."
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:782
 msgid "The highest supported TLS version"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:786
 #: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:73
 msgid "The key direction for 'tls-auth' and 'secret' options"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:778
 msgid "The lowest supported TLS version"
 msgstr ""
 
@@ -754,11 +754,11 @@ msgid ""
 "LuCI (&ge; 100 KB)."
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:790
 msgid "This completely disables cipher negotiation"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
 msgid "Timeframe for key exchange"
 msgstr ""
 
diff --git a/applications/luci-app-openvpn/po/uk/openvpn.po b/applications/luci-app-openvpn/po/uk/openvpn.po
index 18a30f0e8..b99f8e88c 100644
--- a/applications/luci-app-openvpn/po/uk/openvpn.po
+++ b/applications/luci-app-openvpn/po/uk/openvpn.po
@@ -12,8 +12,8 @@ msgstr ""
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Pootle 2.0.4\n"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:822
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:825
 msgid "%s"
 msgstr ""
 
@@ -37,7 +37,7 @@ msgstr ""
 msgid "Add template based configuration"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
 msgid "Additional authentication over TLS"
 msgstr ""
 
@@ -50,7 +50,7 @@ msgstr "Дозволити обмін трафіком між клієнтами
 msgid "Allow multiple clients with same certificate"
 msgstr "Дозволити декілька клієнтів з однаковим сертифікатом"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
 msgid "Allow only one session"
 msgstr "Дозволити лише одну сесію"
 
@@ -104,7 +104,7 @@ msgstr ""
 msgid "Change to directory before initialization"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:774
 msgid "Check peer certificate against a CRL"
 msgstr ""
 
@@ -189,7 +189,7 @@ msgstr ""
 msgid "Don't add routes automatically"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
 msgid "Don't cache --askpass or --auth-user-pass passwords"
 msgstr ""
 
@@ -267,7 +267,7 @@ msgstr ""
 msgid "Enabled"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
 msgid "Encrypt and authenticate all control channel packets with the key"
 msgstr ""
 
@@ -295,11 +295,11 @@ msgid ""
 "added to OpenVPN's internal routing table"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
 msgid "Exit on TLS negotiation failure"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
 msgid "Get PEM password from controlling tty before we daemonize"
 msgstr ""
 
@@ -343,7 +343,7 @@ msgstr ""
 msgid "Keep tun/tap device open on restart"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
 msgid "Key transition window"
 msgstr ""
 
@@ -385,7 +385,7 @@ msgstr ""
 msgid "OVPN configuration file upload"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
 msgid "Only accept connections from given X509 name"
 msgstr ""
 
@@ -496,15 +496,15 @@ msgstr ""
 msgid "Remote ping timeout"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
 msgid "Renegotiate data chan. key after bytes"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
 msgid "Renegotiate data chan. key after packets"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
 msgid "Renegotiate data chan. key after seconds"
 msgstr ""
 
@@ -512,11 +512,11 @@ msgstr ""
 msgid "Replay protection sliding window size"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
 msgid "Require explicit designation on certificate"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
 msgid "Require explicit key usage on certificate"
 msgstr ""
 
@@ -524,11 +524,11 @@ msgstr ""
 msgid "Restart after remote ping timeout"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:794
 msgid "Restrict the allowed ciphers to be negotiated"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
 msgid "Retransmit timeout on TLS control channel"
 msgstr ""
 
@@ -708,11 +708,11 @@ msgstr ""
 msgid "TCP/UDP port # for remote (default=1194)"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
 msgid "TLS 1.3 or newer cipher"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
 msgid "TLS cipher"
 msgstr ""
 
@@ -739,16 +739,16 @@ msgid ""
 "configuration."
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:782
 msgid "The highest supported TLS version"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:786
 #: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:73
 msgid "The key direction for 'tls-auth' and 'secret' options"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:778
 msgid "The lowest supported TLS version"
 msgstr ""
 
@@ -758,11 +758,11 @@ msgid ""
 "LuCI (&ge; 100 KB)."
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:790
 msgid "This completely disables cipher negotiation"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
 msgid "Timeframe for key exchange"
 msgstr ""
 
diff --git a/applications/luci-app-openvpn/po/vi/openvpn.po b/applications/luci-app-openvpn/po/vi/openvpn.po
index 92245cf55..ba6bb3afe 100644
--- a/applications/luci-app-openvpn/po/vi/openvpn.po
+++ b/applications/luci-app-openvpn/po/vi/openvpn.po
@@ -12,8 +12,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:822
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:825
 msgid "%s"
 msgstr ""
 
@@ -37,7 +37,7 @@ msgstr "Thêm tuyến sau khi kết nối thành lập"
 msgid "Add template based configuration"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
 msgid "Additional authentication over TLS"
 msgstr "Xác thực bổ xung trên TLS"
 
@@ -50,7 +50,7 @@ msgstr "Cho phép lưu thông đối tượng - đến - đối tượng"
 msgid "Allow multiple clients with same certificate"
 msgstr "Cho phép nhiều đối tượng với cùng một chứng chỉ"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
 msgid "Allow only one session"
 msgstr "Chỉ cho phép một session"
 
@@ -106,7 +106,7 @@ msgstr "Thay đổi quy trình ưu tiên"
 msgid "Change to directory before initialization"
 msgstr "Chuyển qua thư mục trước khi khởi tạo"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:774
 msgid "Check peer certificate against a CRL"
 msgstr "Kiểm tra chứng chỉ đối tác với một CRL"
 
@@ -191,7 +191,7 @@ msgstr "Đừng thực sự thực hiện ifconfig"
 msgid "Don't add routes automatically"
 msgstr "Đừng tự động thêm vào đường dẫn"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
 msgid "Don't cache --askpass or --auth-user-pass passwords"
 msgstr "Don't cache --askpass or --auth-user-pass passwords"
 
@@ -269,7 +269,7 @@ msgstr "Kích hoạt giao diện điều hành trên <em>IP</em> <em>cổng</em>
 msgid "Enabled"
 msgstr "Kích hoạt "
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
 msgid "Encrypt and authenticate all control channel packets with the key"
 msgstr ""
 
@@ -297,11 +297,11 @@ msgid ""
 "added to OpenVPN's internal routing table"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
 msgid "Exit on TLS negotiation failure"
 msgstr "Exit trên TLS khi thương lượng thất bại"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
 msgid "Get PEM password from controlling tty before we daemonize"
 msgstr "Lấy mật mã PEM từ điều khiển tty trước khi chúng ta daemonize"
 
@@ -345,7 +345,7 @@ msgstr "Giữ remote địa chỉ IP ở chế độ khởi động"
 msgid "Keep tun/tap device open on restart"
 msgstr "Giữ công cụ tun/tap mở khi khởi động lại  "
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
 msgid "Key transition window"
 msgstr "Key transition window"
 
@@ -387,7 +387,7 @@ msgstr "Số dòng cho tập tin log history"
 msgid "OVPN configuration file upload"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
 msgid "Only accept connections from given X509 name"
 msgstr "Chỉ chấp nhận kết nối từ những tên X509 cho sẵn"
 
@@ -498,15 +498,15 @@ msgstr "Tên host ngoài vùng và địa chỉ IP"
 msgid "Remote ping timeout"
 msgstr "PING timeout từ xa"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
 msgid "Renegotiate data chan. key after bytes"
 msgstr "Thương lượng lại data chan. key sau bytes"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
 msgid "Renegotiate data chan. key after packets"
 msgstr "Thương lượng lại data chan. key sau packets"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
 msgid "Renegotiate data chan. key after seconds"
 msgstr "Thương lượng lại data chan. key sau seconds"
 
@@ -514,11 +514,11 @@ msgstr "Thương lượng lại data chan. key sau seconds"
 msgid "Replay protection sliding window size"
 msgstr "Replay chế độ bảo vệ kích thước window trượt"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
 msgid "Require explicit designation on certificate"
 msgstr "Yêu cầu rõ ràng về giấy chứng nhận "
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
 msgid "Require explicit key usage on certificate"
 msgstr "Yêu cầu key dùng rõ rãng trên chứng nhận"
 
@@ -526,11 +526,11 @@ msgstr "Yêu cầu key dùng rõ rãng trên chứng nhận"
 msgid "Restart after remote ping timeout"
 msgstr "Khởi động lại sau khi remote ping timeout"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:794
 msgid "Restrict the allowed ciphers to be negotiated"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
 msgid "Retransmit timeout on TLS control channel"
 msgstr "Retransmit timeout trên kênh kiểm soát TLS"
 
@@ -710,11 +710,11 @@ msgstr "Cổng TCP/UDP # cho địa phương (default=1194)"
 msgid "TCP/UDP port # for remote (default=1194)"
 msgstr "Cổng TCP/UDP # cho ngoài vùng (default=1194)"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
 msgid "TLS 1.3 or newer cipher"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
 msgid "TLS cipher"
 msgstr "TLS cipher"
 
@@ -741,16 +741,16 @@ msgid ""
 "configuration."
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:782
 msgid "The highest supported TLS version"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:786
 #: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:73
 msgid "The key direction for 'tls-auth' and 'secret' options"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:778
 msgid "The lowest supported TLS version"
 msgstr ""
 
@@ -760,11 +760,11 @@ msgid ""
 "LuCI (&ge; 100 KB)."
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:790
 msgid "This completely disables cipher negotiation"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
 msgid "Timeframe for key exchange"
 msgstr "Timeframe cho trao đổi key"
 
diff --git a/applications/luci-app-openvpn/po/zh-cn/openvpn.po b/applications/luci-app-openvpn/po/zh-cn/openvpn.po
index 0c8aff383..7b3564c54 100644
--- a/applications/luci-app-openvpn/po/zh-cn/openvpn.po
+++ b/applications/luci-app-openvpn/po/zh-cn/openvpn.po
@@ -16,8 +16,8 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Gtranslator 2.91.7\n"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:822
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:825
 msgid "%s"
 msgstr "%s"
 
@@ -41,7 +41,7 @@ msgstr "建立连接后添加路由"
 msgid "Add template based configuration"
 msgstr "添加基于模板的配置"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
 msgid "Additional authentication over TLS"
 msgstr "TLS 以外的验证"
 
@@ -54,7 +54,7 @@ msgstr "允许客户端到客户端的通信"
 msgid "Allow multiple clients with same certificate"
 msgstr "允许多用户共用同一证书"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
 msgid "Allow only one session"
 msgstr "只允许一个会话"
 
@@ -108,7 +108,7 @@ msgstr "改变进程优先级"
 msgid "Change to directory before initialization"
 msgstr "初始化前改变根目录"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:774
 msgid "Check peer certificate against a CRL"
 msgstr "验证客户端证书以确保其是否过期"
 
@@ -193,7 +193,7 @@ msgstr "不实际执行 ifconfig 命令"
 msgid "Don't add routes automatically"
 msgstr "不自动添加路由"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
 msgid "Don't cache --askpass or --auth-user-pass passwords"
 msgstr "不缓存 --askpass 或 --auth-user-pass passwords"
 
@@ -271,7 +271,7 @@ msgstr "在 <em>IP</em> <em>port</em> 上启用可管理接口"
 msgid "Enabled"
 msgstr "启用"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
 msgid "Encrypt and authenticate all control channel packets with the key"
 msgstr "使用密钥加密及认证所有的控制通道数据包"
 
@@ -300,11 +300,11 @@ msgid ""
 msgstr ""
 "服务器模式下，将每个 IPv4 地址/路由或 MAC 地址添加到 OpenVPN 的内部路由表中。"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
 msgid "Exit on TLS negotiation failure"
 msgstr "TLS 验证失败后退出"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
 msgid "Get PEM password from controlling tty before we daemonize"
 msgstr "后台运行前从控制的 tty 中获取 PEM 密码"
 
@@ -348,7 +348,7 @@ msgstr "服务重启时保持远程 IP 地址"
 msgid "Keep tun/tap device open on restart"
 msgstr "服务重启时自动打开 tun/tap 设备"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
 msgid "Key transition window"
 msgstr "密钥传输滑动窗口"
 
@@ -390,7 +390,7 @@ msgstr "历史日志文件的行数"
 msgid "OVPN configuration file upload"
 msgstr "OVPN 配置文件上传"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
 msgid "Only accept connections from given X509 name"
 msgstr "只接收已给定的 X509 名称的连接"
 
@@ -501,15 +501,15 @@ msgstr "远程主机名或 ip 地址"
 msgid "Remote ping timeout"
 msgstr "远程 ping 超时"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
 msgid "Renegotiate data chan. key after bytes"
 msgstr "传输若干字节后重新验证数据通道密钥"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
 msgid "Renegotiate data chan. key after packets"
 msgstr "传输若干数据包后重新验证数据通道密钥"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
 msgid "Renegotiate data chan. key after seconds"
 msgstr "传输若干秒后重新验证数据通道密钥"
 
@@ -517,11 +517,11 @@ msgstr "传输若干秒后重新验证数据通道密钥"
 msgid "Replay protection sliding window size"
 msgstr "重播保护的滑动窗口大小"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
 msgid "Require explicit designation on certificate"
 msgstr "证书需要显式指定"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
 msgid "Require explicit key usage on certificate"
 msgstr "证书需要明确的密钥"
 
@@ -529,11 +529,11 @@ msgstr "证书需要明确的密钥"
 msgid "Restart after remote ping timeout"
 msgstr "远程 ping 超时后重启"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:794
 msgid "Restrict the allowed ciphers to be negotiated"
 msgstr "限定协商时允许的密码算法"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
 msgid "Retransmit timeout on TLS control channel"
 msgstr "TLS 控制通道超时后重新发送"
 
@@ -713,11 +713,11 @@ msgstr "TCP/UDP 端口 # 本地（默认 1194）"
 msgid "TCP/UDP port # for remote (default=1194)"
 msgstr "TCP/UDP 端口 # 远程（默认 1194）"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
 msgid "TLS 1.3 or newer cipher"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
 msgid "TLS cipher"
 msgstr "TLS 加密"
 
@@ -744,16 +744,16 @@ msgid ""
 "configuration."
 msgstr "无法找到 OVPN 配置文件（%s），请检查您的配置。"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:782
 msgid "The highest supported TLS version"
 msgstr "最高支持的 TLS 版本"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:786
 #: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:73
 msgid "The key direction for 'tls-auth' and 'secret' options"
 msgstr "“tls-auth”和“secret”选项的密钥类型"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:778
 msgid "The lowest supported TLS version"
 msgstr "最低支持的 TLS 版本"
 
@@ -763,11 +763,11 @@ msgid ""
 "LuCI (&ge; 100 KB)."
 msgstr "OVPN 配置文件（%s）过大，无法使用 LuCI 在线编辑（&ge; 100 KB）。"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:790
 msgid "This completely disables cipher negotiation"
 msgstr "这将完全禁用密码协商"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
 msgid "Timeframe for key exchange"
 msgstr "密钥交换时间表"
 
diff --git a/applications/luci-app-openvpn/po/zh-tw/openvpn.po b/applications/luci-app-openvpn/po/zh-tw/openvpn.po
index ecc45bab4..3372722f8 100644
--- a/applications/luci-app-openvpn/po/zh-tw/openvpn.po
+++ b/applications/luci-app-openvpn/po/zh-tw/openvpn.po
@@ -16,8 +16,8 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Gtranslator 2.91.7\n"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:798
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:801
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:822
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:825
 msgid "%s"
 msgstr "%s"
 
@@ -41,7 +41,7 @@ msgstr "建立連線後新增路由"
 msgid "Add template based configuration"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
 msgid "Additional authentication over TLS"
 msgstr "TLS 以外的驗證"
 
@@ -54,7 +54,7 @@ msgstr "允許客戶端到客戶端的通訊"
 msgid "Allow multiple clients with same certificate"
 msgstr "允許多使用者共用同一證書"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
 msgid "Allow only one session"
 msgstr "只允許一個會話"
 
@@ -108,7 +108,7 @@ msgstr "改變程序優先順序"
 msgid "Change to directory before initialization"
 msgstr "初始化前改變根目錄"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:774
 msgid "Check peer certificate against a CRL"
 msgstr "驗證客戶端證書以確保其是否過期"
 
@@ -193,7 +193,7 @@ msgstr "不實際執行 ifconfig 指令"
 msgid "Don't add routes automatically"
 msgstr "不自動新增路由"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
 msgid "Don't cache --askpass or --auth-user-pass passwords"
 msgstr "不快取 --askpass 或 --auth-user-pass passwords"
 
@@ -271,7 +271,7 @@ msgstr "在 <em>IP</em> <em>port</em> 上啟用可管理介面"
 msgid "Enabled"
 msgstr "啟用"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:750
 msgid "Encrypt and authenticate all control channel packets with the key"
 msgstr "使用金鑰加密及認證所有的控制通道資料包"
 
@@ -300,11 +300,11 @@ msgid ""
 msgstr ""
 "伺服器模式下，將每個 IPv4 位址/路由或 MAC 位址新增到 OpenVPN 的內部路由表中。"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
 msgid "Exit on TLS negotiation failure"
 msgstr "TLS 驗證失敗後退出"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
 msgid "Get PEM password from controlling tty before we daemonize"
 msgstr "後臺執行前從控制的 tty 中獲取 PEM 密碼"
 
@@ -348,7 +348,7 @@ msgstr "服務重啟時保持遠端 IP 位址"
 msgid "Keep tun/tap device open on restart"
 msgstr "服務重啟時自動開啟 tun/tap 裝置"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:734
 msgid "Key transition window"
 msgstr "金鑰傳輸滑動視窗"
 
@@ -390,7 +390,7 @@ msgstr "歷史日誌檔案的行數"
 msgid "OVPN configuration file upload"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:738
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
 msgid "Only accept connections from given X509 name"
 msgstr "只接收已給定的 X509 名稱的連線"
 
@@ -501,15 +501,15 @@ msgstr "遠端主機名或 ip 位址"
 msgid "Remote ping timeout"
 msgstr "遠端 ping 超時"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:694
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:718
 msgid "Renegotiate data chan. key after bytes"
 msgstr "傳輸若干位元組後重新驗證資料通道金鑰"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:698
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:722
 msgid "Renegotiate data chan. key after packets"
 msgstr "傳輸若干資料包後重新驗證資料通道金鑰"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:726
 msgid "Renegotiate data chan. key after seconds"
 msgstr "傳輸若干秒後重新驗證資料通道金鑰"
 
@@ -517,11 +517,11 @@ msgstr "傳輸若干秒後重新驗證資料通道金鑰"
 msgid "Replay protection sliding window size"
 msgstr "重播保護的滑動視窗大小"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:742
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
 msgid "Require explicit designation on certificate"
 msgstr "證書需要顯式指定"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:746
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
 msgid "Require explicit key usage on certificate"
 msgstr "證書需要明確的金鑰"
 
@@ -529,11 +529,11 @@ msgstr "證書需要明確的金鑰"
 msgid "Restart after remote ping timeout"
 msgstr "遠端 ping 超時後重啟"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:770
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:794
 msgid "Restrict the allowed ciphers to be negotiated"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:690
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:714
 msgid "Retransmit timeout on TLS control channel"
 msgstr "TLS 控制通道超時後重新發送"
 
@@ -713,11 +713,11 @@ msgstr "TCP/UDP 埠 # 本地（預設 1194）"
 msgid "TCP/UDP port # for remote (default=1194)"
 msgstr "TCP/UDP 埠 # 遠端（預設 1194）"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:686
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:710
 msgid "TLS 1.3 or newer cipher"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:682
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:702
 msgid "TLS cipher"
 msgstr "TLS 加密"
 
@@ -744,16 +744,16 @@ msgid ""
 "configuration."
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:758
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:782
 msgid "The highest supported TLS version"
 msgstr "最高支援的 TLS 版本"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:762
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:786
 #: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua:73
 msgid "The key direction for 'tls-auth' and 'secret' options"
 msgstr "“tls-auth”和“secret”選項的金鑰型別"
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:754
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:778
 msgid "The lowest supported TLS version"
 msgstr "最低支援的 TLS 版本"
 
@@ -763,11 +763,11 @@ msgid ""
 "LuCI (&ge; 100 KB)."
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:766
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:790
 msgid "This completely disables cipher negotiation"
 msgstr ""
 
-#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:706
+#: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:730
 msgid "Timeframe for key exchange"
 msgstr "金鑰交換時間表"
 
diff --git a/applications/luci-app-simple-adblock/Makefile b/applications/luci-app-simple-adblock/Makefile
index 7cd8514a4..57a9367e1 100644
--- a/applications/luci-app-simple-adblock/Makefile
+++ b/applications/luci-app-simple-adblock/Makefile
@@ -10,7 +10,7 @@ LUCI_TITLE:=Simple Adblock Web UI
 LUCI_DESCRIPTION:=Provides Web UI for simple-adblock service.
 LUCI_DEPENDS:=+luci-mod-admin-full +simple-adblock
 LUCI_PKGARCH:=all
-PKG_RELEASE:=27
+PKG_RELEASE:=35
 
 include ../../luci.mk
 
diff --git a/applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua b/applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua
index 155cb9547..3ec4c4399 100644
--- a/applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua
+++ b/applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua
@@ -1,6 +1,9 @@
 -- Copyright 2016-2018 Stan Grishin <stangri@melmac.net>
 -- Licensed to the public under the Apache License 2.0.
 
+local readmeURL = "https://github.com/openwrt/packages/tree/master/net/simple-adblock/files/README.md"
+-- local readmeURL = "https://github.com/stangri/openwrt_packages/tree/master/simple-adblock/files/README.md"
+
 local packageName = "simple-adblock"
 local uci = require "luci.model.uci".cursor()
 local util = require "luci.util"
@@ -10,7 +13,35 @@ local fs = require "nixio.fs"
 local http = require "luci.http"
 local dispatcher = require "luci.dispatcher"
 local enabledFlag = uci:get(packageName, "config", "enabled")
-local command
+local command, outputFile, outputCache, outputGzip
+local targetDNS = uci:get(packageName, "config", "dns")
+
+if not targetDNS or targetDNS == "" then
+	targetDNS = "dnsmasq.servers"
+end
+
+if targetDNS ~= "dnsmasq.addnhosts" and targetDNS ~= "dnsmasq.conf" and 
+	 targetDNS ~= "dnsmasq.servers" and targetDNS ~= "unbound.adb_list" then
+	targetDNS = "dnsmasq.servers"
+end
+
+if targetDNS == "dnsmasq.addnhosts" then
+	outputFile="/var/run/" .. packageName .. ".addnhosts"
+	outputCache="/var/run/" .. packageName .. ".addnhosts.cache"
+	outputGzip="/etc/" .. packageName .. ".addnhosts.gz"
+elseif targetDNS == "dnsmasq.conf" then
+	outputFile="/var/dnsmasq.d/" .. packageName .. ""
+	outputCache="/var/run/" .. packageName .. ".dnsmasq.cache"
+	outputGzip="/etc/" .. packageName .. ".dnsmasq.gz"
+elseif targetDNS == "dnsmasq.servers" then
+	outputFile="/var/run/" .. packageName .. ".servers"
+	outputCache="/var/run/" .. packageName .. ".servers.cache"
+	outputGzip="/etc/" .. packageName .. ".servers.gz"
+elseif targetDNS == "unbound.adb_list" then
+	outputFile="/var/lib/unbound/adb_list." .. packageName .. ""
+	outputCache="/var/run/" .. packageName .. ".unbound.cache"
+	outputGzip="/etc/" .. packageName .. ".unbound.gz"
+end
 
 m = Map("simple-adblock", translate("Simple AdBlock Settings"))
 m.apply_on_parse = true
@@ -59,11 +90,11 @@ else
 		en.title      = translate("Service is disabled/stopped")
 		en.inputtitle = translate("Enable/Start")
 		en.inputstyle = "apply important"
-		if fs.access("/var/run/simple-adblock.cache") then
+		if fs.access(outputCache) then
 			sm = h:option(DummyValue, "_dummy", translate("Info"))
 			sm.template = "simple-adblock/status"
-			sm.value = "Cache file containing " .. util.trim(sys.exec("wc -l < /var/run/simple-adblock.cache")) .. " domains found."
-		elseif fs.access("/etc/$simple-adblock.gz") then
+			sm.value = "Cache file containing " .. util.trim(sys.exec("wc -l < " .. outputCache)) .. " domains found."
+		elseif fs.access(outputGzip) then
 			sm = h:option(DummyValue, "_dummy", translate("Info"))
 			sm.template = "simple-adblock/status"
 			sm.value = "Compressed cache file found."
@@ -117,17 +148,15 @@ s = m:section(NamedSection, "config", "simple-adblock", translate("Configuration
 -- General options
 s:tab("basic", translate("Basic Configuration"))
 
-o2 = s:taboption("basic", ListValue, "verbosity", translate("Output Verbosity Setting"),translate("Controls system log and console output verbosity"))
+o2 = s:taboption("basic", ListValue, "verbosity", translate("Output Verbosity Setting"),translate("Controls system log and console output verbosity."))
 o2:value("0", translate("Suppress output"))
 o2:value("1", translate("Some output"))
 o2:value("2", translate("Verbose output"))
-o2.rmempty = false
 o2.default = 2
 
-o3 = s:taboption("basic", ListValue, "force_dns", translate("Force Router DNS"), translate("Forces Router DNS use on local devices, also known as DNS Hijacking"))
+o3 = s:taboption("basic", ListValue, "force_dns", translate("Force Router DNS"), translate("Forces Router DNS use on local devices, also known as DNS Hijacking."))
 o3:value("0", translate("Let local devices use their own DNS servers if set"))
 o3:value("1", translate("Force Router DNS server to all local devices"))
-o3.rmempty = false
 o3.default = 1
 
 local sysfs_path = "/sys/class/leds/"
@@ -138,7 +167,7 @@ end
 if #leds ~= 0 then
 	o4 = s:taboption("basic", Value, "led", translate("LED to indicate status"), translate("Pick the LED not already used in")
 		.. [[ <a href="]] .. luci.dispatcher.build_url("admin/system/leds") .. [[">]]
-		.. translate("System LED Configuration") .. [[</a>]])
+		.. translate("System LED Configuration") .. [[</a>]] .. ".")
 	o4.rmempty = false
 	o4:value("", translate("none"))
 	for k, v in ipairs(leds) do
@@ -148,62 +177,78 @@ end
 
 s:tab("advanced", translate("Advanced Configuration"))
 
-o6 = s:taboption("advanced", Value, "boot_delay", translate("Delay (in seconds) for on-boot start"), translate("Run service after set delay on boot"))
-o6.default = 120
-o6.datatype = "range(1,600)"
-
-o7 = s:taboption("advanced", Value, "download_timeout", translate("Download time-out (in seconds)"), translate("Stop the download if it is stalled for set number of seconds"))
-o7.default = 10
-o7.datatype = "range(1,60)"
-
-o5 = s:taboption("advanced", ListValue, "parallel_downloads", translate("Simultaneous processing"), translate("Launch all lists downloads and processing simultaneously, reducing service start time"))
-o5:value("0", translate("Do not use simultaneous processing"))
-o5:value("1", translate("Use simultaneous processing"))
-o5.rmempty = false
-o5.default = 1
+dns = s:taboption("advanced", ListValue, "dns", translate("DNS Service"), translate("Pick the DNS resolution option to create the adblock list for, see the") .. " "
+  .. [[<a href="]] .. readmeURL .. [[#dns-resolution-option" target="_blank">]]
+  .. translate("README") .. [[</a>]] .. " " .. translate("for details."))
+dns:value("dnsmasq.addnhosts", translate("DNSMASQ Additional Hosts"))
+dns:value("dnsmasq.conf", translate("DNSMASQ Config"))
+dns:value("dnsmasq.servers", translate("DNSMASQ Servers File"))
+dns:value("unbound.adb_list", translate("Unbound AdBlock List"))
+dns.default = "dnsmasq.servers"
+
+ipv6 = s:taboption("advanced", ListValue, "ipv6_enabled", translate("IPv6 Support"), translate("Add IPv6 entries to block-list."))
+ipv6:value("", translate("Do not add IPv6 entries"))
+ipv6:value("1", translate("Add IPv6 entries"))
+ipv6:depends({dns="dnsmasq.addnhosts"}) 
+ipv6.default = ""
+ipv6.rmempty = true
+
+o5 = s:taboption("advanced", Value, "boot_delay", translate("Delay (in seconds) for on-boot start"), translate("Run service after set delay on boot."))
+o5.default = 120
+o5.datatype = "range(1,600)"
+
+o6 = s:taboption("advanced", Value, "download_timeout", translate("Download time-out (in seconds)"), translate("Stop the download if it is stalled for set number of seconds."))
+o6.default = 10
+o6.datatype = "range(1,60)"
+
+o7 = s:taboption("advanced", Value, "curl_retry", translate("Curl download retry"), translate("If curl is installed and detected, it would retry download this many times on timeout/fail."))
+o7.default = 3
+o7.datatype = "range(0,30)"
+
+o8 = s:taboption("advanced", ListValue, "parallel_downloads", translate("Simultaneous processing"), translate("Launch all lists downloads and processing simultaneously, reducing service start time."))
+o8:value("0", translate("Do not use simultaneous processing"))
+o8:value("1", translate("Use simultaneous processing"))
+o8.default = 1
 
 o9 = s:taboption("advanced", ListValue, "allow_non_ascii", translate("Allow Non-ASCII characters in DNSMASQ file"), translate("Only enable if your version of DNSMASQ supports the use of Non-ASCII characters, otherwise DNSMASQ will fail to start."))
 o9:value("0", translate("Do not allow Non-ASCII"))
 o9:value("1", translate("Allow Non-ASCII"))
-o9.rmempty = false
 o9.default = "0"
 
-o10 = s:taboption("advanced", ListValue, "compressed_cache", translate("Store compressed cache file on router"), translate("Attempt to create a compressed cache of final block-list on the router."))
+o10 = s:taboption("advanced", ListValue, "compressed_cache", translate("Store compressed cache file on router"), translate("Attempt to create a compressed cache of block-list in the persistent memory."))
 o10:value("0", translate("Do not store compressed cache"))
 o10:value("1", translate("Store compressed cache"))
-o10.rmempty = false
 o10.default = "0"
 
-o8 = s:taboption("advanced", ListValue, "debug", translate("Enable Debugging"), translate("Enables debug output to /tmp/simple-adblock.log"))
-o8:value("0", translate("Disable Debugging"))
-o8:value("1", translate("Enable Debugging"))
-o8.rmempty = false
-o8.default = "0"
+o11 = s:taboption("advanced", ListValue, "debug", translate("Enable Debugging"), translate("Enables debug output to /tmp/simple-adblock.log."))
+o11:value("0", translate("Disable Debugging"))
+o11:value("1", translate("Enable Debugging"))
+o11.default = "0"
 
 
 s2 = m:section(NamedSection, "config", "simple-adblock", translate("Whitelist and Blocklist Management"))
 -- Whitelisted Domains
-d1 = s2:option(DynamicList, "whitelist_domain", translate("Whitelisted Domains"), translate("Individual domains to be whitelisted"))
+d1 = s2:option(DynamicList, "whitelist_domain", translate("Whitelisted Domains"), translate("Individual domains to be whitelisted."))
 d1.addremove = false
 d1.optional = false
 
 -- Blacklisted Domains
-d3 = s2:option(DynamicList, "blacklist_domain", translate("Blacklisted Domains"), translate("Individual domains to be blacklisted"))
+d3 = s2:option(DynamicList, "blacklist_domain", translate("Blacklisted Domains"), translate("Individual domains to be blacklisted."))
 d3.addremove = false
 d3.optional = false
 
 -- Whitelisted Domains URLs
-d2 = s2:option(DynamicList, "whitelist_domains_url", translate("Whitelisted Domain URLs"), translate("URLs to lists of domains to be whitelisted"))
+d2 = s2:option(DynamicList, "whitelist_domains_url", translate("Whitelisted Domain URLs"), translate("URLs to lists of domains to be whitelisted."))
 d2.addremove = false
 d2.optional = false
 
 -- Blacklisted Domains URLs
-d4 = s2:option(DynamicList, "blacklist_domains_url", translate("Blacklisted Domain URLs"), translate("URLs to lists of domains to be blacklisted"))
+d4 = s2:option(DynamicList, "blacklist_domains_url", translate("Blacklisted Domain URLs"), translate("URLs to lists of domains to be blacklisted."))
 d4.addremove = false
 d4.optional = false
 
 -- Blacklisted Hosts URLs
-d5 = s2:option(DynamicList, "blacklist_hosts_url", translate("Blacklisted Hosts URLs"), translate("URLs to lists of hosts to be blacklisted"))
+d5 = s2:option(DynamicList, "blacklist_hosts_url", translate("Blacklisted Hosts URLs"), translate("URLs to lists of hosts to be blacklisted."))
 d5.addremove = false
 d5.optional = false
 
diff --git a/applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua b/applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua
deleted file mode 100644
index 22672124f..000000000
--- a/applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua
+++ /dev/null
@@ -1,69 +0,0 @@
-m = Map("simple-adblock", translate("Simple AdBlock Settings"))
-s = m:section(NamedSection, "config", "simple-adblock")
-
--- General options
-e = s:option(Flag, "enabled", translate("Start Simple Adblock service"))
-e.rmempty  = false
-function e.write(self, section, value)
-	if value ~= "1" then
-		luci.sys.init.stop("simple-adblock")
-	end
-	return Flag.write(self, section, value)
-end
-
-o2 = s:option(ListValue, "verbosity", translate("Output Verbosity Setting"),translate("Controls system log and console output verbosity"))
-o2:value("0", translate("Suppress output"))
-o2:value("1", translate("Some output"))
-o2:value("2", translate("Verbose output"))
-o2.rmempty = false
-o2.default = 2
-
-o3 = s:option(ListValue, "force_dns", translate("Force Router DNS"), translate("Forces Router DNS use on local devices, also known as DNS Hijacking"))
-o3:value("0", translate("Let local devices use their own DNS servers if set"))
-o3:value("1", translate("Force Router DNS server to all local devices"))
-o3.rmempty = false
-o3.default = 1
-
-local sysfs_path = "/sys/class/leds/"
-local leds = {}
-if nixio.fs.access(sysfs_path) then
-	leds = nixio.util.consume((nixio.fs.dir(sysfs_path)))
-end
-if #leds ~= 0 then
-	o3 = s:option(Value, "led", translate("LED to indicate status"), translate("Pick the LED not already used in")
-		.. [[ <a href="]] .. luci.dispatcher.build_url("admin/system/leds") .. [[">]]
-		.. translate("System LED Configuration") .. [[</a>]])
-	o3.rmempty = true
-	o3:value("", translate("none"))
-	for k, v in ipairs(leds) do
-		o3:value(v)
-	end
-end
-
-s2 = m:section(NamedSection, "config", "simple-adblock")
--- Whitelisted Domains
-d1 = s2:option(DynamicList, "whitelist_domain", translate("Whitelisted Domains"), translate("Individual domains to be whitelisted"))
-d1.addremove = false
-d1.optional = false
-
--- Blacklisted Domains
-d3 = s2:option(DynamicList, "blacklist_domain", translate("Blacklisted Domains"), translate("Individual domains to be blacklisted"))
-d3.addremove = false
-d3.optional = false
-
--- Whitelisted Domains URLs
-d2 = s2:option(DynamicList, "whitelist_domains_url", translate("Whitelisted Domain URLs"), translate("URLs to lists of domains to be whitelisted"))
-d2.addremove = false
-d2.optional = false
-
--- Blacklisted Domains URLs
-d4 = s2:option(DynamicList, "blacklist_domains_url", translate("Blacklisted Domain URLs"), translate("URLs to lists of domains to be blacklisted"))
-d4.addremove = false
-d4.optional = false
-
--- Blacklisted Hosts URLs
-d5 = s2:option(DynamicList, "blacklist_hosts_url", translate("Blacklisted Hosts URLs"), translate("URLs to lists of hosts to be blacklisted"))
-d5.addremove = false
-d5.optional = false
-
-return m
diff --git a/applications/luci-app-simple-adblock/po/es/simple-adblock.po b/applications/luci-app-simple-adblock/po/es/simple-adblock.po
index 38fbed646..502c5e68d 100644
--- a/applications/luci-app-simple-adblock/po/es/simple-adblock.po
+++ b/applications/luci-app-simple-adblock/po/es/simple-adblock.po
@@ -3,7 +3,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Project-Id-Version: \n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2019-08-01 22:58-0300\n"
+"PO-Revision-Date: 2019-09-17 22:46-0300\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -12,150 +12,185 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Language: es\n"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:149
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:191
+msgid "Add IPv6 entries"
+msgstr "Añadir entradas IPv6"
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:189
+msgid "Add IPv6 entries to block-list."
+msgstr "Añadir entradas IPv6 a la lista de bloqueo."
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:178
 msgid "Advanced Configuration"
 msgstr "Configuración avanzada"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:167
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:215
 msgid "Allow Non-ASCII"
 msgstr "Permitir no ASCII"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:165
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:213
 msgid "Allow Non-ASCII characters in DNSMASQ file"
 msgstr "Permitir caracteres no ASCII en el archivo DNSMASQ"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:171
-msgid "Attempt to create a compressed cache of final block-list on the router."
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:218
+msgid ""
+"Attempt to create a compressed cache of block-list in the persistent memory."
 msgstr ""
-"Intente crear un caché comprimido de la lista de bloqueo final en el "
-"enrutador."
+"Intente crear un caché comprimido de la lista de bloqueo en la memoria "
+"persistente."
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:118
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:149
 msgid "Basic Configuration"
 msgstr "Configuración básica"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:201
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
 msgid "Blacklisted Domain URLs"
 msgstr "URLs de dominio en lista negra"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:191
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236
 msgid "Blacklisted Domains"
 msgstr "Dominios en la lista negra"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:206
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
 msgid "Blacklisted Hosts URLs"
 msgstr "URLs de hosts en lista negra"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:84
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:115
 msgid "Collected Errors"
 msgstr "Errores recopilados"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:116
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:147
 msgid "Configuration"
 msgstr "Configuración"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:120
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
-msgid "Controls system log and console output verbosity"
-msgstr "Controla el registro del sistema y la salida de consola."
-
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
+msgid "Controls system log and console output verbosity."
+msgstr ""
+"Controla el registro del sistema y la verbosidad de salida de la consola."
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:204
+msgid "Curl download retry"
+msgstr "Intento de descarga de Curl"
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:180
+msgid "DNS Service"
+msgstr "Servicio de DNS"
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:183
+msgid "DNSMASQ Additional Hosts"
+msgstr "Hosts adicionales de DNSMASQ"
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:184
+msgid "DNSMASQ Config"
+msgstr "Config de DNSMASQ"
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:185
+msgid "DNSMASQ Servers File"
+msgstr "Archivo de servidores DNSMASQ"
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
 msgid "Delay (in seconds) for on-boot start"
 msgstr "Retardo (en segundos) para el inicio en el arranque"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:178
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:224
 msgid "Disable Debugging"
 msgstr "Deshabilitar depuración"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:166
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:190
+msgid "Do not add IPv6 entries"
+msgstr "No añadir entradas IPv6"
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:214
 msgid "Do not allow Non-ASCII"
 msgstr "No permitir no ASCII"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:172
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:219
 msgid "Do not store compressed cache"
 msgstr "No almacene caché comprimido"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:160
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:209
 msgid "Do not use simultaneous processing"
 msgstr "No use procesamiento simultáneo"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:155
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:200
 msgid "Download time-out (in seconds)"
 msgstr "Tiempo de espera de descarga (en segundos)"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:177
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:179
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:223
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:225
 msgid "Enable Debugging"
 msgstr "Habilitar depuración"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:60
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:91
 msgid "Enable/Start"
 msgstr "Habilitar/Iniciar"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:177
-msgid "Enables debug output to /tmp/simple-adblock.log"
-msgstr "Habilitar la salida de depuración a /tmp/simple-adblock.log"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:223
+msgid "Enables debug output to /tmp/simple-adblock.log."
+msgstr "Habilita la salida de depuración a /tmp/simple-adblock.log."
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:127
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
 msgid "Force Router DNS"
 msgstr "Forzar enrutador DNS"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:129
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:23
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
 msgid "Force Router DNS server to all local devices"
 msgstr "Forzar el servidor DNS del enrutador a todos los dispositivos locales"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:127
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
-msgid "Forces Router DNS use on local devices, also known as DNS Hijacking"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
+msgid "Forces Router DNS use on local devices, also known as DNS Hijacking."
 msgstr ""
-"Forza el uso del DNS del enrutador en dispositivos locales, también conocido "
-"como Secuestro de DNS"
+"Fuerza el uso de DNS del enrutador en dispositivos locales, también "
+"conocido como secuestro de DNS."
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:191
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
-msgid "Individual domains to be blacklisted"
-msgstr "Dominios individuales para ser incluidos en la lista negra"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:189
+msgid "IPv6 Support"
+msgstr "Soporte de IPv6"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:186
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
-msgid "Individual domains to be whitelisted"
-msgstr "Dominios individuales para ser incluidos en la lista blanca"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:204
+msgid ""
+"If curl is installed and detected, it would retry download this many times "
+"on timeout/fail."
+msgstr ""
+"Si curl está instalado y detectado, volvería a intentar descargar esto "
+"muchas veces en tiempo de espera/falla."
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236
+msgid "Individual domains to be blacklisted."
+msgstr "Dominios individuales para ser incluidos en la lista negra."
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:63
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:67
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231
+msgid "Individual domains to be whitelisted."
+msgstr "Dominios individuales para ser incluidos en la lista blanca."
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:94
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:98
 msgid "Info"
 msgstr "Info"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:139
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
 msgid "LED to indicate status"
 msgstr "LED para indicar estado"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:208
 msgid ""
 "Launch all lists downloads and processing simultaneously, reducing service "
-"start time"
+"start time."
 msgstr ""
 "Inicie todas las descargas y el procesamiento de listas simultáneamente, "
-"reduciendo el tiempo de inicio del servicio"
+"reduciendo el tiempo de inicio del servicio."
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:128
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:22
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:158
 msgid "Let local devices use their own DNS servers if set"
 msgstr ""
 "Dejar que los dispositivos locales usen sus propios servidores DNS si están "
 "configurados"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:79
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:110
 msgid "Message"
 msgstr "Mensaje"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:165
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:213
 msgid ""
 "Only enable if your version of DNSMASQ supports the use of Non-ASCII "
 "characters, otherwise DNSMASQ will fail to start."
@@ -163,39 +198,47 @@ msgstr ""
 "Solo habilítelo si su versión de DNSMASQ admite el uso de caracteres no "
 "ASCII; de lo contrario, DNSMASQ no se iniciará."
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:120
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
 msgid "Output Verbosity Setting"
 msgstr "Configuración de verbosidad de salida"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:139
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:180
+msgid "Pick the DNS resolution option to create the adblock list for, see the"
+msgstr ""
+"Elija la opción de resolución DNS para crear la lista de bloqueos de "
+"anuncios, consulte el"
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
 msgid "Pick the LED not already used in"
 msgstr "Elige el LED que no se haya usado en"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:89
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:182
+msgid "README"
+msgstr "LÉEME"
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:120
 msgid "Reload"
 msgstr "Recargar"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
-msgid "Run service after set delay on boot"
-msgstr "Ejecutar el servicio después de establecer el retraso en el arranque"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
+msgid "Run service after set delay on boot."
+msgstr "Ejecute el servicio después de la demora establecida en el arranque."
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:45
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:48
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:75
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:76
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:79
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:106
 msgid "Service Status"
 msgstr "Estado del servicio"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:59
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:90
 msgid "Service is disabled/stopped"
 msgstr "El servicio está deshabilitado/detenido"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:72
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:103
 msgid "Service is enabled/started"
 msgstr "El servicio está habilitado/iniciado"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:88
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:119
 msgid "Service started with error"
 msgstr "Servicio iniciado con error"
 
@@ -203,94 +246,139 @@ msgstr "Servicio iniciado con error"
 msgid "Simple AdBlock"
 msgstr "Simple AdBlock"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:15
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:1
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:46
 msgid "Simple AdBlock Settings"
-msgstr "Ajustes de Simple AdBlock "
+msgstr "Configuración de Simple AdBlock "
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:208
 msgid "Simultaneous processing"
 msgstr "Procesamiento simultáneo"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:122
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:16
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:153
 msgid "Some output"
 msgstr "Alguna salida"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:5
-msgid "Start Simple Adblock service"
-msgstr "Iniciar el servicio Simple Adblock"
-
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:155
-msgid "Stop the download if it is stalled for set number of seconds"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:200
+msgid "Stop the download if it is stalled for set number of seconds."
 msgstr ""
-"Detenga la descarga si se detiene durante un número de segundos establecido"
+"Detenga la descarga si está detenida durante un número determinado de "
+"segundos."
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:73
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:104
 msgid "Stop/Disable"
 msgstr "Detener/Deshabilitar"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:173
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:220
 msgid "Store compressed cache"
 msgstr "Almacenar caché comprimido"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:171
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:218
 msgid "Store compressed cache file on router"
 msgstr "Almacene el archivo de caché comprimido en el enrutador"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:121
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:15
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:152
 msgid "Suppress output"
 msgstr "Suprimir salida"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:141
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:35
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:170
 msgid "System LED Configuration"
 msgstr "Configuración del sistema LED"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:52
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:83
 msgid "Task"
 msgstr "Tarea"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:201
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
-msgid "URLs to lists of domains to be blacklisted"
-msgstr "URL a listas de dominios que se incluirán en la lista negra"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
+msgid "URLs to lists of domains to be blacklisted."
+msgstr "URL a listas de dominios que se incluirán en la lista negra."
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
-msgid "URLs to lists of domains to be whitelisted"
-msgstr "URL a listas de dominios que se incluirán en la lista blanca"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
+msgid "URLs to lists of domains to be whitelisted."
+msgstr "URL a listas de dominios que se incluirán en la lista blanca."
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
+msgid "URLs to lists of hosts to be blacklisted."
+msgstr "URL a listas de hosts que se incluirán en la lista negra."
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:206
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
-msgid "URLs to lists of hosts to be blacklisted"
-msgstr "URL a listas de hosts para ser incluidos en la lista negra"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:186
+msgid "Unbound AdBlock List"
+msgstr "Lista de AdBlock Unbound"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:161
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:210
 msgid "Use simultaneous processing"
 msgstr "Usar procesamiento simultáneo"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:123
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:17
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:154
 msgid "Verbose output"
 msgstr "Salida verbosa"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:184
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:229
 msgid "Whitelist and Blocklist Management"
 msgstr "Gestión de listas blancas y listas de bloqueo"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
 msgid "Whitelisted Domain URLs"
 msgstr "URLs de dominio en lista blanca"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:186
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231
 msgid "Whitelisted Domains"
 msgstr "Dominios en lista blanca"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:143
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:37
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:182
+msgid "for details."
+msgstr "para detalles."
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:172
 msgid "none"
 msgstr "ninguno"
+
+#~ msgid "Controls system log and console output verbosity"
+#~ msgstr "Controla el registro del sistema y la salida de consola."
+
+#~ msgid "Forces Router DNS use on local devices, also known as DNS Hijacking"
+#~ msgstr ""
+#~ "Forza el uso del DNS del enrutador en dispositivos locales, también "
+#~ "conocido como Secuestro de DNS"
+
+#~ msgid "Individual domains to be blacklisted"
+#~ msgstr "Dominios individuales para ser incluidos en la lista negra"
+
+#~ msgid "Individual domains to be whitelisted"
+#~ msgstr "Dominios individuales para ser incluidos en la lista blanca"
+
+#~ msgid "Start Simple Adblock service"
+#~ msgstr "Iniciar el servicio Simple Adblock"
+
+#~ msgid "URLs to lists of domains to be blacklisted"
+#~ msgstr "URL a listas de dominios que se incluirán en la lista negra"
+
+#~ msgid "URLs to lists of domains to be whitelisted"
+#~ msgstr "URL a listas de dominios que se incluirán en la lista blanca"
+
+#~ msgid "URLs to lists of hosts to be blacklisted"
+#~ msgstr "URL a listas de hosts para ser incluidos en la lista negra"
+
+#~ msgid ""
+#~ "Attempt to create a compressed cache of final block-list on the router."
+#~ msgstr ""
+#~ "Intente crear un caché comprimido de la lista de bloqueo final en el "
+#~ "enrutador."
+
+#~ msgid "Enables debug output to /tmp/simple-adblock.log"
+#~ msgstr "Habilitar la salida de depuración a /tmp/simple-adblock.log"
+
+#~ msgid ""
+#~ "Launch all lists downloads and processing simultaneously, reducing "
+#~ "service start time"
+#~ msgstr ""
+#~ "Inicie todas las descargas y el procesamiento de listas simultáneamente, "
+#~ "reduciendo el tiempo de inicio del servicio"
+
+#~ msgid "Run service after set delay on boot"
+#~ msgstr ""
+#~ "Ejecutar el servicio después de establecer el retraso en el arranque"
+
+#~ msgid "Stop the download if it is stalled for set number of seconds"
+#~ msgstr ""
+#~ "Detenga la descarga si se detiene durante un número de segundos "
+#~ "establecido"
diff --git a/applications/luci-app-simple-adblock/po/ja/simple-adblock.po b/applications/luci-app-simple-adblock/po/ja/simple-adblock.po
index b5f9c73dc..d6786289d 100644
--- a/applications/luci-app-simple-adblock/po/ja/simple-adblock.po
+++ b/applications/luci-app-simple-adblock/po/ja/simple-adblock.po
@@ -12,182 +12,218 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "Language: ja\n"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:149
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:191
+msgid "Add IPv6 entries"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:189
+msgid "Add IPv6 entries to block-list."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:178
 msgid "Advanced Configuration"
 msgstr "詳細設定"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:167
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:215
 msgid "Allow Non-ASCII"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:165
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:213
 msgid "Allow Non-ASCII characters in DNSMASQ file"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:171
-msgid "Attempt to create a compressed cache of final block-list on the router."
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:218
+msgid ""
+"Attempt to create a compressed cache of block-list in the persistent memory."
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:118
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:149
 msgid "Basic Configuration"
 msgstr "基本設定"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:201
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
 msgid "Blacklisted Domain URLs"
 msgstr "ドメイン ブラックリストのURL"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:191
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236
 msgid "Blacklisted Domains"
 msgstr "ブラックリスト ドメイン"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:206
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
 msgid "Blacklisted Hosts URLs"
 msgstr "hosts ブラックリストのURL"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:84
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:115
 msgid "Collected Errors"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:116
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:147
 msgid "Configuration"
 msgstr "設定"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:120
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
-msgid "Controls system log and console output verbosity"
-msgstr "システム ログとコンソール出力の冗長性を設定します。"
-
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
+msgid "Controls system log and console output verbosity."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:204
+msgid "Curl download retry"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:180
+msgid "DNS Service"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:183
+msgid "DNSMASQ Additional Hosts"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:184
+msgid "DNSMASQ Config"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:185
+msgid "DNSMASQ Servers File"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
 msgid "Delay (in seconds) for on-boot start"
 msgstr "ブート時遅延実行（秒）"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:178
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:224
 msgid "Disable Debugging"
 msgstr "デバッグ無効"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:166
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:190
+msgid "Do not add IPv6 entries"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:214
 msgid "Do not allow Non-ASCII"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:172
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:219
 msgid "Do not store compressed cache"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:160
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:209
 msgid "Do not use simultaneous processing"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:155
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:200
 msgid "Download time-out (in seconds)"
 msgstr "ダウンロード タイムアウト（秒）"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:177
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:179
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:223
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:225
 msgid "Enable Debugging"
 msgstr "デバッグ有効"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:60
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:91
 msgid "Enable/Start"
 msgstr "有効化/開始"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:177
-msgid "Enables debug output to /tmp/simple-adblock.log"
-msgstr "/tmp/simple-adblock.log へのデバッグ出力を有効にします。"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:223
+msgid "Enables debug output to /tmp/simple-adblock.log."
+msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:127
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
 msgid "Force Router DNS"
 msgstr "ルーターDNSの強制"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:129
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:23
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
 msgid "Force Router DNS server to all local devices"
 msgstr "全ローカル デバイスにルーター DNSサーバーの使用を強制"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:127
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
-msgid "Forces Router DNS use on local devices, also known as DNS Hijacking"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
+msgid "Forces Router DNS use on local devices, also known as DNS Hijacking."
 msgstr ""
-"ローカル デバイスに対し、ルーター上のDNSサーバーの使用を強制します。これは、"
-"DNS ハイジャックとしても知られています。"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:191
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
-msgid "Individual domains to be blacklisted"
-msgstr "ブラックリストに登録する、個々のドメインです。"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:189
+msgid "IPv6 Support"
+msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:186
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
-msgid "Individual domains to be whitelisted"
-msgstr "ホワイトリストに登録する、個々のドメインです。"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:204
+msgid ""
+"If curl is installed and detected, it would retry download this many times "
+"on timeout/fail."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236
+msgid "Individual domains to be blacklisted."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231
+msgid "Individual domains to be whitelisted."
+msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:63
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:67
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:94
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:98
 msgid "Info"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:139
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
 msgid "LED to indicate status"
 msgstr "ステータスを表示するLED"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:208
 msgid ""
 "Launch all lists downloads and processing simultaneously, reducing service "
-"start time"
+"start time."
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:128
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:22
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:158
 msgid "Let local devices use their own DNS servers if set"
 msgstr "DNSサーバーの使用を強制しない"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:79
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:110
 msgid "Message"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:165
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:213
 msgid ""
 "Only enable if your version of DNSMASQ supports the use of Non-ASCII "
 "characters, otherwise DNSMASQ will fail to start."
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:120
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
 msgid "Output Verbosity Setting"
 msgstr "出力詳細度の設定"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:139
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:180
+msgid "Pick the DNS resolution option to create the adblock list for, see the"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
 msgid "Pick the LED not already used in"
 msgstr "右の設定で既に使用されていないLEDを選択します"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:89
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:182
+msgid "README"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:120
 msgid "Reload"
 msgstr "リロード"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
-msgid "Run service after set delay on boot"
-msgstr "システムのブート時に、設定された遅延でサービスを開始します。"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
+msgid "Run service after set delay on boot."
+msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:45
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:48
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:75
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:76
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:79
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:106
 msgid "Service Status"
 msgstr "サービス ステータス"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:59
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:90
 msgid "Service is disabled/stopped"
 msgstr "サービスは無効/停止中"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:72
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:103
 msgid "Service is enabled/started"
 msgstr "サービスは有効/実行中"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:88
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:119
 msgid "Service started with error"
 msgstr "サービス開始時にエラーが発生"
 
@@ -195,94 +231,123 @@ msgstr "サービス開始時にエラーが発生"
 msgid "Simple AdBlock"
 msgstr "Simple AdBlock"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:15
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:1
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:46
 msgid "Simple AdBlock Settings"
 msgstr "Simple AdBlock 設定"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:208
 msgid "Simultaneous processing"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:122
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:16
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:153
 msgid "Some output"
 msgstr "軽量出力"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:5
-msgid "Start Simple Adblock service"
-msgstr "Simple Adblock サービスを開始"
-
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:155
-msgid "Stop the download if it is stalled for set number of seconds"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:200
+msgid "Stop the download if it is stalled for set number of seconds."
 msgstr ""
-"問題等が発生して指定された秒数を超過した場合、ダウンロードを停止します。"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:73
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:104
 msgid "Stop/Disable"
 msgstr "停止/無効化"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:173
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:220
 msgid "Store compressed cache"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:171
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:218
 msgid "Store compressed cache file on router"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:121
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:15
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:152
 msgid "Suppress output"
 msgstr "出力の抑制"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:141
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:35
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:170
 msgid "System LED Configuration"
 msgstr "LED 設定"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:52
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:83
 msgid "Task"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:201
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
-msgid "URLs to lists of domains to be blacklisted"
-msgstr "ブラックリストに登録するドメインのリストのURLです。"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
+msgid "URLs to lists of domains to be blacklisted."
+msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
-msgid "URLs to lists of domains to be whitelisted"
-msgstr "ホワイトリストに登録するドメインのリストのURLです。"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
+msgid "URLs to lists of domains to be whitelisted."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
+msgid "URLs to lists of hosts to be blacklisted."
+msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:206
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
-msgid "URLs to lists of hosts to be blacklisted"
-msgstr "ブラックリストに登録するドメインが列挙された、hostsファイルのURLです。"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:186
+msgid "Unbound AdBlock List"
+msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:161
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:210
 msgid "Use simultaneous processing"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:123
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:17
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:154
 msgid "Verbose output"
 msgstr "詳細出力"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:184
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:229
 msgid "Whitelist and Blocklist Management"
 msgstr "ホワイトリストとブラックリストの管理"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
 msgid "Whitelisted Domain URLs"
 msgstr "ドメイン ホワイトリストのURL"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:186
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231
 msgid "Whitelisted Domains"
 msgstr "ホワイトリスト ドメイン"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:143
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:37
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:182
+msgid "for details."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:172
 msgid "none"
 msgstr "なし"
+
+#~ msgid "Controls system log and console output verbosity"
+#~ msgstr "システム ログとコンソール出力の冗長性を設定します。"
+
+#~ msgid "Forces Router DNS use on local devices, also known as DNS Hijacking"
+#~ msgstr ""
+#~ "ローカル デバイスに対し、ルーター上のDNSサーバーの使用を強制します。これ"
+#~ "は、DNS ハイジャックとしても知られています。"
+
+#~ msgid "Individual domains to be blacklisted"
+#~ msgstr "ブラックリストに登録する、個々のドメインです。"
+
+#~ msgid "Individual domains to be whitelisted"
+#~ msgstr "ホワイトリストに登録する、個々のドメインです。"
+
+#~ msgid "Start Simple Adblock service"
+#~ msgstr "Simple Adblock サービスを開始"
+
+#~ msgid "URLs to lists of domains to be blacklisted"
+#~ msgstr "ブラックリストに登録するドメインのリストのURLです。"
+
+#~ msgid "URLs to lists of domains to be whitelisted"
+#~ msgstr "ホワイトリストに登録するドメインのリストのURLです。"
+
+#~ msgid "URLs to lists of hosts to be blacklisted"
+#~ msgstr ""
+#~ "ブラックリストに登録するドメインが列挙された、hostsファイルのURLです。"
+
+#~ msgid "Enables debug output to /tmp/simple-adblock.log"
+#~ msgstr "/tmp/simple-adblock.log へのデバッグ出力を有効にします。"
+
+#~ msgid "Run service after set delay on boot"
+#~ msgstr "システムのブート時に、設定された遅延でサービスを開始します。"
+
+#~ msgid "Stop the download if it is stalled for set number of seconds"
+#~ msgstr ""
+#~ "問題等が発生して指定された秒数を超過した場合、ダウンロードを停止します。"
diff --git a/applications/luci-app-simple-adblock/po/pt-br/simple-adblock.po b/applications/luci-app-simple-adblock/po/pt-br/simple-adblock.po
index 57ad5c5f1..1a1fe5902 100644
--- a/applications/luci-app-simple-adblock/po/pt-br/simple-adblock.po
+++ b/applications/luci-app-simple-adblock/po/pt-br/simple-adblock.po
@@ -11,186 +11,220 @@ msgstr ""
 "Language: pt_BR\n"
 "X-Generator: Poedit 2.1.1\n"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:149
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:191
+msgid "Add IPv6 entries"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:189
+msgid "Add IPv6 entries to block-list."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:178
 msgid "Advanced Configuration"
 msgstr "Configurações Avançadas"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:167
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:215
 msgid "Allow Non-ASCII"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:165
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:213
 msgid "Allow Non-ASCII characters in DNSMASQ file"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:171
-msgid "Attempt to create a compressed cache of final block-list on the router."
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:218
+msgid ""
+"Attempt to create a compressed cache of block-list in the persistent memory."
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:118
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:149
 msgid "Basic Configuration"
 msgstr "Configurações Básicas"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:201
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
 msgid "Blacklisted Domain URLs"
 msgstr "Endereço com lista de Domínio para a Lista Negra"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:191
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236
 msgid "Blacklisted Domains"
 msgstr "Domínios para a Lista Negra"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:206
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
 msgid "Blacklisted Hosts URLs"
 msgstr "Endereços de Hosts para a Lista Negra"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:84
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:115
 msgid "Collected Errors"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:116
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:147
 msgid "Configuration"
 msgstr "Configuração"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:120
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
-msgid "Controls system log and console output verbosity"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
+msgid "Controls system log and console output verbosity."
 msgstr ""
-"Controla o sistema de registro e o detalhamento das mensagens de saída do "
-"console"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:204
+msgid "Curl download retry"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:180
+msgid "DNS Service"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:183
+msgid "DNSMASQ Additional Hosts"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:184
+msgid "DNSMASQ Config"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:185
+msgid "DNSMASQ Servers File"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
 msgid "Delay (in seconds) for on-boot start"
 msgstr "Atraso (em segundos) para o início quando o equipamento é ligado"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:178
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:224
 msgid "Disable Debugging"
 msgstr "Desabilitar Depuração"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:166
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:190
+msgid "Do not add IPv6 entries"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:214
 msgid "Do not allow Non-ASCII"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:172
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:219
 msgid "Do not store compressed cache"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:160
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:209
 msgid "Do not use simultaneous processing"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:155
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:200
 msgid "Download time-out (in seconds)"
 msgstr "Tempo limite ao baixar (em segundos)"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:177
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:179
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:223
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:225
 msgid "Enable Debugging"
 msgstr "Habilitar Depuração"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:60
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:91
 msgid "Enable/Start"
 msgstr "Habilitar/Iniciar"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:177
-msgid "Enables debug output to /tmp/simple-adblock.log"
-msgstr "Habilitar a saída da depuração para /tmp/simple-adblock.log"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:223
+msgid "Enables debug output to /tmp/simple-adblock.log."
+msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:127
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
 msgid "Force Router DNS"
 msgstr "Forçar o DNS do Roteador"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:129
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:23
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
 msgid "Force Router DNS server to all local devices"
 msgstr "Forçar o servidor de DNS do Roteador para todos os dispositivos locais"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:127
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
-msgid "Forces Router DNS use on local devices, also known as DNS Hijacking"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
+msgid "Forces Router DNS use on local devices, also known as DNS Hijacking."
 msgstr ""
-"Forçar o uso do DNS do Roteador nos dispositivos locais, também conhecido "
-"como redirecionamento de DNS"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:191
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
-msgid "Individual domains to be blacklisted"
-msgstr "Domínios individuais para serem incluídos na Lista Negra"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:189
+msgid "IPv6 Support"
+msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:186
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
-msgid "Individual domains to be whitelisted"
-msgstr "Domínios individuais para serem incluídos na Lista Branca"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:204
+msgid ""
+"If curl is installed and detected, it would retry download this many times "
+"on timeout/fail."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236
+msgid "Individual domains to be blacklisted."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231
+msgid "Individual domains to be whitelisted."
+msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:63
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:67
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:94
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:98
 msgid "Info"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:139
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
 msgid "LED to indicate status"
 msgstr "LED para indicar o estado"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:208
 msgid ""
 "Launch all lists downloads and processing simultaneously, reducing service "
-"start time"
+"start time."
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:128
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:22
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:158
 msgid "Let local devices use their own DNS servers if set"
 msgstr ""
 "Deixe que os dispositivos locais usem seus próprios servidores de DNS, se "
 "definidos"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:79
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:110
 msgid "Message"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:165
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:213
 msgid ""
 "Only enable if your version of DNSMASQ supports the use of Non-ASCII "
 "characters, otherwise DNSMASQ will fail to start."
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:120
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
 msgid "Output Verbosity Setting"
 msgstr "Definição do detalhamento do registro"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:139
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:180
+msgid "Pick the DNS resolution option to create the adblock list for, see the"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
 msgid "Pick the LED not already used in"
 msgstr "Escolha um LED não usando em"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:89
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:182
+msgid "README"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:120
 msgid "Reload"
 msgstr "Recarregar"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
-msgid "Run service after set delay on boot"
-msgstr "Rodar o serviço depois de um atraso quando o equipamento é ligado"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
+msgid "Run service after set delay on boot."
+msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:45
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:48
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:75
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:76
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:79
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:106
 msgid "Service Status"
 msgstr "Estado do Serviço"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:59
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:90
 msgid "Service is disabled/stopped"
 msgstr "O serviço está desabilitado/parado"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:72
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:103
 msgid "Service is enabled/started"
 msgstr "O serviço está habilitado/rodando"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:88
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:119
 msgid "Service started with error"
 msgstr "O serviço iniciou com erro"
 
@@ -198,97 +232,127 @@ msgstr "O serviço iniciou com erro"
 msgid "Simple AdBlock"
 msgstr "Simple AdBlock"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:15
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:1
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:46
 msgid "Simple AdBlock Settings"
 msgstr "Configuração do Simple AdBlock"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:208
 msgid "Simultaneous processing"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:122
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:16
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:153
 msgid "Some output"
 msgstr "Pouco detalhado"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:5
-msgid "Start Simple Adblock service"
-msgstr "Inicie o serviço Simple Adblock"
-
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:155
-msgid "Stop the download if it is stalled for set number of seconds"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:200
+msgid "Stop the download if it is stalled for set number of seconds."
 msgstr ""
-"Para de baixar se estiver trancado por um determinado número de segundos"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:73
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:104
 msgid "Stop/Disable"
 msgstr "Parar/Desabilitar"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:173
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:220
 msgid "Store compressed cache"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:171
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:218
 msgid "Store compressed cache file on router"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:121
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:15
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:152
 msgid "Suppress output"
 msgstr "Suprimir"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:141
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:35
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:170
 msgid "System LED Configuration"
 msgstr "Configuração do LED"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:52
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:83
 msgid "Task"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:201
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
-msgid "URLs to lists of domains to be blacklisted"
-msgstr "Endereço da lista dos domínios para a Lista Negra"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
+msgid "URLs to lists of domains to be blacklisted."
+msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
-msgid "URLs to lists of domains to be whitelisted"
-msgstr "Endereço da lista dos domínios para a Lista Branca"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
+msgid "URLs to lists of domains to be whitelisted."
+msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:206
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
-msgid "URLs to lists of hosts to be blacklisted"
-msgstr "Endereço da lista dos hosts para a Lista Negra"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
+msgid "URLs to lists of hosts to be blacklisted."
+msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:161
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:186
+msgid "Unbound AdBlock List"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:210
 msgid "Use simultaneous processing"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:123
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:17
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:154
 msgid "Verbose output"
 msgstr "Detalhado"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:184
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:229
 msgid "Whitelist and Blocklist Management"
 msgstr "Gerenciamento de Listas Branca e Preta"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
 msgid "Whitelisted Domain URLs"
 msgstr "Endereço com lista de domínio para a Lista Branca"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:186
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231
 msgid "Whitelisted Domains"
 msgstr "Domínios para a Lista Branca"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:143
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:37
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:182
+msgid "for details."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:172
 msgid "none"
 msgstr "nenhum"
 
+#~ msgid "Controls system log and console output verbosity"
+#~ msgstr ""
+#~ "Controla o sistema de registro e o detalhamento das mensagens de saída do "
+#~ "console"
+
+#~ msgid "Forces Router DNS use on local devices, also known as DNS Hijacking"
+#~ msgstr ""
+#~ "Forçar o uso do DNS do Roteador nos dispositivos locais, também conhecido "
+#~ "como redirecionamento de DNS"
+
+#~ msgid "Individual domains to be blacklisted"
+#~ msgstr "Domínios individuais para serem incluídos na Lista Negra"
+
+#~ msgid "Individual domains to be whitelisted"
+#~ msgstr "Domínios individuais para serem incluídos na Lista Branca"
+
+#~ msgid "Start Simple Adblock service"
+#~ msgstr "Inicie o serviço Simple Adblock"
+
+#~ msgid "URLs to lists of domains to be blacklisted"
+#~ msgstr "Endereço da lista dos domínios para a Lista Negra"
+
+#~ msgid "URLs to lists of domains to be whitelisted"
+#~ msgstr "Endereço da lista dos domínios para a Lista Branca"
+
+#~ msgid "URLs to lists of hosts to be blacklisted"
+#~ msgstr "Endereço da lista dos hosts para a Lista Negra"
+
+#~ msgid "Enables debug output to /tmp/simple-adblock.log"
+#~ msgstr "Habilitar a saída da depuração para /tmp/simple-adblock.log"
+
+#~ msgid "Run service after set delay on boot"
+#~ msgstr "Rodar o serviço depois de um atraso quando o equipamento é ligado"
+
+#~ msgid "Stop the download if it is stalled for set number of seconds"
+#~ msgstr ""
+#~ "Para de baixar se estiver trancado por um determinado número de segundos"
+
 #~ msgid "Enable/start service"
 #~ msgstr "Habilitar/Iniciar o serviço"
diff --git a/applications/luci-app-simple-adblock/po/pt/simple-adblock.po b/applications/luci-app-simple-adblock/po/pt/simple-adblock.po
index a15fd29cc..7010df158 100644
--- a/applications/luci-app-simple-adblock/po/pt/simple-adblock.po
+++ b/applications/luci-app-simple-adblock/po/pt/simple-adblock.po
@@ -1,186 +1,220 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=UTF-8\n"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:149
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:191
+msgid "Add IPv6 entries"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:189
+msgid "Add IPv6 entries to block-list."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:178
 msgid "Advanced Configuration"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:167
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:215
 msgid "Allow Non-ASCII"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:165
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:213
 msgid "Allow Non-ASCII characters in DNSMASQ file"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:171
-msgid "Attempt to create a compressed cache of final block-list on the router."
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:218
+msgid ""
+"Attempt to create a compressed cache of block-list in the persistent memory."
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:118
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:149
 msgid "Basic Configuration"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:201
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
 msgid "Blacklisted Domain URLs"
 msgstr "Endereço com lista de Domínio para a Lista Negra"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:191
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236
 msgid "Blacklisted Domains"
 msgstr "Domínios para a Lista Negra"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:206
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
 msgid "Blacklisted Hosts URLs"
 msgstr "Endereços de Hosts para a Lista Negra"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:84
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:115
 msgid "Collected Errors"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:116
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:147
 msgid "Configuration"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:120
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
-msgid "Controls system log and console output verbosity"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
+msgid "Controls system log and console output verbosity."
 msgstr ""
-"Controla o sistema de registro e o detalhamento das mensagens de saída do "
-"console"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:204
+msgid "Curl download retry"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:180
+msgid "DNS Service"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:183
+msgid "DNSMASQ Additional Hosts"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:184
+msgid "DNSMASQ Config"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:185
+msgid "DNSMASQ Servers File"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
 msgid "Delay (in seconds) for on-boot start"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:178
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:224
 msgid "Disable Debugging"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:166
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:190
+msgid "Do not add IPv6 entries"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:214
 msgid "Do not allow Non-ASCII"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:172
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:219
 msgid "Do not store compressed cache"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:160
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:209
 msgid "Do not use simultaneous processing"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:155
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:200
 msgid "Download time-out (in seconds)"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:177
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:179
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:223
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:225
 msgid "Enable Debugging"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:60
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:91
 msgid "Enable/Start"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:177
-msgid "Enables debug output to /tmp/simple-adblock.log"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:223
+msgid "Enables debug output to /tmp/simple-adblock.log."
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:127
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
 msgid "Force Router DNS"
 msgstr "Forçar o DNS do Roteador"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:129
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:23
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
 msgid "Force Router DNS server to all local devices"
 msgstr "Forçar o servidor de DNS do Roteador para todos os dispositivos locais"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:127
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
-msgid "Forces Router DNS use on local devices, also known as DNS Hijacking"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
+msgid "Forces Router DNS use on local devices, also known as DNS Hijacking."
 msgstr ""
-"Forçar o uso do DNS do Roteador nos dispositivos locais, também conhecido "
-"como redirecionamento de DNS"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:191
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
-msgid "Individual domains to be blacklisted"
-msgstr "Domínios individuais para serem incluídos na Lista Negra"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:189
+msgid "IPv6 Support"
+msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:186
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
-msgid "Individual domains to be whitelisted"
-msgstr "Domínios individuais para serem incluídos na Lista Branca"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:204
+msgid ""
+"If curl is installed and detected, it would retry download this many times "
+"on timeout/fail."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236
+msgid "Individual domains to be blacklisted."
+msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:63
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:67
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231
+msgid "Individual domains to be whitelisted."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:94
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:98
 msgid "Info"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:139
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
 msgid "LED to indicate status"
 msgstr "LED para indicar o estado"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:208
 msgid ""
 "Launch all lists downloads and processing simultaneously, reducing service "
-"start time"
+"start time."
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:128
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:22
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:158
 msgid "Let local devices use their own DNS servers if set"
 msgstr ""
 "Deixe que os dispositivos locais usem seus próprios servidores de DNS, se "
 "definidos"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:79
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:110
 msgid "Message"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:165
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:213
 msgid ""
 "Only enable if your version of DNSMASQ supports the use of Non-ASCII "
 "characters, otherwise DNSMASQ will fail to start."
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:120
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
 msgid "Output Verbosity Setting"
 msgstr "Definição do detalhamento do registro"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:139
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:180
+msgid "Pick the DNS resolution option to create the adblock list for, see the"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
 msgid "Pick the LED not already used in"
 msgstr "Escolha um LED não usando em"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:89
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:182
+msgid "README"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:120
 msgid "Reload"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
-msgid "Run service after set delay on boot"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
+msgid "Run service after set delay on boot."
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:45
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:48
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:75
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:76
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:79
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:106
 msgid "Service Status"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:59
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:90
 msgid "Service is disabled/stopped"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:72
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:103
 msgid "Service is enabled/started"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:88
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:119
 msgid "Service started with error"
 msgstr ""
 
@@ -188,96 +222,114 @@ msgstr ""
 msgid "Simple AdBlock"
 msgstr "Simple AdBlock"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:15
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:1
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:46
 msgid "Simple AdBlock Settings"
 msgstr "Configuração do Simple AdBlock"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:208
 msgid "Simultaneous processing"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:122
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:16
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:153
 msgid "Some output"
 msgstr "Pouco detalhado"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:5
-msgid "Start Simple Adblock service"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:200
+msgid "Stop the download if it is stalled for set number of seconds."
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:155
-msgid "Stop the download if it is stalled for set number of seconds"
-msgstr ""
-
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:73
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:104
 msgid "Stop/Disable"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:173
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:220
 msgid "Store compressed cache"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:171
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:218
 msgid "Store compressed cache file on router"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:121
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:15
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:152
 msgid "Suppress output"
 msgstr "Suprimir"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:141
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:35
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:170
 msgid "System LED Configuration"
 msgstr "Configuração do LED"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:52
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:83
 msgid "Task"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:201
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
-msgid "URLs to lists of domains to be blacklisted"
-msgstr "Endereço da lista dos domínios para a Lista Negra"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
+msgid "URLs to lists of domains to be blacklisted."
+msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
-msgid "URLs to lists of domains to be whitelisted"
-msgstr "Endereço da lista dos domínios para a Lista Branca"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
+msgid "URLs to lists of domains to be whitelisted."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
+msgid "URLs to lists of hosts to be blacklisted."
+msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:206
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
-msgid "URLs to lists of hosts to be blacklisted"
-msgstr "Endereço da lista dos hosts para a Lista Negra"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:186
+msgid "Unbound AdBlock List"
+msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:161
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:210
 msgid "Use simultaneous processing"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:123
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:17
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:154
 msgid "Verbose output"
 msgstr "Detalhado"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:184
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:229
 msgid "Whitelist and Blocklist Management"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
 msgid "Whitelisted Domain URLs"
 msgstr "Endereço com lista de domínio para a Lista Branca"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:186
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231
 msgid "Whitelisted Domains"
 msgstr "Domínios para a Lista Branca"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:143
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:37
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:182
+msgid "for details."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:172
 msgid "none"
 msgstr "Nenhum"
 
+#~ msgid "Controls system log and console output verbosity"
+#~ msgstr ""
+#~ "Controla o sistema de registro e o detalhamento das mensagens de saída do "
+#~ "console"
+
+#~ msgid "Forces Router DNS use on local devices, also known as DNS Hijacking"
+#~ msgstr ""
+#~ "Forçar o uso do DNS do Roteador nos dispositivos locais, também conhecido "
+#~ "como redirecionamento de DNS"
+
+#~ msgid "Individual domains to be blacklisted"
+#~ msgstr "Domínios individuais para serem incluídos na Lista Negra"
+
+#~ msgid "Individual domains to be whitelisted"
+#~ msgstr "Domínios individuais para serem incluídos na Lista Branca"
+
+#~ msgid "URLs to lists of domains to be blacklisted"
+#~ msgstr "Endereço da lista dos domínios para a Lista Negra"
+
+#~ msgid "URLs to lists of domains to be whitelisted"
+#~ msgstr "Endereço da lista dos domínios para a Lista Branca"
+
+#~ msgid "URLs to lists of hosts to be blacklisted"
+#~ msgstr "Endereço da lista dos hosts para a Lista Negra"
+
 #~ msgid "Enable/start service"
 #~ msgstr "Habilitar/Iniciar o serviço"
diff --git a/applications/luci-app-simple-adblock/po/ru/simple-adblock.po b/applications/luci-app-simple-adblock/po/ru/simple-adblock.po
index 5bb38c1a9..9bca395f9 100644
--- a/applications/luci-app-simple-adblock/po/ru/simple-adblock.po
+++ b/applications/luci-app-simple-adblock/po/ru/simple-adblock.po
@@ -15,183 +15,220 @@ msgstr ""
 "Project-Info: Это технический перевод, не дословный. Главное-удобный русский интерфейс, все проверялось в "
 "графическом режиме, совместим с другими apps\n"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:149
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:191
+msgid "Add IPv6 entries"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:189
+msgid "Add IPv6 entries to block-list."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:178
 msgid "Advanced Configuration"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:167
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:215
 msgid "Allow Non-ASCII"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:165
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:213
 msgid "Allow Non-ASCII characters in DNSMASQ file"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:171
-msgid "Attempt to create a compressed cache of final block-list on the router."
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:218
+msgid ""
+"Attempt to create a compressed cache of block-list in the persistent memory."
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:118
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:149
 msgid "Basic Configuration"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:201
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
 msgid "Blacklisted Domain URLs"
 msgstr "URL ссылки Черных<br />списков доменов"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:191
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236
 msgid "Blacklisted Domains"
 msgstr "Черный список доменов"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:206
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
 msgid "Blacklisted Hosts URLs"
 msgstr "URL ссылки Черных<br />списков хостов"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:84
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:115
 msgid "Collected Errors"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:116
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:147
 msgid "Configuration"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:120
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
-msgid "Controls system log and console output verbosity"
-msgstr "Детальная настройка записи событий в системный журнал."
-
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
+msgid "Controls system log and console output verbosity."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:204
+msgid "Curl download retry"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:180
+msgid "DNS Service"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:183
+msgid "DNSMASQ Additional Hosts"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:184
+msgid "DNSMASQ Config"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:185
+msgid "DNSMASQ Servers File"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
 msgid "Delay (in seconds) for on-boot start"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:178
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:224
 msgid "Disable Debugging"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:166
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:190
+msgid "Do not add IPv6 entries"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:214
 msgid "Do not allow Non-ASCII"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:172
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:219
 msgid "Do not store compressed cache"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:160
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:209
 msgid "Do not use simultaneous processing"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:155
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:200
 msgid "Download time-out (in seconds)"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:177
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:179
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:223
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:225
 msgid "Enable Debugging"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:60
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:91
 msgid "Enable/Start"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:177
-msgid "Enables debug output to /tmp/simple-adblock.log"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:223
+msgid "Enables debug output to /tmp/simple-adblock.log."
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:127
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
 msgid "Force Router DNS"
 msgstr "Назначить DNS роутера"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:129
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:23
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
 msgid "Force Router DNS server to all local devices"
 msgstr "Назначить DNS роутера всем локальным устройствам"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:127
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
-msgid "Forces Router DNS use on local devices, also known as DNS Hijacking"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
+msgid "Forces Router DNS use on local devices, also known as DNS Hijacking."
 msgstr ""
-"Назначить DNS роутера всем локальным устройствам, методом DNS Hijacking."
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:191
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
-msgid "Individual domains to be blacklisted"
-msgstr "Домены добавленные пользователем в Черный список."
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:189
+msgid "IPv6 Support"
+msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:186
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
-msgid "Individual domains to be whitelisted"
-msgstr "Домены добавленные пользователем в Белый список."
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:204
+msgid ""
+"If curl is installed and detected, it would retry download this many times "
+"on timeout/fail."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236
+msgid "Individual domains to be blacklisted."
+msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:63
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:67
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231
+msgid "Individual domains to be whitelisted."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:94
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:98
 msgid "Info"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:139
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
 msgid "LED to indicate status"
 msgstr "LED индикация состояния"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:208
 msgid ""
 "Launch all lists downloads and processing simultaneously, reducing service "
-"start time"
+"start time."
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:128
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:22
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:158
 msgid "Let local devices use their own DNS servers if set"
 msgstr ""
 "Разрешить локальным устройствам использовать собственные DNS, если они "
 "прописаны в настройках сети устройства"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:79
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:110
 msgid "Message"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:165
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:213
 msgid ""
 "Only enable if your version of DNSMASQ supports the use of Non-ASCII "
 "characters, otherwise DNSMASQ will fail to start."
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:120
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
 msgid "Output Verbosity Setting"
 msgstr "Настройка журнала"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:139
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:180
+msgid "Pick the DNS resolution option to create the adblock list for, see the"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
 msgid "Pick the LED not already used in"
 msgstr "Выберите LED не используется на странице"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:89
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:182
+msgid "README"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:120
 msgid "Reload"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
-msgid "Run service after set delay on boot"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
+msgid "Run service after set delay on boot."
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:45
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:48
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:75
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:76
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:79
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:106
 msgid "Service Status"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:59
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:90
 msgid "Service is disabled/stopped"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:72
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:103
 msgid "Service is enabled/started"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:88
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:119
 msgid "Service started with error"
 msgstr ""
 
@@ -199,93 +236,111 @@ msgstr ""
 msgid "Simple AdBlock"
 msgstr "Simple AdBlock"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:15
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:1
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:46
 msgid "Simple AdBlock Settings"
 msgstr "Simple AdBlock настройки"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:208
 msgid "Simultaneous processing"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:122
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:16
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:153
 msgid "Some output"
 msgstr "Частичная запись"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:5
-msgid "Start Simple Adblock service"
-msgstr "Запуск сервиса Simple Adblock"
-
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:155
-msgid "Stop the download if it is stalled for set number of seconds"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:200
+msgid "Stop the download if it is stalled for set number of seconds."
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:73
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:104
 msgid "Stop/Disable"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:173
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:220
 msgid "Store compressed cache"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:171
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:218
 msgid "Store compressed cache file on router"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:121
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:15
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:152
 msgid "Suppress output"
 msgstr "Запретить запись"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:141
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:35
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:170
 msgid "System LED Configuration"
 msgstr "'Настройка LED индикации' системы."
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:52
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:83
 msgid "Task"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:201
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
-msgid "URLs to lists of domains to be blacklisted"
-msgstr "URL ссылки Черных списков доменов."
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
+msgid "URLs to lists of domains to be blacklisted."
+msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
-msgid "URLs to lists of domains to be whitelisted"
-msgstr "URL ссылки Белых списков доменов."
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
+msgid "URLs to lists of domains to be whitelisted."
+msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:206
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
-msgid "URLs to lists of hosts to be blacklisted"
-msgstr "URL ссылки Черных списков хостов."
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
+msgid "URLs to lists of hosts to be blacklisted."
+msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:161
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:186
+msgid "Unbound AdBlock List"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:210
 msgid "Use simultaneous processing"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:123
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:17
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:154
 msgid "Verbose output"
 msgstr "Подробная запись"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:184
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:229
 msgid "Whitelist and Blocklist Management"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
 msgid "Whitelisted Domain URLs"
 msgstr "URL ссылки Белых списков доменов"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:186
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231
 msgid "Whitelisted Domains"
 msgstr "Белый список доменов"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:143
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:37
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:182
+msgid "for details."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:172
 msgid "none"
 msgstr "ничего"
+
+#~ msgid "Controls system log and console output verbosity"
+#~ msgstr "Детальная настройка записи событий в системный журнал."
+
+#~ msgid "Forces Router DNS use on local devices, also known as DNS Hijacking"
+#~ msgstr ""
+#~ "Назначить DNS роутера всем локальным устройствам, методом DNS Hijacking."
+
+#~ msgid "Individual domains to be blacklisted"
+#~ msgstr "Домены добавленные пользователем в Черный список."
+
+#~ msgid "Individual domains to be whitelisted"
+#~ msgstr "Домены добавленные пользователем в Белый список."
+
+#~ msgid "Start Simple Adblock service"
+#~ msgstr "Запуск сервиса Simple Adblock"
+
+#~ msgid "URLs to lists of domains to be blacklisted"
+#~ msgstr "URL ссылки Черных списков доменов."
+
+#~ msgid "URLs to lists of domains to be whitelisted"
+#~ msgstr "URL ссылки Белых списков доменов."
+
+#~ msgid "URLs to lists of hosts to be blacklisted"
+#~ msgstr "URL ссылки Черных списков хостов."
diff --git a/applications/luci-app-simple-adblock/po/sv/simple-adblock.po b/applications/luci-app-simple-adblock/po/sv/simple-adblock.po
index d71018c08..9891a6fc0 100644
--- a/applications/luci-app-simple-adblock/po/sv/simple-adblock.po
+++ b/applications/luci-app-simple-adblock/po/sv/simple-adblock.po
@@ -1,180 +1,218 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=UTF-8\n"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:149
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:191
+msgid "Add IPv6 entries"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:189
+msgid "Add IPv6 entries to block-list."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:178
 msgid "Advanced Configuration"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:167
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:215
 msgid "Allow Non-ASCII"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:165
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:213
 msgid "Allow Non-ASCII characters in DNSMASQ file"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:171
-msgid "Attempt to create a compressed cache of final block-list on the router."
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:218
+msgid ""
+"Attempt to create a compressed cache of block-list in the persistent memory."
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:118
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:149
 msgid "Basic Configuration"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:201
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
 msgid "Blacklisted Domain URLs"
 msgstr "Svartlistade domänadresser"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:191
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236
 msgid "Blacklisted Domains"
 msgstr "Svartlistade domäner"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:206
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
 msgid "Blacklisted Hosts URLs"
 msgstr "Svartlistade värdadresser"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:84
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:115
 msgid "Collected Errors"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:116
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:147
 msgid "Configuration"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:120
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
-msgid "Controls system log and console output verbosity"
-msgstr "Kontrollerar systemloggar och detaljnivån för konsoll-utmatningen"
-
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
+msgid "Controls system log and console output verbosity."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:204
+msgid "Curl download retry"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:180
+msgid "DNS Service"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:183
+msgid "DNSMASQ Additional Hosts"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:184
+msgid "DNSMASQ Config"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:185
+msgid "DNSMASQ Servers File"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
 msgid "Delay (in seconds) for on-boot start"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:178
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:224
 msgid "Disable Debugging"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:166
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:190
+msgid "Do not add IPv6 entries"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:214
 msgid "Do not allow Non-ASCII"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:172
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:219
 msgid "Do not store compressed cache"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:160
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:209
 msgid "Do not use simultaneous processing"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:155
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:200
 msgid "Download time-out (in seconds)"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:177
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:179
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:223
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:225
 msgid "Enable Debugging"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:60
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:91
 msgid "Enable/Start"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:177
-msgid "Enables debug output to /tmp/simple-adblock.log"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:223
+msgid "Enables debug output to /tmp/simple-adblock.log."
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:127
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
 msgid "Force Router DNS"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:129
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:23
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
 msgid "Force Router DNS server to all local devices"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:127
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
-msgid "Forces Router DNS use on local devices, also known as DNS Hijacking"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
+msgid "Forces Router DNS use on local devices, also known as DNS Hijacking."
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:191
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
-msgid "Individual domains to be blacklisted"
-msgstr "Individuella domäner som ska svartlistas"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:189
+msgid "IPv6 Support"
+msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:186
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
-msgid "Individual domains to be whitelisted"
-msgstr "Individulla domäner som ska svartlistas"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:204
+msgid ""
+"If curl is installed and detected, it would retry download this many times "
+"on timeout/fail."
+msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:63
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:67
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236
+msgid "Individual domains to be blacklisted."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231
+msgid "Individual domains to be whitelisted."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:94
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:98
 msgid "Info"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:139
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
 msgid "LED to indicate status"
 msgstr "LED för att indikera status"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:208
 msgid ""
 "Launch all lists downloads and processing simultaneously, reducing service "
-"start time"
+"start time."
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:128
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:22
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:158
 msgid "Let local devices use their own DNS servers if set"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:79
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:110
 msgid "Message"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:165
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:213
 msgid ""
 "Only enable if your version of DNSMASQ supports the use of Non-ASCII "
 "characters, otherwise DNSMASQ will fail to start."
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:120
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
 msgid "Output Verbosity Setting"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:139
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:180
+msgid "Pick the DNS resolution option to create the adblock list for, see the"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
 msgid "Pick the LED not already used in"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:89
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:182
+msgid "README"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:120
 msgid "Reload"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
-msgid "Run service after set delay on boot"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
+msgid "Run service after set delay on boot."
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:45
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:48
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:75
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:76
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:79
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:106
 msgid "Service Status"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:59
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:90
 msgid "Service is disabled/stopped"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:72
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:103
 msgid "Service is enabled/started"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:88
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:119
 msgid "Service started with error"
 msgstr ""
 
@@ -182,96 +220,98 @@ msgstr ""
 msgid "Simple AdBlock"
 msgstr "Simple AdBlock"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:15
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:1
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:46
 msgid "Simple AdBlock Settings"
 msgstr "Inställningar för Simple AdBlock"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:208
 msgid "Simultaneous processing"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:122
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:16
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:153
 msgid "Some output"
 msgstr "Viss utmatning"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:5
-msgid "Start Simple Adblock service"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:200
+msgid "Stop the download if it is stalled for set number of seconds."
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:155
-msgid "Stop the download if it is stalled for set number of seconds"
-msgstr ""
-
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:73
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:104
 msgid "Stop/Disable"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:173
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:220
 msgid "Store compressed cache"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:171
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:218
 msgid "Store compressed cache file on router"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:121
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:15
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:152
 msgid "Suppress output"
 msgstr "Förträng utmatning"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:141
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:35
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:170
 msgid "System LED Configuration"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:52
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:83
 msgid "Task"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:201
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
-msgid "URLs to lists of domains to be blacklisted"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
+msgid "URLs to lists of domains to be blacklisted."
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
-msgid "URLs to lists of domains to be whitelisted"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
+msgid "URLs to lists of domains to be whitelisted."
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:206
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
-msgid "URLs to lists of hosts to be blacklisted"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
+msgid "URLs to lists of hosts to be blacklisted."
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:161
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:186
+msgid "Unbound AdBlock List"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:210
 msgid "Use simultaneous processing"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:123
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:17
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:154
 msgid "Verbose output"
 msgstr "Utförlig utmatning"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:184
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:229
 msgid "Whitelist and Blocklist Management"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
 msgid "Whitelisted Domain URLs"
 msgstr "Vitlistade domänadresser"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:186
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231
 msgid "Whitelisted Domains"
 msgstr "Vitlistade domäner"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:143
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:37
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:182
+msgid "for details."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:172
 msgid "none"
 msgstr "ingen"
 
+#~ msgid "Controls system log and console output verbosity"
+#~ msgstr "Kontrollerar systemloggar och detaljnivån för konsoll-utmatningen"
+
+#~ msgid "Individual domains to be blacklisted"
+#~ msgstr "Individuella domäner som ska svartlistas"
+
+#~ msgid "Individual domains to be whitelisted"
+#~ msgstr "Individulla domäner som ska svartlistas"
+
 #~ msgid "Enable/start service"
 #~ msgstr "Aktivera/starta tjänsten"
diff --git a/applications/luci-app-simple-adblock/po/templates/simple-adblock.pot b/applications/luci-app-simple-adblock/po/templates/simple-adblock.pot
index 08e811778..723fbb0cf 100644
--- a/applications/luci-app-simple-adblock/po/templates/simple-adblock.pot
+++ b/applications/luci-app-simple-adblock/po/templates/simple-adblock.pot
@@ -1,180 +1,218 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=UTF-8"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:149
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:191
+msgid "Add IPv6 entries"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:189
+msgid "Add IPv6 entries to block-list."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:178
 msgid "Advanced Configuration"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:167
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:215
 msgid "Allow Non-ASCII"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:165
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:213
 msgid "Allow Non-ASCII characters in DNSMASQ file"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:171
-msgid "Attempt to create a compressed cache of final block-list on the router."
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:218
+msgid ""
+"Attempt to create a compressed cache of block-list in the persistent memory."
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:118
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:149
 msgid "Basic Configuration"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:201
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
 msgid "Blacklisted Domain URLs"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:191
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236
 msgid "Blacklisted Domains"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:206
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
 msgid "Blacklisted Hosts URLs"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:84
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:115
 msgid "Collected Errors"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:116
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:147
 msgid "Configuration"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:120
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
-msgid "Controls system log and console output verbosity"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
+msgid "Controls system log and console output verbosity."
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:204
+msgid "Curl download retry"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:180
+msgid "DNS Service"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:183
+msgid "DNSMASQ Additional Hosts"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:184
+msgid "DNSMASQ Config"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:185
+msgid "DNSMASQ Servers File"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
 msgid "Delay (in seconds) for on-boot start"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:178
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:224
 msgid "Disable Debugging"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:166
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:190
+msgid "Do not add IPv6 entries"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:214
 msgid "Do not allow Non-ASCII"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:172
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:219
 msgid "Do not store compressed cache"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:160
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:209
 msgid "Do not use simultaneous processing"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:155
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:200
 msgid "Download time-out (in seconds)"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:177
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:179
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:223
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:225
 msgid "Enable Debugging"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:60
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:91
 msgid "Enable/Start"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:177
-msgid "Enables debug output to /tmp/simple-adblock.log"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:223
+msgid "Enables debug output to /tmp/simple-adblock.log."
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:127
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
 msgid "Force Router DNS"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:129
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:23
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
 msgid "Force Router DNS server to all local devices"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:127
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
-msgid "Forces Router DNS use on local devices, also known as DNS Hijacking"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
+msgid "Forces Router DNS use on local devices, also known as DNS Hijacking."
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:191
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
-msgid "Individual domains to be blacklisted"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:189
+msgid "IPv6 Support"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:186
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
-msgid "Individual domains to be whitelisted"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:204
+msgid ""
+"If curl is installed and detected, it would retry download this many times "
+"on timeout/fail."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236
+msgid "Individual domains to be blacklisted."
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:63
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:67
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231
+msgid "Individual domains to be whitelisted."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:94
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:98
 msgid "Info"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:139
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
 msgid "LED to indicate status"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:208
 msgid ""
 "Launch all lists downloads and processing simultaneously, reducing service "
-"start time"
+"start time."
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:128
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:22
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:158
 msgid "Let local devices use their own DNS servers if set"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:79
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:110
 msgid "Message"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:165
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:213
 msgid ""
 "Only enable if your version of DNSMASQ supports the use of Non-ASCII "
 "characters, otherwise DNSMASQ will fail to start."
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:120
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
 msgid "Output Verbosity Setting"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:139
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:180
+msgid "Pick the DNS resolution option to create the adblock list for, see the"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
 msgid "Pick the LED not already used in"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:89
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:182
+msgid "README"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:120
 msgid "Reload"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
-msgid "Run service after set delay on boot"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
+msgid "Run service after set delay on boot."
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:45
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:48
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:75
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:76
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:79
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:106
 msgid "Service Status"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:59
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:90
 msgid "Service is disabled/stopped"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:72
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:103
 msgid "Service is enabled/started"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:88
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:119
 msgid "Service started with error"
 msgstr ""
 
@@ -182,93 +220,86 @@ msgstr ""
 msgid "Simple AdBlock"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:15
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:1
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:46
 msgid "Simple AdBlock Settings"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:208
 msgid "Simultaneous processing"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:122
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:16
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:153
 msgid "Some output"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:5
-msgid "Start Simple Adblock service"
-msgstr ""
-
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:155
-msgid "Stop the download if it is stalled for set number of seconds"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:200
+msgid "Stop the download if it is stalled for set number of seconds."
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:73
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:104
 msgid "Stop/Disable"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:173
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:220
 msgid "Store compressed cache"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:171
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:218
 msgid "Store compressed cache file on router"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:121
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:15
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:152
 msgid "Suppress output"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:141
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:35
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:170
 msgid "System LED Configuration"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:52
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:83
 msgid "Task"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:201
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
-msgid "URLs to lists of domains to be blacklisted"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
+msgid "URLs to lists of domains to be blacklisted."
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
-msgid "URLs to lists of domains to be whitelisted"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
+msgid "URLs to lists of domains to be whitelisted."
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:206
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
-msgid "URLs to lists of hosts to be blacklisted"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
+msgid "URLs to lists of hosts to be blacklisted."
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:161
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:186
+msgid "Unbound AdBlock List"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:210
 msgid "Use simultaneous processing"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:123
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:17
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:154
 msgid "Verbose output"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:184
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:229
 msgid "Whitelist and Blocklist Management"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
 msgid "Whitelisted Domain URLs"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:186
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231
 msgid "Whitelisted Domains"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:143
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:37
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:182
+msgid "for details."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:172
 msgid "none"
 msgstr ""
diff --git a/applications/luci-app-simple-adblock/po/zh-cn/simple-adblock.po b/applications/luci-app-simple-adblock/po/zh-cn/simple-adblock.po
index 04837cae2..eb98866e0 100644
--- a/applications/luci-app-simple-adblock/po/zh-cn/simple-adblock.po
+++ b/applications/luci-app-simple-adblock/po/zh-cn/simple-adblock.po
@@ -11,180 +11,218 @@ msgstr ""
 "PO-Revision-Date: 2018-08-17 14:52+0800\n"
 "X-Generator: Gtranslator 2.91.7\n"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:149
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:191
+msgid "Add IPv6 entries"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:189
+msgid "Add IPv6 entries to block-list."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:178
 msgid "Advanced Configuration"
 msgstr "高级配置"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:167
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:215
 msgid "Allow Non-ASCII"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:165
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:213
 msgid "Allow Non-ASCII characters in DNSMASQ file"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:171
-msgid "Attempt to create a compressed cache of final block-list on the router."
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:218
+msgid ""
+"Attempt to create a compressed cache of block-list in the persistent memory."
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:118
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:149
 msgid "Basic Configuration"
 msgstr "基本配置"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:201
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
 msgid "Blacklisted Domain URLs"
 msgstr "列入黑名单的域名 URL"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:191
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236
 msgid "Blacklisted Domains"
 msgstr "列入黑名单的域名"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:206
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
 msgid "Blacklisted Hosts URLs"
 msgstr "列入黑名单的主机 URL"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:84
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:115
 msgid "Collected Errors"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:116
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:147
 msgid "Configuration"
 msgstr "配置"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:120
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
-msgid "Controls system log and console output verbosity"
-msgstr "控制系统日志和控制台输出的详细程度"
-
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
+msgid "Controls system log and console output verbosity."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:204
+msgid "Curl download retry"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:180
+msgid "DNS Service"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:183
+msgid "DNSMASQ Additional Hosts"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:184
+msgid "DNSMASQ Config"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:185
+msgid "DNSMASQ Servers File"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
 msgid "Delay (in seconds) for on-boot start"
 msgstr "开机启动延迟（秒）"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:178
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:224
 msgid "Disable Debugging"
 msgstr "禁用调试"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:166
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:190
+msgid "Do not add IPv6 entries"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:214
 msgid "Do not allow Non-ASCII"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:172
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:219
 msgid "Do not store compressed cache"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:160
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:209
 msgid "Do not use simultaneous processing"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:155
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:200
 msgid "Download time-out (in seconds)"
 msgstr "下载超时（秒）"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:177
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:179
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:223
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:225
 msgid "Enable Debugging"
 msgstr "启用调试"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:60
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:91
 msgid "Enable/Start"
 msgstr "启用/启动"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:177
-msgid "Enables debug output to /tmp/simple-adblock.log"
-msgstr "启用到 /tmp/simple-adblock.log 的调试输出"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:223
+msgid "Enables debug output to /tmp/simple-adblock.log."
+msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:127
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
 msgid "Force Router DNS"
 msgstr "强制路由器 DNS"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:129
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:23
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
 msgid "Force Router DNS server to all local devices"
 msgstr "强制路由器 DNS 服务所有本地设备"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:127
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
-msgid "Forces Router DNS use on local devices, also known as DNS Hijacking"
-msgstr "强制路由器 DNS 在本地设备上使用，也称为 DNS 劫持"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
+msgid "Forces Router DNS use on local devices, also known as DNS Hijacking."
+msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:191
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
-msgid "Individual domains to be blacklisted"
-msgstr "要列入黑名单的单独域名"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:189
+msgid "IPv6 Support"
+msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:186
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
-msgid "Individual domains to be whitelisted"
-msgstr "要列入白名单的单独域名"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:204
+msgid ""
+"If curl is installed and detected, it would retry download this many times "
+"on timeout/fail."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236
+msgid "Individual domains to be blacklisted."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231
+msgid "Individual domains to be whitelisted."
+msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:63
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:67
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:94
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:98
 msgid "Info"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:139
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
 msgid "LED to indicate status"
 msgstr "LED 指示状态"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:208
 msgid ""
 "Launch all lists downloads and processing simultaneously, reducing service "
-"start time"
+"start time."
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:128
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:22
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:158
 msgid "Let local devices use their own DNS servers if set"
 msgstr "如果设置，让本地设备使用自己的 DNS 服务器"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:79
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:110
 msgid "Message"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:165
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:213
 msgid ""
 "Only enable if your version of DNSMASQ supports the use of Non-ASCII "
 "characters, otherwise DNSMASQ will fail to start."
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:120
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
 msgid "Output Verbosity Setting"
 msgstr "输出详细程度设置"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:139
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:180
+msgid "Pick the DNS resolution option to create the adblock list for, see the"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
 msgid "Pick the LED not already used in"
 msgstr "选择尚未使用的 LED"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:89
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:182
+msgid "README"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:120
 msgid "Reload"
 msgstr "刷新"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
-msgid "Run service after set delay on boot"
-msgstr "开机后延迟多少秒运行服务"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
+msgid "Run service after set delay on boot."
+msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:45
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:48
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:75
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:76
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:79
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:106
 msgid "Service Status"
 msgstr "服务状态"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:59
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:90
 msgid "Service is disabled/stopped"
 msgstr "服务已禁用/已停止"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:72
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:103
 msgid "Service is enabled/started"
 msgstr "服务已启用/已启动"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:88
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:119
 msgid "Service started with error"
 msgstr "服务启动时出错"
 
@@ -192,93 +230,119 @@ msgstr "服务启动时出错"
 msgid "Simple AdBlock"
 msgstr "简单 AdBlock"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:15
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:1
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:46
 msgid "Simple AdBlock Settings"
 msgstr "简单 AdBlock 设置"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:208
 msgid "Simultaneous processing"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:122
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:16
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:153
 msgid "Some output"
 msgstr "一些输出"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:5
-msgid "Start Simple Adblock service"
-msgstr "启动简单 Adblock 服务"
-
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:155
-msgid "Stop the download if it is stalled for set number of seconds"
-msgstr "如果下载停滞设定的秒数后，则停止下载"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:200
+msgid "Stop the download if it is stalled for set number of seconds."
+msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:73
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:104
 msgid "Stop/Disable"
 msgstr "停止/禁用"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:173
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:220
 msgid "Store compressed cache"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:171
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:218
 msgid "Store compressed cache file on router"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:121
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:15
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:152
 msgid "Suppress output"
 msgstr "抑制输出"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:141
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:35
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:170
 msgid "System LED Configuration"
 msgstr "系统 LED 配置"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:52
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:83
 msgid "Task"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:201
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
-msgid "URLs to lists of domains to be blacklisted"
-msgstr "黑名单域名列表的 URL"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
+msgid "URLs to lists of domains to be blacklisted."
+msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
-msgid "URLs to lists of domains to be whitelisted"
-msgstr "白名单域名列表的 URL"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
+msgid "URLs to lists of domains to be whitelisted."
+msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:206
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
-msgid "URLs to lists of hosts to be blacklisted"
-msgstr "黑名单主机列表的 URL"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
+msgid "URLs to lists of hosts to be blacklisted."
+msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:161
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:186
+msgid "Unbound AdBlock List"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:210
 msgid "Use simultaneous processing"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:123
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:17
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:154
 msgid "Verbose output"
 msgstr "详细输出"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:184
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:229
 msgid "Whitelist and Blocklist Management"
 msgstr "白名单和黑名单管理"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
 msgid "Whitelisted Domain URLs"
 msgstr "白名单域名 URL"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:186
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231
 msgid "Whitelisted Domains"
 msgstr "白名单域名"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:143
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:37
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:182
+msgid "for details."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:172
 msgid "none"
 msgstr "无"
+
+#~ msgid "Controls system log and console output verbosity"
+#~ msgstr "控制系统日志和控制台输出的详细程度"
+
+#~ msgid "Forces Router DNS use on local devices, also known as DNS Hijacking"
+#~ msgstr "强制路由器 DNS 在本地设备上使用，也称为 DNS 劫持"
+
+#~ msgid "Individual domains to be blacklisted"
+#~ msgstr "要列入黑名单的单独域名"
+
+#~ msgid "Individual domains to be whitelisted"
+#~ msgstr "要列入白名单的单独域名"
+
+#~ msgid "Start Simple Adblock service"
+#~ msgstr "启动简单 Adblock 服务"
+
+#~ msgid "URLs to lists of domains to be blacklisted"
+#~ msgstr "黑名单域名列表的 URL"
+
+#~ msgid "URLs to lists of domains to be whitelisted"
+#~ msgstr "白名单域名列表的 URL"
+
+#~ msgid "URLs to lists of hosts to be blacklisted"
+#~ msgstr "黑名单主机列表的 URL"
+
+#~ msgid "Enables debug output to /tmp/simple-adblock.log"
+#~ msgstr "启用到 /tmp/simple-adblock.log 的调试输出"
+
+#~ msgid "Run service after set delay on boot"
+#~ msgstr "开机后延迟多少秒运行服务"
+
+#~ msgid "Stop the download if it is stalled for set number of seconds"
+#~ msgstr "如果下载停滞设定的秒数后，则停止下载"
diff --git a/applications/luci-app-simple-adblock/po/zh-tw/simple-adblock.po b/applications/luci-app-simple-adblock/po/zh-tw/simple-adblock.po
index 8d76fe361..c64b994f9 100644
--- a/applications/luci-app-simple-adblock/po/zh-tw/simple-adblock.po
+++ b/applications/luci-app-simple-adblock/po/zh-tw/simple-adblock.po
@@ -11,180 +11,218 @@ msgstr ""
 "PO-Revision-Date: 2018-08-17 14:52+0800\n"
 "X-Generator: Gtranslator 2.91.7\n"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:149
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:191
+msgid "Add IPv6 entries"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:189
+msgid "Add IPv6 entries to block-list."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:178
 msgid "Advanced Configuration"
 msgstr "高階配置"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:167
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:215
 msgid "Allow Non-ASCII"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:165
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:213
 msgid "Allow Non-ASCII characters in DNSMASQ file"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:171
-msgid "Attempt to create a compressed cache of final block-list on the router."
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:218
+msgid ""
+"Attempt to create a compressed cache of block-list in the persistent memory."
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:118
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:149
 msgid "Basic Configuration"
 msgstr "基本配置"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:201
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
 msgid "Blacklisted Domain URLs"
 msgstr "列入黑名單的域名 URL"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:191
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236
 msgid "Blacklisted Domains"
 msgstr "列入黑名單的域名"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:206
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
 msgid "Blacklisted Hosts URLs"
 msgstr "列入黑名單的主機 URL"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:84
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:115
 msgid "Collected Errors"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:116
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:147
 msgid "Configuration"
 msgstr "配置"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:120
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
-msgid "Controls system log and console output verbosity"
-msgstr "控制系統日誌和控制檯輸出的詳細程度"
-
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
+msgid "Controls system log and console output verbosity."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:204
+msgid "Curl download retry"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:180
+msgid "DNS Service"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:183
+msgid "DNSMASQ Additional Hosts"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:184
+msgid "DNSMASQ Config"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:185
+msgid "DNSMASQ Servers File"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
 msgid "Delay (in seconds) for on-boot start"
 msgstr "開機啟動延遲（秒）"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:178
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:224
 msgid "Disable Debugging"
 msgstr "禁用除錯"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:166
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:190
+msgid "Do not add IPv6 entries"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:214
 msgid "Do not allow Non-ASCII"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:172
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:219
 msgid "Do not store compressed cache"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:160
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:209
 msgid "Do not use simultaneous processing"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:155
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:200
 msgid "Download time-out (in seconds)"
 msgstr "下載超時（秒）"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:177
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:179
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:223
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:225
 msgid "Enable Debugging"
 msgstr "啟用除錯"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:60
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:91
 msgid "Enable/Start"
 msgstr "啟用/啟動"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:177
-msgid "Enables debug output to /tmp/simple-adblock.log"
-msgstr "啟用到 /tmp/simple-adblock.log 的除錯輸出"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:223
+msgid "Enables debug output to /tmp/simple-adblock.log."
+msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:127
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
 msgid "Force Router DNS"
 msgstr "強制路由器 DNS"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:129
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:23
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
 msgid "Force Router DNS server to all local devices"
 msgstr "強制路由器 DNS 服務所有本地裝置"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:127
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
-msgid "Forces Router DNS use on local devices, also known as DNS Hijacking"
-msgstr "強制路由器 DNS 在本地裝置上使用，也稱為 DNS 劫持"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
+msgid "Forces Router DNS use on local devices, also known as DNS Hijacking."
+msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:191
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
-msgid "Individual domains to be blacklisted"
-msgstr "要列入黑名單的單獨域名"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:189
+msgid "IPv6 Support"
+msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:186
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
-msgid "Individual domains to be whitelisted"
-msgstr "要列入白名單的單獨域名"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:204
+msgid ""
+"If curl is installed and detected, it would retry download this many times "
+"on timeout/fail."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236
+msgid "Individual domains to be blacklisted."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231
+msgid "Individual domains to be whitelisted."
+msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:63
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:67
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:94
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:98
 msgid "Info"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:139
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
 msgid "LED to indicate status"
 msgstr "LED 指示狀態"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:208
 msgid ""
 "Launch all lists downloads and processing simultaneously, reducing service "
-"start time"
+"start time."
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:128
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:22
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:158
 msgid "Let local devices use their own DNS servers if set"
 msgstr "如果設定，讓本地裝置使用自己的 DNS 伺服器"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:79
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:110
 msgid "Message"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:165
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:213
 msgid ""
 "Only enable if your version of DNSMASQ supports the use of Non-ASCII "
 "characters, otherwise DNSMASQ will fail to start."
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:120
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
 msgid "Output Verbosity Setting"
 msgstr "輸出詳細程度設定"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:139
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:180
+msgid "Pick the DNS resolution option to create the adblock list for, see the"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
 msgid "Pick the LED not already used in"
 msgstr "選擇尚未使用的 LED"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:89
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:182
+msgid "README"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:120
 msgid "Reload"
 msgstr "重新整理"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
-msgid "Run service after set delay on boot"
-msgstr "開機後延遲多少秒執行服務"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
+msgid "Run service after set delay on boot."
+msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:45
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:48
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:75
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:76
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:79
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:106
 msgid "Service Status"
 msgstr "服務狀態"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:59
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:90
 msgid "Service is disabled/stopped"
 msgstr "服務已禁用/已停止"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:72
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:103
 msgid "Service is enabled/started"
 msgstr "服務已啟用/已啟動"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:88
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:119
 msgid "Service started with error"
 msgstr "服務啟動時出錯"
 
@@ -192,93 +230,119 @@ msgstr "服務啟動時出錯"
 msgid "Simple AdBlock"
 msgstr "簡單 AdBlock"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:15
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:1
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:46
 msgid "Simple AdBlock Settings"
 msgstr "簡單 AdBlock 設定"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:208
 msgid "Simultaneous processing"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:122
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:16
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:153
 msgid "Some output"
 msgstr "一些輸出"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:5
-msgid "Start Simple Adblock service"
-msgstr "啟動簡單 Adblock 服務"
-
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:155
-msgid "Stop the download if it is stalled for set number of seconds"
-msgstr "如果下載停滯設定的秒數後，則停止下載"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:200
+msgid "Stop the download if it is stalled for set number of seconds."
+msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:73
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:104
 msgid "Stop/Disable"
 msgstr "停止/禁用"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:173
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:220
 msgid "Store compressed cache"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:171
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:218
 msgid "Store compressed cache file on router"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:121
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:15
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:152
 msgid "Suppress output"
 msgstr "抑制輸出"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:141
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:35
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:170
 msgid "System LED Configuration"
 msgstr "系統 LED 配置"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:52
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:83
 msgid "Task"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:201
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
-msgid "URLs to lists of domains to be blacklisted"
-msgstr "黑名單域名列表的 URL"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
+msgid "URLs to lists of domains to be blacklisted."
+msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
-msgid "URLs to lists of domains to be whitelisted"
-msgstr "白名單域名列表的 URL"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
+msgid "URLs to lists of domains to be whitelisted."
+msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:206
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
-msgid "URLs to lists of hosts to be blacklisted"
-msgstr "黑名單主機列表的 URL"
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
+msgid "URLs to lists of hosts to be blacklisted."
+msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:161
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:186
+msgid "Unbound AdBlock List"
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:210
 msgid "Use simultaneous processing"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:123
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:17
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:154
 msgid "Verbose output"
 msgstr "詳細輸出"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:184
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:229
 msgid "Whitelist and Blocklist Management"
 msgstr "白名單和黑名單管理"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
 msgid "Whitelisted Domain URLs"
 msgstr "白名單域名 URL"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:186
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231
 msgid "Whitelisted Domains"
 msgstr "白名單域名"
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:143
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:37
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:182
+msgid "for details."
+msgstr ""
+
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:172
 msgid "none"
 msgstr "無"
+
+#~ msgid "Controls system log and console output verbosity"
+#~ msgstr "控制系統日誌和控制檯輸出的詳細程度"
+
+#~ msgid "Forces Router DNS use on local devices, also known as DNS Hijacking"
+#~ msgstr "強制路由器 DNS 在本地裝置上使用，也稱為 DNS 劫持"
+
+#~ msgid "Individual domains to be blacklisted"
+#~ msgstr "要列入黑名單的單獨域名"
+
+#~ msgid "Individual domains to be whitelisted"
+#~ msgstr "要列入白名單的單獨域名"
+
+#~ msgid "Start Simple Adblock service"
+#~ msgstr "啟動簡單 Adblock 服務"
+
+#~ msgid "URLs to lists of domains to be blacklisted"
+#~ msgstr "黑名單域名列表的 URL"
+
+#~ msgid "URLs to lists of domains to be whitelisted"
+#~ msgstr "白名單域名列表的 URL"
+
+#~ msgid "URLs to lists of hosts to be blacklisted"
+#~ msgstr "黑名單主機列表的 URL"
+
+#~ msgid "Enables debug output to /tmp/simple-adblock.log"
+#~ msgstr "啟用到 /tmp/simple-adblock.log 的除錯輸出"
+
+#~ msgid "Run service after set delay on boot"
+#~ msgstr "開機後延遲多少秒執行服務"
+
+#~ msgid "Stop the download if it is stalled for set number of seconds"
+#~ msgstr "如果下載停滯設定的秒數後，則停止下載"
diff --git a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua
index ee3fd254f..56af1cc96 100644
--- a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua
+++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua
@@ -12,4 +12,25 @@ s = m:section( NamedSection, "collectd_cpu", "luci_statistics" )
 enable = s:option( Flag, "enable", translate("Enable this plugin") )
 enable.default = 0
 
+-- collectd_cpu.reportbycpu (ReportByCpu)
+reportbycpu = s:option( Flag, "ReportByCpu",
+	translate("Report by CPU"),
+	translate("By setting this, CPU is not aggregate of all processors on the system"))
+reportbycpu.default = 1
+reportbycpu:depends( "enable", 1 )
+
+-- collectd_cpu.reportbystate (ReportByState)
+reportbystate = s:option( Flag, "ReportByState",
+	translate("Report by state"),
+	translate("When set to true, reports per-state metric (system, user, idle)"))
+reportbystate.default = 1
+reportbystate:depends( "enable", 1 )
+
+-- collectd_cpu.valuespercentage (ValuesPercentage)
+valuespercentage = s:option( Flag, "ValuesPercentage",
+	translate("Report in percent"),
+	translate("When set to true, we request percentage values"))
+valuespercentage.default = 0
+valuespercentage:depends({ enable = 1, ReportByCpu = 1, ReportByState = 1 })
+
 return m
diff --git a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/memory.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/memory.lua
index fa677b8d1..e5f3360c0 100644
--- a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/memory.lua
+++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/memory.lua
@@ -10,4 +10,18 @@ s = m:section( NamedSection, "collectd_memory", "luci_statistics" )
 enable = s:option( Flag, "enable", translate("Enable this plugin") )
 enable.default = 0
 
+-- collectd_memory.valuesabsolute (ValuesAbsolute)
+valuespercentage = s:option( Flag, "ValuesAbsolute",
+	translate("Absolute values"),
+	translate("When set to true, we request absolute values"))
+valuespercentage.default = 1
+valuespercentage:depends( "enable", 1 )
+
+-- collectd_memory.valuespercentage (ValuesPercentage)
+valuespercentage = s:option( Flag, "ValuesPercentage",
+	translate("Percent values"),
+	translate("When set to true, we request percentage values"))
+valuespercentage.default = 0
+valuespercentage:depends( "enable", 1 )
+
 return m
diff --git a/applications/luci-app-statistics/luasrc/statistics/plugins/cpu.lua b/applications/luci-app-statistics/luasrc/statistics/plugins/cpu.lua
index 004a450ee..bae325990 100644
--- a/applications/luci-app-statistics/luasrc/statistics/plugins/cpu.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/plugins/cpu.lua
@@ -1,7 +1,7 @@
 return {
 	legend = {
 		{ },
-		{ },
+		{ "ValuesPercentage" , "ReportByCpu", "ReportByState" },
 		{ }
 	},
 	label = _("Processor"),
diff --git a/applications/luci-app-statistics/luasrc/statistics/plugins/memory.lua b/applications/luci-app-statistics/luasrc/statistics/plugins/memory.lua
index 8dee2dafc..9ad1b3f88 100644
--- a/applications/luci-app-statistics/luasrc/statistics/plugins/memory.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/plugins/memory.lua
@@ -1,7 +1,7 @@
 return {
-	legend = { 
-		{ },
+	legend = {
 		{ },
+		{ "ValuesPercentage", "ValuesAbsolute" },
 		{ }
 	},
 	label = _("Memory"),
diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpu.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpu.lua
index 226c84ee9..3f8910722 100644
--- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpu.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpu.lua
@@ -3,33 +3,167 @@
 
 module("luci.statistics.rrdtool.definitions.cpu",package.seeall)
 
+local uci = require("luci.model.uci").cursor()
+local reportbystate = uci:get("luci_statistics", "collectd_cpu", "ReportByState") or "0"
+
 function item()
 	return luci.i18n.translate("Processor")
 end
 
 function rrdargs( graph, plugin, plugin_instance, dtype )
+	local p = {}
+
+	local title = "%H: Processor usage"
+	if #plugin_instance > 0 then
+		title = "%H: Processor usage on core #%pi"
+	end
+
+	if reportbystate == "1" then
+		local cpu = {
+			title = title,
+			y_min = "0",
+			alt_autoscale_max = true,
+			vlabel = "Jiffies",
+			number_format = "%5.1lf",
+			data = {
+				instances = {
+					cpu = {
+						"idle",
+						"interrupt",
+						"nice",
+						"softirq",
+						"steal",
+						"system",
+						"user",
+						"wait"
+					}
+				},
+				options = {
+					cpu_idle = {
+						color = "ffffff",
+						title = "Idle"
+					},
+					cpu_interrupt = {
+						color = "a000a0",
+						title = "Interrupt"
+					},
+					cpu_nice = {
+						color = "00e000",
+						title = "Nice"
+					},
+					cpu_softirq = {
+						color = "ff00ff",
+						title = "Softirq"
+					},
+					cpu_steal = {
+						color = "000000",
+						title = "Steal"
+					},
+					cpu_system = {
+						color = "ff0000",
+						title = "System"
+					},
+					cpu_user = {
+						color = "0000ff",
+						title = "User"
+					},
+					cpu_wait = {
+						color = "ffb000",
+						title = "Wait"
+					}
+				}
+			}
+		}
 
-	return {
-		title = "%H: Processor usage on core #%pi",
-		y_min = "0",
-		alt_autoscale_max = true,
-		vlabel = "Percent",
-		number_format = "%5.1lf%%",
-		data = {
-			instances = { 
-				cpu = { "user", "nice", "system", "softirq", "interrupt" }
-			},
-
-			options = {
-				cpu_idle      = { color = "ffffff", title = "Idle" },
-				cpu_nice      = { color = "00e000", title = "Nice" },
-				cpu_user      = { color = "0000ff", title = "User" },
-				cpu_wait      = { color = "ffb000", title = "Wait" },
-				cpu_system    = { color = "ff0000", title = "System" },
-				cpu_softirq   = { color = "ff00ff", title = "Softirq" },
-				cpu_interrupt = { color = "a000a0", title = "Interrupt" },
-				cpu_steal     = { color = "000000", title = "Steal" }
+		local percent = {
+			title = title,
+			y_min = "0",
+			alt_autoscale_max = true,
+			vlabel = "Percent",
+			number_format = "%5.1lf%%",
+			data = {
+				instances = {
+					percent = {
+						"idle",
+						"interrupt",
+						"nice",
+						"softirq",
+						"steal",
+						"system",
+						"user",
+						"wait"
+					}
+				},
+				options = {
+					percent_idle = {
+						color = "ffffff",
+						title = "Idle"
+					},
+					percent_interrupt = {
+						color = "a000a0",
+						title = "Interrupt"
+					},
+					percent_nice = {
+						color = "00e000",
+						title = "Nice"
+					},
+					percent_softirq = {
+						color = "ff00ff",
+						title = "Softirq"
+					},
+					percent_steal = {
+						color = "000000",
+						title = "Steal"
+					},
+					percent_system = {
+						color = "ff0000",
+						title = "System"
+					},
+					percent_user = {
+						color = "0000ff",
+						title = "User"
+					},
+					percent_wait = {
+						color = "ffb000",
+						title = "Wait"
+					}
+				}
 			}
 		}
-	}
+
+		local types = graph.tree:data_types( plugin, plugin_instance )
+
+		for _, t in ipairs(types) do
+			if t == "cpu" then
+				p[#p+1] = cpu
+			end
+
+			if t == "percent" then
+				p[#p+1] = percent
+			end
+		end
+	else
+		p = {
+			title = title,
+			y_min = "0",
+			alt_autoscale_max = true,
+			vlabel = "Percent",
+			number_format = "%5.1lf%%",
+			data = {
+				instances = {
+					percent = {
+						"active",
+					}
+				},
+				options = {
+					percent_active = {
+						color = "00e000",
+						title = "Active"
+					}
+				}
+			}
+		}
+	end
+
+	return p
 end
diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua
index d3596637b..cb7ae53af 100644
--- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua
@@ -48,12 +48,12 @@ function rrdargs( graph, plugin, plugin_instance, dtype )
 		data = {
 			types = { "percent" },
 			options = {
-				percent = { title = "%di Hz", negweight = true },
+				percent = { title = "%di kHz", negweight = true },
 			}
 		}
 	}
 
-	return { cpufreq, transitions, percentage }
+	return { cpufreq, percentage, transitions }
     else
 	return { cpufreq }
     end
diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/memory.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/memory.lua
index b05d31dc0..749c3e352 100644
--- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/memory.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/memory.lua
@@ -1,13 +1,5 @@
---[[
-
-(c) 2011 Manuel Munz <freifunk at somakoma dot de>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-]]--
+-- Copyright  2011 Manuel Munz <freifunk at somakoma dot de>
+-- Licensed to the public under the Apache License 2.0.
 
 module("luci.statistics.rrdtool.definitions.memory",package.seeall)
 
@@ -16,24 +8,92 @@ function item()
 end
 
 function rrdargs( graph, plugin, plugin_instance, dtype )
+	local p = {}
 
-	return {
+	local memory = {
 		title = "%H: Memory usage",
 		vlabel = "MB",
 		number_format = "%5.1lf%s",
 		y_min = "0",
 		alt_autoscale_max = true,
 		data = {
-			instances = { 
-				memory = { "free", "buffered", "cached", "used" }
+			instances = {
+				memory = {
+					"free",
+					"buffered",
+					"cached",
+					"used"
+				}
 			},
 
 			options = {
-				memory_buffered	= { color = "0000ff", title = "Buffered" },
-				memory_cached	= { color = "ff00ff", title = "Cached" },
-				memory_used	= { color = "ff0000", title = "Used" },
-				memory_free	= { color = "00ff00", title = "Free" }
+				memory_buffered = {
+					color = "0000ff",
+					title = "Buffered"
+				},
+				memory_cached = {
+					color = "ff00ff",
+					title = "Cached"
+				},
+				memory_used = {
+					color = "ff0000",
+					title = "Used"
+				},
+				memory_free = {
+					color = "00ff00",
+					title = "Free"
+				}
 			}
 		}
 	}
+
+	local percent = {
+		title = "%H: Memory usage",
+		vlabel = "Percent",
+		number_format = "%5.1lf%%",
+		y_min = "0",
+		alt_autoscale_max = true,
+		data = {
+			instances = {
+				percent = {
+					"free",
+					"buffered",
+					"cached",
+					"used"
+				}
+			},
+			options = {
+				percent_buffered = {
+					color = "0000ff",
+					title = "Buffered"
+				},
+				percent_cached = {
+					color = "ff00ff",
+					title = "Cached"
+				},
+				percent_used = {
+					color = "ff0000",
+					title = "Used"
+				},
+				percent_free = {
+					color = "00ff00",
+					title = "Free"
+				}
+			}
+		}
+	}
+
+	local types = graph.tree:data_types( plugin, plugin_instance )
+
+	for _, t in ipairs(types) do
+		if t == "percent" then
+			p[#p+1] = percent
+		end
+
+		if t == "memory" then
+			p[#p+1] = memory
+		end
+	end
+
+	return p
 end
diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/ping.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/ping.lua
index c3645e408..b8d11c075 100644
--- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/ping.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/ping.lua
@@ -9,25 +9,62 @@ end
 
 function rrdargs( graph, plugin, plugin_instance, dtype )
 
-	return {
-		-- Ping roundtrip time
-		{ title = "%H: ICMP Round Trip Time",
-		  vlabel = "ms",
-		  number_format = "%5.1lf ms",
-		  data = {
-			sources = { ping = { "value" } },
-			options = { ping__value = {
-				noarea = true, overlay = true, title = "%di" } }
-		} },
+	local ping = {
+		title = "%H: ICMP Round Trip Time",
+		vlabel = "ms",
+		number_format = "%5.1lf ms",
+		data = {
+			sources = {
+				ping = {
+					"value"
+				}
+			},
+			options = {
+				ping__value = {
+					noarea = true,
+					overlay = true,
+					title = "%di"
+				}
+			}
+		}
+	}
+
+	local droprate = {
+		title = "%H: ICMP Drop Rate",
+		vlabel = "%",
+		number_format = "%5.2lf %%",
+		data = {
+			types   = {
+				"ping_droprate"
+			},
+			options = {
+				ping_droprate = {
+					noarea = true,
+					overlay = true,
+					title = "%di",
+					transform_rpn = "100,*"
+				}
+			}
+		}
+	}
 
-		-- Ping droprate
-		{ title = "%H: ICMP Drop Rate",
-		  vlabel = "%",
-		  number_format = "%5.2lf %%",
-		  data = {
-			types   = { "ping_droprate" },
-			options = { ping_droprate = {
-				noarea = true, overlay = true, title = "%di" } }
-		} }
+	local stddev = {
+		title = "%H: ICMP Standard Deviation",
+		vlabel = "ms",
+		number_format = "%5.1lf ms",
+		data = {
+			types   = {
+				"ping_stddev"
+			},
+			options = {
+				ping_stddev = {
+					noarea = true,
+					overlay = true,
+					title = "%di"
+				}
+			}
+		}
 	}
+
+	return { ping, droprate, stddev }
 end
diff --git a/applications/luci-app-statistics/po/ca/statistics.po b/applications/luci-app-statistics/po/ca/statistics.po
index 319e82396..f785a5a8e 100644
--- a/applications/luci-app-statistics/po/ca/statistics.po
+++ b/applications/luci-app-statistics/po/ca/statistics.po
@@ -66,7 +66,7 @@ msgid "CPU Context Switches Plugin Configuration"
 msgstr ""
 
 #: applications/luci-app-statistics/luasrc/statistics/plugins/cpufreq.lua:7
-#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:6
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:9
 msgid "CPU Frequency"
 msgstr ""
 
@@ -262,6 +262,10 @@ msgstr "Exec"
 msgid "Exec Plugin Configuration"
 msgstr "Configuració del connector exec"
 
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "Extra items"
+msgstr ""
+
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua:68
 msgid "Filter class monitoring"
 msgstr "Monitoreig de classe filter"
@@ -484,6 +488,10 @@ msgstr "Monitoritza processos"
 msgid "Monitor remote ports"
 msgstr "Monitoritza els ports remots"
 
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "More details about frequency usage and transitions"
+msgstr ""
+
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:20
 msgid "Name"
 msgstr ""
diff --git a/applications/luci-app-statistics/po/cs/statistics.po b/applications/luci-app-statistics/po/cs/statistics.po
index 2a8d762f1..de5fd9b59 100644
--- a/applications/luci-app-statistics/po/cs/statistics.po
+++ b/applications/luci-app-statistics/po/cs/statistics.po
@@ -62,7 +62,7 @@ msgid "CPU Context Switches Plugin Configuration"
 msgstr ""
 
 #: applications/luci-app-statistics/luasrc/statistics/plugins/cpufreq.lua:7
-#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:6
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:9
 msgid "CPU Frequency"
 msgstr ""
 
@@ -258,6 +258,10 @@ msgstr "Exec"
 msgid "Exec Plugin Configuration"
 msgstr "Nastavení pluginu Exec"
 
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "Extra items"
+msgstr ""
+
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua:68
 msgid "Filter class monitoring"
 msgstr ""
@@ -479,6 +483,10 @@ msgstr "Sledovat procesy"
 msgid "Monitor remote ports"
 msgstr "Sledovat vzdálené porty"
 
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "More details about frequency usage and transitions"
+msgstr ""
+
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:20
 msgid "Name"
 msgstr ""
diff --git a/applications/luci-app-statistics/po/de/statistics.po b/applications/luci-app-statistics/po/de/statistics.po
index 3c6a57292..5a1e7e4fc 100644
--- a/applications/luci-app-statistics/po/de/statistics.po
+++ b/applications/luci-app-statistics/po/de/statistics.po
@@ -64,7 +64,7 @@ msgid "CPU Context Switches Plugin Configuration"
 msgstr ""
 
 #: applications/luci-app-statistics/luasrc/statistics/plugins/cpufreq.lua:7
-#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:6
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:9
 msgid "CPU Frequency"
 msgstr ""
 
@@ -260,6 +260,10 @@ msgstr "Exec"
 msgid "Exec Plugin Configuration"
 msgstr "Exec Plugin Konfiguration"
 
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "Extra items"
+msgstr ""
+
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua:68
 msgid "Filter class monitoring"
 msgstr "Filterklassen überwachen"
@@ -486,6 +490,10 @@ msgstr "Überwachte Prozesse"
 msgid "Monitor remote ports"
 msgstr "entfernte Ports überwachen"
 
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "More details about frequency usage and transitions"
+msgstr ""
+
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:20
 msgid "Name"
 msgstr ""
diff --git a/applications/luci-app-statistics/po/el/statistics.po b/applications/luci-app-statistics/po/el/statistics.po
index fc829c1f7..0dfa4765f 100644
--- a/applications/luci-app-statistics/po/el/statistics.po
+++ b/applications/luci-app-statistics/po/el/statistics.po
@@ -65,7 +65,7 @@ msgid "CPU Context Switches Plugin Configuration"
 msgstr ""
 
 #: applications/luci-app-statistics/luasrc/statistics/plugins/cpufreq.lua:7
-#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:6
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:9
 msgid "CPU Frequency"
 msgstr ""
 
@@ -262,6 +262,10 @@ msgstr "Exec"
 msgid "Exec Plugin Configuration"
 msgstr ""
 
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "Extra items"
+msgstr ""
+
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua:68
 msgid "Filter class monitoring"
 msgstr ""
@@ -477,6 +481,10 @@ msgstr ""
 msgid "Monitor remote ports"
 msgstr ""
 
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "More details about frequency usage and transitions"
+msgstr ""
+
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:20
 msgid "Name"
 msgstr ""
diff --git a/applications/luci-app-statistics/po/en/statistics.po b/applications/luci-app-statistics/po/en/statistics.po
index cdc637715..d5d43b192 100644
--- a/applications/luci-app-statistics/po/en/statistics.po
+++ b/applications/luci-app-statistics/po/en/statistics.po
@@ -64,7 +64,7 @@ msgid "CPU Context Switches Plugin Configuration"
 msgstr ""
 
 #: applications/luci-app-statistics/luasrc/statistics/plugins/cpufreq.lua:7
-#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:6
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:9
 msgid "CPU Frequency"
 msgstr ""
 
@@ -260,6 +260,10 @@ msgstr "Exec"
 msgid "Exec Plugin Configuration"
 msgstr "Exec Plugin Configuration"
 
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "Extra items"
+msgstr ""
+
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua:68
 msgid "Filter class monitoring"
 msgstr "Filter class monitoring"
@@ -482,6 +486,10 @@ msgstr "Monitor processes"
 msgid "Monitor remote ports"
 msgstr "Monitor remote ports"
 
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "More details about frequency usage and transitions"
+msgstr ""
+
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:20
 msgid "Name"
 msgstr ""
diff --git a/applications/luci-app-statistics/po/es/statistics.po b/applications/luci-app-statistics/po/es/statistics.po
index 61cd15800..8cea6ad98 100644
--- a/applications/luci-app-statistics/po/es/statistics.po
+++ b/applications/luci-app-statistics/po/es/statistics.po
@@ -64,7 +64,7 @@ msgid "CPU Context Switches Plugin Configuration"
 msgstr "Configuración del complemento de conmutadores de contexto de CPU"
 
 #: applications/luci-app-statistics/luasrc/statistics/plugins/cpufreq.lua:7
-#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:6
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:9
 msgid "CPU Frequency"
 msgstr "Frecuencia de CPU"
 
@@ -260,6 +260,10 @@ msgstr "Exec"
 msgid "Exec Plugin Configuration"
 msgstr "Configuración del plugin Exec"
 
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "Extra items"
+msgstr ""
+
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua:68
 msgid "Filter class monitoring"
 msgstr "Monitorización del filtro de clases"
@@ -485,6 +489,10 @@ msgstr "Monitorizar procesos"
 msgid "Monitor remote ports"
 msgstr "Monitorizar puertos remotos"
 
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "More details about frequency usage and transitions"
+msgstr ""
+
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:20
 msgid "Name"
 msgstr "Nombre"
diff --git a/applications/luci-app-statistics/po/fr/statistics.po b/applications/luci-app-statistics/po/fr/statistics.po
index 0f8851468..df1e92a3a 100644
--- a/applications/luci-app-statistics/po/fr/statistics.po
+++ b/applications/luci-app-statistics/po/fr/statistics.po
@@ -64,7 +64,7 @@ msgid "CPU Context Switches Plugin Configuration"
 msgstr ""
 
 #: applications/luci-app-statistics/luasrc/statistics/plugins/cpufreq.lua:7
-#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:6
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:9
 msgid "CPU Frequency"
 msgstr ""
 
@@ -260,6 +260,10 @@ msgstr "Exec"
 msgid "Exec Plugin Configuration"
 msgstr "Configuration du greffon Exec"
 
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "Extra items"
+msgstr ""
+
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua:68
 msgid "Filter class monitoring"
 msgstr "Surveillance des filtres"
@@ -483,6 +487,10 @@ msgstr "Processus à surveiller"
 msgid "Monitor remote ports"
 msgstr "Surveiller les ports destinataires"
 
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "More details about frequency usage and transitions"
+msgstr ""
+
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:20
 msgid "Name"
 msgstr ""
diff --git a/applications/luci-app-statistics/po/he/statistics.po b/applications/luci-app-statistics/po/he/statistics.po
index 81a260675..7880b49f3 100644
--- a/applications/luci-app-statistics/po/he/statistics.po
+++ b/applications/luci-app-statistics/po/he/statistics.po
@@ -64,7 +64,7 @@ msgid "CPU Context Switches Plugin Configuration"
 msgstr ""
 
 #: applications/luci-app-statistics/luasrc/statistics/plugins/cpufreq.lua:7
-#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:6
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:9
 msgid "CPU Frequency"
 msgstr ""
 
@@ -257,6 +257,10 @@ msgstr ""
 msgid "Exec Plugin Configuration"
 msgstr ""
 
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "Extra items"
+msgstr ""
+
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua:68
 msgid "Filter class monitoring"
 msgstr ""
@@ -472,6 +476,10 @@ msgstr ""
 msgid "Monitor remote ports"
 msgstr ""
 
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "More details about frequency usage and transitions"
+msgstr ""
+
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:20
 msgid "Name"
 msgstr ""
diff --git a/applications/luci-app-statistics/po/hu/statistics.po b/applications/luci-app-statistics/po/hu/statistics.po
index c65047e2b..f7b6643fc 100644
--- a/applications/luci-app-statistics/po/hu/statistics.po
+++ b/applications/luci-app-statistics/po/hu/statistics.po
@@ -62,7 +62,7 @@ msgid "CPU Context Switches Plugin Configuration"
 msgstr ""
 
 #: applications/luci-app-statistics/luasrc/statistics/plugins/cpufreq.lua:7
-#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:6
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:9
 msgid "CPU Frequency"
 msgstr ""
 
@@ -258,6 +258,10 @@ msgstr "Exec"
 msgid "Exec Plugin Configuration"
 msgstr "Exec bővítmény beállítása"
 
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "Extra items"
+msgstr ""
+
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua:68
 msgid "Filter class monitoring"
 msgstr "Szűrő osztály figyelése"
@@ -484,6 +488,10 @@ msgstr "Folyamatok figyelése"
 msgid "Monitor remote ports"
 msgstr "Távoli portok figyelése"
 
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "More details about frequency usage and transitions"
+msgstr ""
+
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:20
 msgid "Name"
 msgstr ""
diff --git a/applications/luci-app-statistics/po/it/statistics.po b/applications/luci-app-statistics/po/it/statistics.po
index e4b8a46a7..6e90a6e1e 100644
--- a/applications/luci-app-statistics/po/it/statistics.po
+++ b/applications/luci-app-statistics/po/it/statistics.po
@@ -64,7 +64,7 @@ msgid "CPU Context Switches Plugin Configuration"
 msgstr ""
 
 #: applications/luci-app-statistics/luasrc/statistics/plugins/cpufreq.lua:7
-#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:6
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:9
 msgid "CPU Frequency"
 msgstr ""
 
@@ -260,6 +260,10 @@ msgstr ""
 msgid "Exec Plugin Configuration"
 msgstr ""
 
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "Extra items"
+msgstr ""
+
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua:68
 msgid "Filter class monitoring"
 msgstr ""
@@ -482,6 +486,10 @@ msgstr ""
 msgid "Monitor remote ports"
 msgstr ""
 
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "More details about frequency usage and transitions"
+msgstr ""
+
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:20
 msgid "Name"
 msgstr ""
diff --git a/applications/luci-app-statistics/po/ja/statistics.po b/applications/luci-app-statistics/po/ja/statistics.po
index 26ea4f270..0835dff7e 100644
--- a/applications/luci-app-statistics/po/ja/statistics.po
+++ b/applications/luci-app-statistics/po/ja/statistics.po
@@ -64,7 +64,7 @@ msgid "CPU Context Switches Plugin Configuration"
 msgstr ""
 
 #: applications/luci-app-statistics/luasrc/statistics/plugins/cpufreq.lua:7
-#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:6
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:9
 msgid "CPU Frequency"
 msgstr "CPU 周波数"
 
@@ -259,6 +259,10 @@ msgstr ""
 msgid "Exec Plugin Configuration"
 msgstr "Exec プラグイン設定"
 
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "Extra items"
+msgstr ""
+
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua:68
 msgid "Filter class monitoring"
 msgstr ""
@@ -484,6 +488,10 @@ msgstr "プロセスをモニターする"
 msgid "Monitor remote ports"
 msgstr "リモートのポートをモニターする"
 
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "More details about frequency usage and transitions"
+msgstr ""
+
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:20
 msgid "Name"
 msgstr ""
diff --git a/applications/luci-app-statistics/po/ms/statistics.po b/applications/luci-app-statistics/po/ms/statistics.po
index 9a767e932..9526e071d 100644
--- a/applications/luci-app-statistics/po/ms/statistics.po
+++ b/applications/luci-app-statistics/po/ms/statistics.po
@@ -61,7 +61,7 @@ msgid "CPU Context Switches Plugin Configuration"
 msgstr ""
 
 #: applications/luci-app-statistics/luasrc/statistics/plugins/cpufreq.lua:7
-#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:6
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:9
 msgid "CPU Frequency"
 msgstr ""
 
@@ -254,6 +254,10 @@ msgstr ""
 msgid "Exec Plugin Configuration"
 msgstr ""
 
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "Extra items"
+msgstr ""
+
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua:68
 msgid "Filter class monitoring"
 msgstr ""
@@ -469,6 +473,10 @@ msgstr ""
 msgid "Monitor remote ports"
 msgstr ""
 
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "More details about frequency usage and transitions"
+msgstr ""
+
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:20
 msgid "Name"
 msgstr ""
diff --git a/applications/luci-app-statistics/po/no/statistics.po b/applications/luci-app-statistics/po/no/statistics.po
index ce66fdf30..9842297b1 100644
--- a/applications/luci-app-statistics/po/no/statistics.po
+++ b/applications/luci-app-statistics/po/no/statistics.po
@@ -55,7 +55,7 @@ msgid "CPU Context Switches Plugin Configuration"
 msgstr ""
 
 #: applications/luci-app-statistics/luasrc/statistics/plugins/cpufreq.lua:7
-#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:6
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:9
 msgid "CPU Frequency"
 msgstr ""
 
@@ -251,6 +251,10 @@ msgstr "Program"
 msgid "Exec Plugin Configuration"
 msgstr "Program plugin konfigurasjon"
 
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "Extra items"
+msgstr ""
+
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua:68
 msgid "Filter class monitoring"
 msgstr "Filter class overvåking"
@@ -471,6 +475,10 @@ msgstr "Overvåk prosesser"
 msgid "Monitor remote ports"
 msgstr "Overvåk eksterne porter"
 
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "More details about frequency usage and transitions"
+msgstr ""
+
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:20
 msgid "Name"
 msgstr ""
diff --git a/applications/luci-app-statistics/po/pl/statistics.po b/applications/luci-app-statistics/po/pl/statistics.po
index 940f684f4..bc3da79e3 100644
--- a/applications/luci-app-statistics/po/pl/statistics.po
+++ b/applications/luci-app-statistics/po/pl/statistics.po
@@ -65,7 +65,7 @@ msgid "CPU Context Switches Plugin Configuration"
 msgstr ""
 
 #: applications/luci-app-statistics/luasrc/statistics/plugins/cpufreq.lua:7
-#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:6
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:9
 msgid "CPU Frequency"
 msgstr ""
 
@@ -261,6 +261,10 @@ msgstr "Exec"
 msgid "Exec Plugin Configuration"
 msgstr "Konfiguracja wtyczki Exec"
 
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "Extra items"
+msgstr ""
+
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua:68
 msgid "Filter class monitoring"
 msgstr "Monitorowanie filtra klas"
@@ -485,6 +489,10 @@ msgstr "Monitoruj procesy"
 msgid "Monitor remote ports"
 msgstr "Monitoruj porty zdalne"
 
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "More details about frequency usage and transitions"
+msgstr ""
+
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:20
 msgid "Name"
 msgstr ""
diff --git a/applications/luci-app-statistics/po/pt-br/statistics.po b/applications/luci-app-statistics/po/pt-br/statistics.po
index c514088b6..62b646fa1 100644
--- a/applications/luci-app-statistics/po/pt-br/statistics.po
+++ b/applications/luci-app-statistics/po/pt-br/statistics.po
@@ -64,7 +64,7 @@ msgid "CPU Context Switches Plugin Configuration"
 msgstr "Configuração do Módulo de Troca de Contexto da CPU"
 
 #: applications/luci-app-statistics/luasrc/statistics/plugins/cpufreq.lua:7
-#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:6
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:9
 msgid "CPU Frequency"
 msgstr "Frequência da CPU"
 
@@ -260,6 +260,10 @@ msgstr "Exec"
 msgid "Exec Plugin Configuration"
 msgstr "Configuração do plugin Exec"
 
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "Extra items"
+msgstr ""
+
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua:68
 msgid "Filter class monitoring"
 msgstr "Monitoramento das Classes de Filtros"
@@ -488,6 +492,10 @@ msgstr "Monitorar processos"
 msgid "Monitor remote ports"
 msgstr "Monitorar portas remotas"
 
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "More details about frequency usage and transitions"
+msgstr ""
+
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:20
 msgid "Name"
 msgstr ""
diff --git a/applications/luci-app-statistics/po/pt/statistics.po b/applications/luci-app-statistics/po/pt/statistics.po
index f85add662..2b643dd34 100644
--- a/applications/luci-app-statistics/po/pt/statistics.po
+++ b/applications/luci-app-statistics/po/pt/statistics.po
@@ -64,7 +64,7 @@ msgid "CPU Context Switches Plugin Configuration"
 msgstr ""
 
 #: applications/luci-app-statistics/luasrc/statistics/plugins/cpufreq.lua:7
-#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:6
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:9
 msgid "CPU Frequency"
 msgstr ""
 
@@ -260,6 +260,10 @@ msgstr "Exec"
 msgid "Exec Plugin Configuration"
 msgstr "Configuração do plugin Exec"
 
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "Extra items"
+msgstr ""
+
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua:68
 msgid "Filter class monitoring"
 msgstr "Monitoramento das Classes de Filtros"
@@ -484,6 +488,10 @@ msgstr "Monitorar processos"
 msgid "Monitor remote ports"
 msgstr "Monitorar portas remotas"
 
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "More details about frequency usage and transitions"
+msgstr ""
+
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:20
 msgid "Name"
 msgstr ""
diff --git a/applications/luci-app-statistics/po/ro/statistics.po b/applications/luci-app-statistics/po/ro/statistics.po
index f0080b346..2756192b0 100644
--- a/applications/luci-app-statistics/po/ro/statistics.po
+++ b/applications/luci-app-statistics/po/ro/statistics.po
@@ -65,7 +65,7 @@ msgid "CPU Context Switches Plugin Configuration"
 msgstr ""
 
 #: applications/luci-app-statistics/luasrc/statistics/plugins/cpufreq.lua:7
-#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:6
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:9
 msgid "CPU Frequency"
 msgstr ""
 
@@ -261,6 +261,10 @@ msgstr "Exec"
 msgid "Exec Plugin Configuration"
 msgstr ""
 
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "Extra items"
+msgstr ""
+
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua:68
 msgid "Filter class monitoring"
 msgstr ""
@@ -476,6 +480,10 @@ msgstr ""
 msgid "Monitor remote ports"
 msgstr ""
 
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "More details about frequency usage and transitions"
+msgstr ""
+
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:20
 msgid "Name"
 msgstr ""
diff --git a/applications/luci-app-statistics/po/ru/statistics.po b/applications/luci-app-statistics/po/ru/statistics.po
index 81201ec79..61f676f1b 100644
--- a/applications/luci-app-statistics/po/ru/statistics.po
+++ b/applications/luci-app-statistics/po/ru/statistics.po
@@ -66,7 +66,7 @@ msgid "CPU Context Switches Plugin Configuration"
 msgstr "Настройка плагина переключений контекста CPU"
 
 #: applications/luci-app-statistics/luasrc/statistics/plugins/cpufreq.lua:7
-#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:6
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:9
 msgid "CPU Frequency"
 msgstr "Частота CPU"
 
@@ -261,6 +261,10 @@ msgstr "Exec"
 msgid "Exec Plugin Configuration"
 msgstr "Настройка плагина «Exec»"
 
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "Extra items"
+msgstr ""
+
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua:68
 msgid "Filter class monitoring"
 msgstr "Мониторинг класса фильтров"
@@ -489,6 +493,10 @@ msgstr "Мониторить процессы"
 msgid "Monitor remote ports"
 msgstr "Мониторить удаленные порты"
 
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "More details about frequency usage and transitions"
+msgstr ""
+
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:20
 msgid "Name"
 msgstr "Имя"
diff --git a/applications/luci-app-statistics/po/sk/statistics.po b/applications/luci-app-statistics/po/sk/statistics.po
index 912e7096e..606a8fac5 100644
--- a/applications/luci-app-statistics/po/sk/statistics.po
+++ b/applications/luci-app-statistics/po/sk/statistics.po
@@ -59,7 +59,7 @@ msgid "CPU Context Switches Plugin Configuration"
 msgstr ""
 
 #: applications/luci-app-statistics/luasrc/statistics/plugins/cpufreq.lua:7
-#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:6
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:9
 msgid "CPU Frequency"
 msgstr ""
 
@@ -252,6 +252,10 @@ msgstr ""
 msgid "Exec Plugin Configuration"
 msgstr ""
 
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "Extra items"
+msgstr ""
+
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua:68
 msgid "Filter class monitoring"
 msgstr ""
@@ -467,6 +471,10 @@ msgstr ""
 msgid "Monitor remote ports"
 msgstr ""
 
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "More details about frequency usage and transitions"
+msgstr ""
+
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:20
 msgid "Name"
 msgstr ""
diff --git a/applications/luci-app-statistics/po/sv/statistics.po b/applications/luci-app-statistics/po/sv/statistics.po
index 83e7b4c8d..2e73625c5 100644
--- a/applications/luci-app-statistics/po/sv/statistics.po
+++ b/applications/luci-app-statistics/po/sv/statistics.po
@@ -60,7 +60,7 @@ msgid "CPU Context Switches Plugin Configuration"
 msgstr ""
 
 #: applications/luci-app-statistics/luasrc/statistics/plugins/cpufreq.lua:7
-#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:6
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:9
 msgid "CPU Frequency"
 msgstr ""
 
@@ -256,6 +256,10 @@ msgstr "Exec"
 msgid "Exec Plugin Configuration"
 msgstr "Konfiguration av insticksprogrammet Exec"
 
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "Extra items"
+msgstr ""
+
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua:68
 msgid "Filter class monitoring"
 msgstr ""
@@ -472,6 +476,10 @@ msgstr "Övervaka processer"
 msgid "Monitor remote ports"
 msgstr "Övervaka fjärrportar"
 
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "More details about frequency usage and transitions"
+msgstr ""
+
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:20
 msgid "Name"
 msgstr ""
diff --git a/applications/luci-app-statistics/po/templates/statistics.pot b/applications/luci-app-statistics/po/templates/statistics.pot
index c616dd7cd..96fd319d0 100644
--- a/applications/luci-app-statistics/po/templates/statistics.pot
+++ b/applications/luci-app-statistics/po/templates/statistics.pot
@@ -52,7 +52,7 @@ msgid "CPU Context Switches Plugin Configuration"
 msgstr ""
 
 #: applications/luci-app-statistics/luasrc/statistics/plugins/cpufreq.lua:7
-#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:6
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:9
 msgid "CPU Frequency"
 msgstr ""
 
@@ -245,6 +245,10 @@ msgstr ""
 msgid "Exec Plugin Configuration"
 msgstr ""
 
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "Extra items"
+msgstr ""
+
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua:68
 msgid "Filter class monitoring"
 msgstr ""
@@ -460,6 +464,10 @@ msgstr ""
 msgid "Monitor remote ports"
 msgstr ""
 
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "More details about frequency usage and transitions"
+msgstr ""
+
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:20
 msgid "Name"
 msgstr ""
diff --git a/applications/luci-app-statistics/po/tr/statistics.po b/applications/luci-app-statistics/po/tr/statistics.po
index 219702811..09986d6bb 100644
--- a/applications/luci-app-statistics/po/tr/statistics.po
+++ b/applications/luci-app-statistics/po/tr/statistics.po
@@ -60,7 +60,7 @@ msgid "CPU Context Switches Plugin Configuration"
 msgstr ""
 
 #: applications/luci-app-statistics/luasrc/statistics/plugins/cpufreq.lua:7
-#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:6
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:9
 msgid "CPU Frequency"
 msgstr ""
 
@@ -253,6 +253,10 @@ msgstr ""
 msgid "Exec Plugin Configuration"
 msgstr ""
 
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "Extra items"
+msgstr ""
+
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua:68
 msgid "Filter class monitoring"
 msgstr ""
@@ -468,6 +472,10 @@ msgstr ""
 msgid "Monitor remote ports"
 msgstr ""
 
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "More details about frequency usage and transitions"
+msgstr ""
+
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:20
 msgid "Name"
 msgstr ""
diff --git a/applications/luci-app-statistics/po/uk/statistics.po b/applications/luci-app-statistics/po/uk/statistics.po
index d87fa0428..fac692b3b 100644
--- a/applications/luci-app-statistics/po/uk/statistics.po
+++ b/applications/luci-app-statistics/po/uk/statistics.po
@@ -65,7 +65,7 @@ msgid "CPU Context Switches Plugin Configuration"
 msgstr ""
 
 #: applications/luci-app-statistics/luasrc/statistics/plugins/cpufreq.lua:7
-#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:6
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:9
 msgid "CPU Frequency"
 msgstr ""
 
@@ -258,6 +258,10 @@ msgstr ""
 msgid "Exec Plugin Configuration"
 msgstr ""
 
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "Extra items"
+msgstr ""
+
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua:68
 msgid "Filter class monitoring"
 msgstr ""
@@ -473,6 +477,10 @@ msgstr ""
 msgid "Monitor remote ports"
 msgstr ""
 
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "More details about frequency usage and transitions"
+msgstr ""
+
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:20
 msgid "Name"
 msgstr ""
diff --git a/applications/luci-app-statistics/po/vi/statistics.po b/applications/luci-app-statistics/po/vi/statistics.po
index 86e6cb409..1c40fa41c 100644
--- a/applications/luci-app-statistics/po/vi/statistics.po
+++ b/applications/luci-app-statistics/po/vi/statistics.po
@@ -65,7 +65,7 @@ msgid "CPU Context Switches Plugin Configuration"
 msgstr ""
 
 #: applications/luci-app-statistics/luasrc/statistics/plugins/cpufreq.lua:7
-#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:6
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:9
 msgid "CPU Frequency"
 msgstr ""
 
@@ -261,6 +261,10 @@ msgstr "Exec"
 msgid "Exec Plugin Configuration"
 msgstr "Cấu hình Exec Plugin"
 
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "Extra items"
+msgstr ""
+
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua:68
 msgid "Filter class monitoring"
 msgstr "Filter class monitoring"
@@ -483,6 +487,10 @@ msgstr "Monitor processes"
 msgid "Monitor remote ports"
 msgstr "Monitor remote ports"
 
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "More details about frequency usage and transitions"
+msgstr ""
+
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:20
 msgid "Name"
 msgstr ""
diff --git a/applications/luci-app-statistics/po/zh-cn/statistics.po b/applications/luci-app-statistics/po/zh-cn/statistics.po
index 424a4255c..27a6749b8 100644
--- a/applications/luci-app-statistics/po/zh-cn/statistics.po
+++ b/applications/luci-app-statistics/po/zh-cn/statistics.po
@@ -67,7 +67,7 @@ msgid "CPU Context Switches Plugin Configuration"
 msgstr "CPU 上下文切换插件配置"
 
 #: applications/luci-app-statistics/luasrc/statistics/plugins/cpufreq.lua:7
-#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:6
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:9
 msgid "CPU Frequency"
 msgstr "CPU 频率"
 
@@ -262,6 +262,10 @@ msgstr "Exec"
 msgid "Exec Plugin Configuration"
 msgstr "Exec 插件配置"
 
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "Extra items"
+msgstr ""
+
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua:68
 msgid "Filter class monitoring"
 msgstr "Filter 类监测"
@@ -481,6 +485,10 @@ msgstr "监测进程"
 msgid "Monitor remote ports"
 msgstr "监测远程端口"
 
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "More details about frequency usage and transitions"
+msgstr ""
+
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:20
 msgid "Name"
 msgstr "名称"
diff --git a/applications/luci-app-statistics/po/zh-tw/statistics.po b/applications/luci-app-statistics/po/zh-tw/statistics.po
index 842d98c83..9ef36a587 100644
--- a/applications/luci-app-statistics/po/zh-tw/statistics.po
+++ b/applications/luci-app-statistics/po/zh-tw/statistics.po
@@ -67,7 +67,7 @@ msgid "CPU Context Switches Plugin Configuration"
 msgstr "CPU Context Switches 外掛配置"
 
 #: applications/luci-app-statistics/luasrc/statistics/plugins/cpufreq.lua:7
-#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:6
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:9
 msgid "CPU Frequency"
 msgstr "CPU 頻率"
 
@@ -262,6 +262,10 @@ msgstr "Exec"
 msgid "Exec Plugin Configuration"
 msgstr "Exec 外掛配置"
 
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "Extra items"
+msgstr ""
+
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua:68
 msgid "Filter class monitoring"
 msgstr "Filter 類監測"
@@ -481,6 +485,10 @@ msgstr "監測程序"
 msgid "Monitor remote ports"
 msgstr "監測遠端埠"
 
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "More details about frequency usage and transitions"
+msgstr ""
+
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:20
 msgid "Name"
 msgstr "名稱"
diff --git a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua
index 429d4357d..cc38bd97e 100644
--- a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua
+++ b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua
@@ -71,19 +71,24 @@ o4 = s:option(Flag, "trm_proactive", translate("ProActive Uplink Switch"),
 o4.default = o4.enabled
 o4.rmempty = false
 
-o5 = s:option(ListValue, "trm_iface", translate("Uplink / Trigger interface"),
+o5 = s:option(Flag, "trm_autoadd", translate("Add Open Uplinks"),
+	translate("Automatically add open uplinks like hotel captive portals to your wireless config."))
+o5.default = o5.disabled
+o5.rmempty = false
+
+o6 = s:option(ListValue, "trm_iface", translate("Uplink / Trigger interface"),
 	translate("Name of the used uplink interface."))
 if dump then
 	local i, v
 	for i, v in ipairs(dump.interface) do
 		if v.interface ~= "loopback" and v.interface ~= "lan" then
 			local device = v.l3_device or v.device or "-"
-			o5:value(v.interface, v.interface.. " (" ..device.. ")")
+			o6:value(v.interface, v.interface.. " (" ..device.. ")")
 		end
 	end
 end
-o5.default = trmiface
-o5.rmempty = false
+o6.default = trmiface
+o6.rmempty = false
 
 -- Runtime information
 
diff --git a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua
index 83011e9dd..e8580daac 100644
--- a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua
+++ b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua
@@ -1,9 +1,11 @@
--- Copyright 2017-2018 Dirk Brenken (dev@brenken.org)
+-- Copyright 2017-2019 Dirk Brenken (dev@brenken.org)
 -- This is free software, licensed under the Apache License, Version 2.0
 
 local fs       = require("nixio.fs")
 local uci      = require("luci.model.uci").cursor()
 local http     = require("luci.http")
+local util     = require("luci.util")
+local scripts  = util.split(util.trim(util.exec("ls /etc/travelmate/*.login 2>/dev/null")), "\n", nil, true) or {}
 local trmiface = uci:get("travelmate", "global", "trm_iface") or "trm_wwan"
 local encr_psk = {"psk", "psk2", "psk-mixed"}
 local encr_wpa = {"wpa", "wpa2", "wpa-mixed"}
@@ -135,6 +137,17 @@ elseif (tonumber(m.hidden.wpa_version) or 0) > 0 then
 	end
 end
 
+local login_section = (m.hidden.ssid or "") .. (m.hidden.bssid or "")
+login_section = login_section:gsub("[^%w_]", "_")
+local cmd = uci:get("travelmate", login_section, "command")
+cmd_list = m:field(ListValue, "cmdlist", translate("Auto Login Script"),
+	translate("External script reference which will be called for automated captive portal logins."))
+cmd_list:value("none")
+for _, z in ipairs(scripts) do
+	cmd_list:value(z)
+end
+cmd_list.default = cmd or "none"
+
 function wssid.write(self, section, value)
 	newsection = uci:section("wireless", "wifi-iface", nil, {
 		mode     = "sta",
@@ -174,6 +187,16 @@ function wssid.write(self, section, value)
 	else
 		uci:set("wireless", newsection, "encryption", "none")
 	end
+	local login_section = (wssid:formvalue(section) or "") .. (bssid:formvalue(section) or "")
+	login_section = login_section:gsub("[^%w_]", "_")
+	if not uci:get("travelmate", login_section) and cmd_list:formvalue(section) ~= "none" then
+		uci:set("travelmate", login_section, "login")
+	end
+	if uci:get("travelmate", login_section) then
+		uci:set("travelmate", login_section, "command", cmd_list:formvalue(section))
+		uci:save("travelmate")
+		uci:commit("travelmate")
+	end
 	uci:save("wireless")
 	uci:commit("wireless")
 	luci.sys.call("env -i /bin/ubus call network reload >/dev/null 2>&1")
diff --git a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua
index dae358ae0..cd2fa69ae 100644
--- a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua
+++ b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua
@@ -1,9 +1,11 @@
 -- Copyright 2017-2019 Dirk Brenken (dev@brenken.org)
 -- This is free software, licensed under the Apache License, Version 2.0
 
-local fs   = require("nixio.fs")
-local uci  = require("luci.model.uci").cursor()
-local http = require("luci.http")
+local fs      = require("nixio.fs")
+local uci     = require("luci.model.uci").cursor()
+local http    = require("luci.http")
+local util    = require("luci.util")
+local scripts = util.split(util.trim(util.exec("ls /etc/travelmate/*.login 2>/dev/null")), "\n", nil, true) or {}
 
 m = SimpleForm("edit", translate("Edit Wireless Uplink Configuration"))
 m.submit = translate("Save")
@@ -19,6 +21,7 @@ m.hidden = {
 }
 
 local s = uci:get_all("wireless", m.hidden.cfg)
+
 if s ~= nil then
 	wssid = m:field(Value, "ssid", translate("SSID"))
 	wssid.datatype = "rangelength(1,32)"
@@ -126,6 +129,17 @@ if s ~= nil then
 		wkey.password = true
 		wkey.default = s.key or s.password
 	end
+
+	local login_section = (s.ssid or "") .. (s.bssid or "")
+	login_section = login_section:gsub("[^%w_]", "_")
+	local cmd = uci:get("travelmate", login_section, "command")
+	cmd_list = m:field(ListValue, "cmdlist", translate("Auto Login Script"),
+		translate("External script reference which will be called for automated captive portal logins."))
+	cmd_list:value("none")
+	for _, z in ipairs(scripts) do
+		cmd_list:value(z)
+	end
+	cmd_list.default = cmd or "none"
 else
 	m.on_cancel()
 end
@@ -160,6 +174,16 @@ function wssid.write(self, section, value)
 			uci:set("wireless", m.hidden.cfg, "priv_key_pwd", privkeypwd:formvalue(section) or "")
 		end
 	end
+	local login_section = (wssid:formvalue(section) or "") .. (bssid:formvalue(section) or "")
+	login_section = login_section:gsub("[^%w_]", "_")
+	if not uci:get("travelmate", login_section) and cmd_list:formvalue(section) ~= "none" then
+		uci:set("travelmate", login_section, "login")
+	end
+	if uci:get("travelmate", login_section) then
+		uci:set("travelmate", login_section, "command", cmd_list:formvalue(section))
+		uci:save("travelmate")
+		uci:commit("travelmate")
+	end
 	uci:save("wireless")
 	uci:commit("wireless")
 	luci.sys.call("env -i /bin/ubus call network reload >/dev/null 2>&1")
diff --git a/applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm b/applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm
index 0e78803d0..5c2896633 100644
--- a/applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm
+++ b/applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm
@@ -34,7 +34,7 @@ This is free software, licensed under the Apache License, Version 2.0
 					if (view)
 					{
 						view.setAttribute("name", "station_nok");
-						view.setAttribute("style", "color: #a22; font-weight: bold");
+						view.setAttribute("style", "text-align: left !important; color: #a22; font-weight: bold");
 					}
 				}
 			}
@@ -59,7 +59,7 @@ This is free software, licensed under the Apache License, Version 2.0
 				view   = document.getElementById(search);
 				if (view)
 				{
-					view.setAttribute("style", "color: #37c; font-weight: bold");
+					view.setAttribute("style", "text-align: left !important; color: #37c; font-weight: bold");
 				}
 			}
 		}
@@ -122,10 +122,10 @@ This is free software, licensed under the Apache License, Version 2.0
 						local encr    = s.encryption or "-"
 			-%>
 			<div class="tr cbi-section-table-row cbi-rowstyle-1" name="station_ok" id="1_<%=device%>/<%=ssid%>/<%=bssid%>">
-				<div class="td left" name="station_ok" id="2_<%=device%>/<%=ssid%>/<%=bssid%>"><%=device%></div>
-				<div class="td left" name="station_ok" id="3_<%=device%>/<%=ssid%>/<%=bssid%>"><%=ssid%></div>
-				<div class="td left" name="station_ok" id="4_<%=device%>/<%=ssid%>/<%=bssid%>"><%=bssid%></div>
-				<div class="td left" name="station_ok" id="5_<%=device%>/<%=ssid%>/<%=bssid%>"><%=encr%></div>
+				<div class="td left" style="text-align: left !important" name="station_ok" id="2_<%=device%>/<%=ssid%>/<%=bssid%>"><%=device%></div>
+				<div class="td left" style="text-align: left !important" name="station_ok" id="3_<%=device%>/<%=ssid%>/<%=bssid%>"><%=ssid%></div>
+				<div class="td left" style="text-align: left !important" name="station_ok" id="4_<%=device%>/<%=ssid%>/<%=bssid%>"><%=bssid%></div>
+				<div class="td left" style="text-align: left !important" name="station_ok" id="5_<%=device%>/<%=ssid%>/<%=bssid%>"><%=encr%></div>
 				<div class="td middle cbi-section-actions">
 					<div>
 						<input class="cbi-button cbi-button-up" type="button" value="<%:Up%>" onclick="location.href='<%=luci.dispatcher.build_url('admin/services/travelmate/wifiorder')%>?cfg=<%=section%>&amp;dir=up'" alt="<%:Move up%>" title="<%:Move up%>" />
diff --git a/applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm b/applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm
index 67568f179..86846a571 100644
--- a/applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm
+++ b/applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm
@@ -52,16 +52,16 @@ This is free software, licensed under the Apache License, Version 2.0
 			</div>
 			<%- for i, net in ipairs(iw.scanlist or { }) do -%>
 			<div class="tr cbi-section-table-row cbi-rowstyle-1">
-				<div class="td left">
+				<div class="td left" style="text-align: left !important">
 					<%=net.ssid and utl.pcdata(net.ssid) or "<em>%s</em>" % translate("hidden")%>
 				</div>
-				<div class="td left">
+				<div class="td left" style="text-align: left !important">
 					<%=net.bssid and utl.pcdata(net.bssid)%>
 				</div>
-				<div class="td left">
+				<div class="td left" style="text-align: left !important">
 					<%=format_wifi_encryption(net.encryption)%>
 				</div>
-				<div class="td left">
+				<div class="td left" style="text-align: left !important">
 					<%=percent_wifi_signal(net)%> %
 				</div>
 				<div class="td cbi-section-actions">
diff --git a/applications/luci-app-travelmate/po/es/travelmate.po b/applications/luci-app-travelmate/po/es/travelmate.po
index 50e613e23..47203c079 100644
--- a/applications/luci-app-travelmate/po/es/travelmate.po
+++ b/applications/luci-app-travelmate/po/es/travelmate.po
@@ -3,7 +3,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Project-Id-Version: \n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2019-08-01 23:10-0300\n"
+"PO-Revision-Date: 2019-09-17 22:49-0300\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,15 +21,19 @@ msgstr "AP en"
 msgid "Action"
 msgstr "Acción"
 
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:74
+msgid "Add Open Uplinks"
+msgstr "Añadir enlaces ascendentes abiertos"
+
 #: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:80
 msgid "Add Uplink"
 msgstr "Añadir enlace"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:11
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:13
 msgid "Add Wireless Uplink Configuration"
 msgstr "Añadir configuración de enlace inalámbrico"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:113
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:118
 msgid ""
 "Additional trigger delay in seconds before travelmate processing begins."
 msgstr ""
@@ -40,19 +44,32 @@ msgstr ""
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:100
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:86
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:102
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:89
 msgid "Authentication"
 msgstr "Autenticación"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:70
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:87
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:57
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:73
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:143
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:136
+msgid "Auto Login Script"
+msgstr "Script de inicio de sesión automático"
+
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:72
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:89
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:60
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:76
 msgid "Automatic"
 msgstr "Automático"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:107
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:75
+msgid ""
+"Automatically add open uplinks like hotel captive portals to your wireless "
+"config."
+msgstr ""
+"Agregue automáticamente enlaces ascendentes abiertos como portales cautivos "
+"de hotel a su configuración inalámbrica."
+
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:112
 msgid ""
 "Automatically resets the 'Faulty Stations' list after n minutes. Default is "
 "'0' which means no expiry."
@@ -60,19 +77,19 @@ msgstr ""
 "Restablece automáticamente la lista de 'Estaciones defectuosas' después de n "
 "minutos. El valor predeterminado es '0', lo que significa que no caduca."
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:44
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:27
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:46
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:30
 #: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:111
 msgid "BSSID"
 msgstr "BSSID"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:13
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:10
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:15
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:12
 #: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:89
 msgid "Back to overview"
 msgstr "Volver a la visión general"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:143
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:148
 msgid "Buffer size in bytes to prepare nearby scan results."
 msgstr ""
 "Tamaño del búfer en bytes para preparar resultados de escaneo cercanos."
@@ -89,10 +106,10 @@ msgstr ""
 "Verifique la disponibilidad de Internet, registre las redirecciones del "
 "portal cautivo y mantenga la conexión del enlace \"viva\"."
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:69
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:86
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:56
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:72
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:71
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:88
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:59
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:75
 msgid "Cipher"
 msgstr "Cifrado"
 
@@ -104,7 +121,7 @@ msgstr ""
 "Configuración del paquete travelmate para habilitar la funcionalidad de "
 "enrutador de viaje."
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:118
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:123
 msgid "Connection Limit"
 msgstr "Límite de conexión"
 
@@ -134,8 +151,8 @@ msgstr "Dispositivo"
 msgid "Down"
 msgstr "Abajo"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:93
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:79
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:95
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:82
 msgid "EAP-Method"
 msgstr "Método EAP"
 
@@ -159,7 +176,7 @@ msgstr "Editar la configuración de Travelmate"
 msgid "Edit Wireless Configuration"
 msgstr "Editar la configuración del WiFi"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:8
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:10
 msgid "Edit Wireless Uplink Configuration"
 msgstr "Editar la configuración del enlace inalámbrico"
 
@@ -169,24 +186,33 @@ msgstr "Editar este enlace"
 
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:54
 msgid "Enable Travelmate"
-msgstr "Habilitar Travelmate"
+msgstr "Habilitar"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:98
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:103
 msgid "Enable Verbose Debug Logging"
 msgstr "Habilitar registro de depuración detallado"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:51
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:63
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:80
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:40
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:50
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:66
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:53
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:65
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:82
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:43
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:53
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:69
 #: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:112
 #: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:49
 msgid "Encryption"
 msgstr "Encriptación"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:95
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:144
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:137
+msgid ""
+"External script reference which will be called for automated captive portal "
+"logins."
+msgstr ""
+"Referencia de script externo que se llamará para inicios de sesión cautivos "
+"automatizados del portal."
+
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:100
 msgid "Extra Options"
 msgstr "Opciones extra"
 
@@ -210,40 +236,40 @@ msgstr ""
 "Para obtener más información <a href=\"%s\" target=\"_blank\">vea la "
 "documentación en línea</a>"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:71
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:88
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:58
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:74
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:73
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:90
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:61
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:77
 msgid "Force CCMP (AES)"
 msgstr "Forzar CCMP (AES)"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:72
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:89
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:59
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:75
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:74
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:91
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:62
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:78
 msgid "Force TKIP"
 msgstr "Forzar TKIP"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:73
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:90
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:60
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:76
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:75
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:92
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:63
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:79
 msgid "Force TKIP and CCMP (AES)"
-msgstr "Forzar TKIP and CCMP (AES)"
+msgstr "Forzar TKIP y CCMP (AES)"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:131
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:136
 msgid ""
 "How long should travelmate wait for a successful wlan uplink connection."
 msgstr ""
 "Cuánto tiempo debe esperar travelmate para una conexión de enlace wlan sea "
 "exitosa."
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:113
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:99
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:115
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:102
 msgid "Identity"
 msgstr "Identidad"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:37
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:39
 msgid "Ignore BSSID"
 msgstr "Ignorar BSSID"
 
@@ -254,7 +280,7 @@ msgstr "Ignorar BSSID"
 msgid "Input file not found, please check your configuration."
 msgstr "Archivo de entrada no encontrado, por favor revise su configuración."
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:130
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:135
 msgid "Interface Timeout"
 msgstr "Tiempo de espera de la interfaz"
 
@@ -266,7 +292,7 @@ msgstr "Asistente de interfaz"
 msgid "Last Run"
 msgstr "Último inicio"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:106
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:111
 msgid "List Auto Expiry"
 msgstr "Lista de caducidad automática"
 
@@ -274,7 +300,7 @@ msgstr "Lista de caducidad automática"
 msgid "Loading"
 msgstr "Cargando"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:125
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:130
 msgid ""
 "Minimum signal quality threshold as percent for conditional uplink (dis-) "
 "connections."
@@ -290,7 +316,7 @@ msgstr "Mover abajo"
 msgid "Move up"
 msgstr "Mover arriba"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:75
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:80
 msgid "Name of the used uplink interface."
 msgstr "Nombre de la interfaz de enlace utilizada."
 
@@ -302,18 +328,18 @@ msgstr "Comprobación de error neto"
 msgid "Open"
 msgstr "Abrir"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:96
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:101
 msgid ""
 "Options for further tweaking in case the defaults are not suitable for you."
 msgstr ""
 "Opciones para ajustes adicionales en caso de que los valores predeterminados "
 "no sean adecuados para usted."
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:136
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:141
 msgid "Overall Timeout"
 msgstr "Tiempo de espera total"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:137
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:142
 msgid "Overall retry timeout in seconds."
 msgstr "Tiempo de espera de reintento global en segundos."
 
@@ -321,33 +347,33 @@ msgstr "Tiempo de espera de reintento global en segundos."
 msgid "Overview"
 msgstr "Visión general"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:47
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:63
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:102
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:50
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:66
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:105
 msgid "Passphrase"
 msgstr "Contraseña"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:115
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:117
 msgid "Password"
 msgstr "Contraseña"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:130
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:119
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:132
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:122
 msgid "Password of Private Key"
 msgstr "Contraseña o clave privada"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:119
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:105
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:121
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:108
 msgid "Path to CA-Certificate"
 msgstr "Ruta al certificado CA"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:122
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:109
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:124
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:112
 msgid "Path to Client-Certificate"
 msgstr "Ruta al certificado del cliente"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:126
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:114
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:128
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:117
 msgid "Path to Private Key"
 msgstr "Ruta a la clave privada"
 
@@ -374,7 +400,7 @@ msgstr ""
 "enlaces existentes o escanear uno nuevo. El enlace utilizado actualmente se "
 "enfatiza en azul, las estaciones defectuosas en rojo."
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:102
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:107
 msgid "Radio Selection / Order"
 msgstr "Selección de Radio / Orden"
 
@@ -391,7 +417,7 @@ msgstr "Reiniciar"
 msgid "Restart Travelmate"
 msgstr "Reiniciar Travelmate"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:103
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:108
 msgid ""
 "Restrict travelmate to a single radio (e.g. 'radio1') or change the overall "
 "scanning order (e.g. 'radio1 radio2 radio0')."
@@ -399,7 +425,7 @@ msgstr ""
 "Restringir Travelmate a una sola radio (por ejemplo, 'radio1') o cambie el "
 "orden de exploración general (por ejemplo, 'radio1 radio2 radio0')."
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:119
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:124
 msgid "Retry limit to connect to an uplink."
 msgstr "Vuelva a intentar el límite para conectarse a un enlace ."
 
@@ -407,13 +433,13 @@ msgstr "Vuelva a intentar el límite para conectarse a un enlace ."
 msgid "Runtime Information"
 msgstr "Información de tiempo de ejecución"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:32
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:23
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:34
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:26
 #: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:110
 msgid "SSID"
 msgstr "SSID"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:30
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:32
 msgid "SSID (hidden)"
 msgstr "SSID (oculto)"
 
@@ -421,8 +447,8 @@ msgstr "SSID (oculto)"
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_network_tab.lua:15
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_wireless_tab.lua:15
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/configuration_tab.lua:17
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:12
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:9
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:14
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:11
 msgid "Save"
 msgstr "Guardar"
 
@@ -430,7 +456,7 @@ msgstr "Guardar"
 msgid "Scan"
 msgstr "Escanear"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:142
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:147
 msgid "Scan Buffer Size"
 msgstr "Tamaño del búfer de escaneo"
 
@@ -438,7 +464,7 @@ msgstr "Tamaño del búfer de escaneo"
 msgid "Show/Hide QR-Codes"
 msgstr "Mostrar/Ocultar códigos QR"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:124
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:129
 msgid "Signal Quality Threshold"
 msgstr "Umbral de calidad de señal"
 
@@ -454,7 +480,7 @@ msgstr "ID de estación (RADIO/SSID/BSSID)"
 msgid "Station Interface"
 msgstr "Interfaz de estación"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:45
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:47
 msgid ""
 "The BSSID information '%s' is optional and only required for hidden networks"
 msgstr ""
@@ -519,7 +545,7 @@ msgstr "Versión de Travelmate"
 msgid "Treat missing internet availability as an error."
 msgstr "Trate la falta de disponibilidad de Internet como un error."
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:112
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:117
 msgid "Trigger Delay"
 msgstr "Retraso de disparo"
 
@@ -532,7 +558,7 @@ msgstr "Desconocido"
 msgid "Up"
 msgstr "Arriba"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:74
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:79
 msgid "Uplink / Trigger interface"
 msgstr "Interfaz de enlace / disparador"
 
@@ -556,7 +582,7 @@ msgstr "Ver archivo de registro"
 msgid "WEP"
 msgstr "WEP"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:58
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:60
 msgid "WEP-Passphrase"
 msgstr "Frase de contraseña WEP"
 
@@ -564,7 +590,7 @@ msgstr "Frase de contraseña WEP"
 msgid "WPA"
 msgstr "WPA"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:76
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:78
 msgid "WPA-Passphrase"
 msgstr "Frase de contraseña WPA"
 
diff --git a/applications/luci-app-travelmate/po/ja/travelmate.po b/applications/luci-app-travelmate/po/ja/travelmate.po
index ade155c84..7a18b07f9 100644
--- a/applications/luci-app-travelmate/po/ja/travelmate.po
+++ b/applications/luci-app-travelmate/po/ja/travelmate.po
@@ -7,7 +7,7 @@ msgstr ""
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.2.1\n"
+"X-Generator: Poedit 2.2.3\n"
 "Last-Translator: INAGAKI Hiroshi <musashino.open@gmail.com>\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "Language: ja\n"
@@ -21,15 +21,19 @@ msgstr "AP の場所:"
 msgid "Action"
 msgstr "アクション"
 
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:74
+msgid "Add Open Uplinks"
+msgstr "オープンなアップリンクの追加"
+
 #: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:80
 msgid "Add Uplink"
 msgstr "アップリンクの追加"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:11
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:13
 msgid "Add Wireless Uplink Configuration"
 msgstr "無線アップリンク追加の設定"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:113
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:118
 msgid ""
 "Additional trigger delay in seconds before travelmate processing begins."
 msgstr "Travelmate の処理が開始されるまでの、追加の遅延時間（秒）です。"
@@ -38,19 +42,32 @@ msgstr "Travelmate の処理が開始されるまでの、追加の遅延時間
 msgid "Advanced"
 msgstr "詳細設定"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:100
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:86
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:102
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:89
 msgid "Authentication"
 msgstr "認証"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:70
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:87
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:57
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:73
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:143
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:136
+msgid "Auto Login Script"
+msgstr "自動ログイン スクリプト"
+
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:72
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:89
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:60
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:76
 msgid "Automatic"
 msgstr "自動"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:107
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:75
+msgid ""
+"Automatically add open uplinks like hotel captive portals to your wireless "
+"config."
+msgstr ""
+"ホテルのキャプティブ ポータルのような、オープンなアップリンクを自動的に無線設"
+"定に追加します。"
+
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:112
 msgid ""
 "Automatically resets the 'Faulty Stations' list after n minutes. Default is "
 "'0' which means no expiry."
@@ -58,19 +75,19 @@ msgstr ""
 "'問題のあるステーション' リストを指定された時間（分）が経過後に自動的にリセッ"
 "トします。デフォルトは期限切れとしないことを意味する '0' です。"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:44
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:27
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:46
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:30
 #: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:111
 msgid "BSSID"
 msgstr "BSSID"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:13
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:10
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:15
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:12
 #: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:89
 msgid "Back to overview"
 msgstr "概要へ戻る"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:143
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:148
 msgid "Buffer size in bytes to prepare nearby scan results."
 msgstr "スキャン結果を準備するためのバッファー サイズ (byte) です。"
 
@@ -86,10 +103,10 @@ msgstr ""
 "インターネットの利用可否を確認し、キャプティブポータル リダイレクトを記録して"
 "アップリンク接続を 'alive' として保持します。"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:69
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:86
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:56
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:72
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:71
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:88
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:59
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:75
 msgid "Cipher"
 msgstr "暗号化方式"
 
@@ -100,7 +117,7 @@ msgid ""
 msgstr ""
 "トラベル ルーター機能を有効化するための、 Travelmate パッケージの設定です。"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:118
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:123
 msgid "Connection Limit"
 msgstr "接続制限"
 
@@ -131,8 +148,8 @@ msgstr "デバイス"
 msgid "Down"
 msgstr "下へ"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:93
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:79
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:95
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:82
 msgid "EAP-Method"
 msgstr "EAP メソッド"
 
@@ -156,7 +173,7 @@ msgstr "Travelmate 設定の編集"
 msgid "Edit Wireless Configuration"
 msgstr "無線設定の編集"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:8
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:10
 msgid "Edit Wireless Uplink Configuration"
 msgstr "無線アップリンク設定の編集"
 
@@ -168,22 +185,31 @@ msgstr "このアップリンクを編集"
 msgid "Enable Travelmate"
 msgstr "Travelmate の有効化"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:98
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:103
 msgid "Enable Verbose Debug Logging"
 msgstr "詳細なデバッグ ログの有効化"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:51
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:63
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:80
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:40
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:50
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:66
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:53
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:65
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:82
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:43
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:53
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:69
 #: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:112
 #: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:49
 msgid "Encryption"
 msgstr "暗号化"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:95
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:144
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:137
+msgid ""
+"External script reference which will be called for automated captive portal "
+"logins."
+msgstr ""
+"キャプティブ ポータルへの自動ログインのために呼び出される、外部スクリプトへの"
+"参照です。"
+
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:100
 msgid "Extra Options"
 msgstr "拡張オプション"
 
@@ -207,38 +233,38 @@ msgstr ""
 "詳細な情報は <a href=\"%s\" target=\"_blank\">オンライン ドキュメント</a> を"
 "確認してください。"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:71
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:88
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:58
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:74
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:73
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:90
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:61
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:77
 msgid "Force CCMP (AES)"
 msgstr "CCMP (AES)"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:72
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:89
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:59
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:75
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:74
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:91
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:62
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:78
 msgid "Force TKIP"
 msgstr "TKIP"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:73
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:90
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:60
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:76
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:75
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:92
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:63
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:79
 msgid "Force TKIP and CCMP (AES)"
 msgstr "TKIP と CCMP (AES)"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:131
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:136
 msgid ""
 "How long should travelmate wait for a successful wlan uplink connection."
 msgstr "Travelmate が無線アップリンクへの接続成功を待つ時間です。"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:113
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:99
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:115
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:102
 msgid "Identity"
 msgstr "ID"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:37
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:39
 msgid "Ignore BSSID"
 msgstr "BSSID の無視"
 
@@ -249,7 +275,7 @@ msgstr "BSSID の無視"
 msgid "Input file not found, please check your configuration."
 msgstr "入力ファイルが見つかりません。設定を確認してください。"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:130
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:135
 msgid "Interface Timeout"
 msgstr "インターフェース タイムアウト"
 
@@ -261,7 +287,7 @@ msgstr "インターフェース ウィザード"
 msgid "Last Run"
 msgstr "最終実行"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:106
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:111
 msgid "List Auto Expiry"
 msgstr "リストの自動期限切れ"
 
@@ -269,7 +295,7 @@ msgstr "リストの自動期限切れ"
 msgid "Loading"
 msgstr "読み込み中"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:125
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:130
 msgid ""
 "Minimum signal quality threshold as percent for conditional uplink (dis-) "
 "connections."
@@ -285,7 +311,7 @@ msgstr "下へ"
 msgid "Move up"
 msgstr "上へ"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:75
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:80
 msgid "Name of the used uplink interface."
 msgstr "使用されるアップリンク インターフェースの名前です。"
 
@@ -297,16 +323,16 @@ msgstr "ネット エラーチェック"
 msgid "Open"
 msgstr "オープン"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:96
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:101
 msgid ""
 "Options for further tweaking in case the defaults are not suitable for you."
 msgstr "デフォルトの設定が適切でない場合、さらに設定するためのオプションです。"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:136
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:141
 msgid "Overall Timeout"
 msgstr "実行間隔"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:137
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:142
 msgid "Overall retry timeout in seconds."
 msgstr "全体的な再試行タイムアウト（秒）です。"
 
@@ -314,33 +340,33 @@ msgstr "全体的な再試行タイムアウト（秒）です。"
 msgid "Overview"
 msgstr "概要"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:47
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:63
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:102
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:50
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:66
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:105
 msgid "Passphrase"
 msgstr "パスフレーズ"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:115
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:117
 msgid "Password"
 msgstr "パスワード"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:130
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:119
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:132
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:122
 msgid "Password of Private Key"
 msgstr "秘密鍵のパスワード"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:119
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:105
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:121
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:108
 msgid "Path to CA-Certificate"
 msgstr "CA 証明書へのパス"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:122
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:109
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:124
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:112
 msgid "Path to Client-Certificate"
 msgstr "クライアント証明書へのパス"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:126
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:114
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:128
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:117
 msgid "Path to Private Key"
 msgstr "秘密鍵へのパス"
 
@@ -367,7 +393,7 @@ msgstr ""
 "クを追加することができます。現在使用されているアップリンクは青色で、問題のあ"
 "るステーションは赤色で強調されます。"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:102
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:107
 msgid "Radio Selection / Order"
 msgstr "無線の選択 / 順番"
 
@@ -384,7 +410,7 @@ msgstr "再起動"
 msgid "Restart Travelmate"
 msgstr "Travelmate の再起動"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:103
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:108
 msgid ""
 "Restrict travelmate to a single radio (e.g. 'radio1') or change the overall "
 "scanning order (e.g. 'radio1 radio2 radio0')."
@@ -392,7 +418,7 @@ msgstr ""
 "Travelmate を単一の無線（例: 'radio1'）のみに制限したり、全体的なスキャンの順"
 "番を変更します（例: 'radio1 radio2 radio0'）。"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:119
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:124
 msgid "Retry limit to connect to an uplink."
 msgstr "アップリンクへの接続を試行する回数です。"
 
@@ -400,13 +426,13 @@ msgstr "アップリンクへの接続を試行する回数です。"
 msgid "Runtime Information"
 msgstr "実行情報"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:32
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:23
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:34
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:26
 #: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:110
 msgid "SSID"
 msgstr "SSID"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:30
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:32
 msgid "SSID (hidden)"
 msgstr "SSID（ステルス）"
 
@@ -414,8 +440,8 @@ msgstr "SSID（ステルス）"
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_network_tab.lua:15
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_wireless_tab.lua:15
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/configuration_tab.lua:17
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:12
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:9
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:14
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:11
 msgid "Save"
 msgstr "保存"
 
@@ -423,7 +449,7 @@ msgstr "保存"
 msgid "Scan"
 msgstr "スキャン:"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:142
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:147
 msgid "Scan Buffer Size"
 msgstr "スキャンバッファー サイズ"
 
@@ -431,7 +457,7 @@ msgstr "スキャンバッファー サイズ"
 msgid "Show/Hide QR-Codes"
 msgstr "QR コードを表示/非表示"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:124
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:129
 msgid "Signal Quality Threshold"
 msgstr "シグナル品質閾値"
 
@@ -447,7 +473,7 @@ msgstr "ステーション ID (RADIO / SSID / BSSID)"
 msgid "Station Interface"
 msgstr "ステーション インターフェース"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:45
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:47
 msgid ""
 "The BSSID information '%s' is optional and only required for hidden networks"
 msgstr ""
@@ -513,7 +539,7 @@ msgstr "Travelmate バージョン"
 msgid "Treat missing internet availability as an error."
 msgstr "インターネット可用性が無い場合をエラーとして扱います。"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:112
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:117
 msgid "Trigger Delay"
 msgstr "トリガ遅延"
 
@@ -526,7 +552,7 @@ msgstr "不明"
 msgid "Up"
 msgstr "上へ"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:74
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:79
 msgid "Uplink / Trigger interface"
 msgstr "アップリンク / トリガー インターフェース"
 
@@ -550,7 +576,7 @@ msgstr "ログファイルの確認"
 msgid "WEP"
 msgstr "WEP"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:58
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:60
 msgid "WEP-Passphrase"
 msgstr "WEP パスフレーズ"
 
@@ -558,7 +584,7 @@ msgstr "WEP パスフレーズ"
 msgid "WPA"
 msgstr "WPA"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:76
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:78
 msgid "WPA-Passphrase"
 msgstr "WPA パスフレーズ"
 
diff --git a/applications/luci-app-travelmate/po/pt-br/travelmate.po b/applications/luci-app-travelmate/po/pt-br/travelmate.po
index 3ad498c85..fd257abf4 100644
--- a/applications/luci-app-travelmate/po/pt-br/travelmate.po
+++ b/applications/luci-app-travelmate/po/pt-br/travelmate.po
@@ -21,15 +21,19 @@ msgstr ""
 msgid "Action"
 msgstr "Ação"
 
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:74
+msgid "Add Open Uplinks"
+msgstr ""
+
 #: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:80
 msgid "Add Uplink"
 msgstr "Adicionar Enlace para Fora"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:11
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:13
 msgid "Add Wireless Uplink Configuration"
 msgstr "Adicionar Configuração Sem Fio de Enlace para Fora"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:113
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:118
 msgid ""
 "Additional trigger delay in seconds before travelmate processing begins."
 msgstr "Atraso adicional em segundos antes do travelmate processe os gatilhos."
@@ -38,37 +42,48 @@ msgstr "Atraso adicional em segundos antes do travelmate processe os gatilhos."
 msgid "Advanced"
 msgstr "Avançado"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:100
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:86
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:102
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:89
 msgid "Authentication"
 msgstr "Autenticação"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:70
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:87
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:57
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:73
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:143
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:136
+msgid "Auto Login Script"
+msgstr ""
+
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:72
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:89
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:60
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:76
 msgid "Automatic"
 msgstr "Automático"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:107
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:75
+msgid ""
+"Automatically add open uplinks like hotel captive portals to your wireless "
+"config."
+msgstr ""
+
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:112
 msgid ""
 "Automatically resets the 'Faulty Stations' list after n minutes. Default is "
 "'0' which means no expiry."
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:44
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:27
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:46
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:30
 #: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:111
 msgid "BSSID"
 msgstr "BSSID"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:13
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:10
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:15
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:12
 #: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:89
 msgid "Back to overview"
 msgstr "Voltar para visão geral"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:143
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:148
 msgid "Buffer size in bytes to prepare nearby scan results."
 msgstr ""
 
@@ -84,10 +99,10 @@ msgstr ""
 "Verificar a disponibilidade de internet, registrar encaminhamentos de "
 "portais de autenticação e manter a conexão para fora 'viva'."
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:69
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:86
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:56
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:72
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:71
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:88
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:59
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:75
 msgid "Cipher"
 msgstr "Cifra"
 
@@ -99,7 +114,7 @@ msgstr ""
 "Configuração do travelmate para habilitar a funcionalidade de roteador de "
 "viagem."
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:118
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:123
 msgid "Connection Limit"
 msgstr "Limite de conexão"
 
@@ -129,8 +144,8 @@ msgstr "Dispositivo"
 msgid "Down"
 msgstr "Abaixo"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:93
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:79
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:95
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:82
 msgid "EAP-Method"
 msgstr "Método EAP"
 
@@ -154,7 +169,7 @@ msgstr "Editar Configurações do Travelmate"
 msgid "Edit Wireless Configuration"
 msgstr "Editar Configurações da Rede sem fio"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:8
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:10
 msgid "Edit Wireless Uplink Configuration"
 msgstr "Editar Configurações da Rede sem fio de saída"
 
@@ -166,22 +181,29 @@ msgstr "Editar Configurações da Rede de saída"
 msgid "Enable Travelmate"
 msgstr "Habilitar o Travelmate"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:98
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:103
 msgid "Enable Verbose Debug Logging"
 msgstr "Habilitar os registros de depuração detalhados"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:51
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:63
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:80
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:40
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:50
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:66
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:53
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:65
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:82
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:43
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:53
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:69
 #: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:112
 #: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:49
 msgid "Encryption"
 msgstr "Cifragem"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:95
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:144
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:137
+msgid ""
+"External script reference which will be called for automated captive portal "
+"logins."
+msgstr ""
+
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:100
 msgid "Extra Options"
 msgstr "Opções adicionais"
 
@@ -205,40 +227,40 @@ msgstr ""
 "Para mais informações <a href=\"%s\" target=\"_blank\">veja a documentação "
 "externa</a>"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:71
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:88
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:58
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:74
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:73
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:90
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:61
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:77
 msgid "Force CCMP (AES)"
 msgstr "Forçar CCMP (AES)"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:72
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:89
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:59
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:75
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:74
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:91
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:62
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:78
 msgid "Force TKIP"
 msgstr "Forçar TKIP"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:73
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:90
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:60
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:76
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:75
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:92
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:63
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:79
 msgid "Force TKIP and CCMP (AES)"
 msgstr "Forçar TKIP e CCMP (AES)"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:131
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:136
 msgid ""
 "How long should travelmate wait for a successful wlan uplink connection."
 msgstr ""
 "Quanto tempo o travelmate irá esperar pelo sucesso da conexão sem fio "
 "externa."
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:113
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:99
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:115
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:102
 msgid "Identity"
 msgstr "Identidade"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:37
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:39
 msgid "Ignore BSSID"
 msgstr "Ignore o BSSID"
 
@@ -251,7 +273,7 @@ msgstr ""
 "O arquivo entrado não foi encontrado. Por favor, verifique suas "
 "configurações."
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:130
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:135
 msgid "Interface Timeout"
 msgstr "Estouro de Tempo da Interface"
 
@@ -263,7 +285,7 @@ msgstr "Assistente da Interface"
 msgid "Last Run"
 msgstr "Última Execução"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:106
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:111
 msgid "List Auto Expiry"
 msgstr ""
 
@@ -271,7 +293,7 @@ msgstr ""
 msgid "Loading"
 msgstr "Carregando"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:125
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:130
 msgid ""
 "Minimum signal quality threshold as percent for conditional uplink (dis-) "
 "connections."
@@ -287,7 +309,7 @@ msgstr "Mover para baixo"
 msgid "Move up"
 msgstr "Mover para cima"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:75
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:80
 msgid "Name of the used uplink interface."
 msgstr "Nome da interface usada para o enlace de saída"
 
@@ -299,18 +321,18 @@ msgstr ""
 msgid "Open"
 msgstr "Abrir"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:96
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:101
 msgid ""
 "Options for further tweaking in case the defaults are not suitable for you."
 msgstr ""
 "Opções para aprimoramentos adicionais caso as opções padrão não sejam "
 "suficientes para você."
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:136
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:141
 msgid "Overall Timeout"
 msgstr "Estouro de Tempo Global"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:137
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:142
 msgid "Overall retry timeout in seconds."
 msgstr "Estouro de tempo global em segundos."
 
@@ -318,33 +340,33 @@ msgstr "Estouro de tempo global em segundos."
 msgid "Overview"
 msgstr "Visão Geral"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:47
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:63
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:102
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:50
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:66
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:105
 msgid "Passphrase"
 msgstr "Senha"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:115
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:117
 msgid "Password"
 msgstr "Senha"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:130
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:119
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:132
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:122
 msgid "Password of Private Key"
 msgstr "Senha da Chave Privada"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:119
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:105
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:121
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:108
 msgid "Path to CA-Certificate"
 msgstr "Caminho para o Certificado da AC"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:122
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:109
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:124
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:112
 msgid "Path to Client-Certificate"
 msgstr "Caminho para o Certificado do Cliente"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:126
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:114
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:128
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:117
 msgid "Path to Private Key"
 msgstr "Caminho para a Chave Privada"
 
@@ -369,7 +391,7 @@ msgstr ""
 "escanear por um novo. O enlace em uso está destacado em azul, enquanto as "
 "estações com falha estão em vermelho."
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:102
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:107
 msgid "Radio Selection / Order"
 msgstr ""
 
@@ -386,13 +408,13 @@ msgstr "Reiniciar"
 msgid "Restart Travelmate"
 msgstr "Reiniciar o Travelmate"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:103
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:108
 msgid ""
 "Restrict travelmate to a single radio (e.g. 'radio1') or change the overall "
 "scanning order (e.g. 'radio1 radio2 radio0')."
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:119
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:124
 msgid "Retry limit to connect to an uplink."
 msgstr "Limite de retentativa de conexão com um enlace externo."
 
@@ -400,13 +422,13 @@ msgstr "Limite de retentativa de conexão com um enlace externo."
 msgid "Runtime Information"
 msgstr "Informações Atuais"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:32
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:23
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:34
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:26
 #: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:110
 msgid "SSID"
 msgstr "SSID"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:30
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:32
 msgid "SSID (hidden)"
 msgstr "SSID (oculto)"
 
@@ -414,8 +436,8 @@ msgstr "SSID (oculto)"
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_network_tab.lua:15
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_wireless_tab.lua:15
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/configuration_tab.lua:17
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:12
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:9
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:14
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:11
 msgid "Save"
 msgstr "Salvar"
 
@@ -423,7 +445,7 @@ msgstr "Salvar"
 msgid "Scan"
 msgstr "Escanear"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:142
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:147
 msgid "Scan Buffer Size"
 msgstr ""
 
@@ -431,7 +453,7 @@ msgstr ""
 msgid "Show/Hide QR-Codes"
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:124
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:129
 msgid "Signal Quality Threshold"
 msgstr "Limite da Qualidade do Sinal"
 
@@ -447,7 +469,7 @@ msgstr "Identificador da Estação (RADIO/SSID/BSSID)"
 msgid "Station Interface"
 msgstr "Interface da Estação"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:45
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:47
 msgid ""
 "The BSSID information '%s' is optional and only required for hidden networks"
 msgstr "O BSSID '%s' é opcional e somente necessário para redes ocultas"
@@ -502,7 +524,7 @@ msgstr "Versão do Travelmate"
 msgid "Treat missing internet availability as an error."
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:112
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:117
 msgid "Trigger Delay"
 msgstr "Atraso no Gatilho"
 
@@ -515,7 +537,7 @@ msgstr "Desconhecido"
 msgid "Up"
 msgstr "Acima"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:74
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:79
 msgid "Uplink / Trigger interface"
 msgstr "Enlace externo"
 
@@ -539,7 +561,7 @@ msgstr "Visualizar o Arquivo de Registros (log)"
 msgid "WEP"
 msgstr "WEP"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:58
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:60
 msgid "WEP-Passphrase"
 msgstr "WEP por Senha"
 
@@ -547,7 +569,7 @@ msgstr "WEP por Senha"
 msgid "WPA"
 msgstr "WPA"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:76
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:78
 msgid "WPA-Passphrase"
 msgstr "WPA por Senha"
 
diff --git a/applications/luci-app-travelmate/po/ru/travelmate.po b/applications/luci-app-travelmate/po/ru/travelmate.po
index 9d694e09b..4f1508c09 100644
--- a/applications/luci-app-travelmate/po/ru/travelmate.po
+++ b/applications/luci-app-travelmate/po/ru/travelmate.po
@@ -24,15 +24,19 @@ msgstr ""
 msgid "Action"
 msgstr ""
 
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:74
+msgid "Add Open Uplinks"
+msgstr ""
+
 #: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:80
 msgid "Add Uplink"
 msgstr "Подключение к сети"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:11
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:13
 msgid "Add Wireless Uplink Configuration"
 msgstr "Добавить настройку внешней беспроводной сети"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:113
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:118
 msgid ""
 "Additional trigger delay in seconds before travelmate processing begins."
 msgstr "Дополнительная задержка в секундах до запуска TravelMate."
@@ -41,37 +45,48 @@ msgstr "Дополнительная задержка в секундах до 
 msgid "Advanced"
 msgstr "Дополнительно"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:100
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:86
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:102
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:89
 msgid "Authentication"
 msgstr "Аутентификация"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:70
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:87
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:57
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:73
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:143
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:136
+msgid "Auto Login Script"
+msgstr ""
+
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:72
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:89
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:60
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:76
 msgid "Automatic"
 msgstr "Автоматически"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:107
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:75
+msgid ""
+"Automatically add open uplinks like hotel captive portals to your wireless "
+"config."
+msgstr ""
+
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:112
 msgid ""
 "Automatically resets the 'Faulty Stations' list after n minutes. Default is "
 "'0' which means no expiry."
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:44
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:27
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:46
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:30
 #: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:111
 msgid "BSSID"
 msgstr "BSSID"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:13
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:10
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:15
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:12
 #: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:89
 msgid "Back to overview"
 msgstr "Назад в меню"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:143
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:148
 msgid "Buffer size in bytes to prepare nearby scan results."
 msgstr ""
 
@@ -85,10 +100,10 @@ msgid ""
 "the uplink connection 'alive'."
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:69
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:86
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:56
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:72
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:71
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:88
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:59
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:75
 msgid "Cipher"
 msgstr "Алгоритм шифрования"
 
@@ -98,7 +113,7 @@ msgid ""
 "functionality."
 msgstr "Настройка утилиты TravelMate - помощника путешественника. "
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:118
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:123
 msgid "Connection Limit"
 msgstr "Ограничение соединений"
 
@@ -129,8 +144,8 @@ msgstr "Устройство"
 msgid "Down"
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:93
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:79
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:95
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:82
 msgid "EAP-Method"
 msgstr "Метод EAP"
 
@@ -154,7 +169,7 @@ msgstr "Настройка config файла Travelmate"
 msgid "Edit Wireless Configuration"
 msgstr "Настройка config файл wireless"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:8
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:10
 msgid "Edit Wireless Uplink Configuration"
 msgstr "Редактировать настройки беспроводной сети"
 
@@ -166,22 +181,29 @@ msgstr "Редактировать настройки сети"
 msgid "Enable Travelmate"
 msgstr "Включить Travelmate"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:98
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:103
 msgid "Enable Verbose Debug Logging"
 msgstr "Включить подробное ведение журнала отладки"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:51
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:63
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:80
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:40
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:50
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:66
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:53
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:65
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:82
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:43
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:53
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:69
 #: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:112
 #: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:49
 msgid "Encryption"
 msgstr "Шифрование"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:95
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:144
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:137
+msgid ""
+"External script reference which will be called for automated captive portal "
+"logins."
+msgstr ""
+
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:100
 msgid "Extra Options"
 msgstr "Дополнительные настройки"
 
@@ -205,38 +227,38 @@ msgstr ""
 "Для получения дополнительной информации <a href=\"%s\" target=\"_blank\"> "
 "смотрите онлайн документацию</a>."
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:71
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:88
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:58
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:74
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:73
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:90
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:61
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:77
 msgid "Force CCMP (AES)"
 msgstr "Назначить CCMP (AES)"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:72
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:89
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:59
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:75
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:74
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:91
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:62
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:78
 msgid "Force TKIP"
 msgstr "Назначить TKIP"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:73
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:90
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:60
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:76
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:75
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:92
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:63
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:79
 msgid "Force TKIP and CCMP (AES)"
 msgstr "Назначить TKIP и CCMP (AES)"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:131
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:136
 msgid ""
 "How long should travelmate wait for a successful wlan uplink connection."
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:113
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:99
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:115
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:102
 msgid "Identity"
 msgstr "Идентификация EAP"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:37
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:39
 msgid "Ignore BSSID"
 msgstr "Игнорировать BSSID"
 
@@ -247,7 +269,7 @@ msgstr "Игнорировать BSSID"
 msgid "Input file not found, please check your configuration."
 msgstr "Config файл не найден, настройте config файл."
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:130
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:135
 msgid "Interface Timeout"
 msgstr "Временная задержка интерфейса"
 
@@ -259,7 +281,7 @@ msgstr "Помощник настройки интерфейса"
 msgid "Last Run"
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:106
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:111
 msgid "List Auto Expiry"
 msgstr ""
 
@@ -267,7 +289,7 @@ msgstr ""
 msgid "Loading"
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:125
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:130
 msgid ""
 "Minimum signal quality threshold as percent for conditional uplink (dis-) "
 "connections."
@@ -281,7 +303,7 @@ msgstr "Переместить вниз"
 msgid "Move up"
 msgstr "Переместить вверх"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:75
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:80
 msgid "Name of the used uplink interface."
 msgstr "Имя используемого интерфейса внешней сети."
 
@@ -293,18 +315,18 @@ msgstr ""
 msgid "Open"
 msgstr "Открыть"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:96
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:101
 msgid ""
 "Options for further tweaking in case the defaults are not suitable for you."
 msgstr ""
 "Возможные варианты детальной настройки, если значения по умолчанию не "
 "подходят для вас."
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:136
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:141
 msgid "Overall Timeout"
 msgstr "Общее время ожидания"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:137
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:142
 msgid "Overall retry timeout in seconds."
 msgstr ""
 
@@ -312,33 +334,33 @@ msgstr ""
 msgid "Overview"
 msgstr "Главное меню"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:47
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:63
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:102
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:50
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:66
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:105
 msgid "Passphrase"
 msgstr "Парольная фраза"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:115
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:117
 msgid "Password"
 msgstr "Пароль"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:130
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:119
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:132
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:122
 msgid "Password of Private Key"
 msgstr "Пароль к Приватному ключу"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:119
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:105
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:121
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:108
 msgid "Path to CA-Certificate"
 msgstr "Путь к CA-Сертификату"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:122
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:109
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:124
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:112
 msgid "Path to Client-Certificate"
 msgstr "Путь к Client-Сертификату"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:126
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:114
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:128
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:117
 msgid "Path to Private Key"
 msgstr "Путь к Приватному ключу"
 
@@ -363,7 +385,7 @@ msgstr ""
 "существующий список внешних сетей или выполнять их поиск. Используемое "
 "сетевое соединение выделено синим цветом."
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:102
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:107
 msgid "Radio Selection / Order"
 msgstr ""
 
@@ -380,13 +402,13 @@ msgstr ""
 msgid "Restart Travelmate"
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:103
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:108
 msgid ""
 "Restrict travelmate to a single radio (e.g. 'radio1') or change the overall "
 "scanning order (e.g. 'radio1 radio2 radio0')."
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:119
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:124
 msgid "Retry limit to connect to an uplink."
 msgstr ""
 
@@ -394,13 +416,13 @@ msgstr ""
 msgid "Runtime Information"
 msgstr "Информация о состоянии"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:32
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:23
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:34
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:26
 #: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:110
 msgid "SSID"
 msgstr "SSID"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:30
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:32
 msgid "SSID (hidden)"
 msgstr "SSID (скрытый)"
 
@@ -408,8 +430,8 @@ msgstr "SSID (скрытый)"
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_network_tab.lua:15
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_wireless_tab.lua:15
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/configuration_tab.lua:17
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:12
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:9
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:14
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:11
 msgid "Save"
 msgstr "Сохранить"
 
@@ -417,7 +439,7 @@ msgstr "Сохранить"
 msgid "Scan"
 msgstr "Поиск"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:142
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:147
 msgid "Scan Buffer Size"
 msgstr ""
 
@@ -425,7 +447,7 @@ msgstr ""
 msgid "Show/Hide QR-Codes"
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:124
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:129
 msgid "Signal Quality Threshold"
 msgstr ""
 
@@ -441,7 +463,7 @@ msgstr "ID (RADIO/SSID/BSSID) клиента"
 msgid "Station Interface"
 msgstr "Интерфейс клиента"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:45
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:47
 msgid ""
 "The BSSID information '%s' is optional and only required for hidden networks"
 msgstr ""
@@ -505,7 +527,7 @@ msgstr "Версия TravelMate"
 msgid "Treat missing internet availability as an error."
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:112
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:117
 msgid "Trigger Delay"
 msgstr ""
 
@@ -518,7 +540,7 @@ msgstr "Неизвестно"
 msgid "Up"
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:74
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:79
 msgid "Uplink / Trigger interface"
 msgstr "Включить интерфейс<br />внешней сети"
 
@@ -542,7 +564,7 @@ msgstr "Показать системный журнал"
 msgid "WEP"
 msgstr "WEP"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:58
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:60
 msgid "WEP-Passphrase"
 msgstr "Пароль WEP"
 
@@ -550,7 +572,7 @@ msgstr "Пароль WEP"
 msgid "WPA"
 msgstr "WPA"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:76
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:78
 msgid "WPA-Passphrase"
 msgstr "Пароль WPA"
 
diff --git a/applications/luci-app-travelmate/po/templates/travelmate.pot b/applications/luci-app-travelmate/po/templates/travelmate.pot
index 481c22fe9..01e70ba2a 100644
--- a/applications/luci-app-travelmate/po/templates/travelmate.pot
+++ b/applications/luci-app-travelmate/po/templates/travelmate.pot
@@ -10,15 +10,19 @@ msgstr ""
 msgid "Action"
 msgstr ""
 
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:74
+msgid "Add Open Uplinks"
+msgstr ""
+
 #: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:80
 msgid "Add Uplink"
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:11
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:13
 msgid "Add Wireless Uplink Configuration"
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:113
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:118
 msgid ""
 "Additional trigger delay in seconds before travelmate processing begins."
 msgstr ""
@@ -27,37 +31,48 @@ msgstr ""
 msgid "Advanced"
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:100
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:86
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:102
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:89
 msgid "Authentication"
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:70
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:87
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:57
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:73
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:143
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:136
+msgid "Auto Login Script"
+msgstr ""
+
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:72
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:89
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:60
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:76
 msgid "Automatic"
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:107
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:75
+msgid ""
+"Automatically add open uplinks like hotel captive portals to your wireless "
+"config."
+msgstr ""
+
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:112
 msgid ""
 "Automatically resets the 'Faulty Stations' list after n minutes. Default is "
 "'0' which means no expiry."
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:44
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:27
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:46
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:30
 #: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:111
 msgid "BSSID"
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:13
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:10
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:15
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:12
 #: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:89
 msgid "Back to overview"
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:143
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:148
 msgid "Buffer size in bytes to prepare nearby scan results."
 msgstr ""
 
@@ -71,10 +86,10 @@ msgid ""
 "the uplink connection 'alive'."
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:69
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:86
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:56
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:72
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:71
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:88
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:59
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:75
 msgid "Cipher"
 msgstr ""
 
@@ -84,7 +99,7 @@ msgid ""
 "functionality."
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:118
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:123
 msgid "Connection Limit"
 msgstr ""
 
@@ -113,8 +128,8 @@ msgstr ""
 msgid "Down"
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:93
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:79
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:95
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:82
 msgid "EAP-Method"
 msgstr ""
 
@@ -138,7 +153,7 @@ msgstr ""
 msgid "Edit Wireless Configuration"
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:8
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:10
 msgid "Edit Wireless Uplink Configuration"
 msgstr ""
 
@@ -150,22 +165,29 @@ msgstr ""
 msgid "Enable Travelmate"
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:98
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:103
 msgid "Enable Verbose Debug Logging"
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:51
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:63
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:80
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:40
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:50
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:66
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:53
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:65
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:82
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:43
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:53
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:69
 #: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:112
 #: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:49
 msgid "Encryption"
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:95
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:144
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:137
+msgid ""
+"External script reference which will be called for automated captive portal "
+"logins."
+msgstr ""
+
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:100
 msgid "Extra Options"
 msgstr ""
 
@@ -187,38 +209,38 @@ msgid ""
 "documentation</a>"
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:71
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:88
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:58
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:74
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:73
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:90
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:61
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:77
 msgid "Force CCMP (AES)"
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:72
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:89
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:59
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:75
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:74
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:91
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:62
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:78
 msgid "Force TKIP"
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:73
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:90
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:60
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:76
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:75
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:92
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:63
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:79
 msgid "Force TKIP and CCMP (AES)"
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:131
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:136
 msgid ""
 "How long should travelmate wait for a successful wlan uplink connection."
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:113
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:99
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:115
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:102
 msgid "Identity"
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:37
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:39
 msgid "Ignore BSSID"
 msgstr ""
 
@@ -229,7 +251,7 @@ msgstr ""
 msgid "Input file not found, please check your configuration."
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:130
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:135
 msgid "Interface Timeout"
 msgstr ""
 
@@ -241,7 +263,7 @@ msgstr ""
 msgid "Last Run"
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:106
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:111
 msgid "List Auto Expiry"
 msgstr ""
 
@@ -249,7 +271,7 @@ msgstr ""
 msgid "Loading"
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:125
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:130
 msgid ""
 "Minimum signal quality threshold as percent for conditional uplink (dis-) "
 "connections."
@@ -263,7 +285,7 @@ msgstr ""
 msgid "Move up"
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:75
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:80
 msgid "Name of the used uplink interface."
 msgstr ""
 
@@ -275,16 +297,16 @@ msgstr ""
 msgid "Open"
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:96
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:101
 msgid ""
 "Options for further tweaking in case the defaults are not suitable for you."
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:136
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:141
 msgid "Overall Timeout"
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:137
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:142
 msgid "Overall retry timeout in seconds."
 msgstr ""
 
@@ -292,33 +314,33 @@ msgstr ""
 msgid "Overview"
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:47
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:63
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:102
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:50
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:66
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:105
 msgid "Passphrase"
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:115
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:117
 msgid "Password"
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:130
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:119
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:132
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:122
 msgid "Password of Private Key"
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:119
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:105
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:121
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:108
 msgid "Path to CA-Certificate"
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:122
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:109
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:124
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:112
 msgid "Path to Client-Certificate"
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:126
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:114
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:128
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:117
 msgid "Path to Private Key"
 msgstr ""
 
@@ -339,7 +361,7 @@ msgid ""
 "one. The currently used uplink is emphasized in blue, faulty stations in red."
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:102
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:107
 msgid "Radio Selection / Order"
 msgstr ""
 
@@ -356,13 +378,13 @@ msgstr ""
 msgid "Restart Travelmate"
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:103
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:108
 msgid ""
 "Restrict travelmate to a single radio (e.g. 'radio1') or change the overall "
 "scanning order (e.g. 'radio1 radio2 radio0')."
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:119
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:124
 msgid "Retry limit to connect to an uplink."
 msgstr ""
 
@@ -370,13 +392,13 @@ msgstr ""
 msgid "Runtime Information"
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:32
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:23
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:34
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:26
 #: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:110
 msgid "SSID"
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:30
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:32
 msgid "SSID (hidden)"
 msgstr ""
 
@@ -384,8 +406,8 @@ msgstr ""
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_network_tab.lua:15
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_wireless_tab.lua:15
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/configuration_tab.lua:17
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:12
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:9
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:14
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:11
 msgid "Save"
 msgstr ""
 
@@ -393,7 +415,7 @@ msgstr ""
 msgid "Scan"
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:142
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:147
 msgid "Scan Buffer Size"
 msgstr ""
 
@@ -401,7 +423,7 @@ msgstr ""
 msgid "Show/Hide QR-Codes"
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:124
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:129
 msgid "Signal Quality Threshold"
 msgstr ""
 
@@ -417,7 +439,7 @@ msgstr ""
 msgid "Station Interface"
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:45
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:47
 msgid ""
 "The BSSID information '%s' is optional and only required for hidden networks"
 msgstr ""
@@ -471,7 +493,7 @@ msgstr ""
 msgid "Treat missing internet availability as an error."
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:112
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:117
 msgid "Trigger Delay"
 msgstr ""
 
@@ -484,7 +506,7 @@ msgstr ""
 msgid "Up"
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:74
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:79
 msgid "Uplink / Trigger interface"
 msgstr ""
 
@@ -508,7 +530,7 @@ msgstr ""
 msgid "WEP"
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:58
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:60
 msgid "WEP-Passphrase"
 msgstr ""
 
@@ -516,7 +538,7 @@ msgstr ""
 msgid "WPA"
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:76
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:78
 msgid "WPA-Passphrase"
 msgstr ""
 
diff --git a/applications/luci-app-travelmate/po/zh-cn/travelmate.po b/applications/luci-app-travelmate/po/zh-cn/travelmate.po
index 53147d279..de86739de 100644
--- a/applications/luci-app-travelmate/po/zh-cn/travelmate.po
+++ b/applications/luci-app-travelmate/po/zh-cn/travelmate.po
@@ -24,15 +24,19 @@ msgstr "AP 开启"
 msgid "Action"
 msgstr "动作"
 
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:74
+msgid "Add Open Uplinks"
+msgstr ""
+
 #: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:80
 msgid "Add Uplink"
 msgstr "添加上行连接"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:11
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:13
 msgid "Add Wireless Uplink Configuration"
 msgstr "添加无线上行连接配置"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:113
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:118
 msgid ""
 "Additional trigger delay in seconds before travelmate processing begins."
 msgstr "在 travelmate 处理开始前的额外触发延迟（秒）。"
@@ -41,37 +45,48 @@ msgstr "在 travelmate 处理开始前的额外触发延迟（秒）。"
 msgid "Advanced"
 msgstr "高级"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:100
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:86
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:102
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:89
 msgid "Authentication"
 msgstr "认证"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:70
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:87
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:57
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:73
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:143
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:136
+msgid "Auto Login Script"
+msgstr ""
+
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:72
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:89
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:60
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:76
 msgid "Automatic"
 msgstr "自动"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:107
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:75
+msgid ""
+"Automatically add open uplinks like hotel captive portals to your wireless "
+"config."
+msgstr ""
+
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:112
 msgid ""
 "Automatically resets the 'Faulty Stations' list after n minutes. Default is "
 "'0' which means no expiry."
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:44
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:27
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:46
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:30
 #: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:111
 msgid "BSSID"
 msgstr "BSSID"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:13
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:10
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:15
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:12
 #: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:89
 msgid "Back to overview"
 msgstr "返回概述"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:143
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:148
 msgid "Buffer size in bytes to prepare nearby scan results."
 msgstr ""
 
@@ -85,10 +100,10 @@ msgid ""
 "the uplink connection 'alive'."
 msgstr "检查互联网可用性，记录强制网络门户重定向，并保持上行连接为“活动”状态。"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:69
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:86
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:56
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:72
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:71
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:88
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:59
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:75
 msgid "Cipher"
 msgstr "密码"
 
@@ -98,7 +113,7 @@ msgid ""
 "functionality."
 msgstr "配置 travelmate 包，以启用旅行路由器功能。"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:118
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:123
 msgid "Connection Limit"
 msgstr "连接限制"
 
@@ -127,8 +142,8 @@ msgstr "设备"
 msgid "Down"
 msgstr "下"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:93
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:79
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:95
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:82
 msgid "EAP-Method"
 msgstr "EAP-方法"
 
@@ -152,7 +167,7 @@ msgstr "编辑 Travelmate 配置"
 msgid "Edit Wireless Configuration"
 msgstr "编辑无线配置"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:8
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:10
 msgid "Edit Wireless Uplink Configuration"
 msgstr "编辑无线上行连接配置"
 
@@ -164,22 +179,29 @@ msgstr "编辑此上行连接"
 msgid "Enable Travelmate"
 msgstr "启用 travelmate"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:98
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:103
 msgid "Enable Verbose Debug Logging"
 msgstr "启用详细调试日志"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:51
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:63
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:80
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:40
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:50
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:66
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:53
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:65
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:82
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:43
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:53
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:69
 #: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:112
 #: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:49
 msgid "Encryption"
 msgstr "加密"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:95
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:144
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:137
+msgid ""
+"External script reference which will be called for automated captive portal "
+"logins."
+msgstr ""
+
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:100
 msgid "Extra Options"
 msgstr "额外选项"
 
@@ -201,38 +223,38 @@ msgid ""
 "documentation</a>"
 msgstr "有关详细信息，请<a href=\"%s\" target=\"_blank\">查看在线文档</a>"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:71
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:88
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:58
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:74
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:73
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:90
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:61
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:77
 msgid "Force CCMP (AES)"
 msgstr "强制 CCMP（AES）"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:72
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:89
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:59
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:75
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:74
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:91
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:62
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:78
 msgid "Force TKIP"
 msgstr "强制 TKIP"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:73
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:90
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:60
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:76
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:75
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:92
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:63
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:79
 msgid "Force TKIP and CCMP (AES)"
 msgstr "强制 TKIP 和 CCMP（AES）"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:131
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:136
 msgid ""
 "How long should travelmate wait for a successful wlan uplink connection."
 msgstr "travelmate 等待 wlan 上行连接成功最长时间。"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:113
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:99
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:115
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:102
 msgid "Identity"
 msgstr "身份"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:37
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:39
 msgid "Ignore BSSID"
 msgstr "忽略 BSSID"
 
@@ -243,7 +265,7 @@ msgstr "忽略 BSSID"
 msgid "Input file not found, please check your configuration."
 msgstr "未找到输入文件，请检查您的配置。"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:130
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:135
 msgid "Interface Timeout"
 msgstr "接口超时"
 
@@ -255,7 +277,7 @@ msgstr "接口向导"
 msgid "Last Run"
 msgstr "上次运行"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:106
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:111
 msgid "List Auto Expiry"
 msgstr ""
 
@@ -263,7 +285,7 @@ msgstr ""
 msgid "Loading"
 msgstr "载入中"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:125
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:130
 msgid ""
 "Minimum signal quality threshold as percent for conditional uplink (dis-) "
 "connections."
@@ -277,7 +299,7 @@ msgstr "下移"
 msgid "Move up"
 msgstr "上移"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:75
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:80
 msgid "Name of the used uplink interface."
 msgstr "要使用的上行连接接口名称。"
 
@@ -289,16 +311,16 @@ msgstr ""
 msgid "Open"
 msgstr "开"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:96
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:101
 msgid ""
 "Options for further tweaking in case the defaults are not suitable for you."
 msgstr "如果默认值不适合您，可以选择进一步调整。"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:136
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:141
 msgid "Overall Timeout"
 msgstr "总体超时"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:137
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:142
 msgid "Overall retry timeout in seconds."
 msgstr "总体重试超时（秒）。"
 
@@ -306,33 +328,33 @@ msgstr "总体重试超时（秒）。"
 msgid "Overview"
 msgstr "概述"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:47
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:63
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:102
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:50
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:66
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:105
 msgid "Passphrase"
 msgstr "密码"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:115
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:117
 msgid "Password"
 msgstr "密码"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:130
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:119
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:132
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:122
 msgid "Password of Private Key"
 msgstr "私钥密码"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:119
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:105
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:121
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:108
 msgid "Path to CA-Certificate"
 msgstr "CA 证书路径"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:122
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:109
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:124
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:112
 msgid "Path to Client-Certificate"
 msgstr "客户证书路径"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:126
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:114
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:128
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:117
 msgid "Path to Private Key"
 msgstr "私钥路径"
 
@@ -355,7 +377,7 @@ msgstr ""
 "此处显示 travelmate 接口（%s）所有已配置上行连接的概述。您可以编辑、删除或重"
 "新排序现有连接，或扫描新上行连接。当前使用的上行连接以蓝色突出显示。"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:102
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:107
 msgid "Radio Selection / Order"
 msgstr "无线电选择/顺序"
 
@@ -372,7 +394,7 @@ msgstr "重启"
 msgid "Restart Travelmate"
 msgstr "重启 Travelmate"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:103
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:108
 msgid ""
 "Restrict travelmate to a single radio (e.g. 'radio1') or change the overall "
 "scanning order (e.g. 'radio1 radio2 radio0')."
@@ -380,7 +402,7 @@ msgstr ""
 "将 travelmate 限制在单个无线电上（例如“radio1”），或改变整个扫描顺序（例"
 "如“radio1 radio2 radio0”）。"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:119
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:124
 msgid "Retry limit to connect to an uplink."
 msgstr "连接到上行连接的重试限制。"
 
@@ -388,13 +410,13 @@ msgstr "连接到上行连接的重试限制。"
 msgid "Runtime Information"
 msgstr "运行信息"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:32
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:23
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:34
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:26
 #: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:110
 msgid "SSID"
 msgstr "SSID"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:30
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:32
 msgid "SSID (hidden)"
 msgstr "SSID（隐藏）"
 
@@ -402,8 +424,8 @@ msgstr "SSID（隐藏）"
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_network_tab.lua:15
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_wireless_tab.lua:15
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/configuration_tab.lua:17
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:12
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:9
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:14
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:11
 msgid "Save"
 msgstr "保存"
 
@@ -411,7 +433,7 @@ msgstr "保存"
 msgid "Scan"
 msgstr "扫描"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:142
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:147
 msgid "Scan Buffer Size"
 msgstr ""
 
@@ -419,7 +441,7 @@ msgstr ""
 msgid "Show/Hide QR-Codes"
 msgstr "显示/隐藏 QR 码"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:124
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:129
 msgid "Signal Quality Threshold"
 msgstr "信号质量阈值"
 
@@ -435,7 +457,7 @@ msgstr "站点 ID（RADIO/SSID/BSSID）"
 msgid "Station Interface"
 msgstr "站点接口"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:45
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:47
 msgid ""
 "The BSSID information '%s' is optional and only required for hidden networks"
 msgstr "BSSID 信息“%s”是可选的，仅对隐藏网络必需"
@@ -489,7 +511,7 @@ msgstr "Travelmate 版本"
 msgid "Treat missing internet availability as an error."
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:112
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:117
 msgid "Trigger Delay"
 msgstr "触发延迟"
 
@@ -502,7 +524,7 @@ msgstr "未知"
 msgid "Up"
 msgstr "上"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:74
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:79
 msgid "Uplink / Trigger interface"
 msgstr "上行 / 触发接口"
 
@@ -526,7 +548,7 @@ msgstr "查看日志文件"
 msgid "WEP"
 msgstr "WEP"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:58
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:60
 msgid "WEP-Passphrase"
 msgstr "WEP-口令"
 
@@ -534,7 +556,7 @@ msgstr "WEP-口令"
 msgid "WPA"
 msgstr "WPA"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:76
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:78
 msgid "WPA-Passphrase"
 msgstr "WPA-口令"
 
diff --git a/applications/luci-app-travelmate/po/zh-tw/travelmate.po b/applications/luci-app-travelmate/po/zh-tw/travelmate.po
index 3c373fb15..583e338dc 100644
--- a/applications/luci-app-travelmate/po/zh-tw/travelmate.po
+++ b/applications/luci-app-travelmate/po/zh-tw/travelmate.po
@@ -24,15 +24,19 @@ msgstr "AP 開啟"
 msgid "Action"
 msgstr "動作"
 
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:74
+msgid "Add Open Uplinks"
+msgstr ""
+
 #: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:80
 msgid "Add Uplink"
 msgstr "新增上行連線"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:11
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:13
 msgid "Add Wireless Uplink Configuration"
 msgstr "新增無線上行連線配置"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:113
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:118
 msgid ""
 "Additional trigger delay in seconds before travelmate processing begins."
 msgstr "在 travelmate 處理開始前的額外觸發延遲（秒）。"
@@ -41,37 +45,48 @@ msgstr "在 travelmate 處理開始前的額外觸發延遲（秒）。"
 msgid "Advanced"
 msgstr "高階"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:100
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:86
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:102
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:89
 msgid "Authentication"
 msgstr "認證"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:70
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:87
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:57
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:73
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:143
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:136
+msgid "Auto Login Script"
+msgstr ""
+
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:72
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:89
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:60
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:76
 msgid "Automatic"
 msgstr "自動"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:107
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:75
+msgid ""
+"Automatically add open uplinks like hotel captive portals to your wireless "
+"config."
+msgstr ""
+
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:112
 msgid ""
 "Automatically resets the 'Faulty Stations' list after n minutes. Default is "
 "'0' which means no expiry."
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:44
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:27
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:46
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:30
 #: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:111
 msgid "BSSID"
 msgstr "BSSID"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:13
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:10
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:15
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:12
 #: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:89
 msgid "Back to overview"
 msgstr "返回概述"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:143
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:148
 msgid "Buffer size in bytes to prepare nearby scan results."
 msgstr ""
 
@@ -86,10 +101,10 @@ msgid ""
 msgstr ""
 "檢查網際網路可用性，記錄強制網路門戶重定向，並保持上行連線為“活動”狀態。"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:69
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:86
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:56
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:72
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:71
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:88
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:59
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:75
 msgid "Cipher"
 msgstr "密碼"
 
@@ -99,7 +114,7 @@ msgid ""
 "functionality."
 msgstr "配置 travelmate 包，以啟用旅行路由器功能。"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:118
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:123
 msgid "Connection Limit"
 msgstr "連線限制"
 
@@ -128,8 +143,8 @@ msgstr "裝置"
 msgid "Down"
 msgstr "下"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:93
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:79
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:95
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:82
 msgid "EAP-Method"
 msgstr "EAP-方法"
 
@@ -153,7 +168,7 @@ msgstr "編輯 Travelmate 配置"
 msgid "Edit Wireless Configuration"
 msgstr "編輯無線配置"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:8
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:10
 msgid "Edit Wireless Uplink Configuration"
 msgstr "編輯無線上行連線配置"
 
@@ -165,22 +180,29 @@ msgstr "編輯此上行連線"
 msgid "Enable Travelmate"
 msgstr "啟用 travelmate"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:98
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:103
 msgid "Enable Verbose Debug Logging"
 msgstr "啟用詳細除錯日誌"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:51
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:63
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:80
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:40
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:50
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:66
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:53
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:65
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:82
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:43
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:53
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:69
 #: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:112
 #: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:49
 msgid "Encryption"
 msgstr "加密"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:95
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:144
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:137
+msgid ""
+"External script reference which will be called for automated captive portal "
+"logins."
+msgstr ""
+
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:100
 msgid "Extra Options"
 msgstr "額外選項"
 
@@ -202,38 +224,38 @@ msgid ""
 "documentation</a>"
 msgstr "有關詳細資訊，請<a href=\"%s\" target=\"_blank\">檢視線上文件</a>"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:71
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:88
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:58
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:74
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:73
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:90
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:61
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:77
 msgid "Force CCMP (AES)"
 msgstr "強制 CCMP（AES）"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:72
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:89
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:59
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:75
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:74
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:91
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:62
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:78
 msgid "Force TKIP"
 msgstr "強制 TKIP"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:73
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:90
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:60
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:76
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:75
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:92
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:63
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:79
 msgid "Force TKIP and CCMP (AES)"
 msgstr "強制 TKIP 和 CCMP（AES）"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:131
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:136
 msgid ""
 "How long should travelmate wait for a successful wlan uplink connection."
 msgstr "travelmate 等待 wlan 上行連線成功最長時間。"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:113
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:99
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:115
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:102
 msgid "Identity"
 msgstr "身份"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:37
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:39
 msgid "Ignore BSSID"
 msgstr "忽略 BSSID"
 
@@ -244,7 +266,7 @@ msgstr "忽略 BSSID"
 msgid "Input file not found, please check your configuration."
 msgstr "未找到輸入檔案，請檢查您的配置。"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:130
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:135
 msgid "Interface Timeout"
 msgstr "介面超時"
 
@@ -256,7 +278,7 @@ msgstr "介面嚮導"
 msgid "Last Run"
 msgstr "上次執行"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:106
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:111
 msgid "List Auto Expiry"
 msgstr ""
 
@@ -264,7 +286,7 @@ msgstr ""
 msgid "Loading"
 msgstr "載入中"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:125
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:130
 msgid ""
 "Minimum signal quality threshold as percent for conditional uplink (dis-) "
 "connections."
@@ -278,7 +300,7 @@ msgstr "下移"
 msgid "Move up"
 msgstr "上移"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:75
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:80
 msgid "Name of the used uplink interface."
 msgstr "要使用的上行連線介面名稱。"
 
@@ -290,16 +312,16 @@ msgstr ""
 msgid "Open"
 msgstr "開"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:96
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:101
 msgid ""
 "Options for further tweaking in case the defaults are not suitable for you."
 msgstr "如果預設值不適合您，可以選擇進一步調整。"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:136
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:141
 msgid "Overall Timeout"
 msgstr "總體超時"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:137
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:142
 msgid "Overall retry timeout in seconds."
 msgstr "總體重試超時（秒）。"
 
@@ -307,33 +329,33 @@ msgstr "總體重試超時（秒）。"
 msgid "Overview"
 msgstr "概述"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:47
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:63
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:102
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:50
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:66
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:105
 msgid "Passphrase"
 msgstr "密碼"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:115
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:117
 msgid "Password"
 msgstr "密碼"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:130
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:119
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:132
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:122
 msgid "Password of Private Key"
 msgstr "私鑰密碼"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:119
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:105
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:121
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:108
 msgid "Path to CA-Certificate"
 msgstr "CA 證書路徑"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:122
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:109
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:124
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:112
 msgid "Path to Client-Certificate"
 msgstr "客戶證書路徑"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:126
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:114
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:128
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:117
 msgid "Path to Private Key"
 msgstr "私鑰路徑"
 
@@ -356,7 +378,7 @@ msgstr ""
 "此處顯示 travelmate 介面（%s）所有已配置上行連線的概述。您可以編輯、刪除或重"
 "新排序現有連線，或掃描新上行連線。當前使用的上行連線以藍色突出顯示。"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:102
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:107
 msgid "Radio Selection / Order"
 msgstr "無線電選擇/順序"
 
@@ -373,7 +395,7 @@ msgstr "重啟"
 msgid "Restart Travelmate"
 msgstr "重啟 Travelmate"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:103
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:108
 msgid ""
 "Restrict travelmate to a single radio (e.g. 'radio1') or change the overall "
 "scanning order (e.g. 'radio1 radio2 radio0')."
@@ -381,7 +403,7 @@ msgstr ""
 "將 travelmate 限制在單個無線電上（例如“radio1”），或改變整個掃描順序（例"
 "如“radio1 radio2 radio0”）。"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:119
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:124
 msgid "Retry limit to connect to an uplink."
 msgstr "連線到上行連線的重試限制。"
 
@@ -389,13 +411,13 @@ msgstr "連線到上行連線的重試限制。"
 msgid "Runtime Information"
 msgstr "執行資訊"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:32
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:23
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:34
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:26
 #: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:110
 msgid "SSID"
 msgstr "SSID"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:30
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:32
 msgid "SSID (hidden)"
 msgstr "SSID（隱藏）"
 
@@ -403,8 +425,8 @@ msgstr "SSID（隱藏）"
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_network_tab.lua:15
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_wireless_tab.lua:15
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/configuration_tab.lua:17
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:12
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:9
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:14
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:11
 msgid "Save"
 msgstr "儲存"
 
@@ -412,7 +434,7 @@ msgstr "儲存"
 msgid "Scan"
 msgstr "掃描"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:142
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:147
 msgid "Scan Buffer Size"
 msgstr ""
 
@@ -420,7 +442,7 @@ msgstr ""
 msgid "Show/Hide QR-Codes"
 msgstr "顯示/隱藏 QR 碼"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:124
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:129
 msgid "Signal Quality Threshold"
 msgstr "訊號質量閾值"
 
@@ -436,7 +458,7 @@ msgstr "站點 ID（RADIO/SSID/BSSID）"
 msgid "Station Interface"
 msgstr "站點介面"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:45
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:47
 msgid ""
 "The BSSID information '%s' is optional and only required for hidden networks"
 msgstr "BSSID 資訊“%s”是可選的，僅對隱藏網路必需"
@@ -490,7 +512,7 @@ msgstr "Travelmate 版本"
 msgid "Treat missing internet availability as an error."
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:112
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:117
 msgid "Trigger Delay"
 msgstr "觸發延遲"
 
@@ -503,7 +525,7 @@ msgstr "未知"
 msgid "Up"
 msgstr "上"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:74
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:79
 msgid "Uplink / Trigger interface"
 msgstr "上行 / 觸發介面"
 
@@ -527,7 +549,7 @@ msgstr "檢視日誌檔案"
 msgid "WEP"
 msgstr "WEP"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:58
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:60
 msgid "WEP-Passphrase"
 msgstr "WEP-口令"
 
@@ -535,7 +557,7 @@ msgstr "WEP-口令"
 msgid "WPA"
 msgstr "WPA"
 
-#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:76
+#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:78
 msgid "WPA-Passphrase"
 msgstr "WPA-口令"
 
diff --git a/applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua b/applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua
index 60d0477d5..d1ea77408 100644
--- a/applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua
+++ b/applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua
@@ -17,6 +17,8 @@ local ht = require "luci.http"
 local ds = require "luci.dispatcher"
 local ucl = luci.model.uci.cursor()
 local valman = ucl:get_first("unbound", "unbound", "manual_conf")
+local dhcplk = ucl:get_first("unbound", "unbound", "dhcp_link")
+local lstrig = ucl:get_first("dhcp", "odhcpd", "leasetrigger")
 
 m1 = Map("unbound")
 s1 = m1:section(TypedSection, "unbound", translate("Recursive DNS"),
@@ -29,6 +31,12 @@ s1 = m1:section(TypedSection, "unbound", translate("Recursive DNS"),
 s1.addremove = false
 s1.anonymous = true
 
+if (valman == "0") and (dhcplk == "odhcpd") and (lstrig ~= "/usr/lib/unbound/odhcpd.sh") then
+    m1.message = translatef( "Note: local DNS is configured to look at odhpcd, "
+    .. "but odhpcd UCI lease trigger is incorrectly set: ")
+    .. "dhcp.odhcpd.leasetrigger='" .. lstrig .. "'"
+end
+
 --LuCI, Unbound, or Not
 s1:tab("basic", translate("Basic"))
 
diff --git a/applications/luci-app-vpnbypass/Makefile b/applications/luci-app-vpnbypass/Makefile
index f426acc53..2e26a5158 100644
--- a/applications/luci-app-vpnbypass/Makefile
+++ b/applications/luci-app-vpnbypass/Makefile
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Stan Grishin (stangri@melmac.net)
+# Copyright 2017-2019 Stan Grishin (stangri@melmac.net)
 # This is free software, licensed under the GNU General Public License v3.
 
 include $(TOPDIR)/rules.mk
@@ -8,9 +8,9 @@ PKG_MAINTAINER:=Stan Grishin <stangri@melmac.net>
 
 LUCI_TITLE:=VPN Bypass Web UI
 LUCI_DESCRIPTION:=Provides Web UI for VPNBypass service.
-LUCI_DEPENDS:=+luci +vpnbypass
+LUCI_DEPENDS:=+luci-mod-admin-full +vpnbypass
 LUCI_PKGARCH:=all
-PKG_RELEASE:=4
+PKG_RELEASE:=9
 
 include ../../luci.mk
 
diff --git a/applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua b/applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua
index ed6f4f4da..56221e043 100644
--- a/applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua
+++ b/applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua
@@ -1,7 +1,10 @@
 module("luci.controller.vpnbypass", package.seeall)
 function index()
-	if not nixio.fs.access("/etc/config/vpnbypass") then
-		return
+	if nixio.fs.access("/etc/config/vpnbypass") then
+		if luci.dispatcher.lookup("admin/vpn") then
+			entry({"admin", "vpn", "vpnbypass"}, cbi("vpnbypass"), _("VPN Bypass"))
+		else
+			entry({"admin", "services", "vpnbypass"}, cbi("vpnbypass"), _("VPN Bypass"))
+		end
 	end
-	entry({"admin", "services", "vpnbypass"}, cbi("vpnbypass"), _("VPN Bypass"))
 end
diff --git a/applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua b/applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua
index 6545154c2..95971fab1 100644
--- a/applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua
+++ b/applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua
@@ -1,18 +1,40 @@
-readmeURL = "https://github.com/openwrt/packages/blob/master/net/vpnbypass/files/README.md"
+local readmeURL = "https://github.com/openwrt/packages/blob/master/net/vpnbypass/files/README.md"
 
 m = Map("vpnbypass", translate("VPN Bypass Settings"))
-s = m:section(NamedSection, "config", "vpnbypass")
-
--- General options
-e = s:option(Flag, "enabled", translate("Start VPNBypass service"))
-e.rmempty = false
-function e.write(self, section, value)
-	if value ~= "1" then
-		luci.sys.init.stop("vpnbypass")
+
+h = m:section(NamedSection, "config", "vpnbypass", translate("Service Status"))
+local packageName = "vpnbypass"
+local uci = require "luci.model.uci".cursor()
+local sys = require "luci.sys"
+local http = require "luci.http"
+local dispatcher = require "luci.dispatcher"
+en = h:option(Button, "__toggle")
+if enabledFlag ~= "1" then
+	en.title      = translate("Service is disabled/stopped")
+	en.inputtitle = translate("Enable/Start")
+	en.inputstyle = "apply important"
+else
+	en.title      = translate("Service is enabled/started")
+	en.inputtitle = translate("Stop/Disable")
+	en.inputstyle = "reset important"
+end
+function en.write()
+	enabledFlag = enabledFlag == "1" and "0" or "1"
+	uci:set(packageName, "config", "enabled", enabledFlag)
+	uci:save(packageName)
+	uci:commit(packageName)
+	if enabledFlag == "0" then
+		sys.init.stop(packageName)
+		sys.init.disable(packageName)
+	else
+		sys.init.enable(packageName)
+		sys.init.start(packageName)
 	end
-	return Flag.write(self, section, value)
+	http.redirect(dispatcher.build_url("admin/services/" .. packageName))
 end
 
+s = m:section(NamedSection, "config", "vpnbypass", translate("VPN Bypass Rules"))
+
 -- Local Ports
 p1 = s:option(DynamicList, "localport", translate("Local Ports to Bypass"), translate("Local ports to trigger VPN Bypass"))
 p1.datatype    = "portrange"
@@ -30,7 +52,7 @@ p2.optional = false
 -- Local Subnets
 r1 = s:option(DynamicList, "localsubnet", translate("Local IP Addresses to Bypass"), translate("Local IP addresses or subnets with direct internet access (outside of the VPN tunnel)"))
 r1.datatype    = "ip4addr"
--- r1.placeholder = luci.ip.new(m.uci:get("network", "lan", "ipaddr"), m.uci:get("network", "lan", "netmask"))
+-- r1.placeholder = ip.new(m.uci:get("network", "lan", "ipaddr"), m.uci:get("network", "lan", "netmask"))
 r1.addremove = false
 r1.optional = false
 
@@ -49,5 +71,8 @@ di = s4:option(DynamicList, "ipset", translate("Domains to Bypass"),
     translate("Domains to be accessed directly (outside of the VPN tunnel), see ")
 		.. [[<a href="]] .. readmeURL .. [[#bypass-domains-formatsyntax" target="_blank">]]
     .. translate("README") .. [[</a> ]] .. translate("for syntax"))
+function d.on_after_commit(map)
+    sys.init.restart("dnsmasq")
+end
 
 return m, d
diff --git a/applications/luci-app-vpnbypass/po/de/vpnbypass.po b/applications/luci-app-vpnbypass/po/de/vpnbypass.po
index 635d9987c..a686c3238 100644
--- a/applications/luci-app-vpnbypass/po/de/vpnbypass.po
+++ b/applications/luci-app-vpnbypass/po/de/vpnbypass.po
@@ -1,20 +1,24 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=UTF-8\n"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:48
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:70
 msgid "Domains to Bypass"
 msgstr "Zu umgehende Domains"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:49
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:71
 msgid "Domains to be accessed directly (outside of the VPN tunnel), see"
 msgstr ""
 "Domains die direkt erreicht werden sollen (außerhalb des VPN Tunnel), siehe"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:31
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:14
+msgid "Enable/Start"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:53
 msgid "Local IP Addresses to Bypass"
 msgstr "Zu umgehende lokale IP Adressen"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:31
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:53
 msgid ""
 "Local IP addresses or subnets with direct internet access (outside of the "
 "VPN tunnel)"
@@ -22,23 +26,23 @@ msgstr ""
 "Lokale IP Adressen, oder Subnetze mit direktem Internet-Zugriff (außerhalb "
 "des VPN Tunnel)"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:39
 msgid "Local Ports to Bypass"
 msgstr "Zu umgehende Lokale Ports"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:39
 msgid "Local ports to trigger VPN Bypass"
 msgstr "Lokale Ports um VPN Bypass anzustoßen"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:51
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:73
 msgid "README"
 msgstr ""
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:38
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:60
 msgid "Remote IP Addresses to Bypass"
 msgstr "Zu umgehende entfernte IP Adressen"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:38
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:60
 msgid ""
 "Remote IP addresses or subnets which will be accessed directly (outside of "
 "the VPN tunnel)"
@@ -46,26 +50,46 @@ msgstr ""
 "Entfernte IP Adressen, oder Subnetze mit direktem Internet-Zugriff "
 "(außerhalb des VPN Tunnel)"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:24
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:46
 msgid "Remote Ports to Bypass"
 msgstr "Zu umgehende entfernte Ports"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:24
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:46
 msgid "Remote ports to trigger VPN Bypass"
 msgstr "Enfernte Ports um VPN Bypass anzustßen"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:7
-msgid "Start VPNBypass service"
-msgstr "Starte VPNBypass service"
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:5
+msgid "Service Status"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:13
+msgid "Service is disabled/stopped"
+msgstr ""
 
-#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:6
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+msgid "Service is enabled/started"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:18
+msgid "Stop/Disable"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:5
+#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:7
 msgid "VPN Bypass"
 msgstr ""
 
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:36
+msgid "VPN Bypass Rules"
+msgstr ""
+
 #: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:3
 msgid "VPN Bypass Settings"
 msgstr "VPN Bypass Einstellungen"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:51
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:73
 msgid "for syntax"
 msgstr "für Syntax"
+
+#~ msgid "Start VPNBypass service"
+#~ msgstr "Starte VPNBypass service"
diff --git a/applications/luci-app-vpnbypass/po/es/vpnbypass.po b/applications/luci-app-vpnbypass/po/es/vpnbypass.po
index 9fdbcacb5..ad077f0b7 100644
--- a/applications/luci-app-vpnbypass/po/es/vpnbypass.po
+++ b/applications/luci-app-vpnbypass/po/es/vpnbypass.po
@@ -3,30 +3,34 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Project-Id-Version: \n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
+"PO-Revision-Date: 2019-09-17 22:51-0300\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.2.1\n"
-"Last-Translator: \n"
+"X-Generator: Poedit 2.2.3\n"
+"Last-Translator: Franco Castillo <castillofrancodamin@gmail.com>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Language: es\n"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:48
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:70
 msgid "Domains to Bypass"
 msgstr "Dominios a omitir"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:49
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:71
 msgid "Domains to be accessed directly (outside of the VPN tunnel), see"
 msgstr ""
 "Dominios a los que se puede acceder directamente (fuera del túnel VPN), "
 "consulte"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:31
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:14
+msgid "Enable/Start"
+msgstr "Habilitar/Iniciar"
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:53
 msgid "Local IP Addresses to Bypass"
 msgstr "Direcciones IP locales para omitir"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:31
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:53
 msgid ""
 "Local IP addresses or subnets with direct internet access (outside of the "
 "VPN tunnel)"
@@ -34,23 +38,23 @@ msgstr ""
 "Direcciones IP o subredes locales con acceso directo a Internet (fuera del "
 "túnel VPN)"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:39
 msgid "Local Ports to Bypass"
 msgstr "Puertos locales para evitar"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:39
 msgid "Local ports to trigger VPN Bypass"
 msgstr "Puertos locales para activar VPN Bypass"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:51
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:73
 msgid "README"
 msgstr "LÉEME"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:38
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:60
 msgid "Remote IP Addresses to Bypass"
 msgstr "Direcciones IP remotas para omitir"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:38
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:60
 msgid ""
 "Remote IP addresses or subnets which will be accessed directly (outside of "
 "the VPN tunnel)"
@@ -58,26 +62,46 @@ msgstr ""
 "Direcciones IP remotas o subredes a las que se accederá directamente (fuera "
 "del túnel VPN)"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:24
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:46
 msgid "Remote Ports to Bypass"
 msgstr "Puertos remotos para omitir"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:24
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:46
 msgid "Remote ports to trigger VPN Bypass"
 msgstr "Puertos remotos para activar VPN Bypass"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:7
-msgid "Start VPNBypass service"
-msgstr "Iniciar el servicio VPNBypass"
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:5
+msgid "Service Status"
+msgstr "Estado del servicio"
 
-#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:6
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:13
+msgid "Service is disabled/stopped"
+msgstr "El servicio está deshabilitado/detenido"
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+msgid "Service is enabled/started"
+msgstr "El servicio está habilitado/iniciado"
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:18
+msgid "Stop/Disable"
+msgstr "Detener/Deshabilitar"
+
+#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:5
+#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:7
 msgid "VPN Bypass"
 msgstr "VPN Bypass"
 
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:36
+msgid "VPN Bypass Rules"
+msgstr "Reglas de VPN Bypass"
+
 #: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:3
 msgid "VPN Bypass Settings"
 msgstr "Configuración de VPN Bypass"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:51
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:73
 msgid "for syntax"
 msgstr "para la sintaxis"
+
+#~ msgid "Start VPNBypass service"
+#~ msgstr "Iniciar el servicio VPNBypass"
diff --git a/applications/luci-app-vpnbypass/po/pt-br/vpnbypass.po b/applications/luci-app-vpnbypass/po/pt-br/vpnbypass.po
index da254e53b..ba4cc890a 100644
--- a/applications/luci-app-vpnbypass/po/pt-br/vpnbypass.po
+++ b/applications/luci-app-vpnbypass/po/pt-br/vpnbypass.po
@@ -12,42 +12,46 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "Language: pt_BR\n"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:48
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:70
 msgid "Domains to Bypass"
 msgstr "Domínios para evitar a VPN"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:49
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:71
 msgid "Domains to be accessed directly (outside of the VPN tunnel), see"
 msgstr "Domínios para serem acessados diretamente (fora do túnel VPN), veja"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:31
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:14
+msgid "Enable/Start"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:53
 msgid "Local IP Addresses to Bypass"
 msgstr "Endereço IP Local para Contornar"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:31
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:53
 msgid ""
 "Local IP addresses or subnets with direct internet access (outside of the "
 "VPN tunnel)"
 msgstr ""
 "Endereço IP Local ou subrede com acesso direto à internet (fora do túnel VPN)"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:39
 msgid "Local Ports to Bypass"
 msgstr "Portas locais para evitar a VPN"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:39
 msgid "Local ports to trigger VPN Bypass"
 msgstr "Portas locais para disparar o VPN Bypass"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:51
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:73
 msgid "README"
 msgstr "LEIAME"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:38
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:60
 msgid "Remote IP Addresses to Bypass"
 msgstr "Endereço IP Remoto para Contornar"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:38
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:60
 msgid ""
 "Remote IP addresses or subnets which will be accessed directly (outside of "
 "the VPN tunnel)"
@@ -55,30 +59,50 @@ msgstr ""
 "Endereço IP Remoto ou subrede que serão acessados diretamente (fora do túnel "
 "VPN)"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:24
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:46
 msgid "Remote Ports to Bypass"
 msgstr "Portas remotas para evitar a VPN"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:24
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:46
 msgid "Remote ports to trigger VPN Bypass"
 msgstr "Portas remotas para disparar o VPN Bypass"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:7
-msgid "Start VPNBypass service"
-msgstr "Inicie o serviço VPNBypass"
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:5
+msgid "Service Status"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:13
+msgid "Service is disabled/stopped"
+msgstr ""
 
-#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:6
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+msgid "Service is enabled/started"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:18
+msgid "Stop/Disable"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:5
+#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:7
 msgid "VPN Bypass"
 msgstr "VPN Bypass"
 
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:36
+msgid "VPN Bypass Rules"
+msgstr ""
+
 #: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:3
 msgid "VPN Bypass Settings"
 msgstr "Configurações do VPN Bypass"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:51
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:73
 msgid "for syntax"
 msgstr "para sintaxe"
 
+#~ msgid "Start VPNBypass service"
+#~ msgstr "Inicie o serviço VPNBypass"
+
 #~ msgid "Enable VPN Bypass"
 #~ msgstr "Habilitar o VPN Bypass"
 
diff --git a/applications/luci-app-vpnbypass/po/ru/vpnbypass.po b/applications/luci-app-vpnbypass/po/ru/vpnbypass.po
index e924cfe50..eca6fec32 100644
--- a/applications/luci-app-vpnbypass/po/ru/vpnbypass.po
+++ b/applications/luci-app-vpnbypass/po/ru/vpnbypass.po
@@ -15,19 +15,23 @@ msgstr ""
 "Project-Info: Это технический перевод, не дословный. Главное-удобный русский "
 "интерфейс, все проверялось в графическом режиме, совместим с другими apps\n"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:48
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:70
 msgid "Domains to Bypass"
 msgstr "Домены, для<br />обхода блокировки"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:49
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:71
 msgid "Domains to be accessed directly (outside of the VPN tunnel), see"
 msgstr "Домены должны быть доступны напрямую (вне VPN-туннеля), см."
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:31
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:14
+msgid "Enable/Start"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:53
 msgid "Local IP Addresses to Bypass"
 msgstr "Локальный IP-адрес<br />обхода VPN"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:31
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:53
 msgid ""
 "Local IP addresses or subnets with direct internet access (outside of the "
 "VPN tunnel)"
@@ -35,23 +39,23 @@ msgstr ""
 "Локальные IP-адреса или подсети с прямым доступом в интернет (вне VPN-"
 "туннеля)."
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:39
 msgid "Local Ports to Bypass"
 msgstr "Локальные порты для запуска обхода VPN"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:39
 msgid "Local ports to trigger VPN Bypass"
 msgstr "Локальные порты<br />для обхода VPN"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:51
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:73
 msgid "README"
 msgstr "Описание"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:38
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:60
 msgid "Remote IP Addresses to Bypass"
 msgstr "Удаленные IP-адреса<br />обхода VPN"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:38
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:60
 msgid ""
 "Remote IP addresses or subnets which will be accessed directly (outside of "
 "the VPN tunnel)"
@@ -59,27 +63,44 @@ msgstr ""
 "Удаленные IP-адреса или подсети, которые будут доступны напрямую (вне "
 "туннеля VPN)."
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:24
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:46
 msgid "Remote Ports to Bypass"
 msgstr "Удаленные порты<br />для обхода VPN"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:24
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:46
 msgid "Remote ports to trigger VPN Bypass"
 msgstr "Удаленные порты для запуска обхода VPN"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:7
-msgid "Start VPNBypass service"
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:5
+msgid "Service Status"
 msgstr ""
 
-#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:6
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:13
+msgid "Service is disabled/stopped"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+msgid "Service is enabled/started"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:18
+msgid "Stop/Disable"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:5
+#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:7
 msgid "VPN Bypass"
 msgstr "Обход VPN"
 
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:36
+msgid "VPN Bypass Rules"
+msgstr ""
+
 #: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:3
 msgid "VPN Bypass Settings"
 msgstr "Настройка обхода VPN"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:51
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:73
 msgid "for syntax"
 msgstr "для синтаксиса"
 
diff --git a/applications/luci-app-vpnbypass/po/templates/vpnbypass.pot b/applications/luci-app-vpnbypass/po/templates/vpnbypass.pot
index 7a9b05327..06b01d405 100644
--- a/applications/luci-app-vpnbypass/po/templates/vpnbypass.pot
+++ b/applications/luci-app-vpnbypass/po/templates/vpnbypass.pot
@@ -1,66 +1,87 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=UTF-8"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:48
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:70
 msgid "Domains to Bypass"
 msgstr ""
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:49
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:71
 msgid "Domains to be accessed directly (outside of the VPN tunnel), see"
 msgstr ""
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:31
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:14
+msgid "Enable/Start"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:53
 msgid "Local IP Addresses to Bypass"
 msgstr ""
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:31
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:53
 msgid ""
 "Local IP addresses or subnets with direct internet access (outside of the "
 "VPN tunnel)"
 msgstr ""
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:39
 msgid "Local Ports to Bypass"
 msgstr ""
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:39
 msgid "Local ports to trigger VPN Bypass"
 msgstr ""
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:51
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:73
 msgid "README"
 msgstr ""
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:38
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:60
 msgid "Remote IP Addresses to Bypass"
 msgstr ""
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:38
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:60
 msgid ""
 "Remote IP addresses or subnets which will be accessed directly (outside of "
 "the VPN tunnel)"
 msgstr ""
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:24
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:46
 msgid "Remote Ports to Bypass"
 msgstr ""
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:24
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:46
 msgid "Remote ports to trigger VPN Bypass"
 msgstr ""
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:7
-msgid "Start VPNBypass service"
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:5
+msgid "Service Status"
 msgstr ""
 
-#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:6
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:13
+msgid "Service is disabled/stopped"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+msgid "Service is enabled/started"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:18
+msgid "Stop/Disable"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:5
+#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:7
 msgid "VPN Bypass"
 msgstr ""
 
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:36
+msgid "VPN Bypass Rules"
+msgstr ""
+
 #: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:3
 msgid "VPN Bypass Settings"
 msgstr ""
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:51
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:73
 msgid "for syntax"
 msgstr ""
diff --git a/applications/luci-app-vpnbypass/po/zh-cn/vpnbypass.po b/applications/luci-app-vpnbypass/po/zh-cn/vpnbypass.po
index 3003cf382..a986ee241 100644
--- a/applications/luci-app-vpnbypass/po/zh-cn/vpnbypass.po
+++ b/applications/luci-app-vpnbypass/po/zh-cn/vpnbypass.po
@@ -11,69 +11,93 @@ msgstr ""
 "PO-Revision-Date: 2018-08-07 20:19+0800\n"
 "X-Generator: Gtranslator 2.91.7\n"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:48
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:70
 msgid "Domains to Bypass"
 msgstr "要绕过的域"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:49
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:71
 msgid "Domains to be accessed directly (outside of the VPN tunnel), see"
 msgstr "要直接访问的域（不使用 VPN 隧道），请参见"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:31
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:14
+msgid "Enable/Start"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:53
 msgid "Local IP Addresses to Bypass"
 msgstr "要绕过的本地 IP 地址"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:31
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:53
 msgid ""
 "Local IP addresses or subnets with direct internet access (outside of the "
 "VPN tunnel)"
 msgstr "直接访问的本地 IP 地址或子网（不使用 VPN 隧道）"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:39
 msgid "Local Ports to Bypass"
 msgstr "要绕过的本地端口"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:39
 msgid "Local ports to trigger VPN Bypass"
 msgstr "触发 VPN 绕过的本地端口"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:51
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:73
 msgid "README"
 msgstr "README"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:38
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:60
 msgid "Remote IP Addresses to Bypass"
 msgstr "要绕过的远程 IP 地址"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:38
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:60
 msgid ""
 "Remote IP addresses or subnets which will be accessed directly (outside of "
 "the VPN tunnel)"
 msgstr "将直接访问的远程 IP 地址或子网（不使用 VPN 隧道）"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:24
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:46
 msgid "Remote Ports to Bypass"
 msgstr "要绕过的远程端口"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:24
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:46
 msgid "Remote ports to trigger VPN Bypass"
 msgstr "触发 VPN 绕过的远程端口"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:7
-msgid "Start VPNBypass service"
-msgstr "启动 VPNBypass 服务"
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:5
+msgid "Service Status"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:13
+msgid "Service is disabled/stopped"
+msgstr ""
 
-#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:6
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+msgid "Service is enabled/started"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:18
+msgid "Stop/Disable"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:5
+#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:7
 msgid "VPN Bypass"
 msgstr "VPN 绕过"
 
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:36
+msgid "VPN Bypass Rules"
+msgstr ""
+
 #: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:3
 msgid "VPN Bypass Settings"
 msgstr "VPN 绕过设置"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:51
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:73
 msgid "for syntax"
 msgstr "对于语法"
 
+#~ msgid "Start VPNBypass service"
+#~ msgstr "启动 VPNBypass 服务"
+
 #~ msgid "Enable/start service"
 #~ msgstr "启用/启动服务"
diff --git a/applications/luci-app-vpnbypass/po/zh-tw/vpnbypass.po b/applications/luci-app-vpnbypass/po/zh-tw/vpnbypass.po
index 1d43363fc..971d5e4ed 100644
--- a/applications/luci-app-vpnbypass/po/zh-tw/vpnbypass.po
+++ b/applications/luci-app-vpnbypass/po/zh-tw/vpnbypass.po
@@ -11,67 +11,88 @@ msgstr ""
 "PO-Revision-Date: 2017-10-29 15:30+0800\n"
 "X-Generator: Gtranslator 2.91.7\n"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:48
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:70
 msgid "Domains to Bypass"
 msgstr "要繞過的域"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:49
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:71
 msgid "Domains to be accessed directly (outside of the VPN tunnel), see"
 msgstr "要直接訪問的域（不使用 VPN 隧道），請參見"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:31
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:14
+msgid "Enable/Start"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:53
 msgid "Local IP Addresses to Bypass"
 msgstr "要繞過的本地 IP 位址"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:31
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:53
 msgid ""
 "Local IP addresses or subnets with direct internet access (outside of the "
 "VPN tunnel)"
 msgstr "直接訪問的本地 IP 位址或子網（不使用 VPN 隧道）"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:39
 msgid "Local Ports to Bypass"
 msgstr "要繞過的本地埠"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:39
 msgid "Local ports to trigger VPN Bypass"
 msgstr "觸發 VPN 繞過的本地埠"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:51
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:73
 msgid "README"
 msgstr "README"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:38
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:60
 msgid "Remote IP Addresses to Bypass"
 msgstr "要繞過的遠端 IP 位址"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:38
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:60
 msgid ""
 "Remote IP addresses or subnets which will be accessed directly (outside of "
 "the VPN tunnel)"
 msgstr "將直接訪問的遠端 IP 位址或子網（不使用 VPN 隧道）"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:24
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:46
 msgid "Remote Ports to Bypass"
 msgstr "要繞過的遠端埠"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:24
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:46
 msgid "Remote ports to trigger VPN Bypass"
 msgstr "觸發 VPN 繞過的遠端埠"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:7
-msgid "Start VPNBypass service"
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:5
+msgid "Service Status"
 msgstr ""
 
-#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:6
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:13
+msgid "Service is disabled/stopped"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+msgid "Service is enabled/started"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:18
+msgid "Stop/Disable"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:5
+#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:7
 msgid "VPN Bypass"
 msgstr "VPN 繞過"
 
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:36
+msgid "VPN Bypass Rules"
+msgstr ""
+
 #: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:3
 msgid "VPN Bypass Settings"
 msgstr "VPN 繞過設定"
 
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:51
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:73
 msgid "for syntax"
 msgstr "對於語法"
 
diff --git a/applications/luci-app-wifischedule/po/es/wifischedule.po b/applications/luci-app-wifischedule/po/es/wifischedule.po
index 03e0fccd0..5aeb5eb7d 100644
--- a/applications/luci-app-wifischedule/po/es/wifischedule.po
+++ b/applications/luci-app-wifischedule/po/es/wifischedule.po
@@ -3,12 +3,12 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Project-Id-Version: \n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
+"PO-Revision-Date: 2019-09-17 22:54-0300\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.2.1\n"
-"Last-Translator: \n"
+"X-Generator: Poedit 2.2.3\n"
+"Last-Translator: Franco Castillo <castillofrancodamian@gmail.com>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Language: es\n"
 
@@ -139,7 +139,7 @@ msgstr "Miércoles"
 #: applications/luci-app-wifischedule/luasrc/controller/wifischedule/wifi_schedule.lua:26
 #: applications/luci-app-wifischedule/luasrc/model/cbi/wifischedule/wifi_schedule.lua:39
 msgid "Wifi Schedule"
-msgstr "Programar WiFi"
+msgstr "Horario de WiFi"
 
 #: applications/luci-app-wifischedule/luasrc/controller/wifischedule/wifi_schedule.lua:35
 msgid "Wifi Schedule Logfile"
diff --git a/applications/luci-app-wireguard/po/es/wireguard.po b/applications/luci-app-wireguard/po/es/wireguard.po
index e1ef4c661..7a7ccaf6a 100644
--- a/applications/luci-app-wireguard/po/es/wireguard.po
+++ b/applications/luci-app-wireguard/po/es/wireguard.po
@@ -3,7 +3,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Project-Id-Version: \n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2019-08-01 21:49-0300\n"
+"PO-Revision-Date: 2019-09-17 22:55-0300\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -55,7 +55,7 @@ msgstr "Último Handshake"
 
 #: applications/luci-app-wireguard/luasrc/view/wireguard.htm:125
 msgid "Listen Port"
-msgstr "Escuchar puerto"
+msgstr "Puerto"
 
 #: applications/luci-app-wireguard/luasrc/view/wireguard.htm:81
 msgid "Never"
diff --git a/libs/luci-lib-ip/src/ip.c b/libs/luci-lib-ip/src/ip.c
index 854a0c09c..188a70f14 100644
--- a/libs/luci-lib-ip/src/ip.c
+++ b/libs/luci-lib-ip/src/ip.c
@@ -1075,22 +1075,24 @@ static int cb_dump_route(struct nl_msg *msg, void *arg)
 
 	bitlen = AF_BITS(rt->rtm_family);
 
-	if ((f->type   && rt->rtm_type     != f->type)   ||
-	    (f->family && rt->rtm_family   != f->family) ||
-	    (f->proto  && rt->rtm_protocol != f->proto)  ||
-	    (f->scope  && rt->rtm_scope    != f->scope)  ||
-		(f->iif    && iif              != f->iif)    ||
-		(f->oif    && oif              != f->oif)    ||
-		(f->table  && table            != f->table)  ||
-	    diff_prefix(rt->rtm_family, from, rt->rtm_src_len,
-	                f->from_exact, &f->from)         ||
-	    diff_prefix(rt->rtm_family, dst,  rt->rtm_dst_len,
-	                f->dst_exact, &f->dst)           ||
-	    diff_prefix(rt->rtm_family, gw,   bitlen,
-	                false, &f->gw)                   ||
-	    diff_prefix(rt->rtm_family, src,  bitlen,
-	                false, &f->src))
-		goto out;
+	if (!f->get) {
+		if ((f->type   && rt->rtm_type     != f->type)   ||
+		    (f->family && rt->rtm_family   != f->family) ||
+		    (f->proto  && rt->rtm_protocol != f->proto)  ||
+		    (f->scope  && rt->rtm_scope    != f->scope)  ||
+		    (f->iif    && iif              != f->iif)    ||
+		    (f->oif    && oif              != f->oif)    ||
+		    (f->table  && table            != f->table)  ||
+		    diff_prefix(rt->rtm_family, from, rt->rtm_src_len,
+		                f->from_exact, &f->from)         ||
+		    diff_prefix(rt->rtm_family, dst,  rt->rtm_dst_len,
+		                f->dst_exact, &f->dst)           ||
+		    diff_prefix(rt->rtm_family, gw,   bitlen,
+		                false, &f->gw)                   ||
+		    diff_prefix(rt->rtm_family, src,  bitlen,
+		                false, &f->src))
+			goto out;
+	}
 
 	if (s->callback)
 		lua_pushvalue(s->L, 2);
@@ -1216,10 +1218,15 @@ static int _route_dump(lua_State *L, struct dump_filter *filter)
 
 	nlmsg_append(msg, &rtm, sizeof(rtm), 0);
 
-	if (filter->get)
+	if (filter->get) {
 		nla_put(msg, RTA_DST, AF_BYTES(filter->dst.family),
 		        &filter->dst.addr.v6);
 
+		if (filter->src.family)
+			nla_put(msg, RTA_SRC, AF_BYTES(filter->src.family),
+			        &filter->src.addr.v6);
+	}
+
 	nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, cb_dump_route, &s);
 	nl_cb_set(cb, NL_CB_FINISH, NL_CB_CUSTOM, cb_done, &s);
 	nl_cb_err(cb, NL_CB_CUSTOM, cb_error, &s);
@@ -1236,17 +1243,32 @@ static int _route_dump(lua_State *L, struct dump_filter *filter)
 
 out:
 	nl_cb_put(cb);
-	return (s.callback == 0);
+
+	if (s.callback)
+		return 0;
+
+	if (!filter->get)
+		return 1;
+
+	return (s.index > 0);
 }
 
 static int route_get(lua_State *L)
 {
 	struct dump_filter filter = { .get = true };
 	const char *dest = luaL_checkstring(L, 1);
+	const char *from = luaL_optstring(L, 2, NULL);
 
 	if (!parse_cidr(dest, &filter.dst))
 		return _error(L, -1, "Invalid destination");
 
+	if (from && !parse_cidr(from, &filter.src))
+		return _error(L, -1, "Invalid source");
+
+	if (filter.src.family != 0 &&
+	    filter.src.family != filter.dst.family)
+		return _error(L, -1, "Different source/destination family");
+
 	filter.family = filter.dst.family;
 
 	return _route_dump(L, &filter);
diff --git a/libs/luci-lib-ip/src/ip.luadoc b/libs/luci-lib-ip/src/ip.luadoc
index a2df96cdb..afd171beb 100644
--- a/libs/luci-lib-ip/src/ip.luadoc
+++ b/libs/luci-lib-ip/src/ip.luadoc
@@ -178,6 +178,8 @@ Determine the route leading to the given destination.
 @name route
 @param address	A `luci.ip.cidr` instance or a string containing
 a valid IPv4 or IPv6 range as specified by `luci.ip.new()`.
+@param source   A `luci.ip.cidr` instance or a string containing
+the preferred source address for route selection (optional).
 @return <p>Table containing the fields described below.</p>
 <table id="routetable">
 <tr><th>Field</th><th>Description</th></tr>
diff --git a/modules/luci-base/Makefile b/modules/luci-base/Makefile
index 9bc8ec17a..92da37a22 100644
--- a/modules/luci-base/Makefile
+++ b/modules/luci-base/Makefile
@@ -12,7 +12,7 @@ LUCI_TYPE:=mod
 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
+LUCI_DEPENDS:=+lua +luci-lib-nixio +luci-lib-ip +rpcd +libubus-lua +luci-lib-jsonc +liblucihttp-lua +rpcd-mod-file +cgi-io
 
 
 PKG_SOURCE:=v1.0.0.tar.gz
diff --git a/modules/luci-base/htdocs/luci-static/resources/cbi.js b/modules/luci-base/htdocs/luci-static/resources/cbi.js
index d4d61eb38..4c3128bfd 100644
--- a/modules/luci-base/htdocs/luci-static/resources/cbi.js
+++ b/modules/luci-base/htdocs/luci-static/resources/cbi.js
@@ -298,8 +298,6 @@ function cbi_init() {
 		                   node.getAttribute('data-type'));
 	}
 
-	document.querySelectorAll('[data-browser]').forEach(cbi_browser_init);
-
 	document.querySelectorAll('.cbi-tooltip:not(:empty)').forEach(function(s) {
 		s.parentNode.classList.add('cbi-tooltip-container');
 	});
@@ -316,39 +314,20 @@ function cbi_init() {
 		i.addEventListener('mouseout', handler);
 	});
 
+	var tasks = [];
+
 	document.querySelectorAll('[data-ui-widget]').forEach(function(node) {
 		var args = JSON.parse(node.getAttribute('data-ui-widget') || '[]'),
 		    widget = new (Function.prototype.bind.apply(L.ui[args[0]], args)),
 		    markup = widget.render();
 
-		markup.addEventListener('widget-change', cbi_d_update);
-		node.parentNode.replaceChild(markup, node);
+		tasks.push(Promise.resolve(markup).then(function(markup) {
+			markup.addEventListener('widget-change', cbi_d_update);
+			node.parentNode.replaceChild(markup, node);
+		}));
 	});
 
-	cbi_d_update();
-}
-
-function cbi_filebrowser(id, defpath) {
-	var field   = L.dom.elem(id) ? id : document.getElementById(id);
-	var browser = window.open(
-		cbi_strings.path.browser + (field.value || defpath || '') + '?field=' + field.id,
-		"luci_filebrowser", "width=300,height=400,left=100,top=200,scrollbars=yes"
-	);
-
-	browser.focus();
-}
-
-function cbi_browser_init(field)
-{
-	field.parentNode.insertBefore(
-		E('img', {
-			'src': L.resource('cbi/folder.gif'),
-			'class': 'cbi-image-button',
-			'click': function(ev) {
-				cbi_filebrowser(field, field.getAttribute('data-browser'));
-				ev.preventDefault();
-			}
-		}), field.nextSibling);
+	Promise.all(tasks).then(cbi_d_update);
 }
 
 function cbi_validate_form(form, errmsg)
@@ -566,7 +545,7 @@ String.prototype.format = function()
 
 				switch(pType) {
 					case 'b':
-						subst = (~~param || 0).toString(2);
+						subst = Math.floor(+param || 0).toString(2);
 						break;
 
 					case 'c':
@@ -574,11 +553,12 @@ String.prototype.format = function()
 						break;
 
 					case 'd':
-						subst = (~~param || 0);
+						subst = Math.floor(+param || 0).toFixed(0);
 						break;
 
 					case 'u':
-						subst = ~~Math.abs(+param || 0);
+						var n = +param || 0;
+						subst = Math.floor((n < 0) ? 0x100000000 + n : n).toFixed(0);
 						break;
 
 					case 'f':
@@ -588,7 +568,7 @@ String.prototype.format = function()
 						break;
 
 					case 'o':
-						subst = (~~param || 0).toString(8);
+						subst = Math.floor(+param || 0).toString(8);
 						break;
 
 					case 's':
@@ -596,11 +576,11 @@ String.prototype.format = function()
 						break;
 
 					case 'x':
-						subst = ('' + (~~param || 0).toString(16)).toLowerCase();
+						subst = Math.floor(+param || 0).toString(16).toLowerCase();
 						break;
 
 					case 'X':
-						subst = ('' + (~~param || 0).toString(16)).toUpperCase();
+						subst = Math.floor(+param || 0).toString(16).toUpperCase();
 						break;
 
 					case 'h':
diff --git a/modules/luci-base/htdocs/luci-static/resources/firewall.js b/modules/luci-base/htdocs/luci-static/resources/firewall.js
index 9ae14e16d..8f6be1813 100644
--- a/modules/luci-base/htdocs/luci-static/resources/firewall.js
+++ b/modules/luci-base/htdocs/luci-static/resources/firewall.js
@@ -99,7 +99,7 @@ Firewall = L.Class.extend({
 			if (name == null || !/^[a-zA-Z0-9_]+$/.test(name))
 				return null;
 
-			if (this.getZone(name) != null)
+			if (lookupZone(name) != null)
 				return null;
 
 			var d = new Defaults(),
diff --git a/modules/luci-base/htdocs/luci-static/resources/form.js b/modules/luci-base/htdocs/luci-static/resources/form.js
index ab0998943..07cacb324 100644
--- a/modules/luci-base/htdocs/luci-static/resources/form.js
+++ b/modules/luci-base/htdocs/luci-static/resources/form.js
@@ -4,6 +4,173 @@
 
 var scope = this;
 
+var CBIJSONConfig = Class.extend({
+	__init__: function(data) {
+		data = Object.assign({}, data);
+
+		this.data = {};
+
+		var num_sections = 0,
+		    section_ids = [];
+
+		for (var sectiontype in data) {
+			if (!data.hasOwnProperty(sectiontype))
+				continue;
+
+			if (L.isObject(data[sectiontype])) {
+				this.data[sectiontype] = Object.assign(data[sectiontype], {
+					'.anonymous': false,
+					'.name': sectiontype,
+					'.type': sectiontype
+				});
+
+				section_ids.push(sectiontype);
+				num_sections++;
+			}
+			else if (Array.isArray(data[sectiontype])) {
+				for (var i = 0, index = 0; i < data[sectiontype].length; i++) {
+					var item = data[sectiontype][i],
+					    anonymous, name;
+
+					if (!L.isObject(item))
+						continue;
+
+					if (typeof(item['.name']) == 'string') {
+						name = item['.name'];
+						anonymous = false;
+					}
+					else {
+						name = sectiontype + num_sections;
+						anonymous = true;
+					}
+
+					if (!this.data.hasOwnProperty(name))
+						section_ids.push(name);
+
+					this.data[name] = Object.assign(item, {
+						'.index': num_sections++,
+						'.anonymous': anonymous,
+						'.name': name,
+						'.type': sectiontype
+					});
+				}
+			}
+		}
+
+		section_ids.sort(L.bind(function(a, b) {
+			var indexA = (this.data[a]['.index'] != null) ? +this.data[a]['.index'] : 9999,
+			    indexB = (this.data[b]['.index'] != null) ? +this.data[b]['.index'] : 9999;
+
+			if (indexA != indexB)
+				return (indexA - indexB);
+
+			return (a > b);
+		}, this));
+
+		for (var i = 0; i < section_ids.length; i++)
+			this.data[section_ids[i]]['.index'] = i;
+	},
+
+	load: function() {
+		return Promise.resolve(this.data);
+	},
+
+	save: function() {
+		return Promise.resolve();
+	},
+
+	get: function(config, section, option) {
+		if (section == null)
+			return null;
+
+		if (option == null)
+			return this.data[section];
+
+		if (!this.data.hasOwnProperty(section))
+			return null;
+
+		var value = this.data[section][option];
+
+		if (Array.isArray(value))
+			return value;
+
+		if (value != null)
+			return String(value);
+
+		return null;
+	},
+
+	set: function(config, section, option, value) {
+		if (section == null || option == null || option.charAt(0) == '.')
+			return;
+
+		if (!this.data.hasOwnProperty(section))
+			return;
+
+		if (value == null)
+			delete this.data[section][option];
+		else if (Array.isArray(value))
+			this.data[section][option] = value;
+		else
+			this.data[section][option] = String(value);
+	},
+
+	unset: function(config, section, option) {
+		return this.set(config, section, option, null);
+	},
+
+	sections: function(config, sectiontype, callback) {
+		var rv = [];
+
+		for (var section_id in this.data)
+			if (sectiontype == null || this.data[section_id]['.type'] == sectiontype)
+				rv.push(this.data[section_id]);
+
+		rv.sort(function(a, b) { return a['.index'] - b['.index'] });
+
+		if (typeof(callback) == 'function')
+			for (var i = 0; i < rv.length; i++)
+				callback.call(this, rv[i], rv[i]['.name']);
+
+		return rv;
+	},
+
+	add: function(config, sectiontype, sectionname) {
+		var num_sections_type = 0, next_index = 0;
+
+		for (var name in this.data) {
+			num_sections_type += (this.data[name]['.type'] == sectiontype);
+			next_index = Math.max(next_index, this.data[name]['.index']);
+		}
+
+		var section_id = sectionname || sectiontype + num_sections_type;
+
+		if (!this.data.hasOwnProperty(section_id)) {
+			this.data[section_id] = {
+				'.name': section_id,
+				'.type': sectiontype,
+				'.anonymous': (sectionname == null),
+				'.index': next_index + 1
+			};
+		}
+
+		return section_id;
+	},
+
+	remove: function(config, section) {
+		if (this.data.hasOwnProperty(section))
+			delete this.data[section];
+	},
+
+	resolveSID: function(config, section_id) {
+		return section_id;
+	},
+
+	move: function(config, section_id1, section_id2, after) {
+		return uci.move.apply(this, [config, section_id1, section_id2, after]);
+	}
+});
+
 var CBINode = Class.extend({
 	__init__: function(title, description) {
 		this.title = title || '';
@@ -52,11 +219,28 @@ var CBINode = Class.extend({
 	},
 
 	stripTags: function(s) {
-		if (!s.match(/[<>]/))
+		if (typeof(s) == 'string' && !s.match(/[<>]/))
 			return s;
 
 		var x = E('div', {}, s);
 		return x.textContent || x.innerText || '';
+	},
+
+	titleFn: function(attr /*, ... */) {
+		var s = null;
+
+		if (typeof(this[attr]) == 'function')
+			s = this[attr].apply(this, this.varargs(arguments, 1));
+		else if (typeof(this[attr]) == 'string')
+			s = (arguments.length > 1) ? ''.format.apply(this[attr], this.varargs(arguments, 1)) : this[attr];
+
+		if (s != null)
+			s = this.stripTags(String(s)).trim();
+
+		if (s == null || s == '')
+			return null;
+
+		return s;
 	}
 });
 
@@ -66,6 +250,7 @@ var CBIMap = CBINode.extend({
 
 		this.config = config;
 		this.parsechain = [ config ];
+		this.data = uci;
 	},
 
 	findElements: function(/* ... */) {
@@ -101,7 +286,7 @@ var CBIMap = CBINode.extend({
 	},
 
 	load: function() {
-		return uci.load(this.parsechain || [ this.config ])
+		return this.data.load(this.parsechain || [ this.config ])
 			.then(this.loadChildren.bind(this));
 	},
 
@@ -115,17 +300,19 @@ var CBIMap = CBINode.extend({
 		return Promise.all(tasks);
 	},
 
-	save: function() {
+	save: function(cb, silent) {
 		this.checkDepends();
 
 		return this.parse()
-			.then(uci.save.bind(uci))
+			.then(cb)
+			.then(this.data.save.bind(this.data))
 			.then(this.load.bind(this))
-			.then(this.renderContents.bind(this))
 			.catch(function(e) {
-				alert('Cannot save due to invalid values')
+				if (!silent)
+					alert('Cannot save due to invalid values');
+
 				return Promise.reject();
-			});
+			}).finally(this.renderContents.bind(this));
 	},
 
 	reset: function() {
@@ -156,7 +343,10 @@ var CBIMap = CBINode.extend({
 			if (this.description != null && this.description != '')
 				mapEl.appendChild(E('div', { 'class': 'cbi-map-descr' }, this.description));
 
-			L.dom.append(mapEl, nodes);
+			if (this.tabbed)
+				L.dom.append(mapEl, E('div', { 'class': 'cbi-map-tabbed' }, nodes));
+			else
+				L.dom.append(mapEl, nodes);
 
 			if (!initialRender) {
 				mapEl.classList.remove('flash');
@@ -168,17 +358,22 @@ var CBIMap = CBINode.extend({
 
 			this.checkDepends();
 
+			var tabGroups = mapEl.querySelectorAll('.cbi-map-tabbed, .cbi-section-node-tabbed');
+
+			for (var i = 0; i < tabGroups.length; i++)
+				ui.tabs.initTabGroup(tabGroups[i].childNodes);
+
 			return mapEl;
 		}, this));
 	},
 
-	lookupOption: function(name, section_id) {
+	lookupOption: function(name, section_id, config_name) {
 		var id, elem, sid, inst;
 
 		if (name.indexOf('.') > -1)
 			id = 'cbid.%s'.format(name);
 		else
-			id = 'cbid.%s.%s.%s'.format(this.config, section_id, name);
+			id = 'cbid.%s.%s.%s'.format(config_name || this.config, section_id, name);
 
 		elem = this.findElement('data-field', id);
 		sid  = elem ? id.split(/\./)[2] : null;
@@ -198,6 +393,49 @@ var CBIMap = CBINode.extend({
 			this.checkDepends(ev, (n || 10) + 1);
 
 		ui.tabs.updateTabs(ev, this.root);
+	},
+
+	isDependencySatisfied: function(depends, config_name, section_id) {
+		var def = false;
+
+		if (!Array.isArray(depends) || !depends.length)
+			return true;
+
+		for (var i = 0; i < depends.length; i++) {
+			var istat = true,
+			    reverse = false;
+
+			for (var dep in depends[i]) {
+				if (dep == '!reverse') {
+					reverse = true;
+				}
+				else if (dep == '!default') {
+					def = true;
+					istat = false;
+				}
+				else {
+					var res = this.lookupOption(dep, section_id, config_name),
+					    val = (res && res[0].isActive(res[1])) ? res[0].formvalue(res[1]) : null;
+
+					istat = (istat && isEqual(val, depends[i][dep]));
+				}
+			}
+
+			if (istat ^ reverse)
+				return true;
+		}
+
+		return def;
+	}
+});
+
+var CBIJSONMap = CBIMap.extend({
+	__init__: function(data /*, ... */) {
+		this.super('__init__', this.varargs(arguments, 1, 'json'));
+
+		this.config = 'json';
+		this.parsechain = [ 'json' ];
+		this.data = new CBIJSONConfig(data);
 	}
 });
 
@@ -437,7 +675,11 @@ var CBIAbstractValue = CBINode.extend({
 						else if (k.indexOf('.') !== -1)
 							dep['cbid.%s'.format(k)] = list[i][k];
 						else
-							dep['cbid.%s.%s.%s'.format(this.config, this.ucisection || section_id, k)] = list[i][k];
+							dep['cbid.%s.%s.%s'.format(
+								this.uciconfig || this.section.uciconfig || this.map.config,
+								this.ucisection || section_id,
+								k
+							)] = list[i][k];
 					}
 				}
 
@@ -466,51 +708,59 @@ var CBIAbstractValue = CBINode.extend({
 	},
 
 	checkDepends: function(section_id) {
-		var def = false;
+		var config_name = this.uciconfig || this.section.uciconfig || this.map.config,
+		    active = this.map.isDependencySatisfied(this.deps, config_name, section_id);
 
-		if (!Array.isArray(this.deps) || !this.deps.length)
-			return true;
+		if (active)
+			this.updateDefaultValue(section_id);
 
-		for (var i = 0; i < this.deps.length; i++) {
-			var istat = true,
-			    reverse = false;
+		return active;
+	},
 
-			for (var dep in this.deps[i]) {
-				if (dep == '!reverse') {
-					reverse = true;
-				}
-				else if (dep == '!default') {
-					def = true;
-					istat = false;
-				}
-				else {
-					var res = this.map.lookupOption(dep, section_id),
-					    val = res ? res[0].formvalue(res[1]) : null;
+	updateDefaultValue: function(section_id) {
+		if (!L.isObject(this.defaults))
+			return;
 
-					istat = (istat && isEqual(val, this.deps[i][dep]));
-				}
-			}
+		var config_name = this.uciconfig || this.section.uciconfig || this.map.config,
+		    cfgvalue = L.toArray(this.cfgvalue(section_id))[0],
+		    default_defval = null, satisified_defval = null;
 
-			if (istat ^ reverse)
-				return true;
+		for (var value in this.defaults) {
+			if (!this.defaults[value] || this.defaults[value].length == 0) {
+				default_defval = value;
+				continue;
+			}
+			else if (this.map.isDependencySatisfied(this.defaults[value], config_name, section_id)) {
+				satisified_defval = value;
+				break;
+			}
 		}
 
-		return def;
+		if (satisified_defval == null)
+			satisified_defval = default_defval;
+
+		var node = this.map.findElement('id', this.cbid(section_id));
+		if (node && node.getAttribute('data-changed') != 'true' && satisified_defval != null && cfgvalue == null)
+			L.dom.callClassMethod(node, 'setValue', satisified_defval);
+
+		this.default = satisified_defval;
 	},
 
 	cbid: function(section_id) {
 		if (section_id == null)
 			L.error('TypeError', 'Section ID required');
 
-		return 'cbid.%s.%s.%s'.format(this.map.config, section_id, this.option);
+		return 'cbid.%s.%s.%s'.format(
+			this.uciconfig || this.section.uciconfig || this.map.config,
+			section_id, this.option);
 	},
 
 	load: function(section_id) {
 		if (section_id == null)
 			L.error('TypeError', 'Section ID required');
 
-		return uci.get(
-			this.uciconfig || this.map.config,
+		return this.map.data.get(
+			this.uciconfig || this.section.uciconfig || this.map.config,
 			this.ucisection || section_id,
 			this.ucioption || this.option);
 	},
@@ -597,16 +847,16 @@ var CBIAbstractValue = CBINode.extend({
 	},
 
 	write: function(section_id, formvalue) {
-		return uci.set(
-			this.uciconfig || this.map.config,
+		return this.map.data.set(
+			this.uciconfig || this.section.uciconfig || this.map.config,
 			this.ucisection || section_id,
 			this.ucioption || this.option,
 			formvalue);
 	},
 
 	remove: function(section_id) {
-		return uci.unset(
-			this.uciconfig || this.map.config,
+		return this.map.data.unset(
+			this.uciconfig || this.section.uciconfig || this.map.config,
 			this.ucisection || section_id,
 			this.ucioption || this.option);
 	}
@@ -616,7 +866,7 @@ var CBITypedSection = CBIAbstractSection.extend({
 	__name__: 'CBI.TypedSection',
 
 	cfgsections: function() {
-		return uci.sections(this.uciconfig || this.map.config, this.sectiontype)
+		return this.map.data.sections(this.uciconfig || this.map.config, this.sectiontype)
 			.map(function(s) { return s['.name'] })
 			.filter(L.bind(this.filter, this));
 	},
@@ -624,15 +874,15 @@ var CBITypedSection = CBIAbstractSection.extend({
 	handleAdd: function(ev, name) {
 		var config_name = this.uciconfig || this.map.config;
 
-		uci.add(config_name, this.sectiontype, name);
-		this.map.save();
+		this.map.data.add(config_name, this.sectiontype, name);
+		return this.map.save(null, true);
 	},
 
 	handleRemove: function(section_id, ev) {
 		var config_name = this.uciconfig || this.map.config;
 
-		uci.remove(config_name, section_id);
-		this.map.save();
+		this.map.data.remove(config_name, section_id);
+		return this.map.save(null, true);
 	},
 
 	renderSectionAdd: function(extra_class) {
@@ -640,19 +890,18 @@ var CBITypedSection = CBIAbstractSection.extend({
 			return E([]);
 
 		var createEl = E('div', { 'class': 'cbi-section-create' }),
-		    config_name = this.uciconfig || this.map.config;
+		    config_name = this.uciconfig || this.map.config,
+		    btn_title = this.titleFn('addbtntitle');
 
 		if (extra_class != null)
 			createEl.classList.add(extra_class);
 
 		if (this.anonymous) {
-			createEl.appendChild(E('input', {
-				'type': 'submit',
+			createEl.appendChild(E('button', {
 				'class': 'cbi-button cbi-button-add',
-				'value': _('Add'),
-				'title': _('Add'),
-				'click': L.bind(this.handleAdd, this)
-			}));
+				'title': btn_title || _('Add'),
+				'click': L.ui.createHandlerFn(this, 'handleAdd')
+			}, [ btn_title || _('Add') ]));
 		}
 		else {
 			var nameEl = E('input', {
@@ -665,14 +914,14 @@ var CBITypedSection = CBIAbstractSection.extend({
 				E('input', {
 					'class': 'cbi-button cbi-button-add',
 					'type': 'submit',
-					'value': _('Add'),
-					'title': _('Add'),
-					'click': L.bind(function(ev) {
+					'value': btn_title || _('Add'),
+					'title': btn_title || _('Add'),
+					'click': L.ui.createHandlerFn(this, function(ev) {
 						if (nameEl.classList.contains('cbi-input-invalid'))
 							return;
 
-						this.handleAdd(ev, nameEl.value);
-					}, this)
+						return this.handleAdd(ev, nameEl.value);
+					})
 				})
 			]);
 
@@ -682,12 +931,21 @@ var CBITypedSection = CBIAbstractSection.extend({
 		return createEl;
 	},
 
+	renderSectionPlaceholder: function() {
+		return E([
+			E('em', _('This section contains no values yet')),
+			E('br'), E('br')
+		]);
+	},
+
 	renderContents: function(cfgsections, nodes) {
 		var section_id = null,
 		    config_name = this.uciconfig || this.map.config,
 		    sectionEl = E('div', {
 				'id': 'cbi-%s-%s'.format(config_name, this.sectiontype),
-				'class': 'cbi-section'
+				'class': 'cbi-section',
+				'data-tab': this.map.tabbed ? this.sectiontype : null,
+				'data-tab-title': this.map.tabbed ? this.title || this.sectiontype : null
 			});
 
 		if (this.title != null && this.title != '')
@@ -700,14 +958,12 @@ var CBITypedSection = CBIAbstractSection.extend({
 			if (this.addremove) {
 				sectionEl.appendChild(
 					E('div', { 'class': 'cbi-section-remove right' },
-						E('input', {
-							'type': 'submit',
+						E('button', {
 							'class': 'cbi-button',
 							'name': 'cbi.rts.%s.%s'.format(config_name, cfgsections[i]),
-							'value': _('Delete'),
 							'data-section-id': cfgsections[i],
-							'click': L.bind(this.handleRemove, this, cfgsections[i])
-						})));
+							'click': L.ui.createHandlerFn(this, 'handleRemove', cfgsections[i])
+						}, [ _('Delete') ])));
 			}
 
 			if (!this.anonymous)
@@ -716,18 +972,13 @@ var CBITypedSection = CBIAbstractSection.extend({
 			sectionEl.appendChild(E('div', {
 				'id': 'cbi-%s-%s'.format(config_name, cfgsections[i]),
 				'class': this.tabs
-					? 'cbi-section-node cbi-section-node-tabbed' : 'cbi-section-node'
+					? 'cbi-section-node cbi-section-node-tabbed' : 'cbi-section-node',
+				'data-section-id': cfgsections[i]
 			}, nodes[i]));
-
-			if (this.tabs)
-				ui.tabs.initTabGroup(sectionEl.lastChild.childNodes);
 		}
 
 		if (nodes.length == 0)
-			L.dom.append(sectionEl, [
-				E('em', _('This section contains no values yet')),
-				E('br'), E('br')
-			]);
+			sectionEl.appendChild(this.renderSectionPlaceholder());
 
 		sectionEl.appendChild(this.renderSectionAdd());
 
@@ -761,7 +1012,9 @@ var CBITableSection = CBITypedSection.extend({
 		    has_more = max_cols < this.children.length,
 		    sectionEl = E('div', {
 				'id': 'cbi-%s-%s'.format(config_name, this.sectiontype),
-				'class': 'cbi-section cbi-tblsection'
+				'class': 'cbi-section cbi-tblsection',
+				'data-tab': this.map.tabbed ? this.sectiontype : null,
+				'data-tab-title': this.map.tabbed ? this.title || this.sectiontype : null
 			}),
 			tableEl = E('div', {
 				'class': 'table cbi-section-table'
@@ -776,8 +1029,7 @@ var CBITableSection = CBITypedSection.extend({
 		tableEl.appendChild(this.renderHeaderRows(max_cols));
 
 		for (var i = 0; i < nodes.length; i++) {
-			var sectionname = this.stripTags((typeof(this.sectiontitle) == 'function')
-				? String(this.sectiontitle(cfgsections[i]) || '') : cfgsections[i]).trim();
+			var sectionname = this.titleFn('sectiontitle', cfgsections[i]);
 
 			var trEl = E('div', {
 				'id': 'cbi-%s-%s'.format(config_name, cfgsections[i]),
@@ -791,7 +1043,8 @@ var CBITableSection = CBITypedSection.extend({
 				'dragleave': this.sortable ? L.bind(this.handleDragLeave, this) : null,
 				'dragend': this.sortable ? L.bind(this.handleDragEnd, this) : null,
 				'drop': this.sortable ? L.bind(this.handleDrop, this) : null,
-				'data-title': (sectionname && (!this.anonymous || this.sectiontitle)) ? sectionname : null
+				'data-title': (sectionname && (!this.anonymous || this.sectiontitle)) ? sectionname : null,
+				'data-section-id': cfgsections[i]
 			});
 
 			if (this.extedit || this.rowcolors)
@@ -822,6 +1075,8 @@ var CBITableSection = CBITypedSection.extend({
 	renderHeaderRows: function(max_cols) {
 		var has_titles = false,
 		    has_descriptions = false,
+		    max_cols = isNaN(this.max_cols) ? this.children.length : this.max_cols,
+		    has_more = max_cols < this.children.length,
 		    anon_class = (!this.anonymous || this.sectiontitle) ? 'named' : 'anonymous',
 		    trEls = E([]);
 
@@ -931,40 +1186,36 @@ var CBITableSection = CBITypedSection.extend({
 				}, this, section_id);
 
 			L.dom.append(tdEl.lastElementChild,
-				E('input', {
-					'type': 'button',
-					'value': _('Edit'),
+				E('button', {
 					'title': _('Edit'),
 					'class': 'cbi-button cbi-button-edit',
 					'click': evFn
-				})
+				}, [ _('Edit') ])
 			);
 		}
 
 		if (more_label) {
 			L.dom.append(tdEl.lastElementChild,
-				E('input', {
-					'type': 'button',
-					'value': more_label,
+				E('button', {
 					'title': more_label,
 					'class': 'cbi-button cbi-button-edit',
-					'click': L.bind(this.renderMoreOptionsModal, this, section_id)
-				})
+					'click': L.ui.createHandlerFn(this, 'renderMoreOptionsModal', section_id)
+				}, [ more_label ])
 			);
 		}
 
 		if (this.addremove) {
+			var btn_title = this.titleFn('removebtntitle', section_id);
+
 			L.dom.append(tdEl.lastElementChild,
-				E('input', {
-					'type': 'submit',
-					'value': _('Delete'),
-					'title': _('Delete'),
+				E('button', {
+					'title': btn_title || _('Delete'),
 					'class': 'cbi-button cbi-button-remove',
-					'click': L.bind(function(sid, ev) {
-						uci.remove(config_name, sid);
-						this.map.save();
-					}, this, section_id)
-				})
+					'click': L.ui.createHandlerFn(this, function(sid, ev) {
+						this.map.data.remove(config_name, sid);
+						return this.map.save(null, true);
+					}, section_id)
+				}, [ btn_title || _('Delete') ])
 			);
 		}
 
@@ -1045,7 +1296,7 @@ var CBITableSection = CBITypedSection.extend({
 		        sid2 = s.targetNode.getAttribute('data-sid');
 
 		    s.node.parentNode.insertBefore(s.node, ref_node);
-		    uci.move(config_name, sid1, sid2, after);
+		    this.map.data.move(config_name, sid1, sid2, after);
 		}
 
 		scope.dragState = null;
@@ -1077,16 +1328,18 @@ var CBITableSection = CBITypedSection.extend({
 		    name = null,
 		    m = new CBIMap(this.map.config, null, null),
 		    s = m.section(CBINamedSection, section_id, this.sectiontype);
-		    s.tabs = this.tabs;
-		    s.tab_names = this.tab_names;
 
-		if (typeof(this.sectiontitle) == 'function')
-			name = this.stripTags(String(this.sectiontitle(section_id) || ''));
-		else if (!this.anonymous)
-			name = section_id;
+		m.parent = parent;
+
+		s.tabs = this.tabs;
+		s.tab_names = this.tab_names;
 
-		if (name)
-			title += ' - ' + name;
+		if ((name = this.titleFn('modaltitle', section_id)) != null)
+			title = name;
+		else if ((name = this.titleFn('sectiontitle', section_id)) != null)
+			title = '%s - %s'.format(parent.title, name);
+		else if (!this.anonymous)
+			title = '%s - %s'.format(parent.title, section_id);
 
 		for (var i = 0; i < this.children.length; i++) {
 			var o1 = this.children[i];
@@ -1114,24 +1367,18 @@ var CBITableSection = CBITypedSection.extend({
 			}
 		}
 
-		//ev.target.classList.add('spinning');
-		Promise.resolve(this.addModalOptions(s, section_id, ev)).then(L.bind(m.render, m)).then(L.bind(function(nodes) {
-			//ev.target.classList.remove('spinning');
+		return Promise.resolve(this.addModalOptions(s, section_id, ev)).then(L.bind(m.render, m)).then(L.bind(function(nodes) {
 			L.ui.showModal(title, [
 				nodes,
 				E('div', { 'class': 'right' }, [
-					E('input', {
-						'type': 'button',
+					E('button', {
 						'class': 'btn',
-						'click': L.bind(this.handleModalCancel, this, m),
-						'value': _('Dismiss')
-					}), ' ',
-					E('input', {
-						'type': 'button',
+						'click': L.ui.createHandlerFn(this, 'handleModalCancel', m)
+					}, [ _('Dismiss') ]), ' ',
+					E('button', {
 						'class': 'cbi-button cbi-button-positive important',
-						'click': L.bind(this.handleModalSave, this, m),
-						'value': _('Save')
-					})
+						'click': L.ui.createHandlerFn(this, 'handleModalSave', m)
+					}, [ _('Save') ])
 				])
 			], 'cbi-modal');
 		}, this)).catch(L.error);
@@ -1145,10 +1392,10 @@ var CBIGridSection = CBITableSection.extend({
 
 	handleAdd: function(ev) {
 		var config_name = this.uciconfig || this.map.config,
-		    section_id = uci.add(config_name, this.sectiontype);
+		    section_id = this.map.data.add(config_name, this.sectiontype);
 
-	    this.addedSection = section_id;
-		this.renderMoreOptionsModal(section_id);
+		this.addedSection = section_id;
+		return this.renderMoreOptionsModal(section_id);
 	},
 
 	handleModalSave: function(/* ... */) {
@@ -1160,7 +1407,7 @@ var CBIGridSection = CBITableSection.extend({
 		var config_name = this.uciconfig || this.map.config;
 
 		if (this.addedSection != null) {
-			uci.remove(config_name, this.addedSection);
+			this.map.data.remove(config_name, this.addedSection);
 			this.addedSection = null;
 		}
 
@@ -1194,7 +1441,7 @@ var CBIGridSection = CBITableSection.extend({
 
 		return E('div', {
 			'class': 'td cbi-value-field',
-			'data-title': (title != '') ? title : opt.option,
+			'data-title': (title != '') ? title : null,
 			'data-description': (descr != '') ? descr : null,
 			'data-name': opt.option,
 			'data-type': opt.typename || opt.__name__
@@ -1240,16 +1487,16 @@ var CBINamedSection = CBIAbstractSection.extend({
 		var section_id = this.section,
 		    config_name = this.uciconfig || this.map.config;
 
-		uci.add(config_name, this.sectiontype, section_id);
-		this.map.save();
+		this.map.data.add(config_name, this.sectiontype, section_id);
+		return this.map.save(null, true);
 	},
 
 	handleRemove: function(ev) {
 		var section_id = this.section,
 		    config_name = this.uciconfig || this.map.config;
 
-		uci.remove(config_name, section_id);
-		this.map.save();
+		this.map.data.remove(config_name, section_id);
+		return this.map.save(null, true);
 	},
 
 	renderContents: function(data) {
@@ -1258,7 +1505,9 @@ var CBINamedSection = CBIAbstractSection.extend({
 		    config_name = this.uciconfig || this.map.config,
 		    sectionEl = E('div', {
 				'id': ucidata ? null : 'cbi-%s-%s'.format(config_name, section_id),
-				'class': 'cbi-section'
+				'class': 'cbi-section',
+				'data-tab': this.map.tabbed ? this.sectiontype : null,
+				'data-tab-title': this.map.tabbed ? this.title || this.sectiontype : null
 			});
 
 		if (typeof(this.title) === 'string' && this.title !== '')
@@ -1271,31 +1520,25 @@ var CBINamedSection = CBIAbstractSection.extend({
 			if (this.addremove) {
 				sectionEl.appendChild(
 					E('div', { 'class': 'cbi-section-remove right' },
-						E('input', {
-							'type': 'submit',
+						E('button', {
 							'class': 'cbi-button',
-							'value': _('Delete'),
-							'click': L.bind(this.handleRemove, this)
-						})));
+							'click': L.ui.createHandlerFn(this, 'handleRemove')
+						}, [ _('Delete') ])));
 			}
 
 			sectionEl.appendChild(E('div', {
 				'id': 'cbi-%s-%s'.format(config_name, section_id),
 				'class': this.tabs
-					? 'cbi-section-node cbi-section-node-tabbed' : 'cbi-section-node'
+					? 'cbi-section-node cbi-section-node-tabbed' : 'cbi-section-node',
+				'data-section-id': section_id
 			}, nodes));
-
-			if (this.tabs)
-				ui.tabs.initTabGroup(sectionEl.lastChild.childNodes);
 		}
 		else if (this.addremove) {
 			sectionEl.appendChild(
-				E('input', {
-					'type': 'submit',
+				E('button', {
 					'class': 'cbi-button cbi-button-add',
-					'value': _('Add'),
-					'click': L.bind(this.handleAdd, this)
-				}));
+					'click': L.ui.createHandlerFn(this, 'handleAdd')
+				}, [ _('Add') ]));
 		}
 
 		L.dom.bindClassInstance(sectionEl, this);
@@ -1308,7 +1551,7 @@ var CBINamedSection = CBIAbstractSection.extend({
 		    section_id = this.section;
 
 		return Promise.all([
-			uci.get(config_name, section_id),
+			this.map.data.get(config_name, section_id),
 			this.renderUCISection(section_id)
 		]).then(this.renderContents.bind(this));
 	}
@@ -1332,14 +1575,15 @@ var CBIValue = CBIAbstractValue.extend({
 	},
 
 	renderFrame: function(section_id, in_table, option_index, nodes) {
-		var config_name = this.uciconfig || this.map.config,
+		var config_name = this.uciconfig || this.section.uciconfig || this.map.config,
 		    depend_list = this.transformDepList(section_id),
 		    optionEl;
 
 		if (in_table) {
+			var title = this.stripTags(this.title).trim();
 			optionEl = E('div', {
 				'class': 'td cbi-value-field',
-				'data-title': this.stripTags(this.title).trim(),
+				'data-title': (title != '') ? title : null,
 				'data-description': this.stripTags(this.description).trim(),
 				'data-name': this.option,
 				'data-type': this.typename || (this.template ? this.template.replace(/^.+\//, '') : null) || this.__name__
@@ -1558,6 +1802,29 @@ var CBIMultiValue = CBIDynamicList.extend({
 	},
 });
 
+var CBITextValue = CBIValue.extend({
+	__name__: 'CBI.TextValue',
+
+	value: null,
+
+	renderWidget: function(section_id, option_index, cfgvalue) {
+		var value = (cfgvalue != null) ? cfgvalue : this.default;
+
+		var widget = new ui.Textarea(value, {
+			id: this.cbid(section_id),
+			optional: this.optional || this.rmempty,
+			placeholder: this.placeholder,
+			monospace: this.monospace,
+			cols: this.cols,
+			rows: this.rows,
+			wrap: this.wrap,
+			validate: L.bind(this.validate, this, section_id)
+		});
+
+		return widget.render();
+	}
+});
+
 var CBIDummyValue = CBIValue.extend({
 	__name__: 'CBI.DummyValue',
 
@@ -1577,34 +1844,37 @@ var CBIDummyValue = CBIValue.extend({
 			hiddenEl.render()
 		]);
 	},
+
+	remove: function() {},
+	write: function() {}
 });
 
 var CBIButtonValue = CBIValue.extend({
 	__name__: 'CBI.ButtonValue',
 
 	renderWidget: function(section_id, option_index, cfgvalue) {
-		var value = (cfgvalue != null) ? cfgvalue : this.default;
+		var value = (cfgvalue != null) ? cfgvalue : this.default,
+		    hiddenEl = new ui.Hiddenfield(value, { id: this.cbid(section_id) }),
+		    outputEl = E('div'),
+		    btn_title = this.titleFn('inputtitle', section_id) || this.titleFn('title', section_id);
 
 		if (value !== false)
-			return E([
-				E('input', {
-					'type': 'hidden',
-					'id': this.cbid(section_id)
-				}),
-				E('input', {
+			L.dom.content(outputEl, [
+				E('button', {
 					'class': 'cbi-button cbi-button-%s'.format(this.inputstyle || 'button'),
-					'type': 'submit',
-					//'id': this.cbid(section_id),
-					//'name': this.cbid(section_id),
-					'value': this.inputtitle || this.title,
-					'click': L.bind(function(ev) {
-						ev.target.previousElementSibling.value = ev.target.value;
-						this.map.save();
-					}, this)
-				})
+					'click': L.ui.createHandlerFn(this, this.onclick || function(ev) {
+						ev.currentTarget.parentNode.nextElementSibling.value = value;
+						return this.map.save();
+					})
+				}, [ btn_title ])
 			]);
 		else
-			return document.createTextNode(' - ');
+			L.dom.content(outputEl, ' - ');
+
+		return E([
+			outputEl,
+			hiddenEl.render()
+		]);
 	}
 });
 
@@ -1620,6 +1890,32 @@ var CBIHiddenValue = CBIValue.extend({
 	}
 });
 
+var CBIFileUpload = CBIValue.extend({
+	__name__: 'CBI.FileSelect',
+
+	__init__: function(/* ... */) {
+		this.super('__init__', arguments);
+
+		this.show_hidden = false;
+		this.enable_upload = true;
+		this.enable_remove = true;
+		this.root_directory = '/etc/luci-uploads';
+	},
+
+	renderWidget: function(section_id, option_index, cfgvalue) {
+		var browserEl = new ui.FileUpload((cfgvalue != null) ? cfgvalue : this.default, {
+			id: this.cbid(section_id),
+			name: this.cbid(section_id),
+			show_hidden: this.show_hidden,
+			enable_upload: this.enable_upload,
+			enable_remove: this.enable_remove,
+			root_directory: this.root_directory
+		});
+
+		return browserEl.render();
+	}
+});
+
 var CBISectionValue = CBIValue.extend({
 	__name__: 'CBI.ContainerValue',
 	__init__: function(map, section, option, cbiClass /*, ... */) {
@@ -1645,7 +1941,7 @@ var CBISectionValue = CBIValue.extend({
 
 	checkDepends: function(section_id) {
 		this.subsection.checkDepends();
-		return this.super('checkDepends');
+		return CBIValue.prototype.checkDepends.apply(this, [ section_id ]);
 	},
 
 	write: function() {},
@@ -1656,6 +1952,7 @@ var CBISectionValue = CBIValue.extend({
 
 return L.Class.extend({
 	Map: CBIMap,
+	JSONMap: CBIJSONMap,
 	AbstractSection: CBIAbstractSection,
 	AbstractValue: CBIAbstractValue,
 
@@ -1669,8 +1966,10 @@ return L.Class.extend({
 	ListValue: CBIListValue,
 	Flag: CBIFlagValue,
 	MultiValue: CBIMultiValue,
+	TextValue: CBITextValue,
 	DummyValue: CBIDummyValue,
 	Button: CBIButtonValue,
 	HiddenValue: CBIHiddenValue,
+	FileUpload: CBIFileUpload,
 	SectionValue: CBISectionValue
 });
diff --git a/modules/luci-base/htdocs/luci-static/resources/luci.js b/modules/luci-base/htdocs/luci-static/resources/luci.js
index 66f32d722..4e3c8445a 100644
--- a/modules/luci-base/htdocs/luci-static/resources/luci.js
+++ b/modules/luci-base/htdocs/luci-static/resources/luci.js
@@ -360,8 +360,13 @@
 						break;
 
 					case 'object':
-						content = JSON.stringify(opt.content);
-						contenttype = 'application/json';
+						if (!(opt.content instanceof FormData)) {
+							content = JSON.stringify(opt.content);
+							contenttype = 'application/json';
+						}
+						else {
+							content = opt.content;
+						}
 						break;
 
 					default:
@@ -378,6 +383,9 @@
 								contenttype = opt.headers[header];
 						}
 
+				if ('progress' in opt && 'upload' in opt.xhr)
+					opt.xhr.upload.addEventListener('progress', opt.progress);
+
 				if (contenttype != null)
 					opt.xhr.setRequestHeader('Content-Type', contenttype);
 
@@ -391,17 +399,21 @@
 		},
 
 		handleReadyStateChange: function(resolveFn, rejectFn, ev) {
-			var xhr = this.xhr;
+			var xhr = this.xhr,
+			    duration = Date.now() - this.start;
 
 			if (xhr.readyState !== 4)
 				return;
 
 			if (xhr.status === 0 && xhr.statusText === '') {
-				rejectFn.call(this, new Error('XHR request aborted by browser'));
+				if (duration >= this.timeout)
+					rejectFn.call(this, new Error('XHR request timed out'));
+				else
+					rejectFn.call(this, new Error('XHR request aborted by browser'));
 			}
 			else {
 				var response = new Response(
-					xhr, xhr.responseURL || this.url, Date.now() - this.start);
+					xhr, xhr.responseURL || this.url, duration);
 
 				Promise.all(Request.interceptors.map(function(fn) { return fn(response) }))
 					.then(resolveFn.bind(this, response))
@@ -491,7 +503,7 @@
 			return true;
 		},
 
-		remove: function(entry) {
+		remove: function(fn) {
 			if (typeof(fn) != 'function')
 				throw new TypeError('Invalid argument to LuCI.Poll.remove()');
 
@@ -559,6 +571,7 @@
 	    domParser = null,
 	    originalCBIInit = null,
 	    rpcBaseURL = null,
+	    sysFeatures = null,
 	    classes = {};
 
 	var LuCI = Class.extend({
@@ -566,8 +579,13 @@
 		__init__: function(env) {
 
 			document.querySelectorAll('script[src*="/luci.js"]').forEach(function(s) {
-				if (env.base_url == null || env.base_url == '')
-					env.base_url = s.getAttribute('src').replace(/\/luci\.js(?:\?v=[^?]+)?$/, '');
+				if (env.base_url == null || env.base_url == '') {
+					var m = (s.getAttribute('src') || '').match(/^(.*)\/luci\.js(?:\?v=([^?]+))?$/);
+					if (m) {
+						env.base_url = m[1];
+						env.resource_version = m[2];
+					}
+				}
 			});
 
 			if (env.base_url == null)
@@ -610,16 +628,35 @@
 
 			if (type instanceof Error) {
 				e = type;
-				stack = (e.stack || '').split(/\n/);
 
 				if (msg)
 					e.message = msg + ': ' + e.message;
 			}
 			else {
+				try { throw new Error('stacktrace') }
+				catch (e2) { stack = (e2.stack || '').split(/\n/) }
+
 				e = new (window[type || 'Error'] || Error)(msg || 'Unspecified error');
 				e.name = type || 'Error';
 			}
 
+			stack = (stack || []).map(function(frame) {
+				frame = frame.replace(/(.*?)@(.+):(\d+):(\d+)/g, 'at $1 ($2:$3:$4)').trim();
+				return frame ? '  ' + frame : '';
+			});
+
+			if (!/^  at /.test(stack[0]))
+				stack.shift();
+
+			if (/\braise /.test(stack[0]))
+				stack.shift();
+
+			if (/\berror /.test(stack[0]))
+				stack.shift();
+
+			if (stack.length)
+				e.message += '\n' + stack.join('\n');
+
 			if (window.console && console.debug)
 				console.debug(e);
 
@@ -631,28 +668,16 @@
 				L.raise.apply(L, Array.prototype.slice.call(arguments));
 			}
 			catch (e) {
-				var stack = (e.stack || '').split(/\n/).map(function(frame) {
-					frame = frame.replace(/(.*?)@(.+):(\d+):(\d+)/g, 'at $1 ($2:$3:$4)').trim();
-					return frame ? '  ' + frame : '';
-				});
-
-				if (!/^  at /.test(stack[0]))
-					stack.shift();
-
-				if (/\braise /.test(stack[0]))
-					stack.shift();
-
-				if (/\berror /.test(stack[0]))
-					stack.shift();
-
-				stack = stack.length ? '\n' + stack.join('\n') : '';
+				if (!e.reported) {
+					if (L.ui)
+						L.ui.addNotification(e.name || _('Runtime error'),
+							E('pre', {}, e.message), 'danger');
+					else
+						L.dom.content(document.querySelector('#maincontent'),
+							E('pre', { 'class': 'alert-message error' }, e.message));
 
-				if (L.ui)
-					L.ui.showModal(e.name || _('Runtime error'),
-						E('pre', { 'class': 'alert-message error' }, e.message + stack));
-				else
-					L.dom.content(document.querySelector('#maincontent'),
-						E('pre', { 'class': 'alert-message error' }, e + stack));
+					e.reported = true;
+				}
 
 				throw e;
 			}
@@ -677,7 +702,7 @@
 				return classes[name];
 			}
 
-			url = '%s/%s.js'.format(L.env.base_url, name.replace(/\./g, '/'));
+			url = '%s/%s.js%s'.format(L.env.base_url, name.replace(/\./g, '/'), (L.env.resource_version ? '?v=' + L.env.resource_version : ''));
 			from = [ name ].concat(from);
 
 			var compileClass = function(res) {
@@ -797,6 +822,70 @@
 			return Promise.resolve(rpcBaseURL);
 		},
 
+		probeSystemFeatures: function() {
+			var sessionid = classes.rpc.getSessionID();
+
+			if (sysFeatures == null) {
+				try {
+					var data = JSON.parse(window.sessionStorage.getItem('sysFeatures'));
+
+					if (this.isObject(data) && this.isObject(data[sessionid]))
+						sysFeatures = data[sessionid];
+				}
+				catch (e) {}
+			}
+
+			if (!this.isObject(sysFeatures)) {
+				sysFeatures = classes.rpc.declare({
+					object: 'luci',
+					method: 'getFeatures',
+					expect: { '': {} }
+				})().then(function(features) {
+					try {
+						var data = {};
+						    data[sessionid] = features;
+
+						window.sessionStorage.setItem('sysFeatures', JSON.stringify(data));
+					}
+					catch (e) {}
+
+					sysFeatures = features;
+
+					return features;
+				});
+			}
+
+			return Promise.resolve(sysFeatures);
+		},
+
+		hasSystemFeature: function() {
+			var ft = sysFeatures[arguments[0]];
+
+			if (arguments.length == 2)
+				return this.isObject(ft) ? ft[arguments[1]] : null;
+
+			return (ft != null && ft != false);
+		},
+
+		notifySessionExpiry: function() {
+			Poll.stop();
+
+			L.ui.showModal(_('Session expired'), [
+				E('div', { class: 'alert-message warning' },
+					_('A new login is required since the authentication session expired.')),
+				E('div', { class: 'right' },
+					E('div', {
+						class: 'btn primary',
+						click: function() {
+							var loc = window.location;
+							window.location = loc.protocol + '//' + loc.host + loc.pathname + loc.search;
+						}
+					}, _('To login…')))
+			]);
+
+			L.raise('SessionError', 'Login session is expired');
+		},
+
 		setupDOM: function(res) {
 			var domEv = res[0],
 			    uiClass = res[1],
@@ -806,32 +895,39 @@
 
 			rpcClass.setBaseURL(rpcBaseURL);
 
-			Request.addInterceptor(function(res) {
-				if (res.status != 403 || res.headers.get('X-LuCI-Login-Required') != 'yes')
+			rpcClass.addInterceptor(function(msg, req) {
+				if (!L.isObject(msg) || !L.isObject(msg.error) || msg.error.code != -32002)
 					return;
 
-				Poll.stop();
-
-				L.ui.showModal(_('Session expired'), [
-					E('div', { class: 'alert-message warning' },
-						_('A new login is required since the authentication session expired.')),
-					E('div', { class: 'right' },
-						E('div', {
-							class: 'btn primary',
-							click: function() {
-								var loc = window.location;
-								window.location = loc.protocol + '//' + loc.host + loc.pathname + loc.search;
-							}
-						}, _('To login…')))
-				]);
+				if (!L.isObject(req) || (req.object == 'session' && req.method == 'access'))
+					return;
 
-				throw 'Session expired';
+				return rpcClass.declare({
+					'object': 'session',
+					'method': 'access',
+					'params': [ 'scope', 'object', 'function' ],
+					'expect': { access: true }
+				})('uci', 'luci', 'read').catch(L.notifySessionExpiry);
 			});
 
-			originalCBIInit();
+			Request.addInterceptor(function(res) {
+				var isDenied = false;
 
-			Poll.start();
+				if (res.status == 403 && res.headers.get('X-LuCI-Login-Required') == 'yes')
+					isDenied = true;
 
+				if (!isDenied)
+					return;
+
+				L.notifySessionExpiry();
+			});
+
+			return this.probeSystemFeatures().finally(this.initDOM);
+		},
+
+		initDOM: function() {
+			originalCBIInit();
+			Poll.start();
 			document.dispatchEvent(new CustomEvent('luci-loaded'));
 		},
 
@@ -1190,9 +1286,9 @@
 				return inst[method].apply(inst, inst.varargs(arguments, 2));
 			},
 
-			isEmpty: function(node) {
+			isEmpty: function(node, ignoreFn) {
 				for (var child = node.firstElementChild; child != null; child = child.nextElementSibling)
-					if (!child.classList.contains('hidden'))
+					if (!child.classList.contains('hidden') && (!ignoreFn || !ignoreFn(child)))
 						return false;
 
 				return true;
@@ -1253,29 +1349,22 @@
 			},
 
 			addFooter: function() {
-				var footer = E([]),
-				    mc = document.getElementById('maincontent');
+				var footer = E([]);
 
-				if (mc.querySelector('.cbi-map')) {
+				if (this.handleSaveApply || this.handleSave || this.handleReset) {
 					footer.appendChild(E('div', { 'class': 'cbi-page-actions' }, [
-						E('input', {
+						this.handleSaveApply ? E('button', {
 							'class': 'cbi-button cbi-button-apply',
-							'type': 'button',
-							'value': _('Save & Apply'),
-							'click': L.bind(this.handleSaveApply, this)
-						}), ' ',
-						E('input', {
+							'click': L.ui.createHandlerFn(this, 'handleSaveApply')
+						}, [ _('Save & Apply') ]) : '', ' ',
+						this.handleSave ? E('button', {
 							'class': 'cbi-button cbi-button-save',
-							'type': 'submit',
-							'value': _('Save'),
-							'click': L.bind(this.handleSave, this)
-						}), ' ',
-						E('input', {
+							'click': L.ui.createHandlerFn(this, 'handleSave')
+						}, [ _('Save') ]) : '', ' ',
+						this.handleReset ? E('button', {
 							'class': 'cbi-button cbi-button-reset',
-							'type': 'button',
-							'value': _('Reset'),
-							'click': L.bind(this.handleReset, this)
-						})
+							'click': L.ui.createHandlerFn(this, 'handleReset')
+						}, [ _('Reset') ]) : ''
 					]));
 				}
 
diff --git a/modules/luci-base/htdocs/luci-static/resources/network.js b/modules/luci-base/htdocs/luci-static/resources/network.js
index d3d9a1cf5..8432bd16f 100644
--- a/modules/luci-base/htdocs/luci-static/resources/network.js
+++ b/modules/luci-base/htdocs/luci-static/resources/network.js
@@ -44,31 +44,42 @@ var iface_patterns_wireless = [
 
 var iface_patterns_virtual = [ ];
 
-var callNetworkWirelessStatus = rpc.declare({
-	object: 'network.wireless',
-	method: 'status'
+var callLuciNetdevs = rpc.declare({
+	object: 'luci',
+	method: 'getNetworkDevices',
+	expect: { '': {} }
 });
 
-var callLuciNetdevs = rpc.declare({
+var callLuciWifidevs = rpc.declare({
 	object: 'luci',
-	method: 'netdevs'
+	method: 'getWirelessDevices',
+	expect: { '': {} }
 });
 
 var callLuciIfaddrs = rpc.declare({
 	object: 'luci',
-	method: 'ifaddrs',
+	method: 'getIfaddrs',
 	expect: { result: [] }
 });
 
 var callLuciBoardjson = rpc.declare({
 	object: 'luci',
-	method: 'boardjson'
+	method: 'getBoardJSON'
 });
 
-var callIwinfoInfo = rpc.declare({
+var callIwinfoAssoclist = rpc.declare({
 	object: 'iwinfo',
-	method: 'info',
-	params: [ 'device' ]
+	method: 'assoclist',
+	params: [ 'device', 'mac' ],
+	expect: { results: [] }
+});
+
+var callIwinfoScan = rpc.declare({
+	object: 'iwinfo',
+	method: 'scan',
+	params: [ 'device' ],
+	nobatch: true,
+	expect: { results: [] }
 });
 
 var callNetworkInterfaceStatus = rpc.declare({
@@ -83,103 +94,140 @@ var callNetworkDeviceStatus = rpc.declare({
 	expect: { '': {} }
 });
 
-var _cache = {},
+var callGetProtoHandlers = rpc.declare({
+	object: 'network',
+	method: 'get_proto_handlers',
+	expect: { '': {} }
+});
+
+var callGetHostHints = rpc.declare({
+	object: 'luci',
+	method: 'getHostHints',
+	expect: { '': {} }
+});
+
+var _init = null,
     _state = null,
-    _protocols = {};
-
-function getWifiState() {
-	if (_cache.wifi == null)
-		return callNetworkWirelessStatus().then(function(state) {
-			if (!L.isObject(state))
-				throw !1;
-			return (_cache.wifi = state);
-		}).catch(function() {
-			return (_cache.wifi = {});
-		});
+    _protocols = {},
+    _protospecs = {};
+
+function getInterfaceState(cache) {
+	return callNetworkInterfaceStatus().then(function(state) {
+		if (!Array.isArray(state))
+			throw !1;
+		return state;
+	}).catch(function() {
+		return [];
+	});
+}
 
-	return Promise.resolve(_cache.wifi);
+function getDeviceState(cache) {
+	return callNetworkDeviceStatus().then(function(state) {
+		if (!L.isObject(state))
+			throw !1;
+		return state;
+	}).catch(function() {
+		return {};
+	});
 }
 
-function getInterfaceState() {
-	if (_cache.interfacedump == null)
-		return callNetworkInterfaceStatus().then(function(state) {
-			if (!Array.isArray(state))
-				throw !1;
-			return (_cache.interfacedump = state);
-		}).catch(function() {
-			return (_cache.interfacedump = []);
-		});
+function getIfaddrState(cache) {
+	return callLuciIfaddrs().then(function(addrs) {
+		if (!Array.isArray(addrs))
+			throw !1;
+		return addrs;
+	}).catch(function() {
+		return [];
+	});
+}
 
-	return Promise.resolve(_cache.interfacedump);
+function getNetdevState(cache) {
+	return callLuciNetdevs().then(function(state) {
+		if (!L.isObject(state))
+			throw !1;
+		return state;
+	}).catch(function() {
+		return {};
+	});
 }
 
-function getDeviceState() {
-	if (_cache.devicedump == null)
-		return callNetworkDeviceStatus().then(function(state) {
-			if (!L.isObject(state))
-				throw !1;
-			return (_cache.devicedump = state);
-		}).catch(function() {
-			return (_cache.devicedump = {});
-		});
+function getWifidevState(cache) {
+	return callLuciWifidevs().then(function(state) {
+		if (!L.isObject(state))
+			throw !1;
+		return state;
+	}).catch(function() {
+		return {};
+	});
+}
 
-	return Promise.resolve(_cache.devicedump);
+function getBoardState(cache) {
+	return callLuciBoardjson().then(function(state) {
+		if (!L.isObject(state))
+			throw !1;
+		return state;
+	}).catch(function() {
+		return {};
+	});
 }
 
-function getIfaddrState() {
-	if (_cache.ifaddrs == null)
-		return callLuciIfaddrs().then(function(addrs) {
-			if (!Array.isArray(addrs))
-				throw !1;
-			return (_cache.ifaddrs = addrs);
-		}).catch(function() {
-			return (_cache.ifaddrs = []);
-		});
+function getProtocolHandlers(cache) {
+	return callGetProtoHandlers().then(function(protos) {
+		if (!L.isObject(protos))
+			throw !1;
 
-	return Promise.resolve(_cache.ifaddrs);
-}
+		/* Register "none" protocol */
+		if (!protos.hasOwnProperty('none'))
+			Object.assign(protos, { none: { no_device: false } });
 
-function getNetdevState() {
-	if (_cache.devices == null)
-		return callLuciNetdevs().then(function(state) {
-			if (!L.isObject(state))
-				throw !1;
-			return (_cache.devices = state);
-		}).catch(function() {
-			return (_cache.devices = {});
-		});
+		/* Hack: emulate relayd protocol */
+		if (!protos.hasOwnProperty('relay'))
+			Object.assign(protos, { relay: { no_device: true } });
 
-	return Promise.resolve(_cache.devices);
-}
+		Object.assign(_protospecs, protos);
 
-function getBoardState() {
-	if (_cache.board == null)
-		return callLuciBoardjson().then(function(state) {
-			if (!L.isObject(state))
-				throw !1;
-			return (_cache.board = state);
-		}).catch(function() {
-			return (_cache.board = {});
+		return Promise.all(Object.keys(protos).map(function(p) {
+			return Promise.resolve(L.require('protocol.%s'.format(p))).catch(function(err) {
+				if (L.isObject(err) && err.name != 'NetworkError')
+					L.error(err);
+			});
+		})).then(function() {
+			return protos;
 		});
+	}).catch(function() {
+		return {};
+	});
+}
 
-	return Promise.resolve(_cache.board);
+function getHostHints(cache) {
+	return callGetHostHints().then(function(hosts) {
+		if (!L.isObject(hosts))
+			throw !1;
+		return hosts;
+	}).catch(function() {
+		return {};
+	});
 }
 
 function getWifiStateBySid(sid) {
 	var s = uci.get('wireless', sid);
 
 	if (s != null && s['.type'] == 'wifi-iface') {
-		for (var radioname in _cache.wifi) {
-			for (var i = 0; i < _cache.wifi[radioname].interfaces.length; i++) {
-				var netstate = _cache.wifi[radioname].interfaces[i];
+		for (var radioname in _state.radios) {
+			for (var i = 0; i < _state.radios[radioname].interfaces.length; i++) {
+				var netstate = _state.radios[radioname].interfaces[i];
 
 				if (typeof(netstate.section) != 'string')
 					continue;
 
 				var s2 = uci.get('wireless', netstate.section);
 
-				if (s2 != null && s['.type'] == s2['.type'] && s['.name'] == s2['.name'])
-					return [ radioname, _cache.wifi[radioname], netstate ];
+				if (s2 != null && s['.type'] == s2['.type'] && s['.name'] == s2['.name']) {
+					if (s2['.anonymous'] == false && netstate.section.charAt(0) == '@')
+						return null;
+
+					return [ radioname, _state.radios[radioname], netstate ];
+				}
 			}
 		}
 	}
@@ -188,15 +236,15 @@ function getWifiStateBySid(sid) {
 }
 
 function getWifiStateByIfname(ifname) {
-	for (var radioname in _cache.wifi) {
-		for (var i = 0; i < _cache.wifi[radioname].interfaces.length; i++) {
-			var netstate = _cache.wifi[radioname].interfaces[i];
+	for (var radioname in _state.radios) {
+		for (var i = 0; i < _state.radios[radioname].interfaces.length; i++) {
+			var netstate = _state.radios[radioname].interfaces[i];
 
 			if (typeof(netstate.ifname) != 'string')
 				continue;
 
 			if (netstate.ifname == ifname)
-				return [ radioname, _cache.wifi[radioname], netstate ];
+				return [ radioname, _state.radios[radioname], netstate ];
 		}
 	}
 
@@ -211,37 +259,6 @@ function isWifiIfname(ifname) {
 	return false;
 }
 
-function getWifiIwinfoByIfname(ifname, forcePhyOnly) {
-	var tasks = [ callIwinfoInfo(ifname) ];
-
-	if (!forcePhyOnly)
-		tasks.push(getNetdevState());
-
-	return Promise.all(tasks).then(function(info) {
-		var iwinfo = info[0],
-		    devstate = info[1],
-		    phyonly = forcePhyOnly || !devstate[ifname] || (devstate[ifname].type != 1);
-
-		if (L.isObject(iwinfo)) {
-			if (phyonly) {
-				delete iwinfo.bitrate;
-				delete iwinfo.quality;
-				delete iwinfo.quality_max;
-				delete iwinfo.mode;
-				delete iwinfo.ssid;
-				delete iwinfo.bssid;
-				delete iwinfo.encryption;
-			}
-
-			iwinfo.ifname = ifname;
-		}
-
-		return iwinfo;
-	}).catch(function() {
-		return null;
-	});
-}
-
 function getWifiSidByNetid(netid) {
 	var m = /^(\w+)\.network(\d+)$/.exec(netid);
 	if (m) {
@@ -336,7 +353,7 @@ function appendValue(config, section, option, value) {
 	    rv = false;
 
 	if (isArray == false)
-		values = String(values || '').split(/\s+/);
+		values = L.toArray(values);
 
 	if (values.indexOf(value) == -1) {
 		values.push(value);
@@ -354,7 +371,7 @@ function removeValue(config, section, option, value) {
 	    rv = false;
 
 	if (isArray == false)
-		values = String(values || '').split(/\s+/);
+		values = L.toArray(values);
 
 	for (var i = values.length - 1; i >= 0; i--) {
 		if (values[i] == value) {
@@ -413,17 +430,20 @@ function maskToPrefix(mask, v6) {
 	return bits;
 }
 
-function initNetworkState() {
-	if (_state == null)
-		return (_state = Promise.all([
+function initNetworkState(refresh) {
+	if (_state == null || refresh) {
+		_init = _init || Promise.all([
 			getInterfaceState(), getDeviceState(), getBoardState(),
-			getWifiState(), getIfaddrState(), getNetdevState(),
+			getIfaddrState(), getNetdevState(), getWifidevState(),
+			getHostHints(), getProtocolHandlers(),
 			uci.load('network'), uci.load('wireless'), uci.load('luci')
-		]).finally(function() {
-			var ifaddrs = _cache.ifaddrs,
-			    devices = _cache.devices,
-			    board = _cache.board,
-			    s = { isTunnel: {}, isBridge: {}, isSwitch: {}, isWifi: {}, interfaces: {}, bridges: {}, switches: {} };
+		]).then(function(data) {
+			var board = data[2], ifaddrs = data[3], devices = data[4];
+			var s = {
+				isTunnel: {}, isBridge: {}, isSwitch: {}, isWifi: {},
+				ifaces: data[0], devices: data[1], radios: data[5],
+				hosts: data[6], netdevs: {}, bridges: {}, switches: {}
+			};
 
 			for (var i = 0, a; (a = ifaddrs[i]) != null; i++) {
 				var name = a.name.replace(/:.+$/, '');
@@ -432,7 +452,7 @@ function initNetworkState() {
 					s.isTunnel[name] = true;
 
 				if (s.isTunnel[name] || !(isIgnoredIfname(name) || isVirtualIfname(name))) {
-					s.interfaces[name] = s.interfaces[name] || {
+					s.netdevs[name] = s.netdevs[name] || {
 						idx:      a.ifindex || i,
 						name:     name,
 						rawname:  a.name,
@@ -442,15 +462,17 @@ function initNetworkState() {
 					};
 
 					if (a.family == 'packet') {
-						s.interfaces[name].flags   = a.flags;
-						s.interfaces[name].stats   = a.data;
-						s.interfaces[name].macaddr = a.addr;
+						s.netdevs[name].flags   = a.flags;
+						s.netdevs[name].stats   = a.data;
+
+						if (a.addr != null && a.addr != '00:00:00:00:00:00' && a.addr.length == 17)
+							s.netdevs[name].macaddr = a.addr;
 					}
 					else if (a.family == 'inet') {
-						s.interfaces[name].ipaddrs.push(a.addr + '/' + a.netmask);
+						s.netdevs[name].ipaddrs.push(a.addr + '/' + a.netmask);
 					}
 					else if (a.family == 'inet6') {
-						s.interfaces[name].ip6addrs.push(a.addr + '/' + a.netmask);
+						s.netdevs[name].ip6addrs.push(a.addr + '/' + a.netmask);
 					}
 				}
 			}
@@ -467,7 +489,7 @@ function initNetworkState() {
 					};
 
 					for (var i = 0; dev.ports && i < dev.ports.length; i++) {
-						var subdev = s.interfaces[dev.ports[i]];
+						var subdev = s.netdevs[dev.ports[i]];
 
 						if (subdev == null)
 							continue;
@@ -477,6 +499,16 @@ function initNetworkState() {
 					}
 
 					s.bridges[devname] = b;
+					s.isBridge[devname] = true;
+				}
+
+				if (s.netdevs.hasOwnProperty(devname)) {
+					Object.assign(s.netdevs[devname], {
+						macaddr: dev.mac,
+						type:    dev.type,
+						mtu:     dev.mtu,
+						qlen:    dev.qlen
+					});
 				}
 			}
 
@@ -544,17 +576,28 @@ function initNetworkState() {
 				}
 			}
 
+			if (L.isObject(board.dsl) && L.isObject(board.dsl.modem)) {
+				s.hasDSLModem = board.dsl.modem;
+			}
+
+			_init = null;
+
 			return (_state = s);
-		}));
+		});
+	}
 
-	return Promise.resolve(_state);
+	return (_state != null ? Promise.resolve(_state) : _init);
 }
 
 function ifnameOf(obj) {
-	if (obj instanceof Interface)
-		return obj.name();
-	else if (obj instanceof Protocol)
-		return obj.ifname();
+	if (obj instanceof Protocol)
+		return obj.getIfname();
+	else if (obj instanceof Device)
+		return obj.getName();
+	else if (obj instanceof WifiDevice)
+		return obj.getName();
+	else if (obj instanceof WifiNetwork)
+		return obj.getIfname();
 	else if (typeof(obj) == 'string')
 		return obj.replace(/:.+$/, '');
 
@@ -576,14 +619,101 @@ function deviceSort(a, b) {
 	return a.getName() > b.getName();
 }
 
+function formatWifiEncryption(enc) {
+	if (!L.isObject(enc))
+		return null;
+
+	if (!enc.enabled)
+		return 'None';
+
+	var ciphers = Array.isArray(enc.ciphers)
+		? enc.ciphers.map(function(c) { return c.toUpperCase() }) : [ 'NONE' ];
+
+	if (Array.isArray(enc.wep)) {
+		var has_open = false,
+		    has_shared = false;
+
+		for (var i = 0; i < enc.wep.length; i++)
+			if (enc.wep[i] == 'open')
+				has_open = true;
+			else if (enc.wep[i] == 'shared')
+				has_shared = true;
+
+		if (has_open && has_shared)
+			return 'WEP Open/Shared (%s)'.format(ciphers.join(', '));
+		else if (has_open)
+			return 'WEP Open System (%s)'.format(ciphers.join(', '));
+		else if (has_shared)
+			return 'WEP Shared Auth (%s)'.format(ciphers.join(', '));
+
+		return 'WEP';
+	}
+
+	if (Array.isArray(enc.wpa)) {
+		var versions = [],
+		    suites = Array.isArray(enc.authentication)
+			? enc.authentication.map(function(a) { return a.toUpperCase() }) : [ 'NONE' ];
+
+		for (var i = 0; i < enc.wpa.length; i++)
+			switch (enc.wpa[i]) {
+			case 1:
+				versions.push('WPA');
+				break;
+
+			default:
+				versions.push('WPA%d'.format(enc.wpa[i]));
+				break;
+			}
+
+		if (versions.length > 1)
+			return 'mixed %s %s (%s)'.format(versions.join('/'), suites.join(', '), ciphers.join(', '));
+
+		return '%s %s (%s)'.format(versions[0], suites.join(', '), ciphers.join(', '));
+	}
+
+	return 'Unknown';
+}
+
+function enumerateNetworks() {
+	var uciInterfaces = uci.sections('network', 'interface'),
+	    networks = {};
+
+	for (var i = 0; i < uciInterfaces.length; i++)
+		networks[uciInterfaces[i]['.name']] = this.instantiateNetwork(uciInterfaces[i]['.name']);
+
+	for (var i = 0; i < _state.ifaces.length; i++)
+		if (networks[_state.ifaces[i].interface] == null)
+			networks[_state.ifaces[i].interface] =
+				this.instantiateNetwork(_state.ifaces[i].interface, _state.ifaces[i].proto);
+
+	var rv = [];
+
+	for (var network in networks)
+		if (networks.hasOwnProperty(network))
+			rv.push(networks[network]);
+
+	rv.sort(networkSort);
+
+	return rv;
+}
 
-var Network, Protocol, Device, WifiDevice, WifiNetwork;
+
+var Hosts, Network, Protocol, Device, WifiDevice, WifiNetwork;
 
 Network = L.Class.extend({
+	prefixToMask: prefixToMask,
+	maskToPrefix: maskToPrefix,
+	formatWifiEncryption: formatWifiEncryption,
+
+	flushCache: function() {
+		initNetworkState(true);
+		return _init;
+	},
+
 	getProtocol: function(protoname, netname) {
 		var v = _protocols[protoname];
 		if (v != null)
-			return v(netname || '__dummy__');
+			return new v(netname || '__dummy__');
 
 		return null;
 	},
@@ -592,18 +722,35 @@ Network = L.Class.extend({
 		var rv = [];
 
 		for (var protoname in _protocols)
-			rv.push(_protocols[protoname]('__dummy__'));
+			rv.push(new _protocols[protoname]('__dummy__'));
 
 		return rv;
 	},
 
 	registerProtocol: function(protoname, methods) {
-		var proto = Protocol.extend(Object.assign({}, methods, {
+		var spec = L.isObject(_protospecs) ? _protospecs[protoname] : null;
+		var proto = Protocol.extend(Object.assign({
+			getI18n: function() {
+				return protoname;
+			},
+
+			isFloating: function() {
+				return false;
+			},
+
+			isVirtual: function() {
+				return (L.isObject(spec) && spec.no_device == true);
+			},
+
+			renderFormOptions: function(section) {
+
+			}
+		}, methods, {
 			__init__: function(name) {
 				this.sid = name;
 			},
 
-			proto: function() {
+			getProtocol: function() {
 				return protoname;
 			}
 		}));
@@ -620,7 +767,7 @@ Network = L.Class.extend({
 	registerErrorCode: function(code, message) {
 		if (typeof(code) == 'string' &&
 		    typeof(message) == 'string' &&
-		    proto_errors.hasOwnProperty(code)) {
+		    !proto_errors.hasOwnProperty(code)) {
 			proto_errors[code] = message;
 			return true;
 		}
@@ -661,9 +808,9 @@ Network = L.Class.extend({
 				return this.instantiateNetwork(name);
 			}
 			else if (name != null) {
-				for (var i = 0; i < _cache.interfacedump.length; i++)
-					if (_cache.interfacedump[i].interface == name)
-						return this.instantiateNetwork(name, _cache.interfacedump[i].proto);
+				for (var i = 0; i < _state.ifaces.length; i++)
+					if (_state.ifaces[i].interface == name)
+						return this.instantiateNetwork(name, _state.ifaces[i].proto);
 			}
 
 			return null;
@@ -671,28 +818,7 @@ Network = L.Class.extend({
 	},
 
 	getNetworks: function() {
-		return initNetworkState().then(L.bind(function() {
-			var uciInterfaces = uci.sections('network', 'interface'),
-			    networks = {};
-
-			for (var i = 0; i < uciInterfaces.length; i++)
-				networks[uciInterfaces[i]['.name']] = this.instantiateNetwork(uciInterfaces[i]['.name']);
-
-			for (var i = 0; i < _cache.interfacedump.length; i++)
-				if (networks[_cache.interfacedump[i].interface] == null)
-					networks[_cache.interfacedump[i].interface] =
-						this.instantiateNetwork(_cache.interfacedump[i].interface, _cache.interfacedump[i].proto);
-
-			var rv = [];
-
-			for (var network in networks)
-				if (networks.hasOwnProperty(network))
-					rv.push(networks[network]);
-
-			rv.sort(networkSort);
-
-			return rv;
-		}, this));
+		return initNetworkState().then(L.bind(enumerateNetworks, this));
 	},
 
 	deleteNetwork: function(name) {
@@ -795,7 +921,7 @@ Network = L.Class.extend({
 			if (name == null)
 				return null;
 
-			if (_state.interfaces.hasOwnProperty(name) || isWifiIfname(name))
+			if (_state.netdevs.hasOwnProperty(name) || isWifiIfname(name))
 				return this.instantiateDevice(name);
 
 			var netid = getWifiNetidBySid(name);
@@ -826,7 +952,7 @@ Network = L.Class.extend({
 				}
 			}
 
-			for (var ifname in _state.interfaces) {
+			for (var ifname in _state.netdevs) {
 				if (devices.hasOwnProperty(ifname))
 					continue;
 
@@ -909,38 +1035,26 @@ Network = L.Class.extend({
 	},
 
 	getWifiDevice: function(devname) {
-		return Promise.all([ getWifiIwinfoByIfname(devname, true), initNetworkState() ]).then(L.bind(function(res) {
+		return initNetworkState().then(L.bind(function() {
 			var existingDevice = uci.get('wireless', devname);
 
 			if (existingDevice == null || existingDevice['.type'] != 'wifi-device')
 				return null;
 
-			return this.instantiateWifiDevice(devname, res[0]);
+			return this.instantiateWifiDevice(devname, _state.radios[devname] || {});
 		}, this));
 	},
 
 	getWifiDevices: function() {
-		var deviceNames = [];
-
 		return initNetworkState().then(L.bind(function() {
 			var uciWifiDevices = uci.sections('wireless', 'wifi-device'),
-			    tasks = [];
+			    rv = [];
 
 			for (var i = 0; i < uciWifiDevices.length; i++) {
-				tasks.push(callIwinfoInfo(uciWifiDevices['.name'], true));
-				deviceNames.push(uciWifiDevices['.name']);
+				var devname = uciWifiDevices[i]['.name'];
+				rv.push(this.instantiateWifiDevice(devname, _state.radios[devname] || {}));
 			}
 
-			return Promise.all(tasks);
-		}, this)).then(L.bind(function(iwinfos) {
-			var rv = [];
-
-			for (var i = 0; i < deviceNames.length; i++)
-				if (L.isObject(iwinfos[i]))
-					rv.push(this.instantiateWifiDevice(deviceNames[i], iwinfos[i]));
-
-			rv.sort(function(a, b) { return a.getName() < b.getName() });
-
 			return rv;
 		}, this));
 	},
@@ -990,11 +1104,7 @@ Network = L.Class.extend({
 				}
 			}
 
-			return (netstate ? getWifiIwinfoByIfname(netstate.ifname) : Promise.reject())
-				.catch(function() { return radioname ? getWifiIwinfoByIfname(radioname) : Promise.reject() })
-				.catch(function() { return Promise.resolve({ ifname: netid || sid || netname }) });
-		}, this)).then(L.bind(function(iwinfo) {
-			return this.instantiateWifiNetwork(sid || netname, radioname, radiostate, netid, netstate, iwinfo);
+			return this.instantiateWifiNetwork(sid || netname, radioname, radiostate, netid, netstate);
 		}, this));
 	},
 
@@ -1017,7 +1127,7 @@ Network = L.Class.extend({
 			var radioname = existingDevice['.name'],
 			    netid = getWifiNetidBySid(sid) || [];
 
-			return this.instantiateWifiNetwork(sid, radioname, _cache.wifi[radioname], netid[0], null, { ifname: netid });
+			return this.instantiateWifiNetwork(sid, radioname, _state.radios[radioname], netid[0], null);
 		}, this));
 	},
 
@@ -1037,20 +1147,24 @@ Network = L.Class.extend({
 		return initNetworkState().then(L.bind(function() {
 			var rv = [];
 
-			for (var i = 0; i < _state.interfacedump.length; i++) {
-				if (!Array.isArray(_state.interfacedump[i].route))
+			for (var i = 0; i < _state.ifaces.length; i++) {
+				if (!Array.isArray(_state.ifaces[i].route))
 					continue;
 
-				for (var j = 0; j < _state.interfacedump[i].route.length; j++) {
-					if (typeof(_state.interfacedump[i].route[j]) != 'object' ||
-					    typeof(_state.interfacedump[i].route[j].target) != 'string' ||
-					    typeof(_state.interfacedump[i].route[j].mask) != 'number')
+				for (var j = 0; j < _state.ifaces[i].route.length; j++) {
+					if (typeof(_state.ifaces[i].route[j]) != 'object' ||
+					    typeof(_state.ifaces[i].route[j].target) != 'string' ||
+					    typeof(_state.ifaces[i].route[j].mask) != 'number')
 					    continue;
 
-					if (_state.interfacedump[i].route[j].table)
+					if (_state.ifaces[i].route[j].table)
 						continue;
 
-					rv.push(_state.interfacedump[i]);
+					if (_state.ifaces[i].route[j].target != addr ||
+					    _state.ifaces[i].route[j].mask != mask)
+					    continue;
+
+					rv.push(_state.ifaces[i]);
 				}
 			}
 
@@ -1062,25 +1176,25 @@ Network = L.Class.extend({
 		return initNetworkState().then(L.bind(function() {
 			var rv = [];
 
-			for (var i = 0; i < _state.interfacedump.length; i++) {
-				if (Array.isArray(_state.interfacedump[i]['ipv4-address']))
-					for (var j = 0; j < _state.interfacedump[i]['ipv4-address'].length; j++)
-						if (typeof(_state.interfacedump[i]['ipv4-address'][j]) == 'object' &&
-						    _state.interfacedump[i]['ipv4-address'][j].address == addr)
-							return _state.interfacedump[i];
-
-				if (Array.isArray(_state.interfacedump[i]['ipv6-address']))
-					for (var j = 0; j < _state.interfacedump[i]['ipv6-address'].length; j++)
-						if (typeof(_state.interfacedump[i]['ipv6-address'][j]) == 'object' &&
-						    _state.interfacedump[i]['ipv6-address'][j].address == addr)
-							return _state.interfacedump[i];
-
-				if (Array.isArray(_state.interfacedump[i]['ipv6-prefix-assignment']))
-					for (var j = 0; j < _state.interfacedump[i]['ipv6-prefix-assignment'].length; j++)
-						if (typeof(_state.interfacedump[i]['ipv6-prefix-assignment'][j]) == 'object' &&
-							typeof(_state.interfacedump[i]['ipv6-prefix-assignment'][j]['local-address']) == 'object' &&
-						    _state.interfacedump[i]['ipv6-prefix-assignment'][j]['local-address'].address == addr)
-							return _state.interfacedump[i];
+			for (var i = 0; i < _state.ifaces.length; i++) {
+				if (Array.isArray(_state.ifaces[i]['ipv4-address']))
+					for (var j = 0; j < _state.ifaces[i]['ipv4-address'].length; j++)
+						if (typeof(_state.ifaces[i]['ipv4-address'][j]) == 'object' &&
+						    _state.ifaces[i]['ipv4-address'][j].address == addr)
+							return _state.ifaces[i];
+
+				if (Array.isArray(_state.ifaces[i]['ipv6-address']))
+					for (var j = 0; j < _state.ifaces[i]['ipv6-address'].length; j++)
+						if (typeof(_state.ifaces[i]['ipv6-address'][j]) == 'object' &&
+						    _state.ifaces[i]['ipv6-address'][j].address == addr)
+							return _state.ifaces[i];
+
+				if (Array.isArray(_state.ifaces[i]['ipv6-prefix-assignment']))
+					for (var j = 0; j < _state.ifaces[i]['ipv6-prefix-assignment'].length; j++)
+						if (typeof(_state.ifaces[i]['ipv6-prefix-assignment'][j]) == 'object' &&
+							typeof(_state.ifaces[i]['ipv6-prefix-assignment'][j]['local-address']) == 'object' &&
+						    _state.ifaces[i]['ipv6-prefix-assignment'][j]['local-address'].address == addr)
+							return _state.ifaces[i];
 			}
 
 			return null;
@@ -1125,16 +1239,93 @@ Network = L.Class.extend({
 		return new protoClass(name);
 	},
 
-	instantiateDevice: function(name, network) {
+	instantiateDevice: function(name, network, extend) {
+		if (extend != null)
+			return new (Device.extend(extend))(name, network);
+
 		return new Device(name, network);
 	},
 
-	instantiateWifiDevice: function(radioname, iwinfo) {
-		return new WifiDevice(radioname, iwinfo);
+	instantiateWifiDevice: function(radioname, radiostate) {
+		return new WifiDevice(radioname, radiostate);
+	},
+
+	instantiateWifiNetwork: function(sid, radioname, radiostate, netid, netstate) {
+		return new WifiNetwork(sid, radioname, radiostate, netid, netstate);
+	},
+
+	getIfnameOf: function(obj) {
+		return ifnameOf(obj);
+	},
+
+	getDSLModemType: function() {
+		return initNetworkState().then(function() {
+			return _state.hasDSLModem ? _state.hasDSLModem.type : null;
+		});
+	},
+
+	getHostHints: function() {
+		return initNetworkState().then(function() {
+			return new Hosts(_state.hosts);
+		});
+	}
+});
+
+Hosts = L.Class.extend({
+	__init__: function(hosts) {
+		this.hosts = hosts;
+	},
+
+	getHostnameByMACAddr: function(mac) {
+		return this.hosts[mac] ? this.hosts[mac].name : null;
+	},
+
+	getIPAddrByMACAddr: function(mac) {
+		return this.hosts[mac] ? this.hosts[mac].ipv4 : null;
+	},
+
+	getIP6AddrByMACAddr: function(mac) {
+		return this.hosts[mac] ? this.hosts[mac].ipv6 : null;
+	},
+
+	getHostnameByIPAddr: function(ipaddr) {
+		for (var mac in this.hosts)
+			if (this.hosts[mac].ipv4 == ipaddr && this.hosts[mac].name != null)
+				return this.hosts[mac].name;
+		return null;
+	},
+
+	getMACAddrByIPAddr: function(ipaddr) {
+		for (var mac in this.hosts)
+			if (this.hosts[mac].ipv4 == ipaddr)
+				return mac;
+		return null;
+	},
+
+	getHostnameByIP6Addr: function(ip6addr) {
+		for (var mac in this.hosts)
+			if (this.hosts[mac].ipv6 == ip6addr && this.hosts[mac].name != null)
+				return this.hosts[mac].name;
+		return null;
+	},
+
+	getMACAddrByIP6Addr: function(ip6addr) {
+		for (var mac in this.hosts)
+			if (this.hosts[mac].ipv6 == ip6addr)
+				return mac;
+		return null;
 	},
 
-	instantiateWifiNetwork: function(sid, radioname, radiostate, netid, netstate, iwinfo) {
-		return new WifiNetwork(sid, radioname, radiostate, netid, netstate, iwinfo);
+	getMACHints: function(preferIp6) {
+		var rv = [];
+		for (var mac in this.hosts) {
+			var hint = this.hosts[mac].name ||
+				this.hosts[mac][preferIp6 ? 'ipv6' : 'ipv4'] ||
+				this.hosts[mac][preferIp6 ? 'ipv4' : 'ipv6'];
+
+			rv.push([mac, hint]);
+		}
+		return rv.sort(function(a, b) { return a[0] > b[0] });
 	}
 });
 
@@ -1153,11 +1344,11 @@ Protocol = L.Class.extend({
 	},
 
 	_ubus: function(field) {
-		for (var i = 0; i < _cache.interfacedump.length; i++) {
-			if (_cache.interfacedump[i].interface != this.sid)
+		for (var i = 0; i < _state.ifaces.length; i++) {
+			if (_state.ifaces[i].interface != this.sid)
 				continue;
 
-			return (field != null ? _cache.interfacedump[i][field] : _cache.interfacedump[i]);
+			return (field != null ? _state.ifaces[i][field] : _state.ifaces[i]);
 		}
 	},
 
@@ -1175,7 +1366,7 @@ Protocol = L.Class.extend({
 		if (this.isFloating())
 			ifname = this._ubus('l3_device');
 		else
-			ifname = this._ubus('device');
+			ifname = this._ubus('device') || this._ubus('l3_device');
 
 		if (ifname != null)
 			return ifname;
@@ -1185,7 +1376,7 @@ Protocol = L.Class.extend({
 	},
 
 	getProtocol: function() {
-		return 'none';
+		return null;
 	},
 
 	getI18n: function() {
@@ -1455,11 +1646,6 @@ Protocol = L.Class.extend({
 			return new Device(ifname, this);
 		}
 		else {
-			var ifname = this._ubus('l3_device') || this._ubus('device');
-
-			if (ifname != null)
-				return L.network.instantiateDevice(ifname, this);
-
 			var ifnames = L.toArray(uci.get('network', this.sid, 'ifname'));
 
 			for (var i = 0; i < ifnames.length; i++) {
@@ -1473,6 +1659,16 @@ Protocol = L.Class.extend({
 		}
 	},
 
+	getL2Device: function() {
+		var ifname = this._ubus('device');
+		return (ifname != null ? L.network.instantiateDevice(ifname, this) : null);
+	},
+
+	getL3Device: function() {
+		var ifname = this._ubus('l3_device');
+		return (ifname != null ? L.network.instantiateDevice(ifname, this) : null);
+	},
+
 	getDevices: function() {
 		var rv = [];
 
@@ -1559,14 +1755,20 @@ Device = L.Class.extend({
 		}
 
 		this.ifname  = this.ifname || ifname;
-		this.dev     = _state.interfaces[this.ifname];
+		this.dev     = _state.netdevs[this.ifname];
 		this.network = network;
 	},
 
-	_ubus: function(field) {
-		var dump = _cache.devicedump[this.ifname] || {};
+	_devstate: function(/* ... */) {
+		var rv = this.dev;
+
+		for (var i = 0; i < arguments.length; i++)
+			if (L.isObject(rv))
+				rv = rv[arguments[i]];
+			else
+				return null;
 
-		return (field != null ? dump[field] : dump);
+		return rv;
 	},
 
 	getName: function() {
@@ -1574,16 +1776,21 @@ Device = L.Class.extend({
 	},
 
 	getMAC: function() {
-		return this._ubus('macaddr');
+		var mac = this._devstate('macaddr');
+		return mac ? mac.toUpperCase() : null;
+	},
+
+	getMTU: function() {
+		return this._devstate('mtu');
 	},
 
 	getIPAddrs: function() {
-		var addrs = (this.dev != null ? this.dev.ipaddrs : null);
+		var addrs = this._devstate('ipaddrs');
 		return (Array.isArray(addrs) ? addrs : []);
 	},
 
 	getIP6Addrs: function() {
-		var addrs = (this.dev != null ? this.dev.ip6addrs : null);
+		var addrs = this._devstate('ip6addrs');
 		return (Array.isArray(addrs) ? addrs : []);
 	},
 
@@ -1655,7 +1862,9 @@ Device = L.Class.extend({
 			return null;
 
 		for (var i = 0; i < br.ifnames.length; i++)
-			rv.push(L.network.instantiateDevice(br.ifnames[i]));
+			rv.push(L.network.instantiateDevice(br.ifnames[i].name));
+
+		rv.sort(deviceSort);
 
 		return rv;
 	},
@@ -1671,7 +1880,7 @@ Device = L.Class.extend({
 	},
 
 	isUp: function() {
-		var up = this._ubus('up');
+		var up = this._devstate('flags', 'up');
 
 		if (up == null)
 			up = (this.getType() == 'alias');
@@ -1684,26 +1893,26 @@ Device = L.Class.extend({
 	},
 
 	isBridgePort: function() {
-		return (this.dev != null && this.dev.bridge != null);
+		return (this._devstate('bridge') != null);
 	},
 
 	getTXBytes: function() {
-		var stat = this._ubus('statistics');
+		var stat = this._devstate('stats');
 		return (stat != null ? stat.tx_bytes || 0 : 0);
 	},
 
 	getRXBytes: function() {
-		var stat = this._ubus('statistics');
+		var stat = this._devstate('stats');
 		return (stat != null ? stat.rx_bytes || 0 : 0);
 	},
 
 	getTXPackets: function() {
-		var stat = this._ubus('statistics');
+		var stat = this._devstate('stats');
 		return (stat != null ? stat.tx_packets || 0 : 0);
 	},
 
 	getRXPackets: function() {
-		var stat = this._ubus('statistics');
+		var stat = this._devstate('stats');
 		return (stat != null ? stat.rx_packets || 0 : 0);
 	},
 
@@ -1715,7 +1924,7 @@ Device = L.Class.extend({
 		if (this.networks == null) {
 			this.networks = [];
 
-			var networks = L.network.getNetworks();
+			var networks = enumerateNetworks.apply(L.network);
 
 			for (var i = 0; i < networks.length; i++)
 				if (networks[i].containsDevice(this.ifname) || networks[i].getIfname() == this.ifname)
@@ -1733,18 +1942,32 @@ Device = L.Class.extend({
 });
 
 WifiDevice = L.Class.extend({
-	__init__: function(name, iwinfo) {
+	__init__: function(name, radiostate) {
 		var uciWifiDevice = uci.get('wireless', name);
 
 		if (uciWifiDevice != null &&
 		    uciWifiDevice['.type'] == 'wifi-device' &&
 		    uciWifiDevice['.name'] != null) {
 			this.sid    = uciWifiDevice['.name'];
-			this.iwinfo = iwinfo;
 		}
 
-		this.sid    = this.sid    || name;
-		this.iwinfo = this.iwinfo || { ifname: this.sid };
+		this.sid    = this.sid || name;
+		this._ubusdata = {
+			radio: name,
+			dev:   radiostate
+		};
+	},
+
+	ubus: function(/* ... */) {
+		var v = this._ubusdata;
+
+		for (var i = 0; i < arguments.length; i++)
+			if (L.isObject(v))
+				v = v[arguments[i]];
+			else
+				return null;
+
+		return v;
 	},
 
 	get: function(opt) {
@@ -1755,39 +1978,50 @@ WifiDevice = L.Class.extend({
 		return uci.set('wireless', this.sid, opt, value);
 	},
 
+	isDisabled: function() {
+		return this.ubus('dev', 'disabled') || this.get('disabled') == '1';
+	},
+
 	getName: function() {
 		return this.sid;
 	},
 
 	getHWModes: function() {
-		if (L.isObject(this.iwinfo.hwmodelist))
-			for (var k in this.iwinfo.hwmodelist)
-				return this.iwinfo.hwmodelist;
+		var hwmodes = this.ubus('dev', 'iwinfo', 'hwmodes');
+		return Array.isArray(hwmodes) ? hwmodes : [ 'b', 'g' ];
+	},
 
-		return { b: true, g: true };
+	getHTModes: function() {
+		var htmodes = this.ubus('dev', 'iwinfo', 'htmodes');
+		return (Array.isArray(htmodes) && htmodes.length) ? htmodes : null;
 	},
 
 	getI18n: function() {
-		var type = this.iwinfo.hardware_name || 'Generic';
+		var hw = this.ubus('dev', 'iwinfo', 'hardware'),
+		    type = L.isObject(hw) ? hw.name : null;
 
-		if (this.iwinfo.type == 'wl')
+		if (this.ubus('dev', 'iwinfo', 'type') == 'wl')
 			type = 'Broadcom';
 
 		var hwmodes = this.getHWModes(),
 		    modestr = '';
 
-		if (hwmodes.a) modestr += 'a';
-		if (hwmodes.b) modestr += 'b';
-		if (hwmodes.g) modestr += 'g';
-		if (hwmodes.n) modestr += 'n';
-		if (hwmodes.ad) modestr += 'ac';
+		hwmodes.sort(function(a, b) {
+			return (a.length != b.length ? a.length > b.length : a > b);
+		});
+
+		modestr = hwmodes.join('');
+
+		return '%s 802.11%s Wireless Controller (%s)'.format(type || 'Generic', modestr, this.getName());
+	},
 
-		return '%s 802.11%s Wireless Controller (%s)'.format(type, modestr, this.getName());
+	getScanList: function() {
+		return callIwinfoScan(this.sid);
 	},
 
 	isUp: function() {
-		if (L.isObject(_cache.wifi[this.sid]))
-			return (_cache.wifi[this.sid].up == true);
+		if (L.isObject(_state.radios[this.sid]))
+			return (_state.radios[this.sid].up == true);
 
 		return false;
 	},
@@ -1846,10 +2080,8 @@ WifiDevice = L.Class.extend({
 });
 
 WifiNetwork = L.Class.extend({
-	__init__: function(sid, radioname, radiostate, netid, netstate, iwinfo) {
+	__init__: function(sid, radioname, radiostate, netid, netstate) {
 		this.sid    = sid;
-		this.wdev   = iwinfo.ifname;
-		this.iwinfo = iwinfo;
 		this.netid  = netid;
 		this._ubusdata = {
 			radio: radioname,
@@ -1878,6 +2110,10 @@ WifiNetwork = L.Class.extend({
 		return uci.set('wireless', this.sid, opt, value);
 	},
 
+	isDisabled: function() {
+		return this.ubus('dev', 'disabled') || this.get('disabled') == '1';
+	},
+
 	getMode: function() {
 		return this.ubus('net', 'config', 'mode') || this.get('mode') || 'ap';
 	},
@@ -1903,7 +2139,7 @@ WifiNetwork = L.Class.extend({
 	},
 
 	getIfname: function() {
-		var ifname = this.ubus('net', 'ifname') || this.iwinfo.ifname;
+		var ifname = this.ubus('net', 'ifname') || this.ubus('net', 'iwinfo', 'ifname');
 
 		if (ifname == null || ifname.match(/^(wifi|radio)\d/))
 			ifname = this.netid;
@@ -1911,8 +2147,12 @@ WifiNetwork = L.Class.extend({
 		return ifname;
 	},
 
+	getWifiDeviceName: function() {
+		return this.ubus('radio') || this.get('device');
+	},
+
 	getWifiDevice: function() {
-		var radioname = this.ubus('radio') || this.get('device');
+		var radioname = this.getWifiDeviceName();
 
 		if (radioname == null)
 			return Promise.reject();
@@ -1930,7 +2170,7 @@ WifiNetwork = L.Class.extend({
 	},
 
 	getActiveMode: function() {
-		var mode = this.iwinfo.mode || this.ubus('net', 'config', 'mode') || this.get('mode') || 'ap';
+		var mode = this.ubus('net', 'iwinfo', 'mode') || this.ubus('net', 'config', 'mode') || this.get('mode') || 'ap';
 
 		switch (mode) {
 		case 'ap':      return 'Master';
@@ -1956,25 +2196,23 @@ WifiNetwork = L.Class.extend({
 	},
 
 	getActiveSSID: function() {
-		return this.iwinfo.ssid || this.ubus('net', 'config', 'ssid') || this.get('ssid');
+		return this.ubus('net', 'iwinfo', 'ssid') || this.ubus('net', 'config', 'ssid') || this.get('ssid');
 	},
 
 	getActiveBSSID: function() {
-		return this.iwinfo.bssid || this.ubus('net', 'config', 'bssid') || this.get('bssid');
+		return this.ubus('net', 'iwinfo', 'bssid') || this.ubus('net', 'config', 'bssid') || this.get('bssid');
 	},
 
 	getActiveEncryption: function() {
-		var encryption = this.iwinfo.encryption;
-
-		return (L.isObject(encryption) ? encryption.description || '-' : '-');
+		return formatWifiEncryption(this.ubus('net', 'iwinfo', 'encryption')) || '-';
 	},
 
 	getAssocList: function() {
-		// XXX tbd
+		return callIwinfoAssoclist(this.getIfname());
 	},
 
 	getFrequency: function() {
-		var freq = this.iwinfo.frequency;
+		var freq = this.ubus('net', 'iwinfo', 'frequency');
 
 		if (freq != null && freq > 0)
 			return '%.03f'.format(freq / 1000);
@@ -1983,7 +2221,7 @@ WifiNetwork = L.Class.extend({
 	},
 
 	getBitRate: function() {
-		var rate = this.iwinfo.bitrate;
+		var rate = this.ubus('net', 'iwinfo', 'bitrate');
 
 		if (rate != null && rate > 0)
 			return (rate / 1000);
@@ -1992,28 +2230,27 @@ WifiNetwork = L.Class.extend({
 	},
 
 	getChannel: function() {
-		return this.iwinfo.channel || this.ubus('dev', 'config', 'channel') || this.get('channel');
+		return this.ubus('net', 'iwinfo', 'channel') || this.ubus('dev', 'config', 'channel') || this.get('channel');
 	},
 
 	getSignal: function() {
-		return this.iwinfo.signal || 0;
+		return this.ubus('net', 'iwinfo', 'signal') || 0;
 	},
 
 	getNoise: function() {
-		return this.iwinfo.noise || 0;
+		return this.ubus('net', 'iwinfo', 'noise') || 0;
 	},
 
 	getCountryCode: function() {
-		return this.iwinfo.country || this.ubus('dev', 'config', 'country') || '00';
+		return this.ubus('net', 'iwinfo', 'country') || this.ubus('dev', 'config', 'country') || '00';
 	},
 
 	getTXPower: function() {
-		var pwr = this.iwinfo.txpower || 0;
-		return (pwr + this.getTXPowerOffset());
+		return this.ubus('net', 'iwinfo', 'txpower');
 	},
 
 	getTXPowerOffset: function() {
-		return this.iwinfo.txpower_offset || 0;
+		return this.ubus('net', 'iwinfo', 'txpower_offset') || 0;
 	},
 
 	getSignalLevel: function(signal, noise) {
@@ -2032,8 +2269,8 @@ WifiNetwork = L.Class.extend({
 	},
 
 	getSignalPercent: function() {
-		var qc = this.iwinfo.quality || 0,
-		    qm = this.iwinfo.quality_max || 0;
+		var qc = this.ubus('net', 'iwinfo', 'quality') || 0,
+		    qm = this.ubus('net', 'iwinfo', 'quality_max') || 0;
 
 		if (qc > 0 && qm > 0)
 			return Math.floor((100 / qm) * qc);
diff --git a/modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js b/modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js
new file mode 100644
index 000000000..f0a3ec579
--- /dev/null
+++ b/modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js
@@ -0,0 +1,62 @@
+'use strict';
+'require rpc';
+'require form';
+'require network';
+
+var callFileRead = rpc.declare({
+	object: 'file',
+	method: 'read',
+	params: [ 'path' ],
+	expect: { data: '' },
+	filter: function(value) { return value.trim() }
+});
+
+return network.registerProtocol('dhcp', {
+	getI18n: function() {
+		return _('DHCP client');
+	},
+
+	renderFormOptions: function(s) {
+		var dev = this.getL2Device() || this.getDevice(), o;
+
+		o = s.taboption('general', form.Value, 'hostname', _('Hostname to send when requesting DHCP'));
+		o.datatype    = 'hostname';
+		o.load = function(section_id) {
+			return callFileRead('/proc/sys/kernel/hostname').then(L.bind(function(hostname) {
+				this.placeholder = hostname;
+				return form.Value.prototype.load.apply(this, [section_id]);
+			}, this));
+		};
+
+		o = s.taboption('advanced', form.Flag, 'broadcast', _('Use broadcast flag'), _('Required for certain ISPs, e.g. Charter with DOCSIS 3'));
+		o.default = o.disabled;
+
+		o = s.taboption('advanced', form.Flag, 'defaultroute', _('Use default gateway'), _('If unchecked, no default route is configured'));
+		o.default = o.enabled;
+
+		o = s.taboption('advanced', form.Flag, 'peerdns', _('Use DNS servers advertised by peer'), _('If unchecked, the advertised DNS server addresses are ignored'));
+		o.default = o.enabled;
+
+		o = s.taboption('advanced', form.DynamicList, 'dns', _('Use custom DNS servers'));
+		o.depends('peerdns', '0');
+		o.datatype = 'ipaddr';
+		o.cast     = 'string';
+
+		o = s.taboption('advanced', form.Value, 'metric', _('Use gateway metric'));
+		o.placeholder = '0';
+		o.datatype    = 'uinteger';
+
+		o = s.taboption('advanced', form.Value, 'clientid', _('Client ID to send when requesting DHCP'));
+		o.datatype  = 'hexstring';
+
+		s.taboption('advanced', form.Value, 'vendorid', _('Vendor Class to send when requesting DHCP'));
+
+		o = s.taboption('advanced', form.Value, 'macaddr', _('Override MAC address'));
+		o.datatype = 'macaddr';
+		o.placeholder = dev ? (dev.getMAC() || '') : '';
+
+		o = s.taboption('advanced', form.Value, 'mtu', _('Override MTU'));
+		o.placeholder = dev ? (dev.getMTU() || '1500') : '1500';
+		o.datatype    = 'max(9200)';
+	}
+});
diff --git a/modules/luci-base/htdocs/luci-static/resources/protocol/none.js b/modules/luci-base/htdocs/luci-static/resources/protocol/none.js
new file mode 100644
index 000000000..37674c0ea
--- /dev/null
+++ b/modules/luci-base/htdocs/luci-static/resources/protocol/none.js
@@ -0,0 +1,8 @@
+'use strict';
+'require network';
+
+return network.registerProtocol('none', {
+	getI18n: function() {
+		return _('Unmanaged');
+	}
+});
diff --git a/modules/luci-base/htdocs/luci-static/resources/protocol/static.js b/modules/luci-base/htdocs/luci-static/resources/protocol/static.js
new file mode 100644
index 000000000..8470e0a20
--- /dev/null
+++ b/modules/luci-base/htdocs/luci-static/resources/protocol/static.js
@@ -0,0 +1,231 @@
+'use strict';
+'require form';
+'require network';
+'require validation';
+
+function isCIDR(value) {
+	return Array.isArray(value) || /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\/(\d{1,2}|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$/.test(value);
+}
+
+function calculateBroadcast(s, use_cfgvalue) {
+	var readfn = use_cfgvalue ? 'cfgvalue' : 'formvalue',
+	    addropt = s.children.filter(function(o) { return o.option == 'ipaddr'})[0],
+	    addrvals = addropt ? L.toArray(addropt[readfn](s.section)) : [],
+	    maskopt = s.children.filter(function(o) { return o.option == 'netmask'})[0],
+	    maskval = maskopt ? maskopt[readfn](s.section) : null,
+	    firstsubnet = maskval ? addrvals[0] + '/' + maskval : addrvals.filter(function(a) { return a.indexOf('/') > 0 })[0];
+
+	if (firstsubnet == null)
+		return null;
+
+	var addr_mask = firstsubnet.split('/'),
+	    addr = validation.parseIPv4(addr_mask[0]),
+	    mask = addr_mask[1];
+
+	if (!isNaN(mask))
+		mask = validation.parseIPv4(network.prefixToMask(+mask));
+	else
+		mask = validation.parseIPv4(mask);
+
+	var bc = [
+		addr[0] | (~mask[0] >>> 0 & 255),
+		addr[1] | (~mask[1] >>> 0 & 255),
+		addr[2] | (~mask[2] >>> 0 & 255),
+		addr[3] | (~mask[3] >>> 0 & 255)
+	];
+
+	return bc.join('.');
+}
+
+function validateBroadcast(section_id, value) {
+	var opt = this.map.lookupOption('broadcast', section_id),
+	    node = opt ? this.map.findElement('id', opt[0].cbid(section_id)) : null,
+	    addr = node ? calculateBroadcast(this.section, false) : null;
+
+	if (node != null) {
+		if (addr != null)
+			node.querySelector('input').setAttribute('placeholder', addr);
+		else
+			node.querySelector('input').removeAttribute('placeholder');
+	}
+
+	return true;
+}
+
+return network.registerProtocol('static', {
+	CBIIPValue: form.Value.extend({
+		handleSwitch: function(section_id, option_index, ev) {
+			var maskopt = this.map.lookupOption('netmask', section_id);
+
+			if (maskopt == null || !this.isValid(section_id))
+				return;
+
+			var maskval = maskopt[0].formvalue(section_id),
+			    addrval = this.formvalue(section_id),
+			    prefix = maskval ? network.maskToPrefix(maskval) : 32;
+
+			if (prefix == null)
+				return;
+
+			this.datatype = 'or(cidr4,ipmask4)';
+
+			var parent = L.dom.parent(ev.target, '.cbi-value-field');
+			L.dom.content(parent, form.DynamicList.prototype.renderWidget.apply(this, [
+				section_id,
+				option_index,
+				addrval ? '%s/%d'.format(addrval, prefix) : ''
+			]));
+
+			var masknode = this.map.findElement('id', maskopt[0].cbid(section_id));
+			if (masknode) {
+				parent = L.dom.parent(masknode, '.cbi-value');
+				parent.parentNode.removeChild(parent);
+			}
+		},
+
+		renderWidget: function(section_id, option_index, cfgvalue) {
+			var maskopt = this.map.lookupOption('netmask', section_id),
+			    widget = isCIDR(cfgvalue) ? 'DynamicList' : 'Value';
+
+			if (widget == 'DynamicList') {
+				this.datatype = 'or(cidr4,ipmask4)';
+				this.placeholder = _('Add IPv4 address…');
+			}
+			else {
+				this.datatype = 'ip4addr("nomask")';
+			}
+
+			var node = form[widget].prototype.renderWidget.apply(this, [ section_id, option_index, cfgvalue ]);
+
+			if (widget == 'Value')
+				L.dom.append(node, E('button', {
+					'class': 'cbi-button cbi-button-neutral',
+					'title': _('Switch to CIDR list notation'),
+					'aria-label': _('Switch to CIDR list notation'),
+					'click': L.bind(this.handleSwitch, this, section_id, option_index)
+				}, '…'));
+
+			return node;
+		},
+
+		validate: validateBroadcast
+	}),
+
+	CBINetmaskValue: form.Value.extend({
+		render: function(option_index, section_id, in_table) {
+			var addropt = this.section.children.filter(function(o) { return o.option == 'ipaddr' })[0],
+			    addrval = addropt ? addropt.cfgvalue(section_id) : null;
+
+			if (addrval != null && isCIDR(addrval))
+				return E([]);
+
+			this.value('255.255.255.0');
+			this.value('255.255.0.0');
+			this.value('255.0.0.0');
+
+			return form.Value.prototype.render.apply(this, [ option_index, section_id, in_table ]);
+		},
+
+		validate: validateBroadcast
+	}),
+
+	CBIGatewayValue: form.Value.extend({
+		datatype: 'ip4addr("nomask")',
+
+		render: function(option_index, section_id, in_table) {
+			return network.getWANNetworks().then(L.bind(function(wans) {
+				if (wans.length == 1) {
+					var gwaddr = wans[0].getGatewayAddr();
+					this.placeholder = gwaddr ? '%s (%s)'.format(gwaddr, wans[0].getName()) : '';
+				}
+
+				return form.Value.prototype.render.apply(this, [ option_index, section_id, in_table ]);
+			}, this));
+		},
+
+		validate: function(section_id, value) {
+			var addropt = this.section.children.filter(function(o) { return o.option == 'ipaddr' })[0],
+			    addrval = addropt ? L.toArray(addropt.cfgvalue(section_id)) : null;
+
+			if (addrval != null) {
+				for (var i = 0; i < addrval.length; i++) {
+					var addr = addrval[i].split('/')[0];
+					if (value == addr)
+						return _('The gateway address must not be a local IP address');
+				}
+			}
+
+			return true;
+		}
+	}),
+
+	CBIBroadcastValue: form.Value.extend({
+		datatype: 'ip4addr("nomask")',
+
+		render: function(option_index, section_id, in_table) {
+			this.placeholder = calculateBroadcast(this.section, true);
+			return form.Value.prototype.render.apply(this, [ option_index, section_id, in_table ]);
+		}
+	}),
+
+	getI18n: function() {
+		return _('Static address');
+	},
+
+	renderFormOptions: function(s) {
+		var dev = this.getL2Device() || this.getDevice(), o;
+
+		s.taboption('general', this.CBIIPValue, 'ipaddr', _('IPv4 address'));
+		s.taboption('general', this.CBINetmaskValue, 'netmask', _('IPv4 netmask'));
+		s.taboption('general', this.CBIGatewayValue, 'gateway', _('IPv4 gateway'));
+		s.taboption('general', this.CBIBroadcastValue, 'broadcast', _('IPv4 broadcast'));
+		s.taboption('general', form.DynamicList, 'dns', _('Use custom DNS servers'));
+
+		o = s.taboption('general', form.Value, 'ip6assign', _('IPv6 assignment length'), _('Assign a part of given length of every public IPv6-prefix to this interface'));
+		o.value('', _('disabled'));
+		o.value('64');
+		o.datatype = 'max(64)';
+
+		o = s.taboption('general', form.Value, 'ip6hint', _('IPv6 assignment hint'), _('Assign prefix parts using this hexadecimal subprefix ID for this interface.'));
+		o.placeholder = '0';
+		o.validate = function(section_id, value) {
+			var n = parseInt(value, 16);
+
+			if (!/^(0x)?[0-9a-fA-F]+$/.test(value) || isNaN(n) || n >= 0xffffffff)
+				return _('Expecting an hexadecimal assignment hint');
+
+			return true;
+		};
+		for (var i = 33; i <= 64; i++)
+			o.depends('ip6assign', String(i));
+
+		o = s.taboption('general', form.DynamicList, 'ip6addr', _('IPv6 address'));
+		o.datatype = 'ip6addr';
+		o.placeholder = _('Add IPv6 address…');
+		o.depends('ip6assign', '');
+
+		o = s.taboption('general', form.Value, 'ip6gw', _('IPv6 gateway'));
+		o.datatype = 'ip6addr("nomask")';
+		o.depends('ip6assign', '');
+
+		o = s.taboption('general', form.Value, 'ip6prefix', _('IPv6 routed prefix'), _('Public prefix routed to this device for distribution to clients.'));
+		o.datatype = 'ip6addr';
+		o.depends('ip6assign', '');
+
+		o = s.taboption('general', form.Value, 'ip6ifaceid', _('IPv6 suffix'), _("Optional. Allowed values: 'eui64', 'random', fixed value like '::1' or '::1:2'. When IPv6 prefix (like 'a:b:c:d::') is received from a delegating server, use the suffix (like '::1') to form the IPv6 address ('a:b:c:d::1') for the interface."));
+		o.datatype = 'ip6hostid';
+		o.placeholder = '::1';
+
+		o = s.taboption('advanced', form.Value, 'macaddr', _('Override MAC address'));
+		o.datatype = 'macaddr';
+		o.placeholder = dev ? (dev.getMAC() || '') : '';
+
+		o = s.taboption('advanced', form.Value, 'mtu', _('Override MTU'));
+		o.datatype = 'max(9200)';
+		o.placeholder = dev ? (dev.getMTU() || '1500') : '1500';
+
+		o = s.taboption('advanced', form.Value, 'metric', _('Use gateway metric'));
+		o.placeholder = this.getMetric() || '0';
+		o.datatype = 'uinteger';
+	}
+});
diff --git a/modules/luci-base/htdocs/luci-static/resources/rpc.js b/modules/luci-base/htdocs/luci-static/resources/rpc.js
index e12c2f77e..9c74bfdaf 100644
--- a/modules/luci-base/htdocs/luci-static/resources/rpc.js
+++ b/modules/luci-base/htdocs/luci-static/resources/rpc.js
@@ -2,10 +2,11 @@
 
 var rpcRequestID = 1,
     rpcSessionID = L.env.sessionid || '00000000000000000000000000000000',
-    rpcBaseURL = L.url('admin/ubus');
+    rpcBaseURL = L.url('admin/ubus'),
+    rpcInterceptorFns = [];
 
 return L.Class.extend({
-	call: function(req, cb) {
+	call: function(req, cb, nobatch) {
 		var q = '';
 
 		if (Array.isArray(req)) {
@@ -13,55 +14,74 @@ return L.Class.extend({
 				return Promise.resolve([]);
 
 			for (var i = 0; i < req.length; i++)
-				q += '%s%s.%s'.format(
-					q ? ';' : '/',
-					req[i].params[1],
-					req[i].params[2]
-				);
+				if (req[i].params)
+					q += '%s%s.%s'.format(
+						q ? ';' : '/',
+						req[i].params[1],
+						req[i].params[2]
+					);
 		}
-		else {
+		else if (req.params) {
 			q += '/%s.%s'.format(req.params[1], req.params[2]);
 		}
 
 		return L.Request.post(rpcBaseURL + q, req, {
-			timeout: (L.env.rpctimeout || 5) * 1000,
+			timeout: (L.env.rpctimeout || 20) * 1000,
+			nobatch: nobatch,
 			credentials: true
-		}).then(cb);
+		}).then(cb, cb);
 	},
 
-	handleListReply: function(req, msg) {
-		var list = msg.result;
+	parseCallReply: function(req, res) {
+		var msg = null;
 
-		/* verify message frame */
-		if (typeof(msg) != 'object' || msg.jsonrpc != '2.0' || !msg.id || !Array.isArray(list))
-			list = [ ];
+		if (res instanceof Error)
+			return req.reject(res);
 
-		req.resolve(list);
-	},
-
-	handleCallReply: function(req, res) {
-		var type = Object.prototype.toString,
-		    msg = null;
+		try {
+			if (!res.ok)
+				L.raise('RPCError', 'RPC call to %s/%s failed with HTTP error %d: %s',
+					req.object, req.method, res.status, res.statusText || '?');
 
-		if (!res.ok)
-			L.error('RPCError', 'RPC call failed with HTTP error %d: %s',
-				res.status, res.statusText || '?');
+			msg = res.json();
+		}
+		catch (e) {
+			return req.reject(e);
+		}
 
-		msg = res.json();
+		/*
+		 * The interceptor args are intentionally swapped.
+		 * Response is passed as first arg to align with Request class interceptors
+		 */
+		Promise.all(rpcInterceptorFns.map(function(fn) { return fn(msg, req) }))
+			.then(this.handleCallReply.bind(this, req, msg))
+			.catch(req.reject);
+	},
 
-		/* fetch response attribute and verify returned type */
-		var ret = undefined;
+	handleCallReply: function(req, msg) {
+		var type = Object.prototype.toString,
+		    ret = null;
+
+		try {
+			/* verify message frame */
+			if (!L.isObject(msg) || msg.jsonrpc != '2.0')
+				L.raise('RPCError', 'RPC call to %s/%s returned invalid message frame',
+					req.object, req.method);
+
+			/* check error condition */
+			if (L.isObject(msg.error) && msg.error.code && msg.error.message)
+				L.raise('RPCError', 'RPC call to %s/%s failed with error %d: %s',
+					req.object, req.method, msg.error.code, msg.error.message || '?');
+		}
+		catch (e) {
+			return req.reject(e);
+		}
 
-		/* verify message frame */
-		if (typeof(msg) == 'object' && msg.jsonrpc == '2.0') {
-			if (typeof(msg.error) == 'object' && msg.error.code && msg.error.message)
-				req.reject(new Error('RPC call failed with error %d: %s'
-					.format(msg.error.code, msg.error.message || '?')));
-			else if (Array.isArray(msg.result) && msg.result[0] == 0)
-				ret = (msg.result.length > 1) ? msg.result[1] : msg.result[0];
+		if (!req.object && !req.method) {
+			ret = msg.result;
 		}
-		else {
-			req.reject(new Error('Invalid message frame received'));
+		else if (Array.isArray(msg.result)) {
+			ret = (msg.result.length > 1) ? msg.result[1] : msg.result[0];
 		}
 
 		if (req.expect) {
@@ -94,7 +114,16 @@ return L.Class.extend({
 			params:  arguments.length ? this.varargs(arguments) : undefined
 		};
 
-		return this.call(msg, this.handleListReply);
+		return new Promise(L.bind(function(resolveFn, rejectFn) {
+			/* store request info */
+			var req = {
+				resolve: resolveFn,
+				reject:  rejectFn
+			};
+
+			/* call rpc */
+			this.call(msg, this.parseCallReply.bind(this, req));
+		}, this));
 	},
 
 	declare: function(options) {
@@ -120,7 +149,9 @@ return L.Class.extend({
 					resolve: resolveFn,
 					reject:  rejectFn,
 					params:  params,
-					priv:    priv
+					priv:    priv,
+					object:  options.object,
+					method:  options.method
 				};
 
 				/* build message object */
@@ -137,7 +168,7 @@ return L.Class.extend({
 				};
 
 				/* call rpc */
-				rpc.call(msg, rpc.handleCallReply.bind(rpc, req));
+				rpc.call(msg, rpc.parseCallReply.bind(rpc, req), options.nobatch);
 			});
 		}, this, this, options);
 	},
@@ -156,5 +187,36 @@ return L.Class.extend({
 
 	setBaseURL: function(url) {
 		rpcBaseURL = url;
+	},
+
+	getStatusText: function(statusCode) {
+		switch (statusCode) {
+		case 0: return _('Command OK');
+		case 1: return _('Invalid command');
+		case 2: return _('Invalid argument');
+		case 3: return _('Method not found');
+		case 4: return _('Resource not found');
+		case 5: return _('No data received');
+		case 6: return _('Permission denied');
+		case 7: return _('Request timeout');
+		case 8: return _('Not supported');
+		case 9: return _('Unspecified error');
+		case 10: return _('Connection lost');
+		default: return _('Unknown error code');
+		}
+	},
+
+	addInterceptor: function(interceptorFn) {
+		if (typeof(interceptorFn) == 'function')
+			rpcInterceptorFns.push(interceptorFn);
+		return interceptorFn;
+	},
+
+	removeInterceptor: function(interceptorFn) {
+		var oldlen = rpcInterceptorFns.length, i = oldlen;
+		while (i--)
+			if (rpcInterceptorFns[i] === interceptorFn)
+				rpcInterceptorFns.splice(i, 1);
+		return (rpcInterceptorFns.length < oldlen);
 	}
 });
diff --git a/modules/luci-base/htdocs/luci-static/resources/tools/widgets.js b/modules/luci-base/htdocs/luci-static/resources/tools/widgets.js
index 39e5aa165..1667fa670 100644
--- a/modules/luci-base/htdocs/luci-static/resources/tools/widgets.js
+++ b/modules/luci-base/htdocs/luci-static/resources/tools/widgets.js
@@ -358,7 +358,7 @@ var CBINetworkSelect = form.ListValue.extend({
 			var network = this.networks[i],
 			    name = network.getName();
 
-			if (name == 'loopback' || !this.filter(section_id, name))
+			if (name == 'loopback' || name == this.exclude || !this.filter(section_id, name))
 				continue;
 
 			if (this.novirtual && network.isVirtual())
@@ -420,8 +420,12 @@ var CBIDeviceSelect = form.ListValue.extend({
 	__name__: 'CBI.DeviceSelect',
 
 	load: function(section_id) {
-		return network.getDevices().then(L.bind(function(devices) {
-			this.devices = devices;
+		return Promise.all([
+			network.getDevices(),
+			this.noaliases ? null : network.getNetworks()
+		]).then(L.bind(function(data) {
+			this.devices = data[0];
+			this.networks = data[1];
 
 			return this.super('load', section_id);
 		}, this));
@@ -474,7 +478,7 @@ var CBIDeviceSelect = form.ListValue.extend({
 			var networks = device.getNetworks();
 
 			if (networks.length > 0)
-				L.dom.append(item.lastChild, [ ' (', networks.join(', '), ')' ]);
+				L.dom.append(item.lastChild, [ ' (', networks.map(function(n) { return n.getName() }).join(', '), ')' ]);
 
 			if (checked[name])
 				values.push(name);
@@ -483,6 +487,35 @@ var CBIDeviceSelect = form.ListValue.extend({
 			order.push(name);
 		}
 
+		if (this.networks != null) {
+			for (var i = 0; i < this.networks.length; i++) {
+				var net = this.networks[i],
+				    device = network.instantiateDevice('@%s'.format(net.getName()), net),
+				    name = device.getName();
+
+				if (name == '@loopback' || name == this.exclude || !this.filter(section_id, name))
+					continue;
+
+				if (this.noinactive && net.isUp() == false)
+					continue;
+
+				var item = E([
+					E('img', {
+						'title': device.getI18n(),
+						'src': L.resource('icons/alias%s.png'.format(net.isUp() ? '' : '_disabled'))
+					}),
+					E('span', { 'class': 'hide-open' }, [ name ]),
+					E('span', { 'class': 'hide-close'}, [ device.getI18n() ])
+				]);
+
+				if (checked[name])
+					values.push(name);
+
+				choices[name] = item;
+				order.push(name);
+			}
+		}
+
 		if (!this.nocreate) {
 			var keys = Object.keys(checked).sort();
 
diff --git a/modules/luci-base/htdocs/luci-static/resources/ui.js b/modules/luci-base/htdocs/luci-static/resources/ui.js
index 29233dec0..99e1548a4 100644
--- a/modules/luci-base/htdocs/luci-static/resources/ui.js
+++ b/modules/luci-base/htdocs/luci-static/resources/ui.js
@@ -1,4 +1,5 @@
 'use strict';
+'require rpc';
 'require uci';
 'require validation';
 
@@ -69,6 +70,11 @@ var UIElement = L.Class.extend({
 	},
 
 	setChangeEvents: function(targetNode /*, ... */) {
+		var tag_changed = L.bind(function(ev) { this.setAttribute('data-changed', true) }, this.node);
+
+		for (var i = 1; i < arguments.length; i++)
+			targetNode.addEventListener(arguments[i], tag_changed);
+
 		this.registerEvents(targetNode, 'widget-change', this.varargs(arguments, 1));
 	}
 });
@@ -146,6 +152,61 @@ var UITextfield = UIElement.extend({
 	}
 });
 
+var UITextarea = UIElement.extend({
+	__init__: function(value, options) {
+		this.value = value;
+		this.options = Object.assign({
+			optional: true,
+			wrap: false,
+			cols: null,
+			rows: null
+		}, options);
+	},
+
+	render: function() {
+		var frameEl = E('div', { 'id': this.options.id }),
+		    value = (this.value != null) ? String(this.value) : '';
+
+		frameEl.appendChild(E('textarea', {
+			'id': this.options.id ? 'widget.' + this.options.id : null,
+			'name': this.options.name,
+			'class': 'cbi-input-textarea',
+			'readonly': this.options.readonly ? '' : null,
+			'placeholder': this.options.placeholder,
+			'style': !this.options.cols ? 'width:100%' : null,
+			'cols': this.options.cols,
+			'rows': this.options.rows,
+			'wrap': this.options.wrap ? '' : null
+		}, [ value ]));
+
+		if (this.options.monospace)
+			frameEl.firstElementChild.style.fontFamily = 'monospace';
+
+		return this.bind(frameEl);
+	},
+
+	bind: function(frameEl) {
+		var inputEl = frameEl.firstElementChild;
+
+		this.node = frameEl;
+
+		this.setUpdateEvents(inputEl, 'keyup', 'blur');
+		this.setChangeEvents(inputEl, 'change');
+
+		L.dom.bindClassInstance(frameEl, this);
+
+		return frameEl;
+	},
+
+	getValue: function() {
+		return this.node.firstElementChild.value;
+	},
+
+	setValue: function(value) {
+		this.node.firstElementChild.value = value;
+	}
+});
+
 var UICheckbox = UIElement.extend({
 	__init__: function(value, options) {
 		this.value = value;
@@ -207,7 +268,7 @@ var UICheckbox = UIElement.extend({
 
 var UISelect = UIElement.extend({
 	__init__: function(value, choices, options) {
-		if (typeof(choices) != 'object')
+		if (!L.isObject(choices))
 			choices = {};
 
 		if (!Array.isArray(value))
@@ -1199,7 +1260,7 @@ var UIDynamicList = UIElement.extend({
 					'name': this.options.name,
 					'value': value })]);
 
-		dl.querySelectorAll('.item, .add-item').forEach(function(item) {
+		dl.querySelectorAll('.item').forEach(function(item) {
 			if (exists)
 				return;
 
@@ -1210,10 +1271,13 @@ var UIDynamicList = UIElement.extend({
 
 			if (hidden && hidden.value === value)
 				exists = true;
-			else if (!hidden || hidden.value >= value)
-				exists = !!item.parentNode.insertBefore(new_item, item);
 		});
 
+		if (!exists) {
+			var ai = dl.querySelector('.add-item');
+			ai.parentNode.insertBefore(new_item, ai);
+		}
+
 		dl.dispatchEvent(new CustomEvent('cbi-dynlist-change', {
 			bubbles: true,
 			detail: {
@@ -1395,6 +1459,417 @@ var UIHiddenfield = UIElement.extend({
 	}
 });
 
+var UIFileUpload = UIElement.extend({
+	__init__: function(value, options) {
+		this.value = value;
+		this.options = Object.assign({
+			show_hidden: false,
+			enable_upload: true,
+			enable_remove: true,
+			root_directory: '/etc/luci-uploads'
+		}, options);
+	},
+
+	callFileStat: rpc.declare({
+		'object': 'file',
+		'method': 'stat',
+		'params': [ 'path' ],
+		'expect': { '': {} }
+	}),
+
+	callFileList: rpc.declare({
+		'object': 'file',
+		'method': 'list',
+		'params': [ 'path' ],
+		'expect': { 'entries': [] }
+	}),
+
+	callFileRemove: rpc.declare({
+		'object': 'file',
+		'method': 'remove',
+		'params': [ 'path' ]
+	}),
+
+	bind: function(browserEl) {
+		this.node = browserEl;
+
+		this.setUpdateEvents(browserEl, 'cbi-fileupload-select', 'cbi-fileupload-cancel');
+		this.setChangeEvents(browserEl, 'cbi-fileupload-select', 'cbi-fileupload-cancel');
+
+		L.dom.bindClassInstance(browserEl, this);
+
+		return browserEl;
+	},
+
+	render: function() {
+		return Promise.resolve(this.value != null ? this.callFileStat(this.value) : null).then(L.bind(function(stat) {
+			var label;
+
+			if (L.isObject(stat) && stat.type != 'directory')
+				this.stat = stat;
+
+			if (this.stat != null)
+				label = [ this.iconForType(this.stat.type), ' %s (%1000mB)'.format(this.truncatePath(this.stat.path), this.stat.size) ];
+			else if (this.value != null)
+				label = [ this.iconForType('file'), ' %s (%s)'.format(this.truncatePath(this.value), _('File not accessible')) ];
+			else
+				label = [ _('Select file…') ];
+
+			return this.bind(E('div', { 'id': this.options.id }, [
+				E('button', {
+					'class': 'btn',
+					'click': L.ui.createHandlerFn(this, 'handleFileBrowser')
+				}, label),
+				E('div', {
+					'class': 'cbi-filebrowser'
+				}),
+				E('input', {
+					'type': 'hidden',
+					'name': this.options.name,
+					'value': this.value
+				})
+			]));
+		}, this));
+	},
+
+	truncatePath: function(path) {
+		if (path.length > 50)
+			path = path.substring(0, 25) + '…' + path.substring(path.length - 25);
+
+		return path;
+	},
+
+	iconForType: function(type) {
+		switch (type) {
+		case 'symlink':
+			return E('img', {
+				'src': L.resource('cbi/link.gif'),
+				'title': _('Symbolic link'),
+				'class': 'middle'
+			});
+
+		case 'directory':
+			return E('img', {
+				'src': L.resource('cbi/folder.gif'),
+				'title': _('Directory'),
+				'class': 'middle'
+			});
+
+		default:
+			return E('img', {
+				'src': L.resource('cbi/file.gif'),
+				'title': _('File'),
+				'class': 'middle'
+			});
+		}
+	},
+
+	canonicalizePath: function(path) {
+		return path.replace(/\/{2,}/, '/')
+			.replace(/\/\.(\/|$)/g, '/')
+			.replace(/[^\/]+\/\.\.(\/|$)/g, '/')
+			.replace(/\/$/, '');
+	},
+
+	splitPath: function(path) {
+		var croot = this.canonicalizePath(this.options.root_directory || '/'),
+		    cpath = this.canonicalizePath(path || '/');
+
+		if (cpath.length <= croot.length)
+			return [ croot ];
+
+		if (cpath.charAt(croot.length) != '/')
+			return [ croot ];
+
+		var parts = cpath.substring(croot.length + 1).split(/\//);
+
+		parts.unshift(croot);
+
+		return parts;
+	},
+
+	handleUpload: function(path, list, ev) {
+		var form = ev.target.parentNode,
+		    fileinput = form.querySelector('input[type="file"]'),
+		    nameinput = form.querySelector('input[type="text"]'),
+		    filename = (nameinput.value != null ? nameinput.value : '').trim();
+
+		ev.preventDefault();
+
+		if (filename == '' || filename.match(/\//) || fileinput.files[0] == null)
+			return;
+
+		var existing = list.filter(function(e) { return e.name == filename })[0];
+
+		if (existing != null && existing.type == 'directory')
+			return alert(_('A directory with the same name already exists.'));
+		else if (existing != null && !confirm(_('Overwrite existing file "%s" ?').format(filename)))
+			return;
+
+		var data = new FormData();
+
+		data.append('sessionid', L.env.sessionid);
+		data.append('filename', path + '/' + filename);
+		data.append('filedata', fileinput.files[0]);
+
+		return L.Request.post('/cgi-bin/cgi-upload', data, {
+			progress: L.bind(function(btn, ev) {
+				btn.firstChild.data = '%.2f%%'.format((ev.loaded / ev.total) * 100);
+			}, this, ev.target)
+		}).then(L.bind(function(path, ev, res) {
+			var reply = res.json();
+
+			if (L.isObject(reply) && reply.failure)
+				alert(_('Upload request failed: %s').format(reply.message));
+
+			return this.handleSelect(path, null, ev);
+		}, this, path, ev));
+	},
+
+	handleDelete: function(path, fileStat, ev) {
+		var parent = path.replace(/\/[^\/]+$/, '') || '/',
+		    name = path.replace(/^.+\//, ''),
+		    msg;
+
+		ev.preventDefault();
+
+		if (fileStat.type == 'directory')
+			msg = _('Do you really want to recursively delete the directory "%s" ?').format(name);
+		else
+			msg = _('Do you really want to delete "%s" ?').format(name);
+
+		if (confirm(msg)) {
+			var button = this.node.firstElementChild,
+			    hidden = this.node.lastElementChild;
+
+			if (path == hidden.value) {
+				L.dom.content(button, _('Select file…'));
+				hidden.value = '';
+			}
+
+			return this.callFileRemove(path).then(L.bind(function(parent, ev, rc) {
+				if (rc == 0)
+					return this.handleSelect(parent, null, ev);
+				else if (rc == 6)
+					alert(_('Delete permission denied'));
+				else
+					alert(_('Delete request failed: %d %s').format(rc, rpc.getStatusText(rc)));
+
+			}, this, parent, ev));
+		}
+	},
+
+	renderUpload: function(path, list) {
+		if (!this.options.enable_upload)
+			return E([]);
+
+		return E([
+			E('a', {
+				'href': '#',
+				'class': 'btn cbi-button-positive',
+				'click': function(ev) {
+					var uploadForm = ev.target.nextElementSibling,
+					    fileInput = uploadForm.querySelector('input[type="file"]');
+
+					ev.target.style.display = 'none';
+					uploadForm.style.display = '';
+					fileInput.click();
+				}
+			}, _('Upload file…')),
+			E('div', { 'class': 'upload', 'style': 'display:none' }, [
+				E('input', {
+					'type': 'file',
+					'style': 'display:none',
+					'change': function(ev) {
+						var nameinput = ev.target.parentNode.querySelector('input[type="text"]'),
+						    uploadbtn = ev.target.parentNode.querySelector('button.cbi-button-save');
+
+						nameinput.value = ev.target.value.replace(/^.+[\/\\]/, '');
+						uploadbtn.disabled = false;
+					}
+				}),
+				E('button', {
+					'class': 'btn',
+					'click': function(ev) {
+						ev.preventDefault();
+						ev.target.previousElementSibling.click();
+					}
+				}, [ _('Browse…') ]),
+				E('div', {}, E('input', { 'type': 'text', 'placeholder': _('Filename') })),
+				E('button', {
+					'class': 'btn cbi-button-save',
+					'click': L.ui.createHandlerFn(this, 'handleUpload', path, list),
+					'disabled': true
+				}, [ _('Upload file') ])
+			])
+		]);
+	},
+
+	renderListing: function(container, path, list) {
+		var breadcrumb = E('p'),
+		    rows = E('ul');
+
+		list.sort(function(a, b) {
+			var isDirA = (a.type == 'directory'),
+			    isDirB = (b.type == 'directory');
+
+			if (isDirA != isDirB)
+				return isDirA < isDirB;
+
+			return a.name > b.name;
+		});
+
+		for (var i = 0; i < list.length; i++) {
+			if (!this.options.show_hidden && list[i].name.charAt(0) == '.')
+				continue;
+
+			var entrypath = this.canonicalizePath(path + '/' + list[i].name),
+			    selected = (entrypath == this.node.lastElementChild.value),
+			    mtime = new Date(list[i].mtime * 1000);
+
+			rows.appendChild(E('li', [
+				E('div', { 'class': 'name' }, [
+					this.iconForType(list[i].type),
+					' ',
+					E('a', {
+						'href': '#',
+						'style': selected ? 'font-weight:bold' : null,
+						'click': L.ui.createHandlerFn(this, 'handleSelect',
+							entrypath, list[i].type != 'directory' ? list[i] : null)
+					}, '%h'.format(list[i].name))
+				]),
+				E('div', { 'class': 'mtime hide-xs' }, [
+					' %04d-%02d-%02d %02d:%02d:%02d '.format(
+						mtime.getFullYear(),
+						mtime.getMonth() + 1,
+						mtime.getDate(),
+						mtime.getHours(),
+						mtime.getMinutes(),
+						mtime.getSeconds())
+				]),
+				E('div', [
+					selected ? E('button', {
+						'class': 'btn',
+						'click': L.ui.createHandlerFn(this, 'handleReset')
+					}, [ _('Deselect') ]) : '',
+					this.options.enable_remove ? E('button', {
+						'class': 'btn cbi-button-negative',
+						'click': L.ui.createHandlerFn(this, 'handleDelete', entrypath, list[i])
+					}, [ _('Delete') ]) : ''
+				])
+			]));
+		}
+
+		if (!rows.firstElementChild)
+			rows.appendChild(E('em', _('No entries in this directory')));
+
+		var dirs = this.splitPath(path),
+		    cur = '';
+
+		for (var i = 0; i < dirs.length; i++) {
+			cur = cur ? cur + '/' + dirs[i] : dirs[i];
+			L.dom.append(breadcrumb, [
+				i ? ' » ' : '',
+				E('a', {
+					'href': '#',
+					'click': L.ui.createHandlerFn(this, 'handleSelect', cur || '/', null)
+				}, dirs[i] != '' ? '%h'.format(dirs[i]) : E('em', '(root)')),
+			]);
+		}
+
+		L.dom.content(container, [
+			breadcrumb,
+			rows,
+			E('div', { 'class': 'right' }, [
+				this.renderUpload(path, list),
+				E('a', {
+					'href': '#',
+					'class': 'btn',
+					'click': L.ui.createHandlerFn(this, 'handleCancel')
+				}, _('Cancel'))
+			]),
+		]);
+	},
+
+	handleCancel: function(ev) {
+		var button = this.node.firstElementChild,
+		    browser = button.nextElementSibling;
+
+		browser.classList.remove('open');
+		button.style.display = '';
+
+		this.node.dispatchEvent(new CustomEvent('cbi-fileupload-cancel', {}));
+	},
+
+	handleReset: function(ev) {
+		var button = this.node.firstElementChild,
+		    hidden = this.node.lastElementChild;
+
+		hidden.value = '';
+		L.dom.content(button, _('Select file…'));
+
+		this.handleCancel(ev);
+	},
+
+	handleSelect: function(path, fileStat, ev) {
+		var browser = L.dom.parent(ev.target, '.cbi-filebrowser'),
+		    ul = browser.querySelector('ul');
+
+		if (fileStat == null) {
+			L.dom.content(ul, E('em', { 'class': 'spinning' }, _('Loading directory contents…')));
+			this.callFileList(path).then(L.bind(this.renderListing, this, browser, path));
+		}
+		else {
+			var button = this.node.firstElementChild,
+			    hidden = this.node.lastElementChild;
+
+			path = this.canonicalizePath(path);
+
+			L.dom.content(button, [
+				this.iconForType(fileStat.type),
+				' %s (%1000mB)'.format(this.truncatePath(path), fileStat.size)
+			]);
+
+			browser.classList.remove('open');
+			button.style.display = '';
+			hidden.value = path;
+
+			this.stat = Object.assign({ path: path }, fileStat);
+			this.node.dispatchEvent(new CustomEvent('cbi-fileupload-select', { detail: this.stat }));
+		}
+	},
+
+	handleFileBrowser: function(ev) {
+		var button = ev.target,
+		    browser = button.nextElementSibling,
+		    path = this.stat ? this.stat.path.replace(/\/[^\/]+$/, '') : this.options.root_directory;
+
+		if (this.options.root_directory.indexOf(path) != 0)
+			path = this.options.root_directory;
+
+		ev.preventDefault();
+
+		return this.callFileList(path).then(L.bind(function(button, browser, path, list) {
+			document.querySelectorAll('.cbi-filebrowser.open').forEach(function(browserEl) {
+				L.dom.findClassInstance(browserEl).handleCancel(ev);
+			});
+
+			button.style.display = 'none';
+			browser.classList.add('open');
+
+			return this.renderListing(browser, path, list);
+		}, this, button, browser, path));
+	},
+
+	getValue: function() {
+		return this.node.lastElementChild.value;
+	},
+
+	setValue: function(value) {
+		this.node.lastElementChild.value = value;
+	}
+});
+
 
 return L.Class.extend({
 	__init__: function() {
@@ -1497,6 +1972,43 @@ return L.Class.extend({
 		tooltipDiv.dispatchEvent(new CustomEvent('tooltip-close', { bubbles: true }));
 	},
 
+	addNotification: function(title, children /*, ... */) {
+		var mc = document.querySelector('#maincontent') || document.body;
+		var msg = E('div', {
+			'class': 'alert-message fade-in',
+			'style': 'display:flex',
+			'transitionend': function(ev) {
+				var node = ev.currentTarget;
+				if (node.parentNode && node.classList.contains('fade-out'))
+					node.parentNode.removeChild(node);
+			}
+		}, [
+			E('div', { 'style': 'flex:10' }),
+			E('div', { 'style': 'flex:1 1 auto; display:flex' }, [
+				E('button', {
+					'class': 'btn',
+					'style': 'margin-left:auto; margin-top:auto',
+					'click': function(ev) {
+						L.dom.parent(ev.target, '.alert-message').classList.add('fade-out');
+					},
+
+				}, [ _('Dismiss') ])
+			])
+		]);
+
+		if (title != null)
+			L.dom.append(msg.firstElementChild, E('h4', {}, title));
+
+		L.dom.append(msg.firstElementChild, children);
+
+		for (var i = 2; i < arguments.length; i++)
+			msg.classList.add(arguments[i]);
+
+		mc.insertBefore(msg, mc.firstElementChild);
+
+		return msg;
+	},
+
 	/* Widget helper */
 	itemlist: function(node, items, separators) {
 		var children = [];
@@ -1553,9 +2065,6 @@ return L.Class.extend({
 			document.addEventListener('dependency-update', this.updateTabs.bind(this));
 
 			this.updateTabs();
-
-			if (!groups.length)
-				this.setActiveTabId(-1, -1);
 		},
 
 		initTabGroup: function(panes) {
@@ -1573,6 +2082,7 @@ return L.Class.extend({
 				    active = pane.getAttribute('data-tab-active') === 'true';
 
 				menu.appendChild(E('li', {
+					'style': this.isEmptyPane(pane) ? 'display:none' : null,
 					'class': active ? 'cbi-tab' : 'cbi-tab-disabled',
 					'data-tab': name
 				}, E('a', {
@@ -1587,11 +2097,11 @@ return L.Class.extend({
 			group.parentNode.insertBefore(menu, group);
 
 			if (selected === null) {
-				selected = this.getActiveTabId(groupId);
+				selected = this.getActiveTabId(panes[0]);
 
-				if (selected < 0 || selected >= panes.length || L.dom.isEmpty(panes[selected])) {
+				if (selected < 0 || selected >= panes.length || this.isEmptyPane(panes[selected])) {
 					for (var i = 0; i < panes.length; i++) {
-						if (!L.dom.isEmpty(panes[i])) {
+						if (!this.isEmptyPane(panes[i])) {
 							selected = i;
 							break;
 						}
@@ -1602,8 +2112,30 @@ return L.Class.extend({
 				menu.childNodes[selected].classList.remove('cbi-tab-disabled');
 				panes[selected].setAttribute('data-tab-active', 'true');
 
-				this.setActiveTabId(groupId, selected);
+				this.setActiveTabId(panes[selected], selected);
 			}
+
+			this.updateTabs(group);
+		},
+
+		isEmptyPane: function(pane) {
+			return L.dom.isEmpty(pane, function(n) { return n.classList.contains('cbi-tab-descr') });
+		},
+
+		getPathForPane: function(pane) {
+			var path = [], node = null;
+
+			for (node = pane ? pane.parentNode : null;
+			     node != null && node.hasAttribute != null;
+			     node = node.parentNode)
+			{
+				if (node.hasAttribute('data-tab'))
+					path.unshift(node.getAttribute('data-tab'));
+				else if (node.hasAttribute('data-section-id'))
+					path.unshift(node.getAttribute('data-section-id'));
+			}
+
+			return path.join('/');
 		},
 
 		getActiveTabState: function() {
@@ -1611,23 +2143,26 @@ return L.Class.extend({
 
 			try {
 				var val = JSON.parse(window.sessionStorage.getItem('tab'));
-				if (val.page === page && Array.isArray(val.groups))
+				if (val.page === page && L.isObject(val.paths))
 					return val;
 			}
 			catch(e) {}
 
 			window.sessionStorage.removeItem('tab');
-			return { page: page, groups: [] };
+			return { page: page, paths: {} };
 		},
 
-		getActiveTabId: function(groupId) {
-			return +this.getActiveTabState().groups[groupId] || 0;
+		getActiveTabId: function(pane) {
+			var path = this.getPathForPane(pane);
+			return +this.getActiveTabState().paths[path] || 0;
 		},
 
-		setActiveTabId: function(groupId, tabIndex) {
+		setActiveTabId: function(pane, tabIndex) {
+			var path = this.getPathForPane(pane);
+
 			try {
 				var state = this.getActiveTabState();
-				    state.groups[groupId] = tabIndex;
+				    state.paths[path] = tabIndex;
 
 			    window.sessionStorage.setItem('tab', JSON.stringify(state));
 			}
@@ -1637,12 +2172,15 @@ return L.Class.extend({
 		},
 
 		updateTabs: function(ev, root) {
-			(root || document).querySelectorAll('[data-tab-title]').forEach(function(pane) {
+			(root || document).querySelectorAll('[data-tab-title]').forEach(L.bind(function(pane) {
 				var menu = pane.parentNode.previousElementSibling,
-				    tab = menu.querySelector('[data-tab="%s"]'.format(pane.getAttribute('data-tab'))),
+				    tab = menu ? menu.querySelector('[data-tab="%s"]'.format(pane.getAttribute('data-tab'))) : null,
 				    n_errors = pane.querySelectorAll('.cbi-input-invalid').length;
 
-				if (L.dom.isEmpty(pane)) {
+				if (!menu || !tab)
+					return;
+
+				if (this.isEmptyPane(pane)) {
 					tab.style.display = 'none';
 					tab.classList.remove('flash');
 				}
@@ -1660,7 +2198,7 @@ return L.Class.extend({
 					tab.removeAttribute('data-errors');
 					tab.removeAttribute('data-tooltip');
 				}
-			});
+			}, this));
 		},
 
 		switchTab: function(ev) {
@@ -1687,7 +2225,7 @@ return L.Class.extend({
 				if (L.dom.matches(pane, '[data-tab]')) {
 					if (pane.getAttribute('data-tab') === name) {
 						pane.setAttribute('data-tab-active', 'true');
-						L.ui.tabs.setActiveTabId(groupId, index);
+						L.ui.tabs.setActiveTabId(pane, index);
 					}
 					else {
 						pane.setAttribute('data-tab-active', 'false');
@@ -1770,24 +2308,18 @@ return L.Class.extend({
 							E('var', {}, E('del', '&#160;')), ' ', _('Option removed') ])]),
 					E('br'), list,
 					E('div', { 'class': 'right' }, [
-						E('input', {
-							'type': 'button',
+						E('button', {
 							'class': 'btn',
-							'click': L.ui.hideModal,
-							'value': _('Dismiss')
-						}), ' ',
-						E('input', {
-							'type': 'button',
+							'click': L.ui.hideModal
+						}, [ _('Dismiss') ]), ' ',
+						E('button', {
 							'class': 'cbi-button cbi-button-positive important',
-							'click': L.bind(this.apply, this, true),
-							'value': _('Save & Apply')
-						}), ' ',
-						E('input', {
-							'type': 'button',
+							'click': L.bind(this.apply, this, true)
+						}, [ _('Save & Apply') ]), ' ',
+						E('button', {
 							'class': 'cbi-button cbi-button-reset',
-							'click': L.bind(this.revert, this),
-							'value': _('Revert')
-						})])])
+							'click': L.bind(this.revert, this)
+						}, [ _('Revert') ])])])
 			]);
 
 			for (var config in this.changes) {
@@ -1863,24 +2395,18 @@ return L.Class.extend({
 							E('h4', _('Configuration has been rolled back!')),
 							E('p', _('The device could not be reached within %d seconds after applying the pending changes, which caused the configuration to be rolled back for safety reasons. If you believe that the configuration changes are correct nonetheless, perform an unchecked configuration apply. Alternatively, you can dismiss this warning and edit changes before attempting to apply again, or revert all pending changes to keep the currently working configuration state.').format(L.env.apply_rollback)),
 							E('div', { 'class': 'right' }, [
-								E('input', {
-									'type': 'button',
+								E('button', {
 									'class': 'btn',
-									'click': L.bind(L.ui.changes.displayStatus, L.ui.changes, false),
-									'value': _('Dismiss')
-								}), ' ',
-								E('input', {
-									'type': 'button',
+									'click': L.bind(L.ui.changes.displayStatus, L.ui.changes, false)
+								}, [ _('Dismiss') ]), ' ',
+								E('button', {
 									'class': 'btn cbi-button-action important',
-									'click': L.bind(L.ui.changes.revert, L.ui.changes),
-									'value': _('Revert changes')
-								}), ' ',
-								E('input', {
-									'type': 'button',
+									'click': L.bind(L.ui.changes.revert, L.ui.changes)
+								}, [ _('Revert changes') ]), ' ',
+								E('button', {
 									'class': 'btn cbi-button-negative important',
-									'click': L.bind(L.ui.changes.apply, L.ui.changes, false),
-									'value': _('Apply unchecked')
-								})
+									'click': L.bind(L.ui.changes.apply, L.ui.changes, false)
+								}, [ _('Apply unchecked') ])
 							])
 						]);
 
@@ -2058,12 +2584,37 @@ return L.Class.extend({
 		catch (e) { }
 	},
 
+	createHandlerFn: function(ctx, fn /*, ... */) {
+		if (typeof(fn) == 'string')
+			fn = ctx[fn];
+
+		if (typeof(fn) != 'function')
+			return null;
+
+		return Function.prototype.bind.apply(function() {
+			var t = arguments[arguments.length - 1].target;
+
+			t.classList.add('spinning');
+			t.disabled = true;
+
+			if (t.blur)
+				t.blur();
+
+			Promise.resolve(fn.apply(ctx, arguments)).finally(function() {
+				t.classList.remove('spinning');
+				t.disabled = false;
+			});
+		}, this.varargs(arguments, 2, ctx));
+	},
+
 	/* Widgets */
 	Textfield: UITextfield,
+	Textarea: UITextarea,
 	Checkbox: UICheckbox,
 	Select: UISelect,
 	Dropdown: UIDropdown,
 	DynamicList: UIDynamicList,
 	Combobox: UICombobox,
-	Hiddenfield: UIHiddenfield
+	Hiddenfield: UIHiddenfield,
+	FileUpload: UIFileUpload
 });
diff --git a/modules/luci-base/htdocs/luci-static/resources/validation.js b/modules/luci-base/htdocs/luci-static/resources/validation.js
index ca544cb15..79ae1d670 100644
--- a/modules/luci-base/htdocs/luci-static/resources/validation.js
+++ b/modules/luci-base/htdocs/luci-static/resources/validation.js
@@ -419,6 +419,12 @@ var ValidatorFactory = L.Class.extend({
 			return this.assert(this.factory.parseDecimal(this.value) <= +max, _('value smaller or equal to %f').format(max));
 		},
 
+		length: function(len) {
+			var val = '' + this.value;
+			return this.assert(val.length == +len,
+				_('value with %d characters').format(len));
+		},
+
 		rangelength: function(min, max) {
 			var val = '' + this.value;
 			return this.assert((val.length >= +min) && (val.length <= +max),
diff --git a/modules/luci-base/luasrc/controller/admin/index.lua b/modules/luci-base/luasrc/controller/admin/index.lua
index 9fcfe4a30..928faa14b 100644
--- a/modules/luci-base/luasrc/controller/admin/index.lua
+++ b/modules/luci-base/luasrc/controller/admin/index.lua
@@ -50,6 +50,13 @@ function index()
 	-- 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")
@@ -89,6 +96,7 @@ function index()
 	page.leaf = true
 
 	page = entry({"admin", "ubus"}, call("action_ubus"), nil)
+	page.sysauth = false
 	page.leaf = true
 
 	-- Logout is last
@@ -139,6 +147,8 @@ local function ubus_reply(id, data, code, errmsg)
 			code = code,
 			message = errmsg
 		}
+	elseif type(code) == "table" then
+		reply.result = code
 	else
 		reply.result = { code, data }
 	end
@@ -158,56 +168,78 @@ local ubus_types = {
 	"double"
 }
 
+local function ubus_access(sid, obj, fun)
+	local res, code = luci.util.ubus("session", "access", {
+		ubus_rpc_session = sid,
+		scope            = "ubus",
+		object           = obj,
+		["function"]     = fun
+	})
+
+	return (type(res) == "table" and res.access == true)
+end
+
 local function ubus_request(req)
-	if type(req) ~= "table" or type(req.method) ~= "string" or type(req.params) ~= "table" or
-	   #req.params < 2 or req.jsonrpc ~= "2.0" or req.id == nil then
+	if type(req) ~= "table" or type(req.method) ~= "string" or req.jsonrpc ~= "2.0" or req.id == nil then
 		return ubus_reply(nil, nil, -32600, "Invalid request")
 
 	elseif req.method == "call" then
+		if type(req.params) ~= "table" or #req.params < 3 then
+			return ubus_reply(nil, nil, -32600, "Invalid parameters")
+		end
+
 		local sid, obj, fun, arg =
 			req.params[1], req.params[2], req.params[3], req.params[4] or {}
 		if type(arg) ~= "table" or arg.ubus_rpc_session ~= nil then
 			return ubus_reply(req.id, nil, -32602, "Invalid parameters")
 		end
 
-		if sid == "00000000000000000000000000000000" then
+		if sid == "00000000000000000000000000000000" and luci.dispatcher.context.authsession then
 			sid = luci.dispatcher.context.authsession
 		end
 
+		if not ubus_access(sid, obj, fun) then
+			return ubus_reply(req.id, nil, -32002, "Access denied")
+		end
+
 		arg.ubus_rpc_session = sid
 
 		local res, code = luci.util.ubus(obj, fun, arg)
 		return ubus_reply(req.id, res, code or 0)
 
 	elseif req.method == "list" then
-		if type(params) ~= "table" or #params == 0 then
-			local objs = { luci.util.ubus() }
-			return ubus_reply(req.id, objs, 0)
-		else
+		if req.params == nil or (type(req.params) == "table" and #req.params == 0) then
+			local objs = luci.util.ubus()
+			return ubus_reply(req.id, nil, objs)
+
+		elseif type(req.params) == "table" then
 			local n, rv = nil, {}
-			for n = 1, #params do
-				if type(params[n]) ~= "string" then
+			for n = 1, #req.params do
+				if type(req.params[n]) ~= "string" then
 					return ubus_reply(req.id, nil, -32602, "Invalid parameters")
 				end
 
-				local sig = luci.util.ubus(params[n])
+				local sig = luci.util.ubus(req.params[n])
 				if sig and type(sig) == "table" then
-					rv[params[n]] = {}
+					rv[req.params[n]] = {}
 
 					local m, p
 					for m, p in pairs(sig) do
 						if type(p) == "table" then
-							rv[params[n]][m] = {}
+							rv[req.params[n]][m] = {}
 
 							local pn, pt
 							for pn, pt in pairs(p) do
-								rv[params[n]][m][pn] = ubus_types[pt] or "unknown"
+								rv[req.params[n]][m][pn] = ubus_types[pt] or "unknown"
 							end
 						end
 					end
 				end
 			end
-			return ubus_reply(req.id, rv, 0)
+			return ubus_reply(req.id, nil, rv)
+
+		else
+			return ubus_reply(req.id, nil, -32602, "Invalid parameters")
 		end
 	end
 
diff --git a/modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua b/modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua
deleted file mode 100644
index 6e04465ac..000000000
--- a/modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua
+++ /dev/null
@@ -1,68 +0,0 @@
--- Copyright 2011-2012 Jo-Philipp Wich <jow@openwrt.org>
--- Licensed to the public under the Apache License 2.0.
-
-local map, section, net = ...
-local ifc = net:get_interface()
-
-local hostname, accept_ra, send_rs
-local bcast, defaultroute, peerdns, dns, metric, clientid, vendorclass
-
-
-hostname = section:taboption("general", Value, "hostname",
-	translate("Hostname to send when requesting DHCP"))
-
-hostname.placeholder = luci.sys.hostname()
-hostname.datatype    = "hostname"
-
-
-bcast = section:taboption("advanced", Flag, "broadcast",
-	translate("Use broadcast flag"),
-	translate("Required for certain ISPs, e.g. Charter with DOCSIS 3"))
-
-bcast.default = bcast.disabled
-
-
-defaultroute = section:taboption("advanced", Flag, "defaultroute",
-	translate("Use default gateway"),
-	translate("If unchecked, no default route is configured"))
-
-defaultroute.default = defaultroute.enabled
-
-
-peerdns = section:taboption("advanced", Flag, "peerdns",
-	translate("Use DNS servers advertised by peer"),
-	translate("If unchecked, the advertised DNS server addresses are ignored"))
-
-peerdns.default = peerdns.enabled
-
-
-dns = section:taboption("advanced", DynamicList, "dns",
-	translate("Use custom DNS servers"))
-
-dns:depends("peerdns", "")
-dns.datatype = "ipaddr"
-dns.cast     = "string"
-
-
-metric = section:taboption("advanced", Value, "metric",
-	translate("Use gateway metric"))
-
-metric.placeholder = "0"
-metric.datatype    = "uinteger"
-
-
-clientid = section:taboption("advanced", Value, "clientid",
-	translate("Client ID to send when requesting DHCP"))
-clientid.datatype  = "hexstring"
-
-
-vendorclass = section:taboption("advanced", Value, "vendorid",
-	translate("Vendor Class to send when requesting DHCP"))
-
-
-luci.tools.proto.opt_macaddr(section, ifc, translate("Override MAC address"))
-
-
-mtu = section:taboption("advanced", Value, "mtu", translate("Override MTU"))
-mtu.placeholder = "1500"
-mtu.datatype    = "max(9200)"
diff --git a/modules/luci-base/luasrc/model/cbi/admin_network/proto_none.lua b/modules/luci-base/luasrc/model/cbi/admin_network/proto_none.lua
deleted file mode 100644
index 6fdded9ad..000000000
--- a/modules/luci-base/luasrc/model/cbi/admin_network/proto_none.lua
+++ /dev/null
@@ -1,4 +0,0 @@
--- Copyright 2011 Jo-Philipp Wich <jow@openwrt.org>
--- Licensed to the public under the Apache License 2.0.
-
-local map, section, net = ...
diff --git a/modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua b/modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua
deleted file mode 100644
index 246d2c0ed..000000000
--- a/modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua
+++ /dev/null
@@ -1,167 +0,0 @@
--- Copyright 2011 Jo-Philipp Wich <jow@openwrt.org>
--- Licensed to the public under the Apache License 2.0.
-
-local map, section, net = ...
-local ifc = net:get_interface()
-
-local netmask, gateway, broadcast, dns, accept_ra, send_rs, ip6addr, ip6gw
-local mtu, metric, usecidr, ipaddr_single, ipaddr_multi
-
-
-local function is_cidr(s)
-	return (type(s) == "string" and luci.ip.IPv4(s) and s:find("/"))
-end
-
-usecidr = section:taboption("general", Value, "ipaddr_usecidr")
-usecidr.forcewrite = true
-
-usecidr.cfgvalue = function(self, section)
-	local cfgvalue = self.map:get(section, "ipaddr")
-	return (type(cfgvalue) == "table" or is_cidr(cfgvalue)) and "1" or "0"
-end
-
-usecidr.render = function(self, section, scope)
-	luci.template.Template(nil, [[
-		<input type="hidden"<%= attr("id", cbid) .. attr("name", cbid) .. attr("value", value) %> />
-	]]):render({
-		cbid = self:cbid(section),
-		value = self:cfgvalue(section)
-	})
-end
-
-usecidr.write = function(self, section)
-	local cfgvalue = self.map:get(section, "ipaddr")
-	local formvalue = (self:formvalue(section) == "1") and ipaddr_multi:formvalue(section) or ipaddr_single:formvalue(section)
-	local equal = (cfgvalue == formvalue)
-
-	if not equal and type(cfgvalue) == "table" and type(formvalue) == "table" and #cfgvalue == #formvalue then
-		equal = true
-
-		local _, v
-		for _, v in ipairs(cfgvalue) do
-			if v ~= formvalue[_] then
-				equal = false
-				break
-			end
-		end
-	end
-
-	if not equal then
-		self.map:set(section, "ipaddr", formvalue or "")
-	end
-
-	return not equal
-end
-
-
-ipaddr_multi = section:taboption("general", DynamicList, "ipaddrs", translate("IPv4 address"))
-ipaddr_multi:depends("ipaddr_usecidr", "1")
-ipaddr_multi.datatype = "or(cidr4,ipnet4)"
-ipaddr_multi.placeholder = translate("Add IPv4 address…")
-
-ipaddr_multi.alias = "ipaddr"
-ipaddr_multi.write = function() end
-ipaddr_multi.remove = function() end
-ipaddr_multi.cfgvalue = function(self, section)
-	local addr = self.map:get(section, "ipaddr")
-	local mask = self.map:get(section, "netmask")
-
-	if is_cidr(addr) then
-		return { addr }
-	elseif type(addr) == "string" and
-	       type(mask) == "string" and
-	       #addr > 0 and #mask > 0
-	then
-		return { "%s/%s" %{ addr, mask } }
-	elseif type(addr) == "table" then
-		return addr
-	else
-		return {}
-	end
-end
-
-
-ipaddr_single = section:taboption("general", Value, "ipaddr", translate("IPv4 address"))
-ipaddr_single:depends("ipaddr_usecidr", "0")
-ipaddr_single.datatype = "ip4addr"
-ipaddr_single.template = "cbi/ipaddr"
-ipaddr_single.write = function() end
-ipaddr_single.remove = function() end
-
-
-netmask = section:taboption("general", Value, "netmask", translate("IPv4 netmask"))
-netmask:depends("ipaddr_usecidr", "0")
-netmask.datatype = "ip4addr"
-netmask:value("255.255.255.0")
-netmask:value("255.255.0.0")
-netmask:value("255.0.0.0")
-
-
-gateway = section:taboption("general", Value, "gateway", translate("IPv4 gateway"))
-gateway.datatype = "ip4addr"
-
-
-broadcast = section:taboption("general", Value, "broadcast", translate("IPv4 broadcast"))
-broadcast.datatype = "ip4addr"
-
-
-dns = section:taboption("general", DynamicList, "dns",
-	translate("Use custom DNS servers"))
-
-dns.datatype = "ipaddr"
-dns.cast     = "string"
-
-
-if luci.model.network:has_ipv6() then
-
-	local ip6assign = section:taboption("general", Value, "ip6assign", translate("IPv6 assignment length"),
-		translate("Assign a part of given length of every public IPv6-prefix to this interface"))
-	ip6assign:value("", translate("disabled"))
-	ip6assign:value("64")
-	ip6assign.datatype = "max(64)"
-
-	local ip6hint = section:taboption("general", Value, "ip6hint", translate("IPv6 assignment hint"),
-		translate("Assign prefix parts using this hexadecimal subprefix ID for this interface."))
-	for i=33,64 do ip6hint:depends("ip6assign", i) end
-
-	ip6addr = section:taboption("general", DynamicList, "ip6addr", translate("IPv6 address"))
-	ip6addr.datatype = "ip6addr"
-	ip6addr.placeholder = translate("Add IPv6 address…")
-	ip6addr:depends("ip6assign", "")
-
-
-	ip6gw = section:taboption("general", Value, "ip6gw", translate("IPv6 gateway"))
-	ip6gw.datatype = "ip6addr"
-	ip6gw:depends("ip6assign", "")
-
-
-	local ip6prefix = s:taboption("general", Value, "ip6prefix", translate("IPv6 routed prefix"),
-		translate("Public prefix routed to this device for distribution to clients."))
-	ip6prefix.datatype = "ip6addr"
-	ip6prefix:depends("ip6assign", "")
-
-	local ip6ifaceid = s:taboption("general", Value, "ip6ifaceid", translate("IPv6 suffix"),
-		translate("Optional. Allowed values: 'eui64', 'random', fixed value like '::1' " ..
-			"or '::1:2'. When IPv6 prefix (like 'a:b:c:d::') is received from a " ..
-			"delegating server, use the suffix (like '::1') to form the IPv6 address " ..
-			"('a:b:c:d::1') for the interface."))
-	ip6ifaceid.datatype = "ip6hostid"
-	ip6ifaceid.placeholder = "::1"
-	ip6ifaceid.rmempty = true
-
-end
-
-
-luci.tools.proto.opt_macaddr(section, ifc, translate("Override MAC address"))
-
-
-mtu = section:taboption("advanced", Value, "mtu", translate("Override MTU"))
-mtu.placeholder = "1500"
-mtu.datatype    = "max(9200)"
-
-
-metric = section:taboption("advanced", Value, "metric",
-	translate("Use gateway metric"))
-
-metric.placeholder = "0"
-metric.datatype    = "uinteger"
diff --git a/modules/luci-base/luasrc/sys.lua b/modules/luci-base/luasrc/sys.lua
index d0df27572..5aede8484 100644
--- a/modules/luci-base/luasrc/sys.lua
+++ b/modules/luci-base/luasrc/sys.lua
@@ -189,7 +189,7 @@ local function _nethints(what, callback)
 			end
 		end
 	)
-	
+
 	cur:foreach("dhcp", "odhcpd",
 		function(s)
 			if type(s.leasefile) == "string" and fs.access(s.leasefile) then
@@ -645,7 +645,7 @@ function init.enabled(name)
 end
 
 function init.enable(name)
-	return (init_action("enable", name) == 1)
+	return (init_action("enable", name) == 0)
 end
 
 function init.disable(name)
diff --git a/modules/luci-base/luasrc/tools/status.lua b/modules/luci-base/luasrc/tools/status.lua
index e4bc4451a..dc30c064c 100644
--- a/modules/luci-base/luasrc/tools/status.lua
+++ b/modules/luci-base/luasrc/tools/status.lua
@@ -248,43 +248,3 @@ function wifi_assoclist()
 
 	return assoc
 end
-
-function switch_status(devs)
-	local dev
-	local switches = { }
-	for dev in devs:gmatch("[^%s,]+") do
-		local ports = { }
-		local swc = io.popen("swconfig dev %s show"
-			% luci.util.shellquote(dev), "r")
-
-		if swc then
-			local l
-			repeat
-				l = swc:read("*l")
-				if l then
-					local port, up = l:match("port:(%d+) link:(%w+)")
-					if port then
-						local speed  = l:match(" speed:(%d+)")
-						local duplex = l:match(" (%w+)-duplex")
-						local txflow = l:match(" (txflow)")
-						local rxflow = l:match(" (rxflow)")
-						local auto   = l:match(" (auto)")
-
-						ports[#ports+1] = {
-							port   = tonumber(port) or 0,
-							speed  = tonumber(speed) or 0,
-							link   = (up == "up"),
-							duplex = (duplex == "full"),
-							rxflow = (not not rxflow),
-							txflow = (not not txflow),
-							auto   = (not not auto)
-						}
-					end
-				end
-			until not l
-			swc:close()
-		end
-		switches[dev] = ports
-	end
-	return switches
-end
diff --git a/modules/luci-base/luasrc/view/cbi/filebrowser.htm b/modules/luci-base/luasrc/view/cbi/filebrowser.htm
deleted file mode 100644
index 806b1b5f4..000000000
--- a/modules/luci-base/luasrc/view/cbi/filebrowser.htm
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-    <title>Filebrowser - LuCI</title>
-	<style type="text/css">
-		#path, #listing {
-			font-size: 85%;
-		}
-
-		ul {
-			padding-left: 0;
-			list-style-type: none;
-		}
-
-		li img {
-			vertical-align: bottom;
-			margin-right: 0.2em;
-		}
-	</style>
-
-	<script type="text/javascript">
-		function callback(path) {
-			if( window.opener ) {
-				var input = window.opener.document.getElementById(decodeURIComponent('<%=luci.http.urlencode(luci.http.formvalue('field'))%>'));
-				if( input ) {
-					input.value = decodeURIComponent(path);
-					window.close();
-				}
-			}
-		}
-	</script>
-</head>
-<body>
-	<%
-		require("nixio.fs")
-		require("nixio.util")
-		require("luci.http")
-		require("luci.dispatcher")
-
-		local field   = luci.http.formvalue('field')
-		local request = luci.dispatcher.context.args
-		local path    = { '' }
-
-		for i = 1, #request do
-			if request[i] ~= '..' and #request[i] > 0 then
-				path[#path+1] = request[i]
-			end
-		end
-
-		local filestat = nixio.fs.stat(table.concat(path, '/'))
-		local baseurl  = { 'admin', 'filebrowser' }
-
-		if filestat and filestat.type == "reg" then
-			path[#path] = ''
-		elseif not (filestat and filestat.type == "dir") then
-			path = { '', '' }
-		else
-			path[#path+1] = ''
-		end
-
-		filepath = table.concat(path, '/')
-
-		local entries = {}
-		local _, e
-		for _, e in luci.util.vspairs(nixio.util.consume((nixio.fs.dir(filepath)))) do
-			local p = filepath .. e
-			local s = nixio.fs.stat(p)
-			if s then
-				entries[#entries+1] = {
-					name = e,
-					path = p,
-					type = s.type
-				}
-			end
-		end
-	-%>
-	<div id="path">
-		Location:
-		<% for i, dir in ipairs(path) do %>
-			<% if i == 1 then %>
-				<a href="<%=url(unpack(baseurl))%>?field=<%=luci.http.urlencode(field)%>">(root)</a>
-			<% elseif next(path, i) then %>
-				<% baseurl[#baseurl+1] = luci.http.urlencode(dir) %>
-				/ <a href="<%=url(unpack(baseurl))%>?field=<%=luci.http.urlencode(field)%>"><%=pcdata(dir)%></a>
-			<% else %>
-				<% baseurl[#baseurl+1] = luci.http.urlencode(dir) %>
-				/ <%=pcdata(dir)%>
-			<% end %>
-		<% end %>
-	</div>
-
-	<hr />
-
-	<div id="listing">
-		<ul>
-			<% for _, e in ipairs(entries) do if e.type == 'dir' then -%>
-				<li class="dir">
-					<img src="<%=resource%>/cbi/folder.gif" alt="<%:Directory%>" />
-					<a href="<%=url(unpack(baseurl))%>/<%=luci.http.urlencode(e.name)%>?field=<%=luci.http.urlencode(field)%>"><%=pcdata(e.name)%>/</a>
-				</li>
-			<% end end -%>
-
-			<% for _, e in ipairs(entries) do if e.type ~= 'dir' then -%>
-				<li class="file">
-					<img src="<%=resource%>/cbi/file.gif" alt="<%:File%>" />
-					<a href="#" onclick="callback('<%=luci.http.urlencode(e.path)%>')"><%=pcdata(e.name)%></a>
-				</li>
-			<% end end -%>
-		</ul>
-	</div>
-</body>
-</html>
diff --git a/modules/luci-base/luasrc/view/cbi/upload.htm b/modules/luci-base/luasrc/view/cbi/upload.htm
index 3c3d82b65..e61049538 100644
--- a/modules/luci-base/luasrc/view/cbi/upload.htm
+++ b/modules/luci-base/luasrc/view/cbi/upload.htm
@@ -1,24 +1,14 @@
-<%
-	local t = require("luci.tools.webadmin")
-	local v = self:cfgvalue(section)
-	local s = v and nixio.fs.stat(v)
--%>
 <%+cbi/valueheader%>
-	<% if s then %>
-		<%:Uploaded File%> (<%=t.byte_format(s.size)%>)
-                <% if self.unsafeupload then %>
-		    <input type="hidden"<%= attr("value", v) .. attr("name", cbid) .. attr("id", cbid) %> />
-		    <input class="cbi-button cbi-button-image" type="image" value="<%:Replace entry%>" name="cbi.rlf.<%=section .. "." .. self.option%>" alt="<%:Replace entry%>" title="<%:Replace entry%>" src="<%=resource%>/cbi/reload.gif" />
-                <% end %>
-	<% end %>
 
-        <% if not self.unsafeupload then %>
-		<input type="hidden"<%= attr("value", v) .. attr("name", "cbi.rlf." .. section .. "." .. self.option) .. attr("id", "cbi.rlf." .. section .. "." .. self.option) %> />
-	<% end %>
+<div<%=attr("data-ui-widget", luci.util.serialize_json({
+	"FileUpload", self:cfgvalue(section) or self.default, {
+		id = cbid,
+		name = cbid,
+		show_hidden = self.show_hidden,
+		enable_remove = self.enable_remove,
+		enable_upload = self.enable_upload,
+		root_directory = "/" --self.root_directory
+	}
+}))%>></div>
 
-	<% if (not s) or (s and not self.unsafeupload) then %>
-		<input class="cbi-input-file" type="file"<%= attr("name", cbid) .. attr("id", cbid) %> />
-	<% end %>
-	<input type="text" class="cbi-input-text" data-update="change"<%=
-		attr("name", cbid .. ".textbox") .. attr("id", cbid .. ".textbox") .. attr("value", luci.cbi.AbstractValue.cfgvalue(self, section) or self.default) .. ifattr(self.size, "size") .. ifattr(self.placeholder, "placeholder") .. ifattr(self.readonly, "readonly") .. ifattr(self.maxlength, "maxlength") %> />
 <%+cbi/valuefooter%>
diff --git a/modules/luci-base/luasrc/view/view.htm b/modules/luci-base/luasrc/view/view.htm
index bddd8e446..9220ecf29 100644
--- a/modules/luci-base/luasrc/view/view.htm
+++ b/modules/luci-base/luasrc/view/view.htm
@@ -2,7 +2,10 @@
 
 <div id="view">
 	<div class="spinning"><%:Loading view…%></div>
-	<script type="text/javascript">L.require('view.<%=view%>');</script>
+	<script type="text/javascript">L.require('view.<%=view%>').catch(function(err) {
+		L.dom.content(document.querySelector('#view'), null);
+		L.error(err);
+	});</script>
 </div>
 
 <%+footer%>
diff --git a/modules/luci-base/po/ca/base.po b/modules/luci-base/po/ca/base.po
index f9e769f65..df59a035a 100644
--- a/modules/luci-base/po/ca/base.po
+++ b/modules/luci-base/po/ca/base.po
@@ -13,19 +13,20 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.6\n"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:133
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:857
 msgid "%.1f dB"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:109
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:122
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 msgid "%d Bit"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1641
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2194
 msgid "%d invalid field(s)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:281
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:31
 msgid "%s is untagged in multiple VLANs!"
 msgstr ""
 
@@ -63,19 +64,19 @@ msgid "-- Additional Field --"
 msgstr "-- Camp addicional --"
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:258
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1401
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1533
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:250
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:350
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1114
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1648
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1780
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:314
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:414
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1178
 #: modules/luci-base/luasrc/view/cbi/header.htm:5
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:26
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:88
 msgid "-- Please choose --"
 msgstr "-- Escolliu, si us plau --"
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:259
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:351
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1115
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:415
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1179
 #: modules/luci-base/luasrc/view/cbi/header.htm:6
 msgid "-- custom --"
 msgstr "-- personalitzat --"
@@ -98,7 +99,7 @@ msgstr ""
 msgid "-- please select --"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:382
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:814
 msgid "0 = not using RSSI threshold, 1 = do not change driver default"
 msgstr ""
 
@@ -110,10 +111,11 @@ msgstr "Càrrega d'1 minut:"
 msgid "15 Minute Load:"
 msgstr "Càrrega de 15 minuts:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:924
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1337
 msgid "4-character hexadecimal ID"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:11
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:18
 msgid "464XLAT (CLAT)"
 msgstr ""
@@ -122,47 +124,47 @@ msgstr ""
 msgid "5 Minute Load:"
 msgstr "Càrrega de 5 minuts:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:960
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1366
 msgid "6-octet identifier as a hex string - no colons"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:891
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1310
 msgid "802.11r Fast Transition"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1157
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1567
 msgid "802.11w Association SA Query maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1574
 msgid "802.11w Association SA Query retry timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1133
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1533
 msgid "802.11w Management Frame Protection"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1156
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1567
 msgid "802.11w maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1165
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1574
 msgid "802.11w retry timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:399
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:831
 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:224
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:225
 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:215
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:216
 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:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
 msgid ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
 "order of the resolvfile"
@@ -170,11 +172,11 @@ msgstr ""
 "Es consultaran els servidors <abbr title=\"Domain Name System\">DNS</abbr> "
 "segons l'ordre del fitxer de resolució"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:388
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:820
 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:351
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:373
 #: 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>"
@@ -184,8 +186,8 @@ msgstr "Adreça <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
 msgstr "Passarel·la <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:555
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:35
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:506
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr ""
 "Màscara de xarxa <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
@@ -201,29 +203,29 @@ 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:378
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:402
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:58
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:35
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:33
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "Configuració dels <abbr title=\"Light Emitting Diode\">LED</abbr>s"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:67
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:51
 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:328
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:329
 #: 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:372
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:233
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:234
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> leases"
@@ -231,7 +233,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:242
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> packet size"
@@ -239,11 +241,11 @@ 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:251
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:252
 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
 msgstr "Consultes concurrents <abbr title=\"màximes\">max.</abbr>"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:10
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:42
 msgid ""
 "<br/>Note: you need to manually restart the cron service if the crontab file "
 "was empty before editing."
@@ -251,55 +253,59 @@ msgstr ""
 "Avís: cal reiniciar manualment el servei cron si el fitxer crontab estava "
 "buit abans d'editar-lo."
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:817
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1605
+msgid "A directory with the same name already exists."
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:863
 msgid "A new login is required since the authentication session expired."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:114
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:837
 msgid "A43C + J43 + A43"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:838
 msgid "A43C + J43 + A43 + V43"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:850
 msgid "ADSL"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:826
 msgid "ANSI T1.413"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:33
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:47
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:23
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:94
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:86
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:67
 msgid "APN"
 msgstr "APN"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:56
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:175
 msgid "ARP retry threshold"
 msgstr "Llindar de reintent ARP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:122
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:845
 msgid "ATM (Asynchronous Transfer Mode)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:144
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:866
 msgid "ATM Bridges"
 msgstr "Ponts ATM"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:178
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:21
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:898
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:66
 msgid "ATM Virtual Channel Identifier (VCI)"
 msgstr "Identificador de canal virtual (VCI) ATM"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:179
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:26
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:899
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:70
 msgid "ATM Virtual Path Identifier (VPI)"
 msgstr "Identificador de camí virtual (VPI) ATM"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:866
 msgid ""
 "ATM bridges expose encapsulated ethernet in AAL5 connections as virtual "
 "Linux network interfaces which can be used in conjunction with DHCP or PPP "
@@ -309,8 +315,8 @@ msgstr ""
 "de xarxa virtual de Linux que es poden utilitzar conjuntament amb DHCP o PPP "
 "per trucar a la xarxa del proveïdor."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:184
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:905
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:62
 msgid "ATM device number"
 msgstr "Número de dispositiu ATM"
 
@@ -319,17 +325,17 @@ msgid "ATU-C System Vendor ID"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:251
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:495
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:499
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:528
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:532
 msgid "Absent Interface"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:19
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
 msgid "Access Concentrator"
 msgstr "Concentrador d'accés"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:368
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:470
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:802
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
 msgid "Access Point"
 msgstr "Punt d'accés"
 
@@ -352,7 +358,7 @@ msgid "Active Connections"
 msgstr "Connexions actives"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:68
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:30
 msgid "Active DHCP Leases"
 msgstr "Arrendaments DHCP actius"
 
@@ -360,56 +366,76 @@ msgstr "Arrendaments DHCP actius"
 msgid "Active DHCPv6 Leases"
 msgstr "Arrendaments DHCPv6 actius"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1951
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:370
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:12
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2190
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:804
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:23
 msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:650
-#: modules/luci-base/htdocs/luci-static/resources/form.js:651
-#: modules/luci-base/htdocs/luci-static/resources/form.js:666
-#: modules/luci-base/htdocs/luci-static/resources/form.js:667
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1290
+#: modules/luci-base/htdocs/luci-static/resources/form.js:902
+#: modules/luci-base/htdocs/luci-static/resources/form.js:904
+#: modules/luci-base/htdocs/luci-static/resources/form.js:917
+#: modules/luci-base/htdocs/luci-static/resources/form.js:918
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1539
 #: modules/luci-base/luasrc/view/cbi/nsection.htm:25
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:189
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:197
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:39
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:47
 #: modules/luci-base/luasrc/view/cbi/ucisection.htm:54
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:703
 msgid "Add"
 msgstr "Afegeix"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:60
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:870
+msgid "Add ATM Bridge"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:92
 msgid "Add IPv4 address…"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:129
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:204
 msgid "Add IPv6 address…"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:143
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:149
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:38
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:47
+msgid "Add LED action"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:215
+msgid "Add VLAN"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:14
+msgid "Add instance"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:153
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:159
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:250
 msgid "Add key"
 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:155
 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"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:705
 msgid "Add new interface..."
 msgstr "Afegeix una interfície nova..."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:104
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:99
+msgid "Add peer"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:105
 msgid "Additional Hosts files"
 msgstr "Fitxers de Hosts addicionals"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:161
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
 msgid "Additional servers file"
 msgstr ""
 
@@ -436,7 +462,7 @@ msgstr ""
 msgid "Address"
 msgstr "Adreça"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:12
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:151
 msgid "Address to access local relay bridge"
 msgstr "Adreça per accedir al relay bridge local"
 
@@ -445,13 +471,13 @@ msgstr "Adreça per accedir al relay bridge local"
 msgid "Administration"
 msgstr "Administració"
 
-#: 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:70
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:505
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:896
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:24
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:189
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:463
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:176
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:143
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:364
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:742
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:799
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:50
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:34
 msgid "Advanced Settings"
@@ -461,169 +487,169 @@ msgstr "Paràmetres avançats"
 msgid "Aggregate Transmit Power(ACTATP)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:175
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:166
 msgid "Alert"
 msgstr "Alerta"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1628
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1834
 #: modules/luci-base/luasrc/model/network.lua:1416
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:54
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:78
 msgid "Alias Interface"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:138
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:66
 msgid "Alias of \"%s\""
 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:170
 msgid "All Servers"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:114
 msgid ""
 "Allocate IP addresses sequentially, starting from the lowest available "
 "address"
 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:113
 msgid "Allocate IP sequentially"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:24
 msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
 msgstr ""
 "Permetre l'autenticació <abbr title=\"Secure Shell\">SSH</abbr> amb "
 "contrasenya"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:545
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:987
 msgid "Allow AP mode to disconnect STAs based on low ACK condition"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:462
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:589
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:891
 msgid "Allow all except listed"
 msgstr "Permet-les totes menys les llistades"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:236
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:767
 msgid "Allow legacy 802.11b rates"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:461
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:588
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:890
 msgid "Allow listed only"
 msgstr "Permet només les llistades"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:198
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:199
 msgid "Allow localhost"
 msgstr "Permetre el localhost"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:47
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:35
 msgid "Allow remote hosts to connect to local SSH forwarded ports"
 msgstr ""
 "Permetre a màquines remotes de connectar-se als ports reenviats de l'SSH "
 "local"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:38
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:30
 msgid "Allow root logins with password"
 msgstr "Accés d'administrador amb contrasenya"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:39
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:30
 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:199
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:200
 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"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:135
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:122
 msgid "Allowed IPs"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:549
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:602
 msgid "Always announce default router"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:259
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:782
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
 "option does not comply with IEEE 802.11n-2009!"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:95
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:818
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:119
 msgid "Annex"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:96
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:819
 msgid "Annex A + L + M (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:827
 msgid "Annex A G.992.1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:828
 msgid "Annex A G.992.2"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:829
 msgid "Annex A G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:830
 msgid "Annex A G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:97
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:820
 msgid "Annex B (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:823
 msgid "Annex B G.992.1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:824
 msgid "Annex B G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:102
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:825
 msgid "Annex B G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:98
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:821
 msgid "Annex J (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:831
 msgid "Annex L G.992.3 POTS 1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:99
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:822
 msgid "Annex M (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:109
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:832
 msgid "Annex M G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:833
 msgid "Annex M G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:550
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:602
 msgid "Announce as default router even if no public prefix is available."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:555
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:607
 msgid "Announced DNS domains"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:554
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:606
 msgid "Announced DNS servers"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1093
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1496
 msgid "Anonymous Identity"
 msgstr ""
 
@@ -635,20 +661,6 @@ msgstr ""
 msgid "Anonymous Swap"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:322
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:329
-msgid "Antenna 1"
-msgstr "Antena 1"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:323
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:330
-msgid "Antenna 2"
-msgstr "Antena 2"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:246
-msgid "Antenna Configuration"
-msgstr "Configuració d'antena"
-
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:71
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:160
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:181
@@ -656,11 +668,11 @@ msgstr "Configuració d'antena"
 msgid "Any zone"
 msgstr "Qualsevol zona"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1981
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2522
 msgid "Apply request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1867
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2409
 msgid "Apply unchecked"
 msgstr ""
 
@@ -668,8 +680,8 @@ msgstr ""
 msgid "Architecture"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:19
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:184
+#: 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 ""
@@ -678,13 +690,13 @@ msgstr ""
 msgid "Assign interfaces..."
 msgstr "Assigna interfícies..."
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:124
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:24
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:189
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:31
 msgid ""
 "Assign prefix parts using this hexadecimal subprefix ID for this interface."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:148
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1967
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:22
 msgid "Associated Stations"
 msgstr "Estacions associades"
@@ -693,20 +705,20 @@ msgstr "Estacions associades"
 msgid "Associations"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:39
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:37
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:101
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:64
 msgid "Auth Group"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1027
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1421
 msgid "Authentication"
 msgstr "Autenticació"
 
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:29
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:70
 msgid "Authentication Type"
 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:78
 msgid "Authoritative"
 msgstr "Autoritzada"
 
@@ -724,17 +736,19 @@ msgstr "Es requereix autenticació"
 msgid "Auto Refresh"
 msgstr "Refresc automàtic"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:53
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:7
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:17
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:67
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:24
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:36
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:42
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:36
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:106
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:24
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:98
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:50
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:94
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:81
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:55
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:68
 msgid "Automatic"
 msgstr ""
 
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:7
 #: protocols/luci-proto-hnet/luasrc/model/network/proto_hnet.lua:7
 msgid "Automatic Homenet (HNCP)"
 msgstr ""
@@ -777,21 +791,21 @@ msgstr "Disponible"
 msgid "Average:"
 msgstr "Mitjana:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:116
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:839
 msgid "B43 + B43C"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:840
 msgid "B43 + B43C + V43"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:48
 msgid "BR / DMR / AFTR"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:43
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:75
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1620
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:176
 msgid "BSSID"
 msgstr "BSSID"
@@ -805,20 +819,11 @@ msgstr "Enrere al Resum"
 msgid "Back to configuration"
 msgstr "Enrere a la configuració"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:48
-msgid "Back to overview"
-msgstr "Enrere al resum"
-
-# Endarrere cap a resultats d'escaneig
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:20
-msgid "Back to scan results"
-msgstr "Enrere als resultats de l'escaneig"
-
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:17
 msgid "Backup"
 msgstr "Còpia de seguretat"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:38
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:36
 msgid "Backup / Flash Firmware"
 msgstr "Còpia de seguretat i microprogramari"
 
@@ -831,11 +836,11 @@ msgid "Bad address specified!"
 msgstr "Adreça mal especificada!"
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:158
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:288
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:368
 msgid "Band"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:261
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:785
 msgid "Beacon Interval"
 msgstr ""
 
@@ -849,79 +854,85 @@ 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:293
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:294
 msgid ""
 "Bind dynamically to interfaces rather than wildcard address (recommended as "
 "linux default)"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:16
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:48
 msgid "Bind interface"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:16
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:48
 msgid "Bind the tunnel to this interface (optional)."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:49
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:134
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:187
 msgid "Bitrate"
 msgstr "Velocitat de bits"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:172
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
 msgid "Bogus NX Domain Override"
 msgstr "Substitució dels dominis NX falsos"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1634
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1840
 #: modules/luci-base/luasrc/model/network.lua:1420
 msgid "Bridge"
 msgstr "Pont"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:264
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:368
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:678
 msgid "Bridge interfaces"
 msgstr "Pont d'interfícies"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:906
 msgid "Bridge unit number"
 msgstr "Número d'unitat de pont"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:250
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:364
 msgid "Bring up on boot"
 msgstr "Aixecar a l'engegada"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:35
-msgid "Broadcom 802.11%s Wireless Controller"
-msgstr "Controlador sense fil Broadcom 802.11%s"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:45
-msgid "Broadcom BCM%04x 802.11 Wireless Controller"
-msgstr "Controlador sense fil Broadcom BCM%04x 802.11"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1697
+msgid "Browse…"
+msgstr ""
 
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:18
 msgid "Buffered"
 msgstr "En memòria intermèdia"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:75
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:134
 msgid "CA certificate; if empty it will be saved after the first connection."
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:7
+msgid "CLAT configuration failed"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:13
 msgid "CPU usage (%)"
 msgstr "Ús de CPU (%)"
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:21
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:53
 msgid "Call failed"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1789
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:14
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:52
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:711
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:948
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1839
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:191
 #: modules/luci-mod-system/luasrc/view/admin_system/upgrade.htm:60
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:6
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:17
 msgid "Category"
 msgstr ""
 
@@ -939,13 +950,7 @@ msgstr ""
 msgid "Chain"
 msgstr "Cadena"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:9
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:14
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:24
-msgid "Change login password"
-msgstr ""
-
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1744
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 msgid "Changes"
 msgstr "Canvis"
 
@@ -953,33 +958,23 @@ msgstr "Canvis"
 msgid "Changes applied."
 msgstr "Canvis aplicats."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2004
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2545
 msgid "Changes have been reverted."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:43
 msgid "Changes the administrator password for accessing the device"
 msgstr "Canvia la paraula clau de l'administrador per accedir al dispositiu"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:10
-msgid "Changing password…"
-msgstr ""
-
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:162
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:45
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:87
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:174
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:376
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1618
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:186
 msgid "Channel"
 msgstr "Canal"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:119
-msgid ""
-"Channel %d is not available in the %s regulatory domain and has been auto-"
-"adjusted to %d."
-msgstr ""
-
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:229
 msgid "Check"
 msgstr "Comprovació"
@@ -988,7 +983,7 @@ msgstr "Comprovació"
 msgid "Check filesystems before mount"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1806
 msgid "Check this option to delete the existing networks from this radio."
 msgstr ""
 
@@ -1000,8 +995,8 @@ msgstr "Suma de verificació"
 msgid "Choose mtdblock"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:358
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:443
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1829
 msgid ""
 "Choose the firewall zone you want to assign to this interface. Select "
 "<em>unspecified</em> to remove the interface from the associated zone or "
@@ -1013,7 +1008,7 @@ msgstr ""
 "ompliu el camp <em>crea</em> per definir una nova zona i adjuntar-hi la "
 "interfície."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:834
 msgid ""
 "Choose the network(s) you want to attach to this wireless interface or fill "
 "out the <em>create</em> field to define a new network."
@@ -1021,11 +1016,11 @@ msgstr ""
 "Trieu les xarxes que voleu adjuntar a la interfície sense fil o ompliu el "
 "camp <em>crea</em> per definir una xarxa nova."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:614
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1023
 msgid "Cipher"
 msgstr "Xifra"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:61
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:91
 msgid "Cisco UDP encapsulation"
 msgstr ""
 
@@ -1043,28 +1038,28 @@ msgid ""
 "FEATURE IS FOR PROFESSIONALS! )"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1950
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:369
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:471
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2189
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:803
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:908
 msgid "Client"
 msgstr "Client"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:55
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:52
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:47
 msgid "Client ID to send when requesting DHCP"
 msgstr "ID de client a enviar en les sol·licituds DHCP"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:145
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:151
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:155
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:161
 msgid "Close"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:146
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:119
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:125
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:127
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:98
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:119
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:157
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:141
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:115
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:138
 msgid ""
 "Close inactive connection after the given amount of seconds, use 0 to "
 "persist connection"
@@ -1077,12 +1072,9 @@ msgstr "Tanca la llista..."
 #: modules/luci-base/luasrc/view/lease_status.htm:77
 #: modules/luci-base/luasrc/view/lease_status.htm:98
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:118
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:37
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:24
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1965
 #: modules/luci-mod-network/luasrc/view/admin_network/iface_status.htm:6
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:40
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:30
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:8
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:398
 #: modules/luci-mod-status/luasrc/view/admin_status/index/30-network.htm:11
 #: modules/luci-mod-status/luasrc/view/admin_status/index/50-dsl.htm:17
@@ -1096,15 +1088,19 @@ msgstr "Aplegant dades..."
 msgid "Command"
 msgstr "Ordre"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:193
+msgid "Command OK"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:41
+msgid "Command failed"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:64
 msgid "Comment"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:185
-msgid "Common Configuration"
-msgstr "Configuració comuna"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
 msgid ""
 "Complicates key reinstallation attacks on the client side by disabling "
 "retransmission of EAPOL-Key frames that are used to install keys. This "
@@ -1112,13 +1108,14 @@ msgid ""
 "negotiation especially in environments with heavy traffic load."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1744
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 #: modules/luci-base/luasrc/controller/admin/uci.lua:11
 #: modules/luci-mod-system/luasrc/view/admin_system/backupfiles.htm:9
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:13
 msgid "Configuration"
 msgstr "Configuració"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:21
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:63
 msgid "Configuration failed"
 msgstr ""
@@ -1127,89 +1124,89 @@ msgstr ""
 msgid "Configuration files will be kept"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1915
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2456
 msgid "Configuration has been applied."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1848
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2395
 msgid "Configuration has been rolled back!"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:43
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:942
+msgid "Confirm disconnect"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:50
 msgid "Confirmation"
 msgstr "Confirmació"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:32
-msgid "Connect"
-msgstr "Connecta"
-
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:72
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:105
 msgid "Connected"
 msgstr "Connectat"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:338
-msgid "Connection Limit"
-msgstr "Límit de connexió"
-
 #: modules/luci-base/htdocs/luci-static/resources/network.js:7
 #: modules/luci-base/luasrc/model/network.lua:27
 msgid "Connection attempt failed"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:203
+msgid "Connection lost"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/controller/admin/status.lua:32
 msgid "Connections"
 msgstr "Connexions"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1890
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:66
+msgid "Contents have been saved."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:618
+msgid "Continue"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2431
 msgid ""
 "Could not regain access to the device after applying the configuration "
 "changes. You might need to reconnect if you modified network related "
 "settings such as the IP address or wireless security credentials."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:135
 msgid "Country"
 msgstr "País"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:227
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:233
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:337
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:764
 msgid "Country Code"
 msgstr "Codi de País"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:36
-msgid "Cover the following interface"
-msgstr "Cobreix la interfície següent"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:43
-msgid "Cover the following interfaces"
-msgstr "Cobreix les interfícies següents"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:357
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:86
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:443
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1829
 msgid "Create / Assign firewall-zone"
 msgstr "Crea / Assigna zona de tallafocs"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:9
-msgid "Create Interface"
-msgstr "Crea interfície"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:33
-msgid "Create a bridge over multiple interfaces"
-msgstr "Crea un pont entre múltiples interfícies"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:735
+msgid "Create interface"
+msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:174
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:165
 msgid "Critical"
 msgstr "Crític"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:178
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:169
 msgid "Cron Log Level"
 msgstr "Nivell de registre del Cron"
 
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:519
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:521
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:447
+msgid "Current power"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:552
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:554
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:51
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:53
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:82
@@ -1217,7 +1214,7 @@ msgstr "Nivell de registre del Cron"
 msgid "Custom Interface"
 msgstr "Interfície personalitzada"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:36
 msgid "Custom delegated IPv6-prefix"
 msgstr ""
 
@@ -1227,7 +1224,7 @@ msgid ""
 "this, perform a factory-reset first."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:59
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:41
 msgid ""
 "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
 "\">LED</abbr>s if possible."
@@ -1235,46 +1232,47 @@ msgstr ""
 "Personalitza el comportament dels <abbr title=\"Light Emitting Diode\">LED</"
 "abbr>s del dispositiu, si és possible."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:799
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1223
 msgid "DAE-Client"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:807
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1231
 msgid "DAE-Port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:815
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1239
 msgid "DAE-Secret"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:448
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:459
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:279
 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:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:61
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:62
 msgid "DHCP and DNS"
 msgstr "DHCP i DNS"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1195
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1385
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:16
 #: modules/luci-base/luasrc/model/network.lua:968
 msgid "DHCP client"
 msgstr "Client DHCP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:571
 msgid "DHCP-Options"
 msgstr "Opcions DHCP"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_dhcpv6.lua:7
 msgid "DHCPv6 client"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:540
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:594
 msgid "DHCPv6-Mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:529
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:583
 msgid "DHCPv6-Service"
 msgstr ""
 
@@ -1291,31 +1289,31 @@ msgstr ""
 msgid "DNS"
 msgstr "DNS"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:183
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
 msgid "DNS forwardings"
 msgstr "Reenviaments DNS"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:30
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:37
 msgid "DNS-Label / FQDN"
 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:136
 msgid "DNSSEC"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:139
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
 msgid "DNSSEC check unsigned"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:73
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:99
 msgid "DPD Idle Timeout"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:14
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:41
 msgid "DS-Lite AFTR address"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:92
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:815
 #: modules/luci-mod-status/luasrc/view/admin_status/index/50-dsl.htm:14
 msgid "DSL"
 msgstr ""
@@ -1324,11 +1322,11 @@ msgstr ""
 msgid "DSL Status"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:125
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:848
 msgid "DSL line mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:519
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:963
 msgid "DTIM Interval"
 msgstr ""
 
@@ -1340,77 +1338,92 @@ msgstr "DUID"
 msgid "Data Rate"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:169
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:180
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:160
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:171
 msgid "Debug"
 msgstr "Depuració"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:759
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:783
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:807
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1183
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1207
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1231
 msgid "Default %d"
 msgstr "%d per defecte"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:82
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:107
 msgid "Default Route"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:17
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:81
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:51
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:32
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:48
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:85
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:65
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:80
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:108
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:146
 msgid "Default gateway"
 msgstr "Passarel·la per defecte"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:541
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:594
 msgid "Default is stateless + stateful"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:70
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:54
 msgid "Default state"
 msgstr "Estat per defecte"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:503
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:553
 msgid "Define a name for this network."
 msgstr "Definiu el nom d'aquesta xarxa"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:514
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:571
 msgid ""
 "Define additional DHCP options, for example "
 "\"<code>6,192.168.2.1,192.168.2.2</code>\" which advertises different DNS "
 "servers to clients."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:705
-#: modules/luci-base/htdocs/luci-static/resources/form.js:958
-#: modules/luci-base/htdocs/luci-static/resources/form.js:959
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1271
+#: modules/luci-base/htdocs/luci-static/resources/form.js:966
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1210
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1216
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1524
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1758
 #: modules/luci-base/luasrc/view/cbi/nsection.htm:11
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:162
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:16
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:41
 msgid "Delete"
 msgstr "Suprimeix"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:178
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:187
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:193
 msgid "Delete key"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:45
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1654
+msgid "Delete permission denied"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1656
+msgid "Delete request failed: %d %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:723
 msgid "Delete this network"
 msgstr "Suprimeix aquesta xarxa"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:519
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:963
 msgid "Delivery Traffic Indication Message Interval"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:102
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:108
 msgid "Description"
 msgstr "Descripció"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:224
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1754
+msgid "Deselect"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:215
 msgid "Design"
 msgstr "Disseny"
 
@@ -1428,10 +1441,12 @@ msgstr ""
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:177
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:43
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:13
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:38
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:73
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:33
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:52
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:85
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:86
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:72
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:154
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:253
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:86
@@ -1439,15 +1454,24 @@ msgstr ""
 msgid "Device"
 msgstr "Dispositiu"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:138
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:737
 msgid "Device Configuration"
 msgstr "Configuració de dispositiu"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:81
+msgid "Device is not active"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/reboot.htm:23
 msgid "Device is rebooting..."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1889
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:167
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:513
+msgid "Device is restarting…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2430
 msgid "Device unreachable!"
 msgstr ""
 
@@ -1455,26 +1479,26 @@ msgstr ""
 msgid "Device unreachable! Still waiting for device..."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:123
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:78
 #: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:61
 msgid "Diagnostics"
 msgstr "Diagnòstics"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:45
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:60
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:101
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:93
 msgid "Dial number"
 msgstr ""
 
-#: modules/luci-base/luasrc/view/cbi/filebrowser.htm:99
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1554
 msgid "Directory"
 msgstr "Directori"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:131
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:715
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:754
 msgid "Disable"
 msgstr "Inhabilita"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:472
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:531
 msgid ""
 "Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for "
 "this interface."
@@ -1482,71 +1506,66 @@ msgstr ""
 "Inhabilita el <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> en aquesta interfície."
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:64
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:93
 msgid "Disable Encryption"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:530
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:973
 msgid "Disable Inactivity Polling"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:713
 msgid "Disable this network"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:44
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:54
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:68
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:37
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:43
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:37
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1534
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:76
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:107
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:99
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:51
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:95
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:82
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:69
 msgid "Disabled"
 msgstr "Inhabilitat"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1139
-msgid "Disabled (default)"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:544
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:987
 msgid "Disassociate On Low Acknowledgement"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:193
 msgid "Discard upstream RFC1918 responses"
 msgstr "Descarta les respostes RFC1918 des de dalt"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:92
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:114
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:956
 msgid "Disconnect"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:22
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:64
 msgid "Disconnection attempt failed"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1121
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1762
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1855
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:17
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1375
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1995
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2314
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2401
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1634
 msgid "Dismiss"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:240
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:334
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:770
 msgid "Distance Optimization"
 msgstr "Optimització de distància"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:241
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:770
 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/luasrc/model/cbi/admin_network/wifi.lua:347
-msgid "Diversity"
-msgstr "Diversitat"
-
-#: 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:61
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
@@ -1558,35 +1577,43 @@ msgstr ""
 "\">DNS</abbr> per tallafocs <abbr title=\"Network Address Translation\">NAT</"
 "abbr>"
 
-#: 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:159
 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:123
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:124
 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:118
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
 msgid "Do not forward reverse lookups for local networks"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:173
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1639
+msgid "Do you really want to delete \"%s\" ?"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:188
 msgid "Do you really want to delete the following SSH key?"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1637
+msgid "Do you really want to recursively delete the directory \"%s\" ?"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:74
 msgid "Domain required"
 msgstr "Es requereix un domini"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:205
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:206
 msgid "Domain whitelist"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:34
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:67
 msgid "Don't Fragment"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:74
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:75
 msgid ""
 "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
 "<abbr title=\"Domain Name System\">DNS</abbr>-Name"
@@ -1606,19 +1633,19 @@ msgstr "Descarrega còpia de seguretat"
 msgid "Download mtdblock"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:853
 msgid "Downstream SNR offset"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:914
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1169
 msgid "Drag to reorder"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:9
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:11
 msgid "Dropbear Instance"
 msgstr "Instància de Dropbear"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:6
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 msgid ""
 "Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access "
 "and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
@@ -1626,40 +1653,41 @@ msgstr ""
 "El Dropbear ofereix accés a una consola <abbr title=\"Secure Shell\">SSH</"
 "abbr> per xarxa i un servidor <abbr title=\"Secure Copy\">SCP</abbr> integrat"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:11
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:14
 msgid "Dual-Stack Lite (RFC6333)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:493
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:547
 msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 msgstr ""
 "<abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> dinàmic"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:60
 msgid "Dynamic tunnel"
 msgstr "Túnel dinàmic"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:494
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:547
 msgid ""
 "Dynamically allocate DHCP addresses for clients. If disabled, only clients "
 "having static leases will be served."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:67
 msgid "EA-bits length"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:990
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1386
 msgid "EAP-Method"
 msgstr "Mètode EAP"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:934
-#: modules/luci-base/htdocs/luci-static/resources/form.js:935
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1199
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1188
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1191
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1450
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:154
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:160
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:38
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:291
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:720
 msgid "Edit"
 msgstr "Edita"
 
@@ -1669,90 +1697,91 @@ msgid ""
 "reload the page."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:38
-msgid "Edit this interface"
-msgstr "Edita aquesta interfície"
-
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:718
 msgid "Edit this network"
 msgstr "Edita aquesta xarxa"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:669
+msgid "Edit wireless network"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:167
 msgid "Emergency"
 msgstr "Emergència"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:127
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:715
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:754
 msgid "Enable"
 msgstr "Habilita"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:414
 msgid ""
 "Enable <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> "
 "snooping"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:271
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:412
 msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 msgstr "Habilita l'<abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:41
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:60
 msgid "Enable HE.net dynamic endpoint update"
 msgstr ""
 
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:51
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:89
 msgid "Enable IPv6 negotiation"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:23
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:35
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:41
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:35
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:37
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:49
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:80
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:54
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:67
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:93
 msgid "Enable IPv6 negotiation on the PPP link"
 msgstr "Habilita negociació IPv6 en la enllaç PPP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:143
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:188
 msgid "Enable Jumbo Frame passthrough"
 msgstr "Habilita el passatge de trames enormes"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:244
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:235
 msgid "Enable NTP client"
 msgstr "Habilita el client NTP"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:69
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:96
 msgid "Enable Single DES"
 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:267
 msgid "Enable TFTP server"
 msgstr "Habilita el servidor TFTP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:134
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:180
 msgid "Enable VLAN functionality"
 msgstr "Habilita la funcionalitat VLAN"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1595
 msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1175
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
 msgid "Enable key reinstallation (KRACK) countermeasures"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:138
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:183
 msgid "Enable learning and aging"
 msgstr "Habilita l'aprenentatge i l'envelliment"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:194
 msgid "Enable mirroring of incoming packets"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:151
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:195
 msgid "Enable mirroring of outgoing packets"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:34
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:67
 msgid "Enable the DF (Don't Fragment) flag of the encapsulating packets."
 msgstr ""
 
@@ -1760,7 +1789,7 @@ msgstr ""
 msgid "Enable this mount"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:713
 msgid "Enable this network"
 msgstr ""
 
@@ -1768,48 +1797,52 @@ msgstr ""
 msgid "Enable this swap"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:37
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:88
 msgid "Enable/Disable"
 msgstr "Activa/Desactiva"
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:76
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:152
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:251
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:41
 msgid "Enabled"
 msgstr "Habilitat"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:277
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:414
 msgid "Enables IGMP snooping on this bridge"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:892
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1310
 msgid ""
 "Enables fast roaming among access points that belong to the same Mobility "
 "Domain"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:272
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:412
 msgid "Enables the Spanning Tree Protocol on this bridge"
 msgstr "Habilita l'Spanning Tree Protocol a aquest pont"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:120
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:180
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:59
+msgid "Encapsulation limit"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:843
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:901
 msgid "Encapsulation mode"
 msgstr "Mode d'encapsulació"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:76
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:603
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:129
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:992
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1621
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:177
 msgid "Encryption"
 msgstr "Encriptació"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:155
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:128
 msgid "Endpoint Host"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:165
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:132
 msgid "Endpoint Port"
 msgstr ""
 
@@ -1821,16 +1854,21 @@ msgstr ""
 msgid "Enter custom values"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:273
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:271
 msgid "Erasing..."
 msgstr "Esborrant..."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:95
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:96
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:97
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:98
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:99
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:106
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:107
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:108
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:109
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:110
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:173
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:164
 msgid "Error"
 msgstr "Error"
 
@@ -1838,24 +1876,28 @@ msgstr "Error"
 msgid "Errored seconds (ES)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1646
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1852
 #: modules/luci-base/luasrc/model/network.lua:1432
 msgid "Ethernet Adapter"
 msgstr "Adaptador Ethernet"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1637
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1843
 #: modules/luci-base/luasrc/model/network.lua:1422
 msgid "Ethernet Switch"
 msgstr "Switch Ethernet"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:303
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
 msgid "Exclude interfaces"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:153
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
 msgid "Expand hosts"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:195
+msgid "Expecting an hexadecimal assignment hint"
+msgstr ""
+
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:59
 msgid "Expecting: %s"
 msgstr ""
@@ -1864,60 +1906,76 @@ msgstr ""
 msgid "Expires"
 msgstr "Caduca"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:488
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:543
 msgid ""
 "Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:8
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:19
 msgid "External"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:971
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1377
 msgid "External R0 Key Holder List"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:980
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1381
 msgid "External R1 Key Holder List"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:150
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:141
 msgid "External system log server"
 msgstr "Servidor de registre del sistema extern"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:155
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:146
 msgid "External system log server port"
 msgstr "Port del servidor de registre del sistema extern"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:160
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:151
 msgid "External system log server protocol"
 msgstr "Protocol del servidor de registre del sistema extern"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:18
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:79
 msgid "Extra SSH command options"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:940
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1351
 msgid "FT over DS"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:941
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1352
 msgid "FT over the Air"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:938
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1349
 msgid "FT protocol"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1842
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:82
+msgid "Failed to change the system password."
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2389
 msgid "Failed to confirm apply within %ds, waiting for rollback…"
 msgstr ""
 
-#: modules/luci-base/luasrc/view/cbi/filebrowser.htm:106
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:45
+msgid "Failed to execute \"/etc/init.d/%s %s\" action: %s"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1561
 msgid "File"
 msgstr "Fitxer"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:279
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1514
+msgid "File not accessible"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1698
+msgid "Filename"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:280
 msgid "Filename of the boot image advertised to clients"
 msgstr "Nom de fitxer de la imatge d'inici que es publica als clients"
 
@@ -1927,14 +1985,15 @@ 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:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:118
 msgid "Filter private"
 msgstr "Filtra privat"
 
-#: 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:123
 msgid "Filter useless"
 msgstr "Filtra els no útils"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:23
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:65
 msgid "Finalizing failed"
 msgstr ""
@@ -1945,7 +2004,7 @@ msgid ""
 "with defaults based on what was detected"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:696
 msgid "Find and join network"
 msgstr "Troba i uneix-te a la xarxa"
 
@@ -1957,11 +2016,11 @@ msgstr "Acaba"
 msgid "Firewall"
 msgstr "Tallafocs"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:77
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:76
 msgid "Firewall Mark"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:193
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:278
 msgid "Firewall Settings"
 msgstr "Ajusts de tallafocs"
 
@@ -1969,7 +2028,7 @@ msgstr "Ajusts de tallafocs"
 msgid "Firewall Status"
 msgstr "Estat de tallafocs"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:137
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:860
 msgid "Firmware File"
 msgstr ""
 
@@ -1977,7 +2036,7 @@ msgstr ""
 msgid "Firmware Version"
 msgstr "Versió de microprogramari"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:225
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:226
 msgid "Fixed source port for outbound DNS queries"
 msgstr ""
 
@@ -1997,35 +2056,35 @@ msgstr "Escriu una imatge nova a la memòria flaix"
 msgid "Flash operations"
 msgstr "Operacions a la memòria flaix"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:194
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:192
 msgid "Flashing..."
 msgstr "Escrivint a la memòria flaix..."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:498
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:550
 msgid "Force"
 msgstr "Força"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:258
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:782
 msgid "Force 40MHz mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:622
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1031
 msgid "Force CCMP (AES)"
 msgstr "Força el CCMP (AES)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:499
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:550
 msgid "Force DHCP on this network even if another server is detected."
 msgstr "Força el DHCP en aquesta xarxa encara que es detecti altre servidor."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:623
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1032
 msgid "Force TKIP"
 msgstr "Força el TKIP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:624
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1033
 msgid "Force TKIP and CCMP (AES)"
 msgstr "Força el TKIP i el CCMP (AES)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:795
 msgid "Force link"
 msgstr ""
 
@@ -2033,7 +2092,7 @@ msgstr ""
 msgid "Force upgrade"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:60
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:90
 msgid "Force use of NAT-T"
 msgstr ""
 
@@ -2041,7 +2100,7 @@ msgstr ""
 msgid "Form token mismatch"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:34
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:164
 msgid "Forward DHCP traffic"
 msgstr "Reenvia el trànsit DHCP"
 
@@ -2049,46 +2108,41 @@ msgstr "Reenvia el trànsit DHCP"
 msgid "Forward Error Correction Seconds (FECS)"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:28
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:161
 msgid "Forward broadcast traffic"
 msgstr "Reenvia el trànsit difós"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:375
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:809
 msgid "Forward mesh peer traffic"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:186
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:908
 msgid "Forwarding mode"
 msgstr "Mode de reenviament"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:255
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:596
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:774
 msgid "Fragmentation Threshold"
 msgstr "Llindar de fragmentació"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:332
-msgid "Frame Bursting"
-msgstr ""
-
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:17
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:28
 msgid "Free"
 msgstr "Lliure"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:91
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:89
 msgid ""
-"Further information about WireGuard interfaces and peers at <a href=\"http://"
-"wireguard.com\">wireguard.com</a>."
+"Further information about WireGuard interfaces and peers at <a href='http://"
+"wireguard.com'>wireguard.com</a>."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:45
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:130
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:186
 msgid "GHz"
 msgstr "GHz"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:29
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:36
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:91
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:77
 msgid "GPRS only"
 msgstr "Només GPRS"
 
@@ -2097,28 +2151,28 @@ msgstr "Només GPRS"
 msgid "Gateway"
 msgstr "Passarel·la"
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:35
+msgid "Gateway Ports"
+msgstr "Ports de passarel·la"
+
 #: modules/luci-base/htdocs/luci-static/resources/network.js:9
 #: modules/luci-base/luasrc/model/network.lua:29
 msgid "Gateway address is invalid"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:46
-msgid "Gateway ports"
-msgstr "Ports de passarel·la"
-
-#: 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:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:275
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:23
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:112
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:103
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:49
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:33
 msgid "General Settings"
 msgstr "Ajusts generals"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:188
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:462
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:175
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:141
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:361
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:504
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:895
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:741
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:796
 msgid "General Setup"
 msgstr ""
 
@@ -2126,7 +2180,7 @@ msgstr ""
 msgid "Generate Config"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:945
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1355
 msgid "Generate PMK locally"
 msgstr ""
 
@@ -2134,11 +2188,7 @@ msgstr ""
 msgid "Generate archive"
 msgstr "Genera l'arxiu"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:63
-msgid "Generic 802.11%s Wireless Controller"
-msgstr "Controlador sense fils 802.11%s genèric"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:26
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:74
 msgid "Given password confirmation did not match, password not changed!"
 msgstr ""
 "La contrasenya i la confirmació de contrasenya no es coincideixen. La "
@@ -2148,7 +2198,7 @@ msgstr ""
 msgid "Global Settings"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:806
 msgid "Global network options"
 msgstr ""
 
@@ -2159,33 +2209,29 @@ msgstr ""
 msgid "Go to password configuration..."
 msgstr "Vés a la configuració de contrasenya"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:857
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1369
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1112
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1616
 #: modules/luci-base/luasrc/view/cbi/full_valueheader.htm:4
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:58
 msgid "Go to relevant configuration page"
 msgstr "Vés a la pàgina de configuració"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:38
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:66
 msgid "Group Password"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:11
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:22
 msgid "Guest"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:73
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:81
 msgid "HE.net password"
 msgstr "Contrasenya de HE.net"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:60
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:73
 msgid "HE.net username"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:310
-msgid "HT mode (802.11n)"
-msgstr ""
-
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:16
 msgid "Hang Up"
 msgstr "Penja"
@@ -2194,7 +2240,7 @@ msgstr "Penja"
 msgid "Header Error Code Errors (HEC)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:103
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 msgid ""
 "Here you can configure the basic aspects of your device like its hostname or "
 "the timezone."
@@ -2202,9 +2248,7 @@ msgstr ""
 "Ací pots configurar els aspectes bàsics del teu dispositiu, com el nom de la "
 "màquina o el fus horari."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:499
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:556
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:579
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:941
 msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr ""
 "No mostris l'<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
@@ -2216,14 +2260,15 @@ msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:92
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1959
 msgid "Host"
 msgstr "Nom de màquina"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:20
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:21
 msgid "Host entries"
 msgstr "Entrades de noms de màquina"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:48
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:171
 msgid "Host expiry timeout"
 msgstr ""
 
@@ -2231,45 +2276,45 @@ msgstr ""
 msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
 msgstr "Xarxa o adreça <abbr title=\"Internet Protocol Address\">IP</abbr>"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:118
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:102
 msgid "Host-Uniq tag content"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:71
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:31
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:316
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:25
+#: 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:317
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:26
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:17
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:125
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:116
 msgid "Hostname"
 msgstr "Nom de màquina"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:12
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:22
 msgid "Hostname to send when requesting DHCP"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:18
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:19
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:67
 msgid "Hostnames"
 msgstr "Noms de màquina"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:13
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:24
 msgid "Hybrid"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:45
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:75
 msgid "IKE DH Group"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:41
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:59
 msgid "IP Addresses"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:40
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:80
 msgid "IP Protocol"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:29
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:30
 msgid "IP address"
 msgstr "Adreça IP"
 
@@ -2288,6 +2333,11 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:20
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:21
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:22
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:79
+#: 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/network.js:89
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:90
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:91
@@ -2295,7 +2345,7 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:93
 #: 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/luasrc/model/cbi/admin_network/proto_ncm.lua:42
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:82
 msgid "IPv4"
 msgstr "IPv4"
 
@@ -2307,24 +2357,23 @@ msgstr "Tallafocs IPv4"
 msgid "IPv4 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:57
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:178
 msgid "IPv4 address"
 msgstr "Adreça IPv4"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:26
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:33
 msgid "IPv4 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:104
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:181
 msgid "IPv4 broadcast"
 msgstr "Difusió IPv4"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:100
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:180
 msgid "IPv4 gateway"
 msgstr "Passarel·la IPv4"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:92
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:179
 msgid "IPv4 netmask"
 msgstr "Màscara de xarxa IPv4"
 
@@ -2332,24 +2381,25 @@ msgstr "Màscara de xarxa IPv4"
 msgid "IPv4 network in address/netmask notation"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:25
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:52
 msgid "IPv4 prefix"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:42
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:30
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:55
 msgid "IPv4 prefix length"
 msgstr "Longitud de prefix IPv4"
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:43
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:83
 msgid "IPv4+IPv6"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:72
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:34
 msgid "IPv4-Address"
 msgstr "Adreça IPv4"
 
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:10
 #: protocols/luci-proto-ipip/luasrc/model/network/proto_ipip.lua:9
 msgid "IPv4-in-IPv4 (RFC2003)"
 msgstr ""
@@ -2364,6 +2414,16 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:30
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:31
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:32
+#: 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/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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:89
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:90
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:91
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:92
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:95
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:96
@@ -2376,7 +2436,7 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:103
 #: 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/luasrc/model/cbi/admin_network/proto_ncm.lua:44
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:84
 msgid "IPv6"
 msgstr "IPv6"
 
@@ -2388,11 +2448,11 @@ msgstr "Tallafocs IPv6"
 msgid "IPv6 Neighbours"
 msgstr "Veïns IPv6"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:464
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:506
 msgid "IPv6 Settings"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:195
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:810
 msgid "IPv6 ULA-Prefix"
 msgstr ""
 
@@ -2400,21 +2460,21 @@ msgstr ""
 msgid "IPv6 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:202
 msgid "IPv6 address"
 msgstr "Adreça IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:23
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:189
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:31
 msgid "IPv6 assignment hint"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:18
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:184
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:27
 msgid "IPv6 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:207
 msgid "IPv6 gateway"
 msgstr "Passarel·la IPv6"
 
@@ -2422,22 +2482,22 @@ msgstr "Passarel·la IPv6"
 msgid "IPv6 network in address/netmask notation"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:37
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:59
 msgid "IPv6 prefix"
 msgstr "Prefix IPv6"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:34
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:45
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:63
 msgid "IPv6 prefix length"
 msgstr "Longitud de prefix IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:33
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:211
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:57
 msgid "IPv6 routed prefix"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:143
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:215
 msgid "IPv6 suffix"
 msgstr ""
 
@@ -2447,31 +2507,35 @@ msgid "IPv6-Address"
 msgstr "Adreça IPv6"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:93
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:104
 msgid "IPv6-PD"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:10
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:13
 msgid "IPv6-in-IPv4 (RFC4213)"
 msgstr "IPv6-en-IPv4 (RFC4213)"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:17
 msgid "IPv6-over-IPv4 (6rd)"
 msgstr "IPv6-sobre-IPv4 (6rd)"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:15
 msgid "IPv6-over-IPv4 (6to4)"
 msgstr "IPv6-sobre-IPv4 (6to4)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1075
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1478
 msgid "Identity"
 msgstr "Identitat"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:70
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:96
 msgid "If checked, 1DES is enabled"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:65
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:93
 msgid "If checked, encryption is disabled"
 msgstr ""
 
@@ -2488,36 +2552,36 @@ msgid ""
 "device node"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:27
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:71
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:18
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:82
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:52
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:17
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:29
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:33
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:68
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:85
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:32
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:45
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:45
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:24
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:44
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:116
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:48
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:85
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:65
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:33
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:80
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:108
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:146
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:74
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:97
 msgid "If unchecked, no default route is configured"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:34
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:86
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:35
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:99
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:47
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:60
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:60
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:39
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:59
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:124
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:39
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:116
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:59
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:103
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:64
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:77
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:100
 msgid "If unchecked, the advertised DNS server addresses are ignored"
 msgstr ""
 
@@ -2536,15 +2600,15 @@ 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:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:102
 msgid "Ignore <code>/etc/hosts</code>"
 msgstr "Ignora <code>/etc/hosts</code>"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:471
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:531
 msgid "Ignore interface"
 msgstr "Ignora la interfície"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:90
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:91
 msgid "Ignore resolve file"
 msgstr "Ignora el fitxer de resolució"
 
@@ -2562,12 +2626,12 @@ msgid ""
 "blocked. Click \"Continue »\" below to return to the previous page."
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:145
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:118
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:124
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:126
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:97
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:118
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:157
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:141
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:115
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:138
 msgid "Inactivity timeout"
 msgstr "Temps d'espera d'inactivitat"
 
@@ -2575,23 +2639,25 @@ msgstr "Temps d'espera d'inactivitat"
 msgid "Inbound:"
 msgstr "Entrant:"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:170
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:161
 msgid "Info"
 msgstr "Informació"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:105
 msgid "Information"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:25
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:67
 msgid "Initialization failure"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:34
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:87
 msgid "Initscript"
 msgstr "Script d'inici"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:26
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:122
 msgid "Initscripts"
 msgstr "Scripts d'inici"
 
@@ -2599,55 +2665,74 @@ msgstr "Scripts d'inici"
 msgid "Install iputils-traceroute6 for IPv6 traceroute"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:223
-msgid "Install package %q"
-msgstr "Instal·la el paquet %q"
-
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:220
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:120
 msgid "Install protocol extensions..."
 msgstr "Instal·la extensions de protocol"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:416
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:423
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:683
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:687
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:26
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:284
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:342
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:47
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:134
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:14
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:16
 msgid "Interface"
 msgstr "Interfície"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:58
 msgid "Interface %q device auto-migrated from %q to %q."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:356
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:792
 msgid "Interface Configuration"
 msgstr "Configuració d'interfície"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:51
-msgid "Interface Overview"
-msgstr "Visió de conjunt de la interfície"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:99
+msgid "Interface has %d pending changes"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:57
+msgid "Interface is marked for deletion"
+msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:162
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:3
 msgid "Interface is reconnecting..."
 msgstr "La interfície s'està reconnectant..."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:162
+msgid "Interface is shutting down..."
+msgstr "La interfície s'està aturant..."
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:205
+msgid "Interface is starting..."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:208
+msgid "Interface is stopping..."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:954
 msgid "Interface name"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:34
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:224
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:131
 msgid "Interface not present or not connected yet."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:88
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:16
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:11
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:287
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:54
 msgid "Interfaces"
 msgstr "Interfícies"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:9
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:20
 msgid "Internal"
 msgstr ""
 
@@ -2660,19 +2745,35 @@ msgstr "Error de servidor intern"
 msgid "Invalid"
 msgstr "Invàlid"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:311
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:10
+msgid "Invalid Base64 key string"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:281
 msgid "Invalid VLAN ID given! Only IDs between %d and %d are allowed."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:307
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:290
 msgid "Invalid VLAN ID given! Only unique IDs are allowed"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:195
+msgid "Invalid argument"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:194
+msgid "Invalid command"
+msgstr ""
+
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:80
+msgid "Invalid hexadecimal value"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/sysauth.htm:12
 msgid "Invalid username and/or password! Please try again."
 msgstr "Usuari i/o contrasenya invàlids! Si us plau prova-ho de nou."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:508
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:950
 msgid "Isolate Clients"
 msgstr ""
 
@@ -2692,15 +2793,15 @@ msgstr ""
 msgid "JavaScript required!"
 msgstr "Es requereix JavaScript!"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:52
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1691
 msgid "Join Network"
 msgstr "Uneix-te a la xarxa"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:22
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1628
 msgid "Join Network: Wireless Scan"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:19
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1833
 msgid "Joining Network: %q"
 msgstr ""
 
@@ -2717,15 +2818,15 @@ msgstr "Registre del nucli"
 msgid "Kernel Version"
 msgstr "Versió del nucli"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:823
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1248
 msgid "Key"
 msgstr "Clau"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:851
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:852
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:853
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:854
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:870
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1277
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1278
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1279
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1291
 msgid "Key #%d"
 msgstr "Clau #%d"
 
@@ -2733,33 +2834,34 @@ msgstr "Clau #%d"
 msgid "Kill"
 msgstr "Mata"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:10
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:21
 msgid "L2TP"
 msgstr "L2TP"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:10
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:40
 msgid "L2TP Server"
 msgstr "Servidor L2TP"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:100
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:74
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:80
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:74
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:53
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:73
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:131
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:102
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:89
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:112
 msgid "LCP echo failure threshold"
 msgstr "Llindar de fracàs d'eco LCP"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:118
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:89
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:95
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:89
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:68
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:91
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:144
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:102
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:125
 msgid "LCP echo interval"
 msgstr "Interval d'eco LCP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:181
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:902
 msgid "LLC"
 msgstr "LLC"
 
@@ -2768,11 +2870,11 @@ msgstr "LLC"
 msgid "Label"
 msgstr "Etiqueta"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:213
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:204
 msgid "Language"
 msgstr "Llengua"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:115
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:106
 msgid "Language and Style"
 msgstr "Llengua i estil"
 
@@ -2780,51 +2882,51 @@ msgstr "Llengua i estil"
 msgid "Latency"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:10
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:21
 msgid "Leaf"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:369
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:487
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:393
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:543
 msgid "Lease time"
 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:87
 msgid "Leasefile"
 msgstr "Fitxer d'arrendament"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:74
 #: modules/luci-base/luasrc/view/lease_status.htm:95
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:34
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
 msgid "Leasetime remaining"
 msgstr "Temps d'arrendament restant"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:9
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:20
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:27
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:50
 msgid "Leave empty to autodetect"
 msgstr "Deixeu-ho en blanc per autodetectar"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:21
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:45
 msgid "Leave empty to use the current WAN address"
 msgstr "Deixeu-ho en blanc per utilitzar l'adreça WAN actual"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1746
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2299
 msgid "Legend:"
 msgstr "Llegenda:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:481
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:538
 msgid "Limit"
 msgstr "Límit"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:287
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:288
 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:299
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:300
 msgid "Limit listening to these interfaces, and loopback."
 msgstr ""
 
@@ -2844,17 +2946,17 @@ msgstr ""
 msgid "Line Uptime"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:101
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:88
 msgid "Link On"
 msgstr "Enllaç actiu"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:185
 msgid ""
 "List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
 "requests to"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:972
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1377
 msgid ""
 "List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-"
 "Identifier,128-bit key as hex string. <br />This list is used to map R0KH-ID "
@@ -2863,7 +2965,7 @@ msgid ""
 "Association."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:981
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1381
 msgid ""
 "List of R1KHs in the same Mobility Domain. <br />Format: MAC-address,R1KH-ID "
 "as 6 octets with colons,128-bit key as hex string. <br />This list is used "
@@ -2872,33 +2974,33 @@ msgid ""
 "PMK-R1 keys."
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:21
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:82
 msgid "List of SSH key files for auth"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:206
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:207
 msgid "List of domains to allow RFC1918 responses for"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:174
 msgid "List of hosts that supply bogus NX domain results"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:298
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:299
 msgid "Listen Interfaces"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:30
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:54
 msgid "Listen Port"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:15
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:16
 msgid "Listen only on the given interface or, if unspecified, on all"
 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:216
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:217
 msgid "Listening port for inbound DNS queries"
 msgstr ""
 
@@ -2917,11 +3019,11 @@ msgstr "Càrrega mitjana"
 msgid "Loading"
 msgstr "Carregant"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:35
-msgid "Loading SSH keys…"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1819
+msgid "Loading directory contents…"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1204
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1296
 #: modules/luci-base/luasrc/view/view.htm:4
 msgid "Loading view…"
 msgstr ""
@@ -2931,77 +3033,73 @@ msgstr ""
 msgid "Local IP address is invalid"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:25
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:86
 msgid "Local IP address to assign"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:10
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:11
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:44
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:39
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:151
 msgid "Local IPv4 address"
 msgstr "Adreça IPv4 local"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:20
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:54
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:45
 msgid "Local IPv6 address"
 msgstr "Adreça IPv6 local"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:286
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:287
 msgid "Local Service Only"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:81
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:126
 msgid "Local Startup"
 msgstr "Inici local"
 
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:25
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:121
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:112
 msgid "Local Time"
 msgstr "Hora local"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:149
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
 msgid "Local domain"
 msgstr "Domini 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:147
 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:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:151
 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:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
 msgid "Local server"
 msgstr "Servidor local"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:129
 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:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:128
 msgid "Localise queries"
 msgstr "Localitza les peticions"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:175
-msgid "Locked to channel %s used by: %s"
-msgstr ""
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:168
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:159
 msgid "Log output level"
 msgstr "Nivell de sortida de registre"
 
-#: 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:181
 msgid "Log queries"
 msgstr "Registra les peticions"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:113
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:104
 msgid "Logging"
 msgstr "Registre"
 
@@ -3009,7 +3107,7 @@ msgstr "Registre"
 msgid "Login"
 msgstr "Entra"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:95
+#: modules/luci-base/luasrc/controller/admin/index.lua:103
 msgid "Logout"
 msgstr "Surt"
 
@@ -3017,11 +3115,13 @@ msgstr "Surt"
 msgid "Loss of Signal Seconds (LOSS)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:476
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:533
 msgid "Lowest leased address as offset from the network address."
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:40
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:75
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:35
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:86
 msgid "MAC"
@@ -3029,32 +3129,32 @@ msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:73
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:109
-#: 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:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1958
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:86
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:133
 msgid "MAC-Address"
 msgstr "Adreça MAC"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:457
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:586
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:886
 msgid "MAC-Address Filter"
 msgstr "Filtre d'adreces MAC"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:142
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:363
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:798
 msgid "MAC-Filter"
 msgstr "Filtre MAC"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:464
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:590
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:893
 msgid "MAC-List"
 msgstr "Llista MAC"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:13
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:16
 msgid "MAP / LW4over6"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:62
 msgid "MAP rule is invalid"
 msgstr ""
@@ -3072,8 +3172,8 @@ msgid "MHz"
 msgstr "MHz"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:53
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:29
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:66
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:53
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:71
 msgid "MTU"
 msgstr "MTU"
 
@@ -3083,16 +3183,17 @@ msgid ""
 "below:"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:55
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:69
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:26
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:38
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:38
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:108
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:52
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:96
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:83
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:57
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:70
 msgid "Manual"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1949
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2188
 msgid "Master"
 msgstr ""
 
@@ -3100,48 +3201,46 @@ msgstr ""
 msgid "Max. Attainable Data Rate (ATTNDR)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:539
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:982
 msgid "Maximum allowed Listen Interval"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:234
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
 msgid "Maximum allowed number of active DHCP leases"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:252
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:253
 msgid "Maximum allowed number of concurrent DNS queries"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:244
 msgid "Maximum allowed size of EDNS.0 UDP packets"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:63
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:77
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:57
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:112
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:104
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:93
 msgid "Maximum amount of seconds to wait for the modem to become ready"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:27
-msgid ""
-"Maximum length of the name is 15 characters including the automatic protocol/"
-"bridge prefix (br-, 6in4-, pppoe- etc.)"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:538
+msgid "Maximum number of leased addresses."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:482
-msgid "Maximum number of leased addresses."
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:761
+msgid "Maximum transmit power"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:21
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:49
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:134
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:187
 #: modules/luci-mod-status/luasrc/view/admin_status/bandwidth.htm:79
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:284
 msgid "Mbit/s"
 msgstr "Mbit/s"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:18
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:32
 msgid "Medium"
 msgstr ""
 
@@ -3153,42 +3252,43 @@ msgstr "Memòria"
 msgid "Memory usage (%)"
 msgstr "Ús de Memòria (%)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1952
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2191
 msgid "Mesh"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:372
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:806
 msgid "Mesh Id"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:196
+msgid "Method not found"
+msgstr ""
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:45
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:76
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:104
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:54
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:66
 msgid "Metric"
 msgstr "Mètrica"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:154
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:198
 msgid "Mirror monitor port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:153
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:197
 msgid "Mirror source port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:408
-msgid "Missing protocol extension for proto %q"
-msgstr "Manca l'extensió de protocol del protocol %q"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:923
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1337
 msgid "Mobility Domain"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:154
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:41
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:74
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:366
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:31
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:360
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:801
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1619
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:175
 msgid "Mode"
 msgstr "Mode"
@@ -3197,39 +3297,38 @@ msgstr "Mode"
 msgid "Model"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:31
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:72
 msgid "Modem default"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:11
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:19
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:11
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:10
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:73
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:73
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:57
 msgid "Modem device"
 msgstr "Dispositiu mòdem"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:24
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:66
 msgid "Modem information query failed"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:62
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:76
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:56
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:112
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:104
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:93
 msgid "Modem init timeout"
 msgstr "Temps d'espera d'inici de mòdem"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1953
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:452
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:554
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:577
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2192
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:880
 msgid "Monitor"
 msgstr "Monitor"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:14
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
 msgid "More Characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:802
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1057
 msgid "More…"
 msgstr ""
 
@@ -3242,7 +3341,7 @@ msgstr ""
 msgid "Mount Point"
 msgstr "Punt de muntatge"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:26
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:36
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:137
 msgid "Mount Points"
@@ -3292,46 +3391,44 @@ msgstr "Baixa"
 msgid "Move up"
 msgstr "Puja"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:912
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
 msgid "NAS ID"
 msgstr "NAS ID"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:57
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:87
 msgid "NAT-T Mode"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:9
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 msgid "NAT64 Prefix"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:31
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:26
 msgid "NCM"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:535
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:589
 msgid "NDP-Proxy"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:43
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:72
 msgid "NT Domain"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:273
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:264
 msgid "NTP server candidates"
 msgstr "Candidats de servidor NTP"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:837
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1092
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:27
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:502
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:65
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:553
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:658
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:49
 msgid "Name"
 msgstr "Nom"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:17
-msgid "Name of the new interface"
-msgstr "Nom de la nova interfície"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1808
 msgid "Name of the new network"
 msgstr "Nom de la nova xarxa"
 
@@ -3339,9 +3436,10 @@ msgstr "Nom de la nova xarxa"
 msgid "Navigation"
 msgstr "Navegació"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:62
+#: modules/luci-base/luasrc/controller/admin/index.lua:69
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:108
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:402
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:834
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1957
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:389
 #: modules/luci-mod-status/luasrc/view/admin_status/index/30-network.htm:8
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:73
@@ -3353,7 +3451,7 @@ msgstr "Xarxa"
 msgid "Network Utilities"
 msgstr "Utilitats de xarxa"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:278
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:279
 msgid "Network boot image"
 msgstr "Imatge d'inici de xarxa"
 
@@ -3366,53 +3464,59 @@ msgstr ""
 msgid "Network without interfaces."
 msgstr "Xarxa sense interfícies."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:661
+msgid "New interface name…"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:11
 msgid "Next »"
 msgstr "Següent"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1507
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1754
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:108
 msgid "No"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:453
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:514
 msgid "No DHCP Server configured for this interface"
 msgstr "Cap servidor DHCP configurat en aquesta interfície"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1162
+msgid "No Encryption"
+msgstr ""
+
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:89
 msgid "No NAT-T"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:198
+msgid "No data received"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1764
+msgid "No entries in this directory"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/backupfiles.lua:82
 msgid "No files found"
 msgstr "Cap fitxer trobat"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:550
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:191
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:180
 msgid "No information available"
 msgstr "No hi ha informació disponible"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:8
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:63
 msgid "No matching prefix delegation"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:157
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
 msgid "No negative cache"
 msgstr "Sense memòria cau negativa"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:53
-msgid "No network configured on this device"
-msgstr "Cap xarxa configurada en aquest dispositiu"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:65
-msgid "No network name specified"
-msgstr "Cap nom de xarxa especificat"
-
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:147
-msgid "No networks in range"
-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
@@ -3420,7 +3524,12 @@ msgstr ""
 msgid "No password set!"
 msgstr "No hi ha cap contrasenya establerta!"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:116
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:104
+msgid "No peers defined yet"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:129
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:271
 msgid "No public keys present yet."
 msgstr ""
 
@@ -3428,19 +3537,19 @@ msgstr ""
 msgid "No rules in this chain."
 msgstr "No hi ha regles en aquesta cadena"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:150
-msgid "No scan results available yet..."
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:53
+msgid "No signal"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:7
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:756
 msgid "No zone assigned"
 msgstr "Cap zona assignada"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:111
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:35
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:48
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:133
 msgid "Noise"
 msgstr "Soroll"
 
@@ -3456,16 +3565,16 @@ msgstr "Soroll:"
 msgid "Non Pre-emtive CRC errors (CRC_P)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:292
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:293
 msgid "Non-wildcard"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:129
 msgid "None"
 msgstr "Cap"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:181
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:172
 msgid "Normal"
 msgstr "Normal"
 
@@ -3473,25 +3582,29 @@ msgstr "Normal"
 msgid "Not Found"
 msgstr "No trobat"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:27
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:5
-msgid "Not associated"
-msgstr "No associat"
-
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:87
 msgid "Not connected"
 msgstr "No connectat"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:38
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:139
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:232
+msgid "Not present"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:105
 msgid "Not started on boot"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:26
-msgid "Note: interface name length"
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:201
+msgid "Not supported"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:171
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:162
 msgid "Notice"
 msgstr "Avís"
 
@@ -3499,63 +3612,50 @@ msgstr "Avís"
 msgid "Nslookup"
 msgstr "Nslookup"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:261
 msgid "Number of cached DNS entries (max is 10000, 0 is no caching)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:203
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:194
 msgid "Number of parallel threads used for compression"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:40
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:69
 msgid "Obfuscated Group Password"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:35
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:61
 msgid "Obfuscated Password"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:22
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:34
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:40
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:105
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:97
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:49
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:80
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:54
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:67
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:93
 msgid "Obtain IPv6-Address"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:83
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:68
 msgid "Off-State Delay"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:16
-msgid ""
-"On this page you can configure the network interfaces. You can bridge "
-"several interfaces by ticking the \"bridge interfaces\" field and enter the "
-"names of several network interfaces separated by spaces. You can also use "
-"<abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
-"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
-"<samp>eth0.1</samp>)."
-msgstr ""
-"En aquesta pàgina pots configurar les interfícies de xarxa. Pots fer un pont "
-"entre diverses interfícies clicant sobre el camp \"interfície pont\" i "
-"introduint els noms de les diverses interfícies de xarxa separats per "
-"espais. També pots fer servir la notació <abbr title=\"Virtual Local Area "
-"Network\">VLAN</abbr> <samp>INTERFACE.VLANNR</samp> (<abbr title=\"per "
-"exemple\">p.e.</abbr>: <samp>eth0.1</samp>)."
-
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:95
 msgid "On-Link route"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:80
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:64
 msgid "On-State Delay"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:360
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:382
 msgid "One of hostname or mac address must be specified!"
 msgstr "Cal especificar o el nom de host o l'adreça MAC!"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:456
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:462
 msgid "One of the following: %s"
 msgstr ""
 
@@ -3577,34 +3677,35 @@ msgstr "Un o més dels camps requerits no té valor!"
 msgid "Open list..."
 msgstr "Obre una llista..."
 
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:61
 #: protocols/luci-proto-openconnect/luasrc/model/network/proto_openconnect.lua:9
 msgid "OpenConnect (CISCO AnyConnect)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:757
 msgid "Operating frequency"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1753
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2306
 msgid "Option changed"
 msgstr "Opció canviada"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1755
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2308
 msgid "Option removed"
 msgstr "Opció treta"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1140
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:55
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1535
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:66
 msgid "Optional"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:78
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:76
 msgid ""
 "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, "
 "starting with <code>0x</code>."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:144
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:215
 msgid ""
 "Optional. Allowed values: 'eui64', 'random', fixed value like '::1' or "
 "'::1:2'. When IPv6 prefix (like 'a:b:c:d::') is received from a delegating "
@@ -3612,41 +3713,41 @@ msgid ""
 "for the interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:123
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:117
 msgid ""
 "Optional. Base64-encoded preshared key. Adds in an additional layer of "
 "symmetric-key cryptography for post-quantum resistance."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:148
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:126
 msgid "Optional. Create routes for Allowed IPs for this peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:103
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:108
 msgid "Optional. Description of peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:156
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:128
 msgid ""
 "Optional. Host of peer. Names are resolved prior to bringing up the "
 "interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:67
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:71
 msgid "Optional. Maximum Transmission Unit of tunnel interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:166
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:132
 msgid "Optional. Port of peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:175
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:136
 msgid ""
 "Optional. Seconds between keep alive messages. Default is 0 (disabled). "
 "Recommended value if this device is behind a NAT is 25."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:31
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:54
 msgid "Optional. UDP port used for outgoing and incoming packets."
 msgstr ""
 
@@ -3667,7 +3768,7 @@ msgstr "Sort."
 msgid "Outbound:"
 msgstr "Sortint:"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:26
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:50
 msgid "Output Interface"
 msgstr ""
 
@@ -3676,51 +3777,51 @@ msgstr ""
 msgid "Output zone"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:63
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:155
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:33
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:54
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:54
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:219
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:50
 msgid "Override MAC address"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:66
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:35
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:56
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:88
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:125
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:131
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:133
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:104
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:61
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:58
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:223
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:44
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:54
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:154
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:71
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:145
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:132
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:110
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:119
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:97
 msgid "Override MTU"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:30
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:63
 msgid "Override TOS"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:25
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:58
 msgid "Override TTL"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:954
 msgid "Override default interface name"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:41
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:167
 msgid "Override the gateway in DHCP responses"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:507
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:555
 msgid ""
 "Override the netmask sent to clients. Normally it is calculated from the "
 "subnet that is served."
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:65
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:179
 msgid "Override the table used for internal routes"
 msgstr ""
 
@@ -3728,29 +3829,33 @@ msgstr ""
 msgid "Overview"
 msgstr "Visió de conjunt"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1606
+msgid "Overwrite existing file \"%s\" ?"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:11
 msgid "Owner"
 msgstr "Propietari"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:42
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:56
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:17
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:28
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:34
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:14
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:18
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:43
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:98
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:45
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:44
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:63
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:82
 msgid "PAP/CHAP password"
 msgstr "Contrasenya PAP/CHAP"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:39
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:53
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:14
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:11
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:15
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:96
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:88
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:43
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:74
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:42
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:61
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:77
 msgid "PAP/CHAP username"
 msgstr "Nom d'usuari PAP/CHAP"
 
@@ -3758,9 +3863,9 @@ msgstr "Nom d'usuari PAP/CHAP"
 msgid "PID"
 msgstr "PID"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:36
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:50
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:26
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:95
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:87
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:68
 msgid "PIN"
 msgstr "PIN"
 
@@ -3769,114 +3874,116 @@ msgstr "PIN"
 msgid "PIN code rejected"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:966
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1372
 msgid "PMK R1 Push"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:43
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:13
 msgid "PPP"
 msgstr "PPP"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:11
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:58
 msgid "PPPoA Encapsulation"
 msgstr "Encapsulació PPPoA"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:19
 msgid "PPPoATM"
 msgstr "PPPoATM"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:17
 msgid "PPPoE"
 msgstr "PPPoE"
 
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:28
 #: protocols/luci-proto-pppossh/luasrc/model/network/proto_pppossh.lua:9
 msgid "PPPoSSH"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:15
 msgid "PPtP"
 msgstr "PPtP"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:59
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:73
 msgid "PSID offset"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:56
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:70
 msgid "PSID-bits length"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:123
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:846
 msgid "PTM/EFM (Packet Transfer Mode)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:78
-msgid "Package libiwinfo required!"
-msgstr "Es requereix el paquet libiwinfo!"
-
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:45
 msgid "Packets"
 msgstr "Paquets"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:7
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:756
 msgid "Part of zone %q"
 msgstr "Part de la zona %q"
 
 #: modules/luci-base/luasrc/view/sysauth.htm:29
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1111
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:35
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:42
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1514
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:46
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:104
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:58
 msgid "Password"
 msgstr "Contrasenya"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:29
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:24
 msgid "Password authentication"
 msgstr "Autenticació per contrasenya"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1019
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1414
 msgid "Password of Private Key"
 msgstr "Contrasenya de la clau privada"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1067
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1471
 msgid "Password of inner Private Key"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:14
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:16
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:18
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:20
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:32
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:34
 msgid "Password strength"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:44
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:107
 msgid "Password2"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:37
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:244
 msgid "Paste or drag SSH key file…"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1000
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1396
 msgid "Path to CA-Certificate"
 msgstr "Ruta als Certificats CA"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1007
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1402
 msgid "Path to Client-Certificate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1013
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1408
 msgid "Path to Private Key"
 msgstr "Ruta a la clau privada"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1049
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1453
 msgid "Path to inner CA-Certificate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1055
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1459
 msgid "Path to inner Client-Certificate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1061
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1465
 msgid "Path to inner Private Key"
 msgstr ""
 
@@ -3894,7 +4001,7 @@ msgstr ""
 msgid "Peak:"
 msgstr "Màxim:"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:28
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:89
 msgid "Peer IP address to assign"
 msgstr ""
 
@@ -3903,11 +4010,11 @@ msgstr ""
 msgid "Peer address is missing"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:90
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:89
 msgid "Peers"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:50
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:80
 msgid "Perfect Forward Secrecy"
 msgstr ""
 
@@ -3919,7 +4026,11 @@ msgstr "Executa un reinici"
 msgid "Perform reset"
 msgstr "Executa un reinici"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:174
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:199
+msgid "Permission denied"
+msgstr ""
+
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:136
 msgid "Persistent Keep Alive"
 msgstr ""
 
@@ -3927,7 +4038,7 @@ msgstr ""
 msgid "Phy Rate:"
 msgstr "Velocitat física:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:190
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:277
 msgid "Physical Settings"
 msgstr "Ajusts físics"
 
@@ -3938,6 +4049,10 @@ msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:16
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:17
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:41
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:77
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:87
@@ -3955,15 +4070,19 @@ msgstr "Si us plau entra el teu nom d'usuari i contrasenya."
 msgid "Policy"
 msgstr "Política"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:22
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:20
 msgid "Port"
 msgstr "Port"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:18
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:133
+msgid "Port %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:274
 msgid "Port status:"
 msgstr "Estatus de port"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:482
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:488
 msgid "Potential negation of: %s"
 msgstr ""
 
@@ -3975,11 +4094,11 @@ msgstr ""
 msgid "Pre-emtive CRC errors (CRCP_P)"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:32
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:73
 msgid "Prefer LTE"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:33
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:74
 msgid "Prefer UMTS"
 msgstr ""
 
@@ -3987,31 +4106,30 @@ msgstr ""
 msgid "Prefix Delegated"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:122
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:117
 msgid "Preshared Key"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:101
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:75
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:81
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:75
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:54
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:74
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:131
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:102
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:89
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:112
 msgid ""
 "Presume peer to be dead after given amount of LCP echo failures, use 0 to "
 "ignore failures"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:305
 msgid "Prevent listening on these interfaces."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:509
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:562
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:950
 msgid "Prevents client-to-client communication"
 msgstr "Evita la comunicació client a client"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:18
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:49
 msgid "Private Key"
 msgstr ""
 
@@ -4032,39 +4150,33 @@ msgstr ""
 msgid "Prot."
 msgstr "Prot."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:72
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:349
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:675
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:84
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:216
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:87
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:390
 msgid "Protocol"
 msgstr "Protocol"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:31
-msgid "Protocol of the new interface"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:222
-msgid "Protocol support is not installed"
-msgstr ""
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:269
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:260
 msgid "Provide NTP server"
 msgstr "Habilita el servidor NTP"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:701
 msgid "Provide new network"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:451
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:879
 msgid "Pseudo Ad-Hoc (ahdemo)"
 msgstr "Pseudo Ad-Hoc (ahdemo)"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:112
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:113
 msgid "Public Key"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:278
 msgid ""
 "Public keys allow for the passwordless SSH logins with a higher security "
 "compared to the use of plain passwords. In order to upload a new key to the "
@@ -4072,47 +4184,48 @@ msgid ""
 "code> file into the input field."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:139
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:211
 msgid "Public prefix routed to this device for distribution to clients."
 msgstr ""
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:27
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:9
 msgid "QMI Cellular"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:173
 msgid "Quality"
 msgstr "Calidad"
 
-#: 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:171
 msgid ""
 "Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> "
 "servers"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:952
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1360
 msgid "R0 Key Lifetime"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:959
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1366
 msgid "R1 Key Holder"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:58
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:88
 msgid "RFC3947 NAT-T mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:381
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:814
 msgid "RSSI threshold for joining"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:256
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:597
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:778
 msgid "RTS/CTS Threshold"
 msgstr "Llindar RTS/CTS"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:41
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:76
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:87
 msgid "RX"
@@ -4122,35 +4235,39 @@ msgstr "RX"
 msgid "RX Rate"
 msgstr "Velocitat RX"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:783
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1961
+msgid "RX Rate / TX Rate"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1207
 msgid "Radius-Accounting-Port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:791
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1215
 msgid "Radius-Accounting-Secret"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:775
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1199
 msgid "Radius-Accounting-Server"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:759
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1183
 msgid "Radius-Authentication-Port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:767
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1191
 msgid "Radius-Authentication-Secret"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:751
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1175
 msgid "Radius-Authentication-Server"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:119
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:102
 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:83
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:84
 msgid ""
 "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-Server"
@@ -4164,17 +4281,11 @@ msgid ""
 "access to this device if you are connected via this interface"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2
-msgid ""
-"Really delete this wireless network? The deletion cannot be undone! You "
-"might lose access to this device if you are connected via this network."
-msgstr ""
-
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:40
 msgid "Really reset all changes?"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:237
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:354
 msgid "Really switch protocol?"
 msgstr ""
 
@@ -4198,15 +4309,15 @@ msgstr "Trànsit en temps real"
 msgid "Realtime Wireless"
 msgstr "Dispositiu sense fils en temps real"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:931
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1343
 msgid "Reassociation Deadline"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:191
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
 msgid "Rebind protection"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:48
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:46
 #: modules/luci-mod-system/luasrc/view/admin_system/reboot.htm:9
 msgid "Reboot"
 msgstr "Reinicia"
@@ -4220,21 +4331,15 @@ msgstr "Reiniciant..."
 msgid "Reboots the operating system of your device"
 msgstr "Arranca de nou el sistema operatiu del teu dispositiu"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:103
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:90
 msgid "Receive"
 msgstr "Recepció"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:325
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:350
-msgid "Receiver Antenna"
-msgstr "Antena receptora"
-
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:42
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:59
 msgid "Recommended. IP addresses of the WireGuard interface."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:28
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:300
 msgid "Reconnect this interface"
 msgstr "Reconnex aquesta interfície"
 
@@ -4242,92 +4347,134 @@ msgstr "Reconnex aquesta interfície"
 msgid "References"
 msgstr "Referències"
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:39
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:153
 msgid "Relay"
 msgstr "Relé"
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:36
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:157
 msgid "Relay Bridge"
 msgstr "Pont de relé"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:17
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:154
 msgid "Relay between networks"
 msgstr "Relé entre xarxes"
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:64
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:12
 msgid "Relay bridge"
 msgstr "Pont de relé"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:18
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:50
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:49
 msgid "Remote IPv4 address"
 msgstr "Adreça IPv4 remota"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:8
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:40
 msgid "Remote IPv4 address or FQDN"
 msgstr "Adreça IPv4 remota o FQDN"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:45
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:725
 msgid "Remove"
 msgstr "Treu"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:53
-msgid "Repeat scan"
-msgstr ""
-
-#: modules/luci-base/luasrc/view/cbi/upload.htm:11
-msgid "Replace entry"
-msgstr "Reemplaça l'entrada"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:46
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:51
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1806
 msgid "Replace wireless configuration"
 msgstr "Reemplaça la configuració sense fil"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:8
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:17
 msgid "Request IPv6-address"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:16
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:23
 msgid "Request IPv6-prefix of length"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1141
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:200
+msgid "Request timeout"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1536
 msgid "Required"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:20
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:31
 msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3"
 msgstr "Alguns ISP ho requereixen, per exemple el Charter amb DOCSIS 3"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:19
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:49
 msgid "Required. Base64-encoded private key for this interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:113
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:113
 msgid "Required. Base64-encoded public key of peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:136
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:122
 msgid ""
 "Required. IP addresses and prefixes that this peer is allowed to use inside "
 "the tunnel. Usually the peer's tunnel IP addresses and the networks the peer "
 "routes through the tunnel."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1134
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1095
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1096
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1097
+msgid "Requires hostapd"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1101
+msgid "Requires hostapd with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1102
+msgid "Requires hostapd with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1098
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1099
+msgid "Requires hostapd with SAE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1533
 msgid ""
 "Requires the 'full' version of wpad/hostapd and support from the wifi driver "
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:141
 msgid ""
 "Requires upstream supports DNSSEC; verify unsigned domain responses really "
 "come from unsigned domains"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1268
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1109
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1119
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1120
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1121
+msgid "Requires wpa-supplicant"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1113
+msgid "Requires wpa-supplicant with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1114
+msgid "Requires wpa-supplicant with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1111
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1124
+msgid "Requires wpa-supplicant with SAE support"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1355
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:17
 #: modules/luci-base/luasrc/view/cbi/footer.htm:30
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:66
@@ -4343,17 +4490,22 @@ 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:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:68
 msgid "Resolv and Hosts Files"
 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:94
 msgid "Resolve file"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:28
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:14
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:71
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:197
+msgid "Resource not found"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:302
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:693
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:90
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:112
 msgid "Restart"
 msgstr "Reinicia"
 
@@ -4361,7 +4513,7 @@ msgstr "Reinicia"
 msgid "Restart Firewall"
 msgstr "Reinicia el tallafocs"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:14
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:691
 msgid "Restart radio interface"
 msgstr ""
 
@@ -4373,26 +4525,24 @@ msgstr "Restauració de la configuració"
 msgid "Restore backup"
 msgstr "Restaura còpia de seguretat"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:113
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:114
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:38
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:46
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:119
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:120
 msgid "Reveal/hide password"
 msgstr "Mostra/amaga la contrasenya"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1774
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2322
 msgid "Revert"
 msgstr "Reverteix"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1861
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2405
 msgid "Revert changes"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2013
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2554
 msgid "Revert request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1993
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2534
 msgid "Reverting configuration…"
 msgstr ""
 
@@ -4400,7 +4550,7 @@ msgstr ""
 msgid "Root"
 msgstr "Arrel"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:271
 msgid "Root directory for files served via TFTP"
 msgstr "Directori arrel dels fitxers servits per TFTP"
 
@@ -4408,7 +4558,7 @@ msgstr "Directori arrel dels fitxers servits per TFTP"
 msgid "Root preparation"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:147
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:126
 msgid "Route Allowed IPs"
 msgstr ""
 
@@ -4420,12 +4570,12 @@ msgstr ""
 msgid "Route type"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:523
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:577
 msgid "Router Advertisement-Service"
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:43
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:15
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:27
 msgid "Router Password"
 msgstr "Contrasenya de l'encaminador"
 
@@ -4455,7 +4605,7 @@ msgstr ""
 msgid "Run filesystem check"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:651
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:669
 msgid "Runtime error"
 msgstr ""
 
@@ -4467,31 +4617,31 @@ msgstr ""
 msgid "SNR"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:5
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:18
 msgid "SSH Access"
 msgstr "Accés SSH"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:10
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:70
 msgid "SSH server address"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:13
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:74
 msgid "SSH server port"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:8
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:58
 msgid "SSH username"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:27
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:277
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
 msgid "SSH-Keys"
 msgstr "Claus SSH"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:42
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:73
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:29
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1617
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:174
 msgid "SSID"
 msgstr "SSID"
@@ -4500,17 +4650,17 @@ msgstr "SSID"
 msgid "SWAP"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1127
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1262
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1379
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1351
 #: modules/luci-base/luasrc/view/cbi/error.htm:17
 #: modules/luci-base/luasrc/view/cbi/footer.htm:26
 #: modules/luci-base/luasrc/view/cbi/header.htm:17
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:54
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:133
 msgid "Save"
 msgstr "Desa"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1256
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1768
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1347
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2318
 #: modules/luci-base/luasrc/view/cbi/footer.htm:22
 msgid "Save & Apply"
 msgstr "Desa i aplica"
@@ -4523,28 +4673,20 @@ msgstr ""
 msgid "Save mtdblock contents"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
-msgid "Saving keys…"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:698
 msgid "Scan"
 msgstr "Escaneja"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:109
-msgid "Scan request failed"
-msgstr ""
-
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:8
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:39
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:23
 msgid "Scheduled Tasks"
 msgstr "Tasques programades"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1749
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2302
 msgid "Section added"
 msgstr "Secció afegida"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1751
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2304
 msgid "Section removed"
 msgstr "Secció treta"
 
@@ -4559,61 +4701,66 @@ msgid ""
 "your device!"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:119
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:90
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:96
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:90
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:69
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:92
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1516
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1646
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1809
+msgid "Select file…"
+msgstr ""
+
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:144
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:102
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:125
 msgid ""
 "Send LCP echo requests at the given interval in seconds, only effective in "
 "conjunction with failure threshold"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:561
-msgid "Separate Clients"
-msgstr "Clients separats"
-
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:62
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:63
 msgid "Server Settings"
 msgstr "Ajusts de servidor"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:26
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:50
 msgid "Service Name"
 msgstr "Nom de servei"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:25
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:30
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:87
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:71
 msgid "Service Type"
 msgstr "Tipus de servei"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:55
+#: modules/luci-base/luasrc/controller/admin/index.lua:62
 msgid "Services"
 msgstr "Serveis"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:815
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:861
 msgid "Session expired"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:83
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:107
 msgid "Set VPN as Default Route"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:258
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:795
 msgid ""
 "Set interface properties regardless of the link carrier (If set, carrier "
 "sense events do not invoke hotplug handlers)."
 msgstr ""
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:23
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:55
 msgid "Setting PLMN failed"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:26
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:68
 msgid "Setting operation mode failed"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:454
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:517
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:527
 msgid "Setup DHCP Server"
 msgstr ""
 
@@ -4625,7 +4772,7 @@ msgstr ""
 msgid "Short GI"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:516
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:960
 msgid "Short Preamble"
 msgstr ""
 
@@ -4637,21 +4784,23 @@ msgstr ""
 msgid "Show empty chains"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:306
 msgid "Shutdown this interface"
 msgstr "Atura aquesta interfície"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:111
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:34
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:47
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:132
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1616
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:173
 msgid "Signal"
 msgstr "Senyal"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1960
+msgid "Signal / Noise"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:125
 msgid "Signal Attenuation (SATN)"
 msgstr ""
@@ -4664,11 +4813,11 @@ msgstr "Senyal:"
 msgid "Size"
 msgstr "Mida"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:259
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:260
 msgid "Size of DNS query cache"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:191
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
 msgid "Size of the ZRam device in megabytes"
 msgstr ""
 
@@ -4685,11 +4834,7 @@ msgstr "Salta al contingut"
 msgid "Skip to navigation"
 msgstr "Salta a la navegació"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:335
-msgid "Slot time"
-msgstr ""
-
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1640
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1846
 #: modules/luci-base/luasrc/model/network.lua:1427
 msgid "Software VLAN"
 msgstr ""
@@ -4727,61 +4872,65 @@ msgstr ""
 msgid "Specifies the directory the device is attached to"
 msgstr "Especifica el directori a que el dispositiu està adjuntat"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:23
-msgid "Specifies the listening port of this <em>Dropbear</em> instance"
-msgstr "Especifica el port d'escolta d'aquesta instància del <em>Dropbear</em>"
-
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:57
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:175
 msgid ""
 "Specifies the maximum amount of failed ARP requests until hosts are presumed "
 "to be dead"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:49
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:171
 msgid ""
 "Specifies the maximum amount of seconds after which hosts are presumed to be "
 "dead"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:761
+msgid ""
+"Specifies the maximum transmit power the wireless radio may use. Depending "
+"on regulatory requirements and wireless usage, the actual transmit power may "
+"be reduced by the driver."
+msgstr ""
+
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:63
 msgid "Specify a TOS (Type of Service)."
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:25
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:58
 msgid ""
 "Specify a TTL (Time to Live) for the encapsulating packet other than the "
 "default (64)."
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:53
 msgid ""
 "Specify an MTU (Maximum Transmission Unit) other than the default (1280 "
 "bytes)."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:60
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "Specify the secret encryption key here."
 msgstr "Especifiqueu el clau de xifració secret aquí."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:475
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:64
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:533
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:89
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:111
 msgid "Start"
 msgstr "Inici"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:33
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:86
 msgid "Start priority"
 msgstr "Prioritat d'inici"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1958
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2499
 msgid "Starting configuration apply…"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1626
 msgid "Starting wireless scan..."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:24
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:120
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
 msgid "Startup"
 msgstr "Arrencada"
 
@@ -4793,59 +4942,62 @@ 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:70
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:71
 msgid "Static Leases"
 msgstr "Leases estàtics"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:118
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:73
 msgid "Static Routes"
 msgstr "Rutes estàtiques"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1194
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1384
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:172
 #: modules/luci-base/luasrc/model/network.lua:966
 msgid "Static address"
 msgstr "Adreça estàtica"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:308
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:309
 msgid ""
 "Static leases are used to assign fixed IP addresses and symbolic hostnames "
 "to DHCP clients. They are also required for non-dynamic interface "
 "configurations where only hosts with a corresponding lease are served."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:534
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:977
 msgid "Station inactivity limit"
 msgstr ""
 
 #: modules/luci-base/luasrc/controller/admin/index.lua:40
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:197
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:337
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:746
 #: modules/luci-mod-status/luasrc/view/admin_status/index.htm:128
 msgid "Status"
 msgstr "Estat"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:35
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:75
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:308
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:91
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:113
 msgid "Stop"
 msgstr "Atura"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:165
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Strict order"
 msgstr "Ordre estricte"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:16
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:30
 msgid "Strong"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1843
 msgid "Submit"
 msgstr "Envia"
 
-#: 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:108
 msgid "Suppress logging"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:109
 msgid "Suppress logging of the routine operation of these protocols"
 msgstr ""
 
@@ -4857,42 +5009,44 @@ msgstr ""
 msgid "Swap Entry"
 msgstr "Entrada d'intercanvi"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:23
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:5
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:135
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:21
 msgid "Switch"
 msgstr "Commutador"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:129
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:168
 msgid "Switch %q"
 msgstr "Commutador %q"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:128
-msgid "Switch %q (%s)"
-msgstr "Commutador %q (%s)"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:66
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:146
 msgid ""
 "Switch %q has an unknown topology - the VLAN settings might not be accurate."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:146
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:142
 msgid "Switch Port Mask"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1640
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1846
 #: modules/luci-base/luasrc/model/network.lua:1425
 msgid "Switch VLAN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:238
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:355
 msgid "Switch protocol"
 msgstr "Protocol de commutador"
 
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:103
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:104
 #: modules/luci-base/luasrc/view/cbi/ipaddr.htm:26
 msgid "Switch to CIDR list notation"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:77
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1547
+msgid "Symbolic link"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:71
 msgid "Sync with NTP-Server"
 msgstr ""
 
@@ -4902,7 +5056,7 @@ msgstr "Sincronitza amb el navegador"
 
 #: modules/luci-base/luasrc/controller/admin/index.lua:47
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:14
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:102
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:94
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
 #: modules/luci-mod-system/luasrc/view/admin_system/applyreboot.htm:39
 msgid "System"
@@ -4913,11 +5067,11 @@ msgstr "Sistema"
 msgid "System Log"
 msgstr "Registre del sistema"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:108
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:99
 msgid "System Properties"
 msgstr "Propietats del sistema"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:145
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:136
 msgid "System log buffer size"
 msgstr "Mida de la memòria intermèdia per al registre del sistema"
 
@@ -4925,15 +5079,17 @@ 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:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:69
 msgid "TFTP Settings"
 msgstr "Ajusts TFTP"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:269
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
 msgid "TFTP server root"
 msgstr "Arrel del servidor TFTP"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:17
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:77
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:88
 msgid "TX"
@@ -4956,7 +5112,7 @@ msgstr "Taula"
 msgid "Target"
 msgstr "Destí"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:77
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:103
 msgid "Target network"
 msgstr ""
 
@@ -4964,42 +5120,24 @@ msgstr ""
 msgid "Terminate"
 msgstr "Acaba"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:27
-msgid ""
-"The <em>Device Configuration</em> section covers physical settings of the "
-"radio hardware such as channel, transmit power or antenna selection which "
-"are shared among all defined wireless networks (if the radio hardware is "
-"multi-SSID capable). Per network settings like encryption or operation mode "
-"are grouped in the <em>Interface Configuration</em>."
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:79
-msgid ""
-"The <em>libiwinfo-lua</em> package is not installed. You must install this "
-"component for working wireless configuration!"
-msgstr ""
-"El paquet <em>libiwinfo-lua</em> no està instal·lat. Heu de instal·lar "
-"aquest component per tenir una configuració sense fil funcionant!"
-
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:66
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:77
 msgid ""
 "The HE.net endpoint update configuration changed, you must now use the plain "
 "username instead of the user ID!"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:8
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:40
 msgid ""
 "The IPv4 address or the fully-qualified domain name of the remote tunnel end."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:27
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:38
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:59
 msgid ""
 "The IPv6 prefix assigned to the provider, usually ends with <code>::</code>"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:18
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1808
 msgid ""
 "The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
 "code> and <code>_</code>"
@@ -5015,7 +5153,7 @@ msgstr ""
 msgid "The configuration file could not be loaded due to the following error:"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1849
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2396
 msgid ""
 "The device could not be reached within %d seconds after applying the pending "
 "changes, which caused the configuration to be rolled back for safety "
@@ -5035,6 +5173,12 @@ msgstr ""
 "El fitxer de dispositiu de la memòria o partició (<abbr title=\"per exemple"
 "\">p.e.</abbr> <code>/dev/sda1</code>)"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:612
+msgid ""
+"The existing wireless configuration needs to be changed for LuCI to function "
+"properly."
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:127
 msgid ""
 "The filesystem that was used to format the memory (<abbr title=\"for example"
@@ -5060,47 +5204,50 @@ msgstr ""
 msgid "The following rules are currently active on this system."
 msgstr "Les següents regles estan actualment actives en aquest sistema."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:144
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:154
+msgid "The gateway address must not be a local IP address"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:154
 msgid "The given SSH public key has already been added."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:150
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:160
 msgid ""
 "The given SSH public key is invalid. Please supply proper public RSA or "
 "ECDSA keys."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:67
-msgid "The given network name is not unique"
-msgstr "El nom de xarxa donat no és únic"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:664
+msgid "The interface name is already used"
+msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:52
-#, fuzzy
-msgid ""
-"The hardware is not multi-SSID capable and the existing configuration will "
-"be replaced if you proceed."
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:670
+msgid "The interface name is too long"
 msgstr ""
-"El maquinari no es capaç de múltiples SSID i la configuració existent es "
-"reemplaçara si procediu."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:43
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:31
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:55
 msgid ""
 "The length of the IPv4 prefix in bits, the remainder is used in the IPv6 "
 "addresses."
 msgstr ""
 "La longitud del prefix IPv4 en bits, el reste s'utilitza en les adreces IPv6."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:35
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:46
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:63
 msgid "The length of the IPv6 prefix in bits"
 msgstr "La longitud del prefix IPv6 en bits"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:12
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:44
 msgid "The local IPv4 address over which the tunnel is created (optional)."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:5
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1814
+msgid "The network name is already used"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:135
 msgid ""
 "The network ports on this device can be combined to several <abbr title="
 "\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
@@ -5110,16 +5257,15 @@ msgid ""
 "next greater network like the internet and other ports for a local network."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:77
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:395
-msgid "The selected protocol needs a device assigned"
-msgstr "El protocol seleccionat necessita un dispositiu assignat"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1149
+msgid "The selected %s mode is incompatible with %s encryption"
+msgstr ""
 
 #: modules/luci-base/luasrc/view/csrftoken.htm:11
 msgid "The submitted security token is invalid or already expired!"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:274
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:272
 msgid ""
 "The system is erasing the configuration partition now and will reboot itself "
 "when finished."
@@ -5127,7 +5273,7 @@ msgstr ""
 "El sistema està esborrant la partició de configuració i es reiniciarà quan "
 "termini."
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:195
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:193
 #, fuzzy
 msgid ""
 "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
@@ -5141,7 +5287,7 @@ msgstr ""
 "connectar-te de nou a l'encaminador, depenent de la configuració que hi "
 "tinguis."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:15
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:80
 msgid "The system password has been successfully changed."
 msgstr ""
 
@@ -5153,7 +5299,7 @@ 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:403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:427
 msgid "There are no active leases"
 msgstr ""
 
@@ -5162,16 +5308,10 @@ msgstr ""
 msgid "There are no active leases."
 msgstr "No hi ha arrendaments actius."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1973
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2514
 msgid "There are no changes to apply"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:204
-msgid ""
-"There is no device assigned yet, please attach a network device in the "
-"\"Physical Settings\" tab"
-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
@@ -5183,11 +5323,19 @@ msgstr ""
 "No s'ha establert cap contrasenya en aquest encaminador. Si us plau, "
 "configura una contrasenya per protegir la interfície web i l'accés SSH."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:19
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:49
 msgid "This IPv4 address of the relay"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1448
+msgid "This authentication type is not applicable to the selected EAP method."
+msgstr ""
+
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:54
+msgid "This does not look like a valid PEM file"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
 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 "
@@ -5201,13 +5349,13 @@ msgid ""
 "configurations are automatically preserved."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:74
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:81
 msgid ""
 "This is either the \"Update Key\" configured for the tunnel or the account "
 "password if no update key has been configured"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:82
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:127
 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."
@@ -5216,13 +5364,13 @@ msgstr ""
 "(abans de la línia 'exit 0') per executar-les en finalitzar el procés "
 "d'arrencada."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:27
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:54
 msgid ""
 "This is the local endpoint address assigned by the tunnel broker, it usually "
 "ends with <code>...:2/64</code>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:79
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> in the local network"
@@ -5230,22 +5378,22 @@ msgstr ""
 "Aquest és l'únic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> a la teva xarxa local"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:73
 msgid "This is the plain username for logging into the account"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:34
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:57
 msgid ""
 "This is the prefix routed to you by the tunnel broker for use by clients"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:9
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:41
 msgid "This is the system crontab in which scheduled tasks can be defined."
 msgstr ""
 "Aquest és el crontab del sistema en el qual es poden definir tasques "
 "programades."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:19
+#: 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 ""
@@ -5264,26 +5412,26 @@ msgstr ""
 "Aquesta pàgina ofereix una vista general de les connexions de xarxa actives "
 "actualment."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:726
-#: modules/luci-base/htdocs/luci-static/resources/form.js:809
+#: modules/luci-base/htdocs/luci-static/resources/form.js:936
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1064
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:172
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:32
 msgid "This section contains no values yet"
 msgstr "Aquesta secció encara no conté cap valor"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:114
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:105
 msgid "Time Synchronization"
 msgstr "Sincronització de l'hora"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:525
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:968
 msgid "Time interval for rekeying GTK"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:128
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:119
 msgid "Timezone"
 msgstr "Zona horària"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:825
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:871
 msgid "To login…"
 msgstr ""
 
@@ -5298,7 +5446,7 @@ msgstr ""
 "inicial, fes clic a \"Restableix la configuració\" (només funciona amb "
 "imatges squashfs)."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:835
 msgid "Tone"
 msgstr ""
 
@@ -5322,55 +5470,41 @@ msgstr "Trànsit"
 msgid "Transfer"
 msgstr "Transferència"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:595
-msgid "Transmission Rate"
-msgstr "Taxa de transmissió"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:102
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:89
 msgid "Transmit"
 msgstr "Transmissió"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:211
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:273
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:345
-msgid "Transmit Power"
-msgstr "Potència de transmissió"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:318
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:349
-msgid "Transmitter Antenna"
-msgstr "Antena transmissora"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:73
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:57
 msgid "Trigger"
 msgstr "Activador"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:98
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:84
 msgid "Trigger Mode"
 msgstr "Mode d'activació"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:54
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:69
 msgid "Tunnel ID"
 msgstr "ID del túnel"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1643
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1849
 #: modules/luci-base/luasrc/model/network.lua:1430
 msgid "Tunnel Interface"
 msgstr "Interfície del túnel"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:44
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:55
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:76
 msgid "Tunnel Link"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:46
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:131
 msgid "Tx-Power"
 msgstr "Potència Tx"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:32
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:185
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:11
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:43
 msgid "Type"
 msgstr "Tipus"
 
@@ -5378,19 +5512,20 @@ msgstr "Tipus"
 msgid "UDP:"
 msgstr "UDP:"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:28
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:90
 msgid "UMTS only"
 msgstr "Només UMTS"
 
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:43
 #: protocols/luci-proto-3g/luasrc/model/network/proto_3g.lua:10
 msgid "UMTS/GPRS/EV-DO"
 msgstr "UMTS/GPRS/EV-DO"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:106
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:93
 msgid "USB Device"
 msgstr "Dispositiu USB"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:122
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:110
 msgid "USB Ports"
 msgstr ""
 
@@ -5420,10 +5555,12 @@ msgstr ""
 msgid "Unable to dispatch"
 msgstr ""
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:22
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:54
 msgid "Unable to obtain client ID"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:61
 msgid "Unable to resolve AFTR host name"
 msgstr ""
@@ -5433,21 +5570,31 @@ msgstr ""
 msgid "Unable to resolve peer host name"
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:33
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:68
+msgid "Unable to save contents: %s"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:132
 msgid "Unavailable Seconds (UAS)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1196
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1386
 #: modules/luci-base/luasrc/model/network.lua:970
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1349
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1539
 #: modules/luci-base/luasrc/model/network.lua:1137
 msgid "Unknown error (%s)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1193
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:204
+msgid "Unknown error code"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1383
+#: modules/luci-base/htdocs/luci-static/resources/protocol/none.js:6
 #: modules/luci-base/luasrc/model/network.lua:964
 msgid "Unmanaged"
 msgstr "Sense gestionar"
@@ -5457,22 +5604,30 @@ msgstr "Sense gestionar"
 msgid "Unmount"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:107
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:262
 msgid "Unnamed key"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1708
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2261
 msgid "Unsaved Changes"
 msgstr "Canvis sense desar"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:202
+msgid "Unspecified error"
+msgstr ""
+
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:64
 msgid "Unsupported MAP type"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:27
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:69
 msgid "Unsupported modem"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:219
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:119
 msgid "Unsupported protocol type."
 msgstr "Tipus de protocol no suportat."
@@ -5495,56 +5650,70 @@ msgstr ""
 msgid "Upload archive..."
 msgstr "Puja un arxiu..."
 
-#: modules/luci-base/luasrc/view/cbi/upload.htm:8
-msgid "Uploaded File"
-msgstr "Fitxer pujat"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1703
+msgid "Upload file"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1678
+msgid "Upload file…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1623
+msgid "Upload request failed: %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:613
+msgid ""
+"Upon pressing \"Continue\", anonymous \"wifi-iface\" sections will be "
+"assigned with a name in the form <em>wifinet#</em> and the network will be "
+"restarted to apply the updated configuration."
+msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:14
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:74
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:85
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:26
 msgid "Uptime"
 msgstr "Temps en marxa"
 
-#: 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:83
 msgid "Use <code>/etc/ethers</code>"
 msgstr "Fes servir <code>/etc/ethers</code>"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:40
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:167
 msgid "Use DHCP gateway"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:33
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:85
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:34
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:98
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:46
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:65
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:38
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:58
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:124
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:39
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:116
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:59
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:103
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:64
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:77
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:100
 msgid "Use DNS servers advertised by peer"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:227
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:233
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:479
 msgid "Use ISO/IEC 3166 alpha2 country codes."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:31
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:100
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:70
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:35
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:51
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:86
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:56
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:97
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:77
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:75
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:92
 msgid "Use MTU on tunnel interface"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:95
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:65
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:30
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:46
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:81
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:93
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:73
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:88
 msgid "Use TTL on tunnel interface"
 msgstr ""
 
@@ -5556,68 +5725,65 @@ msgstr ""
 msgid "Use as root filesystem (/)"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:19
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:31
 msgid "Use broadcast flag"
 msgstr "Utilitza la bandera de difusió"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:253
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:791
 msgid "Use builtin IPv6-management"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:40
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:109
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:92
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:45
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:105
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:53
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:72
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:45
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:65
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:40
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:182
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:127
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:42
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:119
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:62
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:67
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:80
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:103
 msgid "Use custom DNS servers"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:26
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:70
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:16
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:28
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:84
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:24
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:50
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:23
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:43
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:116
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:33
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:74
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:97
 msgid "Use default gateway"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:48
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:164
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:77
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:24
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:88
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:58
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:23
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:39
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:74
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:90
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:38
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:57
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:30
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:50
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:45
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:227
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:119
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:51
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:88
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:68
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:52
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:70
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:83
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:111
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:149
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:67
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:111
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:98
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:72
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:85
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:108
 msgid "Use gateway metric"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:64
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:179
 msgid "Use routing table"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:309
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:310
 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 "
@@ -5630,77 +5796,78 @@ msgstr ""
 msgid "Used"
 msgstr "Usat"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:848
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1273
 msgid "Used Key Slot"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:913
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
 msgid ""
 "Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not "
 "needed with normal WPA(2)-PSK."
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:48
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:110
 msgid "User certificate (PEM encoded)"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:61
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:122
 msgid "User key (PEM encoded)"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/sysauth.htm:23
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:41
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:32
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:102
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:56
 msgid "Username"
 msgstr "Nom d'usuari"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:182
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:903
 msgid "VC-Mux"
 msgstr "VC-Mux"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:851
 msgid "VDSL"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:172
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:169
 msgid "VLANs on %q"
 msgstr "VLANs en %q"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:171
-msgid "VLANs on %q (%s)"
-msgstr "VLANs en %q (%s)"
+#: modules/luci-base/luasrc/controller/admin/index.lua:55
+msgid "VPN"
+msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:18
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:42
 msgid "VPN Local address"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:22
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:46
 msgid "VPN Local port"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:15
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:11
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:15
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:58
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:39
 msgid "VPN Server"
 msgstr "Servidor VPN"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:18
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:96
 msgid "VPN Server port"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:37
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:100
 msgid "VPN Server's certificate SHA1 hash"
 msgstr ""
 
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:9
 #: protocols/luci-proto-vpnc/luasrc/model/network/proto_vpnc.lua:9
 msgid "VPNC (CISCO 3000 (and others) VPN)"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:44
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:73
 msgid "Vendor"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:60
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:52
 msgid "Vendor Class to send when requesting DHCP"
 msgstr "Classe de venidor per enviar al sol·licitar DHCP"
 
@@ -5708,41 +5875,37 @@ msgstr "Classe de venidor per enviar al sol·licitar DHCP"
 msgid "Verify"
 msgstr "Verifica"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:52
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:76
 msgid "Virtual dynamic interface"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:470
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:471
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:553
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:576
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:908
 msgid "WDS"
 msgstr "WDS"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:667
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1160
 msgid "WEP Open System"
 msgstr "Sistema obert WEP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:668
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1161
 msgid "WEP Shared Key"
 msgstr "Clau compartit WEP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "WEP passphrase"
 msgstr "Contrasenya WEP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:503
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:566
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:945
 msgid "WMM Mode"
 msgstr "Mode WMM"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "WPA passphrase"
 msgstr "Contrasenya WPA"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:716
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:735
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:740
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1074
 msgid ""
 "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
 "and ad-hoc mode) to be installed."
@@ -5758,7 +5921,7 @@ msgstr "Esperant que s'apliquin els canvis..."
 msgid "Waiting for command to complete..."
 msgstr "Esperant que s'acabi l'ordre..."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1940
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2481
 msgid "Waiting for configuration to get applied… %ds"
 msgstr ""
 
@@ -5766,8 +5929,8 @@ msgstr ""
 msgid "Waiting for device..."
 msgstr "Esperant el dispositiu..."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:172
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:163
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:173
 msgid "Warning"
 msgstr "Advertència"
 
@@ -5775,11 +5938,11 @@ msgstr "Advertència"
 msgid "Warning: There are unsaved changes that will get lost on reboot!"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:20
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:34
 msgid "Weak"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:946
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1355
 msgid ""
 "When using a PSK, the PMK can be automatically generated. When enabled, the "
 "R0/R1 key options below are not applied. Disable this to use the R0 and R1 "
@@ -5787,78 +5950,85 @@ msgid ""
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:383
 msgid "Width"
 msgstr ""
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:17
 #: protocols/luci-proto-wireguard/luasrc/model/network/proto_wireguard.lua:9
 msgid "WireGuard VPN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:58
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:40
 #: modules/luci-mod-status/luasrc/controller/admin/status.lua:28
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:14
 msgid "Wireless"
 msgstr "Sense fils"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1631
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1837
 #: modules/luci-base/luasrc/model/network.lua:1418
 msgid "Wireless Adapter"
 msgstr "Adaptador sense fils"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1617
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2052
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1823
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2288
 #: modules/luci-base/luasrc/model/network.lua:1404
 #: modules/luci-base/luasrc/model/network.lua:1865
 msgid "Wireless Network"
 msgstr "Xarxa sense fils"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:629
 msgid "Wireless Overview"
 msgstr "Resum sense fils"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:362
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:797
 msgid "Wireless Security"
 msgstr "Seguretat sense fils"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:54
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:611
+msgid "Wireless configuration migration"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:139
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:179
 msgid "Wireless is disabled"
 msgstr "El dispositiu sense fils està inhabilitat"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:54
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:139
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:179
 msgid "Wireless is not associated"
 msgstr "El dispositiu sense fils està sense associar"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:15
-msgid "Wireless is restarting..."
-msgstr "El dispositiu sense fils està reiniciant..."
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:752
 msgid "Wireless network is disabled"
 msgstr "La xarxa sense fil està inhabilitada"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:752
 msgid "Wireless network is enabled"
 msgstr "La xarxa sense fils està habilitada"
 
-#: 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:182
 msgid "Write received DNS requests to syslog"
 msgstr "Escriure les peticions DNS rebudes al registre del sistema"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:164
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:155
 msgid "Write system log to file"
 msgstr "Escriure el registre del sistema al fitxer"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1507
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:85
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1754
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:109
 msgid "Yes"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:26
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:943
+msgid ""
+"You appear to be currently connected to the device via the \"%h\" interface. "
+"Do you really want to shut down the interface?"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:123
 msgid ""
 "You can enable or disable installed init scripts here. Changes will applied "
 "after a device reboot.<br /><strong>Warning: If you disable essential init "
@@ -5879,38 +6049,34 @@ msgstr ""
 "Has d'activar el JavaScript al teu navegador o LuCI no funcionarà "
 "correctament."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:196
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:187
 msgid "ZRam Compression Algorithm"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:203
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:194
 msgid "ZRam Compression Streams"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:189
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:180
 msgid "ZRam Settings"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:191
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
 msgid "ZRam Size"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:229
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:230
 msgid "any"
 msgstr "qualsevol"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:113
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:121
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:126
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:218
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:282
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:321
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:328
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:621
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:37
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:22
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:29
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:121
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:836
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:844
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:849
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1030
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:78
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:48
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:51
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:103
 msgid "auto"
 msgstr "auto"
 
@@ -5919,11 +6085,11 @@ msgstr "auto"
 msgid "automatic"
 msgstr "estàtic"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:45
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:78
 msgid "baseT"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:909
 msgid "bridged"
 msgstr "pontejat"
 
@@ -5939,22 +6105,21 @@ msgstr ""
 msgid "create:"
 msgstr "crea:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:264
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:368
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:678
 msgid "creates a bridge over specified interface(s)"
 msgstr "crea un pont entre les interfícies especificades"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:277
 msgid "dB"
 msgstr "dB"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:34
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:35
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:46
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:47
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:48
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:131
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:132
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:133
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:277
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:279
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:331
@@ -5966,26 +6131,30 @@ msgstr "dB"
 msgid "dBm"
 msgstr "dBm"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:460
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:587
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:889
 msgid "disable"
 msgstr "inhabilita"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:119
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:524
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:530
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:536
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:18
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:578
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:584
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:590
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:25
 msgid "disabled"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:433
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:467
+msgid "driver default"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/lease_status.htm:17
 #: modules/luci-base/luasrc/view/lease_status.htm:46
-#: 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:416
 msgid "expired"
 msgstr "caducat"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:88
 msgid ""
 "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr>-leases will be stored"
@@ -5999,25 +6168,21 @@ msgstr ""
 msgid "forward"
 msgstr "transemès"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:80
 msgid "full-duplex"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:80
 msgid "half-duplex"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:559
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:565
 msgid "hexadecimal encoded value"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:138
-msgid "hidden"
-msgstr "amagat"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:527
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:533
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:538
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:581
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:587
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:592
 msgid "hybrid mode"
 msgstr ""
 
@@ -6025,6 +6190,10 @@ msgstr ""
 msgid "if target is a network"
 msgstr "si el destí és una xarxa"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:63
+msgid "ignore"
+msgstr ""
+
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:177
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
@@ -6059,25 +6228,26 @@ msgstr ""
 msgid "key with either 5 or 13 characters"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:94
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:95
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr "fitxer <abbr title=\"Domain Name System\">DNS</abbr> local"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:952
-msgid "minutes"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1168
+msgid "medium security"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:43
-msgid "mixed WPA/WPA2"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1360
+msgid "minutes"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:225
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:232
 msgid "no"
 msgstr "no"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:54
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:72
 msgid "no link"
 msgstr "cap enllaç"
 
@@ -6085,7 +6255,7 @@ msgstr "cap enllaç"
 msgid "non-empty value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1195
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1446
 msgid "none"
 msgstr "cap"
 
@@ -6095,7 +6265,9 @@ msgstr "cap"
 msgid "not present"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:363
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:341
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:776
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:780
 #: 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
@@ -6110,9 +6282,9 @@ msgstr "parat"
 msgid "on"
 msgstr "engegat"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
-msgid "open"
-msgstr "obert"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1169
+msgid "open network"
+msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
@@ -6131,73 +6303,77 @@ msgstr ""
 msgid "positive integer value"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:34
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:56
 msgid "random"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:526
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:532
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:537
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:580
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:586
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:591
 msgid "relay mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:910
 msgid "routed"
 msgstr "encaminat"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:525
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:534
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:968
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:977
 msgid "sec"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:525
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:531
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:579
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:585
 msgid "server mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:544
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:597
 msgid "stateful-only"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:542
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:595
 msgid "stateless"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:543
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:596
 msgid "stateless + stateful"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:369
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1167
+msgid "strong security"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:346
 msgid "tagged"
 msgstr "etiquetat"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:932
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1343
 msgid "time units (TUs / 1.024 ms) [1000-65535]"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:549
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:555
 msgid "unique value"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:448
 msgid "unknown"
 msgstr "desconegut"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:15
 #: modules/luci-base/luasrc/view/lease_status.htm:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:238
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:390
+#: 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:414
 msgid "unlimited"
 msgstr "il·limitat"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1401
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1648
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:63
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:355
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:378
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:413
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:446
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:512
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:450
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:545
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:53
 #: modules/luci-base/luasrc/view/cbi/network_netlist.htm:38
 msgid "unspecified"
@@ -6207,7 +6383,7 @@ msgstr "sense espeficicar"
 msgid "unspecified -or- create:"
 msgstr "sense espeficicar -o- crear:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:366
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:344
 msgid "untagged"
 msgstr "sense etiquetar"
 
@@ -6288,8 +6464,8 @@ msgstr ""
 msgid "valid address:port"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:523
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:527
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:529
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:533
 msgid "valid date (YYYY-MM-DD)"
 msgstr ""
 
@@ -6326,7 +6502,7 @@ msgstr ""
 msgid "valid network in address/netmask notation"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:498
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:504
 msgid "valid phone digit (0-9, \"*\", \"#\", \"!\" or \".\")"
 msgstr ""
 
@@ -6339,11 +6515,11 @@ msgstr ""
 msgid "valid port value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:503
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:509
 msgid "valid time (HH:MM:SS)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:425
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:431
 msgid "value between %d and %d characters"
 msgstr ""
 
@@ -6359,14 +6535,23 @@ msgstr ""
 msgid "value smaller or equal to %f"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:430
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:425
+msgid "value with %d characters"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:436
 msgid "value with at least %d characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:435
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:441
 msgid "value with at most %d characters"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1169
+msgid "weak security"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:221
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:232
@@ -6377,6 +6562,158 @@ msgstr "sí"
 msgid "« Back"
 msgstr "« Enrere"
 
+#~ msgid "Specifies the listening port of this <em>Dropbear</em> instance"
+#~ msgstr ""
+#~ "Especifica el port d'escolta d'aquesta instància del <em>Dropbear</em>"
+
+#~ msgid "Switch %q (%s)"
+#~ msgstr "Commutador %q (%s)"
+
+#~ msgid "VLANs on %q (%s)"
+#~ msgstr "VLANs en %q (%s)"
+
+#~ msgid "Antenna 1"
+#~ msgstr "Antena 1"
+
+#~ msgid "Antenna 2"
+#~ msgstr "Antena 2"
+
+#~ msgid "Antenna Configuration"
+#~ msgstr "Configuració d'antena"
+
+#~ msgid "Back to overview"
+#~ msgstr "Enrere al resum"
+
+# Endarrere cap a resultats d'escaneig
+#~ msgid "Back to scan results"
+#~ msgstr "Enrere als resultats de l'escaneig"
+
+#~ msgid "Broadcom 802.11%s Wireless Controller"
+#~ msgstr "Controlador sense fil Broadcom 802.11%s"
+
+#~ msgid "Broadcom BCM%04x 802.11 Wireless Controller"
+#~ msgstr "Controlador sense fil Broadcom BCM%04x 802.11"
+
+#~ msgid "Common Configuration"
+#~ msgstr "Configuració comuna"
+
+#~ msgid "Connect"
+#~ msgstr "Connecta"
+
+#~ msgid "Connection Limit"
+#~ msgstr "Límit de connexió"
+
+#~ msgid "Cover the following interface"
+#~ msgstr "Cobreix la interfície següent"
+
+#~ msgid "Cover the following interfaces"
+#~ msgstr "Cobreix les interfícies següents"
+
+#~ msgid "Create Interface"
+#~ msgstr "Crea interfície"
+
+#~ msgid "Create a bridge over multiple interfaces"
+#~ msgstr "Crea un pont entre múltiples interfícies"
+
+#~ msgid "Diversity"
+#~ msgstr "Diversitat"
+
+#~ msgid "Edit this interface"
+#~ msgstr "Edita aquesta interfície"
+
+#~ msgid "Generic 802.11%s Wireless Controller"
+#~ msgstr "Controlador sense fils 802.11%s genèric"
+
+#~ msgid "Install package %q"
+#~ msgstr "Instal·la el paquet %q"
+
+#~ msgid "Interface Overview"
+#~ msgstr "Visió de conjunt de la interfície"
+
+#~ msgid "Missing protocol extension for proto %q"
+#~ msgstr "Manca l'extensió de protocol del protocol %q"
+
+#~ msgid "Name of the new interface"
+#~ msgstr "Nom de la nova interfície"
+
+#~ msgid "No network configured on this device"
+#~ msgstr "Cap xarxa configurada en aquest dispositiu"
+
+#~ msgid "No network name specified"
+#~ msgstr "Cap nom de xarxa especificat"
+
+#~ msgid "Not associated"
+#~ msgstr "No associat"
+
+#~ msgid ""
+#~ "On this page you can configure the network interfaces. You can bridge "
+#~ "several interfaces by ticking the \"bridge interfaces\" field and enter "
+#~ "the names of several network interfaces separated by spaces. You can also "
+#~ "use <abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
+#~ "<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
+#~ "<samp>eth0.1</samp>)."
+#~ msgstr ""
+#~ "En aquesta pàgina pots configurar les interfícies de xarxa. Pots fer un "
+#~ "pont entre diverses interfícies clicant sobre el camp \"interfície pont\" "
+#~ "i introduint els noms de les diverses interfícies de xarxa separats per "
+#~ "espais. També pots fer servir la notació <abbr title=\"Virtual Local Area "
+#~ "Network\">VLAN</abbr> <samp>INTERFACE.VLANNR</samp> (<abbr title=\"per "
+#~ "exemple\">p.e.</abbr>: <samp>eth0.1</samp>)."
+
+#~ msgid "Package libiwinfo required!"
+#~ msgstr "Es requereix el paquet libiwinfo!"
+
+#~ msgid "Receiver Antenna"
+#~ msgstr "Antena receptora"
+
+#~ msgid "Replace entry"
+#~ msgstr "Reemplaça l'entrada"
+
+#~ msgid "Separate Clients"
+#~ msgstr "Clients separats"
+
+#~ msgid ""
+#~ "The <em>libiwinfo-lua</em> package is not installed. You must install "
+#~ "this component for working wireless configuration!"
+#~ msgstr ""
+#~ "El paquet <em>libiwinfo-lua</em> no està instal·lat. Heu de instal·lar "
+#~ "aquest component per tenir una configuració sense fil funcionant!"
+
+#~ msgid "The given network name is not unique"
+#~ msgstr "El nom de xarxa donat no és únic"
+
+#, fuzzy
+#~ msgid ""
+#~ "The hardware is not multi-SSID capable and the existing configuration "
+#~ "will be replaced if you proceed."
+#~ msgstr ""
+#~ "El maquinari no es capaç de múltiples SSID i la configuració existent es "
+#~ "reemplaçara si procediu."
+
+#~ msgid "The selected protocol needs a device assigned"
+#~ msgstr "El protocol seleccionat necessita un dispositiu assignat"
+
+#~ msgid "Transmission Rate"
+#~ msgstr "Taxa de transmissió"
+
+#~ msgid "Transmit Power"
+#~ msgstr "Potència de transmissió"
+
+#~ msgid "Transmitter Antenna"
+#~ msgstr "Antena transmissora"
+
+#~ msgid "Uploaded File"
+#~ msgstr "Fitxer pujat"
+
+#~ msgid "Wireless is restarting..."
+#~ msgstr "El dispositiu sense fils està reiniciant..."
+
+#~ msgid "hidden"
+#~ msgstr "amagat"
+
+#~ msgid "open"
+#~ msgstr "obert"
+
 #~ msgid "Back"
 #~ msgstr "Enrere"
 
@@ -6518,9 +6855,6 @@ msgstr "« Enrere"
 #~ msgid "Hermes 802.11b Wireless Controller"
 #~ msgstr "Controlador sense fil Hermes 802.11b"
 
-#~ msgid "Interface is shutting down..."
-#~ msgstr "La interfície s'està aturant..."
-
 #~ msgid "RaLink 802.11%s Wireless Controller"
 #~ msgstr "Controlador sense fil RaLink 802.11%s"
 
diff --git a/modules/luci-base/po/cs/base.po b/modules/luci-base/po/cs/base.po
index b3630519f..bffcbad16 100644
--- a/modules/luci-base/po/cs/base.po
+++ b/modules/luci-base/po/cs/base.po
@@ -11,19 +11,20 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Generator: Pootle 2.0.6\n"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:133
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:857
 msgid "%.1f dB"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:109
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:122
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 msgid "%d Bit"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1641
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2194
 msgid "%d invalid field(s)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:281
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:31
 msgid "%s is untagged in multiple VLANs!"
 msgstr ""
 
@@ -61,19 +62,19 @@ msgid "-- Additional Field --"
 msgstr "-- Doplňující pole --"
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:258
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1401
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1533
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:250
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:350
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1114
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1648
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1780
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:314
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:414
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1178
 #: modules/luci-base/luasrc/view/cbi/header.htm:5
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:26
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:88
 msgid "-- Please choose --"
 msgstr "-- Prosím vyberte --"
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:259
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:351
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1115
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:415
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1179
 #: modules/luci-base/luasrc/view/cbi/header.htm:6
 msgid "-- custom --"
 msgstr "-- vlastní --"
@@ -96,7 +97,7 @@ msgstr ""
 msgid "-- please select --"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:382
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:814
 msgid "0 = not using RSSI threshold, 1 = do not change driver default"
 msgstr ""
 
@@ -108,10 +109,11 @@ msgstr "Zatížení za 1 minutu:"
 msgid "15 Minute Load:"
 msgstr "Zatížení za 15 minut:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:924
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1337
 msgid "4-character hexadecimal ID"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:11
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:18
 msgid "464XLAT (CLAT)"
 msgstr ""
@@ -120,47 +122,47 @@ msgstr ""
 msgid "5 Minute Load:"
 msgstr "Zatížení za 5 minut:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:960
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1366
 msgid "6-octet identifier as a hex string - no colons"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:891
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1310
 msgid "802.11r Fast Transition"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1157
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1567
 msgid "802.11w Association SA Query maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1574
 msgid "802.11w Association SA Query retry timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1133
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1533
 msgid "802.11w Management Frame Protection"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1156
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1567
 msgid "802.11w maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1165
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1574
 msgid "802.11w retry timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:399
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:831
 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:224
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:225
 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:215
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:216
 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:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
 msgid ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
 "order of the resolvfile"
@@ -168,11 +170,11 @@ msgstr ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servery budou dotazovány podle "
 "pořadí resolvfile"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:388
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:820
 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:351
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:373
 #: 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"
@@ -182,8 +184,8 @@ msgstr "<abbr title=\"Internet Protokol Verze 4\">IPv4</abbr>-Adresa"
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
 msgstr "<abbr title=\"Internet Protocol Verze 4\">IPv4</abbr>-Brána"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:555
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:35
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:506
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr "<abbr title=\"Internet Protokol Verze 4\">IPv4</abbr>-Maska sítě"
 
@@ -198,29 +200,29 @@ 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:378
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:402
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:58
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:35
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:33
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> Konfigurace"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:67
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:51
 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:328
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:329
 #: 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:372
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:233
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:234
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> leases"
@@ -228,7 +230,7 @@ msgstr ""
 "Nejvyšší 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:242
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> packet size"
@@ -236,65 +238,69 @@ msgstr ""
 "Největší 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:251
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:252
 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
 msgstr "Nejvyšší počet souběžných dotazů"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:10
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:42
 msgid ""
 "<br/>Note: you need to manually restart the cron service if the crontab file "
 "was empty before editing."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:817
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1605
+msgid "A directory with the same name already exists."
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:863
 msgid "A new login is required since the authentication session expired."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:114
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:837
 msgid "A43C + J43 + A43"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:838
 msgid "A43C + J43 + A43 + V43"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:850
 msgid "ADSL"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:826
 msgid "ANSI T1.413"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:33
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:47
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:23
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:94
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:86
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:67
 msgid "APN"
 msgstr "APN"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:56
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:175
 msgid "ARP retry threshold"
 msgstr "ARP limit opakování"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:122
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:845
 msgid "ATM (Asynchronous Transfer Mode)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:144
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:866
 msgid "ATM Bridges"
 msgstr "ATM mosty"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:178
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:21
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:898
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:66
 msgid "ATM Virtual Channel Identifier (VCI)"
 msgstr "Identifikátor virtuálního kanálu ATM (VCI)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:179
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:26
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:899
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:70
 msgid "ATM Virtual Path Identifier (VPI)"
 msgstr "Identifikátor virtuální cesty ATM (VPI)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:866
 msgid ""
 "ATM bridges expose encapsulated ethernet in AAL5 connections as virtual "
 "Linux network interfaces which can be used in conjunction with DHCP or PPP "
@@ -304,8 +310,8 @@ msgstr ""
 "virtuální síťová rozhraní Linuxu, které mohou být použity ve spojení s DHCP "
 "nebo PPP vytáčeného připojení od poskytovatele sítě."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:184
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:905
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:62
 msgid "ATM device number"
 msgstr "číslo ATM zařízení"
 
@@ -314,17 +320,17 @@ msgid "ATU-C System Vendor ID"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:251
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:495
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:499
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:528
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:532
 msgid "Absent Interface"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:19
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
 msgid "Access Concentrator"
 msgstr "Přístupový koncentrátor"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:368
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:470
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:802
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
 msgid "Access Point"
 msgstr "Přístupový bod"
 
@@ -351,7 +357,7 @@ msgid "Active Connections"
 msgstr "Aktivní spojení"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:68
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:30
 msgid "Active DHCP Leases"
 msgstr "Aktivní propůjčené DHCP adresy (leases)"
 
@@ -359,55 +365,75 @@ msgstr "Aktivní propůjčené DHCP adresy (leases)"
 msgid "Active DHCPv6 Leases"
 msgstr "Aktivní propůjčené DHCPv6 adresy (leases)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1951
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:370
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:12
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2190
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:804
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:23
 msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:650
-#: modules/luci-base/htdocs/luci-static/resources/form.js:651
-#: modules/luci-base/htdocs/luci-static/resources/form.js:666
-#: modules/luci-base/htdocs/luci-static/resources/form.js:667
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1290
+#: modules/luci-base/htdocs/luci-static/resources/form.js:902
+#: modules/luci-base/htdocs/luci-static/resources/form.js:904
+#: modules/luci-base/htdocs/luci-static/resources/form.js:917
+#: modules/luci-base/htdocs/luci-static/resources/form.js:918
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1539
 #: modules/luci-base/luasrc/view/cbi/nsection.htm:25
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:189
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:197
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:39
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:47
 #: modules/luci-base/luasrc/view/cbi/ucisection.htm:54
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:703
 msgid "Add"
 msgstr "Přidat"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:60
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:870
+msgid "Add ATM Bridge"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:92
 msgid "Add IPv4 address…"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:129
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:204
 msgid "Add IPv6 address…"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:143
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:149
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:38
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:47
+msgid "Add LED action"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:215
+msgid "Add VLAN"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:14
+msgid "Add instance"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:153
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:159
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:250
 msgid "Add key"
 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:155
 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"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:705
 msgid "Add new interface..."
 msgstr "Přidat rozhraní..."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:104
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:99
+msgid "Add peer"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:105
 msgid "Additional Hosts files"
 msgstr "Dodatečné Hosts soubory"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:161
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
 msgid "Additional servers file"
 msgstr ""
 
@@ -434,7 +460,7 @@ msgstr ""
 msgid "Address"
 msgstr "Adresa"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:12
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:151
 msgid "Address to access local relay bridge"
 msgstr "Adresa pro přístup k místnímu relay bridge"
 
@@ -443,13 +469,13 @@ msgstr "Adresa pro přístup k místnímu relay bridge"
 msgid "Administration"
 msgstr "Správa"
 
-#: 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:70
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:505
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:896
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:24
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:189
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:463
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:176
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:143
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:364
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:742
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:799
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:50
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:34
 msgid "Advanced Settings"
@@ -459,167 +485,167 @@ msgstr "Pokročilé nastavení"
 msgid "Aggregate Transmit Power(ACTATP)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:175
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:166
 msgid "Alert"
 msgstr "Upozornění"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1628
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1834
 #: modules/luci-base/luasrc/model/network.lua:1416
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:54
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:78
 msgid "Alias Interface"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:138
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:66
 msgid "Alias of \"%s\""
 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:170
 msgid "All Servers"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:114
 msgid ""
 "Allocate IP addresses sequentially, starting from the lowest available "
 "address"
 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:113
 msgid "Allocate IP sequentially"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:24
 msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
 msgstr "Povolit <abbr title=\"Secure Shell\">SSH</abbr> autentizaci heslem"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:545
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:987
 msgid "Allow AP mode to disconnect STAs based on low ACK condition"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:462
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:589
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:891
 msgid "Allow all except listed"
 msgstr "Povolit vše mimo uvedené"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:236
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:767
 msgid "Allow legacy 802.11b rates"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:461
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:588
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:890
 msgid "Allow listed only"
 msgstr "Povolit pouze uvedené"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:198
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:199
 msgid "Allow localhost"
 msgstr "Povolit localhost"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:47
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:35
 msgid "Allow remote hosts to connect to local SSH forwarded ports"
 msgstr ""
 "Povolit vzdáleným hostitelům připojování k místním portům přesměrovaným "
 "pomocí SSH"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:38
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:30
 msgid "Allow root logins with password"
 msgstr "Povolit přihlašovaní root účtu pomocí hesla"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:39
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:30
 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:199
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:200
 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"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:135
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:122
 msgid "Allowed IPs"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:549
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:602
 msgid "Always announce default router"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:259
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:782
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
 "option does not comply with IEEE 802.11n-2009!"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:95
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:818
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:119
 msgid "Annex"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:96
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:819
 msgid "Annex A + L + M (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:827
 msgid "Annex A G.992.1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:828
 msgid "Annex A G.992.2"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:829
 msgid "Annex A G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:830
 msgid "Annex A G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:97
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:820
 msgid "Annex B (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:823
 msgid "Annex B G.992.1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:824
 msgid "Annex B G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:102
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:825
 msgid "Annex B G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:98
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:821
 msgid "Annex J (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:831
 msgid "Annex L G.992.3 POTS 1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:99
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:822
 msgid "Annex M (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:109
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:832
 msgid "Annex M G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:833
 msgid "Annex M G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:550
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:602
 msgid "Announce as default router even if no public prefix is available."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:555
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:607
 msgid "Announced DNS domains"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:554
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:606
 msgid "Announced DNS servers"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1093
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1496
 msgid "Anonymous Identity"
 msgstr ""
 
@@ -631,20 +657,6 @@ msgstr ""
 msgid "Anonymous Swap"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:322
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:329
-msgid "Antenna 1"
-msgstr "Anténa 1"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:323
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:330
-msgid "Antenna 2"
-msgstr "Anténa 2"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:246
-msgid "Antenna Configuration"
-msgstr "Konfigurace antén"
-
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:71
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:160
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:181
@@ -652,11 +664,11 @@ msgstr "Konfigurace antén"
 msgid "Any zone"
 msgstr "Libovolná zóna"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1981
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2522
 msgid "Apply request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1867
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2409
 msgid "Apply unchecked"
 msgstr ""
 
@@ -664,8 +676,8 @@ msgstr ""
 msgid "Architecture"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:19
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:184
+#: 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 ""
@@ -674,13 +686,13 @@ msgstr ""
 msgid "Assign interfaces..."
 msgstr "Přiřadit rozhraní..."
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:124
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:24
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:189
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:31
 msgid ""
 "Assign prefix parts using this hexadecimal subprefix ID for this interface."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:148
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1967
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:22
 msgid "Associated Stations"
 msgstr "Připojení klienti"
@@ -689,20 +701,20 @@ msgstr "Připojení klienti"
 msgid "Associations"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:39
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:37
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:101
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:64
 msgid "Auth Group"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1027
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1421
 msgid "Authentication"
 msgstr "Autentizace"
 
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:29
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:70
 msgid "Authentication Type"
 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:78
 msgid "Authoritative"
 msgstr "Autoritativní"
 
@@ -720,17 +732,19 @@ msgstr "Vyžadována autorizace"
 msgid "Auto Refresh"
 msgstr "Automaticky obnovovat"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:53
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:7
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:17
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:67
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:24
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:36
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:42
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:36
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:106
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:24
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:98
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:50
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:94
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:81
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:55
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:68
 msgid "Automatic"
 msgstr ""
 
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:7
 #: protocols/luci-proto-hnet/luasrc/model/network/proto_hnet.lua:7
 msgid "Automatic Homenet (HNCP)"
 msgstr ""
@@ -773,21 +787,21 @@ msgstr "Dostupné"
 msgid "Average:"
 msgstr "Průměr:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:116
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:839
 msgid "B43 + B43C"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:840
 msgid "B43 + B43C + V43"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:48
 msgid "BR / DMR / AFTR"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:43
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:75
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1620
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:176
 msgid "BSSID"
 msgstr "BSSID"
@@ -801,19 +815,11 @@ msgstr "Zpět k přehledu"
 msgid "Back to configuration"
 msgstr "Zpět ke konfiguraci"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:48
-msgid "Back to overview"
-msgstr "Zpět k přehledu"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:20
-msgid "Back to scan results"
-msgstr "Zpět k výsledkům vyhledávání"
-
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:17
 msgid "Backup"
 msgstr "Zálohovat"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:38
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:36
 msgid "Backup / Flash Firmware"
 msgstr "Zálohovat / nahrát firmware"
 
@@ -826,11 +832,11 @@ msgid "Bad address specified!"
 msgstr "Zadána neplatná adresa!"
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:158
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:288
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:368
 msgid "Band"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:261
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:785
 msgid "Beacon Interval"
 msgstr ""
 
@@ -844,79 +850,85 @@ 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:293
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:294
 msgid ""
 "Bind dynamically to interfaces rather than wildcard address (recommended as "
 "linux default)"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:16
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:48
 msgid "Bind interface"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:16
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:48
 msgid "Bind the tunnel to this interface (optional)."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:49
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:134
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:187
 msgid "Bitrate"
 msgstr "Přenosová rychlost"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:172
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
 msgid "Bogus NX Domain Override"
 msgstr "Přepíše falešnou hodnotu NX Domény"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1634
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1840
 #: modules/luci-base/luasrc/model/network.lua:1420
 msgid "Bridge"
 msgstr "Síťový most"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:264
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:368
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:678
 msgid "Bridge interfaces"
 msgstr "Síťové mosty"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:906
 msgid "Bridge unit number"
 msgstr "Číslo síťového mostu"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:250
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:364
 msgid "Bring up on boot"
 msgstr "Zapnout po startu"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:35
-msgid "Broadcom 802.11%s Wireless Controller"
-msgstr "Broadcom 802.11%s bezdrátový ovladač"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:45
-msgid "Broadcom BCM%04x 802.11 Wireless Controller"
-msgstr "Broadcom modul BCM%04x 802.11 bezdrátový ovladač"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1697
+msgid "Browse…"
+msgstr ""
 
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:18
 msgid "Buffered"
 msgstr "Bufferováno"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:75
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:134
 msgid "CA certificate; if empty it will be saved after the first connection."
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:7
+msgid "CLAT configuration failed"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:13
 msgid "CPU usage (%)"
 msgstr "Vytížení CPU (%)"
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:21
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:53
 msgid "Call failed"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1789
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:14
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:52
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:711
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:948
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1839
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:191
 #: modules/luci-mod-system/luasrc/view/admin_system/upgrade.htm:60
 msgid "Cancel"
 msgstr "Storno"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:6
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:17
 msgid "Category"
 msgstr ""
 
@@ -934,13 +946,7 @@ msgstr ""
 msgid "Chain"
 msgstr "Řetěz"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:9
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:14
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:24
-msgid "Change login password"
-msgstr ""
-
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1744
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 msgid "Changes"
 msgstr "Změny"
 
@@ -948,33 +954,23 @@ msgstr "Změny"
 msgid "Changes applied."
 msgstr "Změny aplikovány."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2004
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2545
 msgid "Changes have been reverted."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:43
 msgid "Changes the administrator password for accessing the device"
 msgstr "Změní administrátorské heslo pro přístup k zařízení"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:10
-msgid "Changing password…"
-msgstr ""
-
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:162
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:45
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:87
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:174
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:376
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1618
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:186
 msgid "Channel"
 msgstr "Kanál"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:119
-msgid ""
-"Channel %d is not available in the %s regulatory domain and has been auto-"
-"adjusted to %d."
-msgstr ""
-
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:229
 msgid "Check"
 msgstr "Kontrola"
@@ -983,7 +979,7 @@ msgstr "Kontrola"
 msgid "Check filesystems before mount"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1806
 msgid "Check this option to delete the existing networks from this radio."
 msgstr ""
 
@@ -995,8 +991,8 @@ msgstr "Kontrolní součet"
 msgid "Choose mtdblock"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:358
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:443
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1829
 msgid ""
 "Choose the firewall zone you want to assign to this interface. Select "
 "<em>unspecified</em> to remove the interface from the associated zone or "
@@ -1008,7 +1004,7 @@ msgstr ""
 "zóny a její následné přiřazení danému rozhraní vyplňte pole <em>vytvořit</"
 "em>."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:834
 msgid ""
 "Choose the network(s) you want to attach to this wireless interface or fill "
 "out the <em>create</em> field to define a new network."
@@ -1016,11 +1012,11 @@ msgstr ""
 "Vyberte síť(ě), které chcete připojit k tomuto bezdrátovému rozhraní, nebo "
 "vyplňte pole <em>vytvořit</em> a pojmenujte novou síť."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:614
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1023
 msgid "Cipher"
 msgstr "Å ifra"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:61
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:91
 msgid "Cisco UDP encapsulation"
 msgstr ""
 
@@ -1037,28 +1033,28 @@ msgid ""
 "FEATURE IS FOR PROFESSIONALS! )"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1950
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:369
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:471
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2189
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:803
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:908
 msgid "Client"
 msgstr "Klient"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:55
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:52
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:47
 msgid "Client ID to send when requesting DHCP"
 msgstr "Klientské ID odesílané v DHCP požadavku"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:145
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:151
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:155
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:161
 msgid "Close"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:146
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:119
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:125
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:127
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:98
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:119
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:157
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:141
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:115
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:138
 msgid ""
 "Close inactive connection after the given amount of seconds, use 0 to "
 "persist connection"
@@ -1073,12 +1069,9 @@ msgstr "Zavřít seznam..."
 #: modules/luci-base/luasrc/view/lease_status.htm:77
 #: modules/luci-base/luasrc/view/lease_status.htm:98
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:118
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:37
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:24
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1965
 #: modules/luci-mod-network/luasrc/view/admin_network/iface_status.htm:6
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:40
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:30
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:8
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:398
 #: modules/luci-mod-status/luasrc/view/admin_status/index/30-network.htm:11
 #: modules/luci-mod-status/luasrc/view/admin_status/index/50-dsl.htm:17
@@ -1092,15 +1085,19 @@ msgstr "Probíhá sběr dat..."
 msgid "Command"
 msgstr "Příkaz"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:193
+msgid "Command OK"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:41
+msgid "Command failed"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:64
 msgid "Comment"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:185
-msgid "Common Configuration"
-msgstr "Společná nastavení"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
 msgid ""
 "Complicates key reinstallation attacks on the client side by disabling "
 "retransmission of EAPOL-Key frames that are used to install keys. This "
@@ -1108,13 +1105,14 @@ msgid ""
 "negotiation especially in environments with heavy traffic load."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1744
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 #: modules/luci-base/luasrc/controller/admin/uci.lua:11
 #: modules/luci-mod-system/luasrc/view/admin_system/backupfiles.htm:9
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:13
 msgid "Configuration"
 msgstr "Nastavení"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:21
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:63
 msgid "Configuration failed"
 msgstr ""
@@ -1123,89 +1121,89 @@ msgstr ""
 msgid "Configuration files will be kept"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1915
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2456
 msgid "Configuration has been applied."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1848
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2395
 msgid "Configuration has been rolled back!"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:43
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:942
+msgid "Confirm disconnect"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:50
 msgid "Confirmation"
 msgstr "Ověření"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:32
-msgid "Connect"
-msgstr "Připojit"
-
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:72
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:105
 msgid "Connected"
 msgstr "Připojeno"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:338
-msgid "Connection Limit"
-msgstr "Omezení počtu připojení"
-
 #: modules/luci-base/htdocs/luci-static/resources/network.js:7
 #: modules/luci-base/luasrc/model/network.lua:27
 msgid "Connection attempt failed"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:203
+msgid "Connection lost"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/controller/admin/status.lua:32
 msgid "Connections"
 msgstr "Připojení"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1890
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:66
+msgid "Contents have been saved."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:618
+msgid "Continue"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2431
 msgid ""
 "Could not regain access to the device after applying the configuration "
 "changes. You might need to reconnect if you modified network related "
 "settings such as the IP address or wireless security credentials."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:135
 msgid "Country"
 msgstr "Země"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:227
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:233
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:337
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:764
 msgid "Country Code"
 msgstr "Kód země"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:36
-msgid "Cover the following interface"
-msgstr "Pokrýt následující rozhraní"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:43
-msgid "Cover the following interfaces"
-msgstr "Pokrýt následující rozhraní"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:357
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:86
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:443
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1829
 msgid "Create / Assign firewall-zone"
 msgstr "Vytvořit / přiřadit zónu firewallu"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:9
-msgid "Create Interface"
-msgstr "Vytvořit rozhraní"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:33
-msgid "Create a bridge over multiple interfaces"
-msgstr "Vytvořit síťový most přes více rozhraní"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:735
+msgid "Create interface"
+msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:174
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:165
 msgid "Critical"
 msgstr "Kritické"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:178
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:169
 msgid "Cron Log Level"
 msgstr "Úroveň protokolování Cronu"
 
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:519
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:521
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:447
+msgid "Current power"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:552
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:554
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:51
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:53
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:82
@@ -1213,7 +1211,7 @@ msgstr "Úroveň protokolování Cronu"
 msgid "Custom Interface"
 msgstr "Vlastní rozhraní"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:36
 msgid "Custom delegated IPv6-prefix"
 msgstr ""
 
@@ -1223,7 +1221,7 @@ msgid ""
 "this, perform a factory-reset first."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:59
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:41
 msgid ""
 "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
 "\">LED</abbr>s if possible."
@@ -1231,46 +1229,47 @@ msgstr ""
 "Upraví chování <abbr title=\"Light Emitting Diode\">LED</abbr> diod zařízení "
 "pokud je to možné."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:799
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1223
 msgid "DAE-Client"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:807
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1231
 msgid "DAE-Port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:815
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1239
 msgid "DAE-Secret"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:448
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:459
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:279
 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:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:61
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:62
 msgid "DHCP and DNS"
 msgstr "DHCP a DNS"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1195
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1385
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:16
 #: modules/luci-base/luasrc/model/network.lua:968
 msgid "DHCP client"
 msgstr "DHCP klient"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:571
 msgid "DHCP-Options"
 msgstr "Volby DHCP"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_dhcpv6.lua:7
 msgid "DHCPv6 client"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:540
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:594
 msgid "DHCPv6-Mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:529
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:583
 msgid "DHCPv6-Service"
 msgstr ""
 
@@ -1287,31 +1286,31 @@ msgstr ""
 msgid "DNS"
 msgstr "DNS"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:183
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
 msgid "DNS forwardings"
 msgstr "Přeposílání DNS"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:30
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:37
 msgid "DNS-Label / FQDN"
 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:136
 msgid "DNSSEC"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:139
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
 msgid "DNSSEC check unsigned"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:73
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:99
 msgid "DPD Idle Timeout"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:14
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:41
 msgid "DS-Lite AFTR address"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:92
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:815
 #: modules/luci-mod-status/luasrc/view/admin_status/index/50-dsl.htm:14
 msgid "DSL"
 msgstr ""
@@ -1320,11 +1319,11 @@ msgstr ""
 msgid "DSL Status"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:125
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:848
 msgid "DSL line mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:519
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:963
 msgid "DTIM Interval"
 msgstr ""
 
@@ -1336,42 +1335,45 @@ msgstr "DUID"
 msgid "Data Rate"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:169
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:180
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:160
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:171
 msgid "Debug"
 msgstr "Ladění"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:759
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:783
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:807
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1183
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1207
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1231
 msgid "Default %d"
 msgstr "Výchozí %d"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:82
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:107
 msgid "Default Route"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:17
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:81
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:51
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:32
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:48
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:85
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:65
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:80
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:108
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:146
 msgid "Default gateway"
 msgstr "Výchozí brána"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:541
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:594
 msgid "Default is stateless + stateful"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:70
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:54
 msgid "Default state"
 msgstr "Výchozí stav"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:503
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:553
 msgid "Define a name for this network."
 msgstr "Jméno sítě."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:514
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:571
 msgid ""
 "Define additional DHCP options, for example "
 "\"<code>6,192.168.2.1,192.168.2.2</code>\" which advertises different DNS "
@@ -1380,35 +1382,47 @@ msgstr ""
 "Další možnosti DHCP, například \"<code>6,192.168.2.1,192.168.2.2</code>\", "
 "které odkazuje na různé DNS servery pro klienty."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:705
-#: modules/luci-base/htdocs/luci-static/resources/form.js:958
-#: modules/luci-base/htdocs/luci-static/resources/form.js:959
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1271
+#: modules/luci-base/htdocs/luci-static/resources/form.js:966
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1210
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1216
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1524
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1758
 #: modules/luci-base/luasrc/view/cbi/nsection.htm:11
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:162
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:16
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:41
 msgid "Delete"
 msgstr "Odstranit"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:178
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:187
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:193
 msgid "Delete key"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:45
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1654
+msgid "Delete permission denied"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1656
+msgid "Delete request failed: %d %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:723
 msgid "Delete this network"
 msgstr "Odstranit tuto síť"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:519
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:963
 msgid "Delivery Traffic Indication Message Interval"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:102
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:108
 msgid "Description"
 msgstr "Popis"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:224
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1754
+msgid "Deselect"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:215
 msgid "Design"
 msgstr "Vzhled"
 
@@ -1426,10 +1440,12 @@ msgstr ""
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:177
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:43
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:13
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:38
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:73
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:33
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:52
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:85
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:86
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:72
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:154
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:253
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:86
@@ -1437,15 +1453,24 @@ msgstr ""
 msgid "Device"
 msgstr "Zařízení"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:138
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:737
 msgid "Device Configuration"
 msgstr "Nastavení zařízení"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:81
+msgid "Device is not active"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/reboot.htm:23
 msgid "Device is rebooting..."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1889
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:167
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:513
+msgid "Device is restarting…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2430
 msgid "Device unreachable!"
 msgstr ""
 
@@ -1453,26 +1478,26 @@ msgstr ""
 msgid "Device unreachable! Still waiting for device..."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:123
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:78
 #: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:61
 msgid "Diagnostics"
 msgstr "Diagnostika"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:45
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:60
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:101
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:93
 msgid "Dial number"
 msgstr ""
 
-#: modules/luci-base/luasrc/view/cbi/filebrowser.htm:99
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1554
 msgid "Directory"
 msgstr "Adresář"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:131
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:715
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:754
 msgid "Disable"
 msgstr "Zakázat"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:472
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:531
 msgid ""
 "Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for "
 "this interface."
@@ -1480,71 +1505,66 @@ msgstr ""
 "Pro toto rozhraní zakázat <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr>."
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:64
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:93
 msgid "Disable Encryption"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:530
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:973
 msgid "Disable Inactivity Polling"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:713
 msgid "Disable this network"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:44
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:54
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:68
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:37
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:43
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:37
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1534
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:76
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:107
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:99
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:51
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:95
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:82
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:69
 msgid "Disabled"
 msgstr "Zakázáno"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1139
-msgid "Disabled (default)"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:544
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:987
 msgid "Disassociate On Low Acknowledgement"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:193
 msgid "Discard upstream RFC1918 responses"
 msgstr "Vyřadit upstream RFC1918 odpovědi"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:92
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:114
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:956
 msgid "Disconnect"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:22
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:64
 msgid "Disconnection attempt failed"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1121
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1762
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1855
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:17
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1375
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1995
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2314
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2401
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1634
 msgid "Dismiss"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:240
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:334
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:770
 msgid "Distance Optimization"
 msgstr "Optimalizace na vzdálenost"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:241
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:770
 msgid "Distance to farthest network member in meters."
 msgstr "Vzdálenost nejodlehlejšího člena sítě v metrech."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:347
-msgid "Diversity"
-msgstr "Diverzita"
-
-#: 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:61
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
@@ -1556,37 +1576,45 @@ 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:158
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:159
 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:123
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:124
 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:118
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
 msgid "Do not forward reverse lookups for local networks"
 msgstr "Nepřeposílat reverzní dotazy na místní sítě"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:173
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1639
+msgid "Do you really want to delete \"%s\" ?"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:188
 msgid "Do you really want to delete the following SSH key?"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1637
+msgid "Do you really want to recursively delete the directory \"%s\" ?"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:74
 msgid "Domain required"
 msgstr "Vyžadována doména"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:205
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:206
 msgid "Domain whitelist"
 msgstr "Whitelist domén"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:34
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:67
 msgid "Don't Fragment"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:74
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:75
 msgid ""
 "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
 "<abbr title=\"Domain Name System\">DNS</abbr>-Name"
@@ -1606,19 +1634,19 @@ msgstr "Stáhnout zálohu"
 msgid "Download mtdblock"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:853
 msgid "Downstream SNR offset"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:914
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1169
 msgid "Drag to reorder"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:9
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:11
 msgid "Dropbear Instance"
 msgstr "Instance Dropbear"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:6
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 msgid ""
 "Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access "
 "and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
@@ -1626,20 +1654,21 @@ msgstr ""
 "Dropbear poskytuje <abbr title=\"Secure Shell\">SSH</abbr> přístup a <abbr "
 "title=\"Secure Copy\">SCP</abbr> server"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:11
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:14
 msgid "Dual-Stack Lite (RFC6333)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:493
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:547
 msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 msgstr ""
 "Dynamický <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:60
 msgid "Dynamic tunnel"
 msgstr "Dynamický tunel"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:494
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:547
 msgid ""
 "Dynamically allocate DHCP addresses for clients. If disabled, only clients "
 "having static leases will be served."
@@ -1647,21 +1676,21 @@ msgstr ""
 "Pro klienty alokovat DHCP adresy dynamicky. Pokud je volba zakázána, budou "
 "obsloužení pouze klienti se statickými výpůjčkami."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:67
 msgid "EA-bits length"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:990
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1386
 msgid "EAP-Method"
 msgstr "Metoda EAP"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:934
-#: modules/luci-base/htdocs/luci-static/resources/form.js:935
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1199
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1188
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1191
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1450
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:154
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:160
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:38
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:291
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:720
 msgid "Edit"
 msgstr "Upravit"
 
@@ -1671,90 +1700,91 @@ msgid ""
 "reload the page."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:38
-msgid "Edit this interface"
-msgstr "Upravit toto rozhraní"
-
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:718
 msgid "Edit this network"
 msgstr "Upravit tuto síť"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:669
+msgid "Edit wireless network"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:167
 msgid "Emergency"
 msgstr "Záchrana"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:127
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:715
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:754
 msgid "Enable"
 msgstr "Povolit"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:414
 msgid ""
 "Enable <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> "
 "snooping"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:271
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:412
 msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 msgstr "Povolit <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:41
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:60
 msgid "Enable HE.net dynamic endpoint update"
 msgstr "Povolit dynamickou aktualizaci koncového bodu HE.net"
 
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:51
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:89
 msgid "Enable IPv6 negotiation"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:23
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:35
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:41
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:35
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:37
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:49
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:80
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:54
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:67
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:93
 msgid "Enable IPv6 negotiation on the PPP link"
 msgstr "Na PPP spoji povolit vyjednání IPv6"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:143
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:188
 msgid "Enable Jumbo Frame passthrough"
 msgstr "Povolit průchod jumbo rámců"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:244
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:235
 msgid "Enable NTP client"
 msgstr "Povolit NTP klienta"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:69
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:96
 msgid "Enable Single DES"
 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:267
 msgid "Enable TFTP server"
 msgstr "Povolit TFTP server"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:134
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:180
 msgid "Enable VLAN functionality"
 msgstr "Povolit funkcionalitu VLAN"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1595
 msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1175
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
 msgid "Enable key reinstallation (KRACK) countermeasures"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:138
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:183
 msgid "Enable learning and aging"
 msgstr "Povolit ARP učení a stárnutí"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:194
 msgid "Enable mirroring of incoming packets"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:151
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:195
 msgid "Enable mirroring of outgoing packets"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:34
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:67
 msgid "Enable the DF (Don't Fragment) flag of the encapsulating packets."
 msgstr ""
 
@@ -1762,7 +1792,7 @@ msgstr ""
 msgid "Enable this mount"
 msgstr "Povolit tento přípojný bod"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:713
 msgid "Enable this network"
 msgstr ""
 
@@ -1770,48 +1800,52 @@ msgstr ""
 msgid "Enable this swap"
 msgstr "Povolit tento swapovací oddíl"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:37
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:88
 msgid "Enable/Disable"
 msgstr "Povolit/Zakázat"
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:76
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:152
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:251
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:41
 msgid "Enabled"
 msgstr "Povoleno"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:277
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:414
 msgid "Enables IGMP snooping on this bridge"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:892
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1310
 msgid ""
 "Enables fast roaming among access points that belong to the same Mobility "
 "Domain"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:272
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:412
 msgid "Enables the Spanning Tree Protocol on this bridge"
 msgstr "Na tomto síťovém mostě povolit Spanning Tree Protocol"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:120
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:180
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:59
+msgid "Encapsulation limit"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:843
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:901
 msgid "Encapsulation mode"
 msgstr "Režim zapouzdření"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:76
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:603
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:129
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:992
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1621
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:177
 msgid "Encryption"
 msgstr "Šifrování"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:155
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:128
 msgid "Endpoint Host"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:165
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:132
 msgid "Endpoint Port"
 msgstr ""
 
@@ -1823,16 +1857,21 @@ msgstr ""
 msgid "Enter custom values"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:273
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:271
 msgid "Erasing..."
 msgstr "Odstraňování..."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:95
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:96
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:97
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:98
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:99
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:106
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:107
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:108
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:109
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:110
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:173
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:164
 msgid "Error"
 msgstr "Chyba"
 
@@ -1840,24 +1879,28 @@ msgstr "Chyba"
 msgid "Errored seconds (ES)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1646
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1852
 #: modules/luci-base/luasrc/model/network.lua:1432
 msgid "Ethernet Adapter"
 msgstr "Ethernetový adaptér"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1637
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1843
 #: modules/luci-base/luasrc/model/network.lua:1422
 msgid "Ethernet Switch"
 msgstr "Ethernetový switch"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:303
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
 msgid "Exclude interfaces"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:153
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
 msgid "Expand hosts"
 msgstr "Rozšířit hostitele"
 
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:195
+msgid "Expecting an hexadecimal assignment hint"
+msgstr ""
+
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:59
 msgid "Expecting: %s"
 msgstr ""
@@ -1866,62 +1909,78 @@ msgstr ""
 msgid "Expires"
 msgstr "Vyprší"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:488
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:543
 #, fuzzy
 msgid ""
 "Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
 msgstr ""
 "Čas vypršení vypůjčené adresy, minimum jsou 2 minuty (<code>2m</code>)."
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:8
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:19
 msgid "External"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:971
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1377
 msgid "External R0 Key Holder List"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:980
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1381
 msgid "External R1 Key Holder List"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:150
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:141
 msgid "External system log server"
 msgstr "Externí protokolovací server"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:155
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:146
 msgid "External system log server port"
 msgstr "Port externího protokolovacího serveru"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:160
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:151
 msgid "External system log server protocol"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:18
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:79
 msgid "Extra SSH command options"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:940
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1351
 msgid "FT over DS"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:941
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1352
 msgid "FT over the Air"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:938
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1349
 msgid "FT protocol"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1842
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:82
+msgid "Failed to change the system password."
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2389
 msgid "Failed to confirm apply within %ds, waiting for rollback…"
 msgstr ""
 
-#: modules/luci-base/luasrc/view/cbi/filebrowser.htm:106
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:45
+msgid "Failed to execute \"/etc/init.d/%s %s\" action: %s"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1561
 msgid "File"
 msgstr "Soubor"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:279
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1514
+msgid "File not accessible"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1698
+msgid "Filename"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:280
 msgid "Filename of the boot image advertised to clients"
 msgstr "Název souboru s bootovacím obrazem oznamovaný klientům"
 
@@ -1931,14 +1990,15 @@ 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:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:118
 msgid "Filter private"
 msgstr "Filtrovat soukromé"
 
-#: 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:123
 msgid "Filter useless"
 msgstr "Filtrovat nepotřebné"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:23
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:65
 msgid "Finalizing failed"
 msgstr ""
@@ -1949,7 +2009,7 @@ msgid ""
 "with defaults based on what was detected"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:696
 msgid "Find and join network"
 msgstr "Vyhledat a připojit síť"
 
@@ -1961,11 +2021,11 @@ msgstr "Dokončit"
 msgid "Firewall"
 msgstr "Firewall"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:77
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:76
 msgid "Firewall Mark"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:193
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:278
 msgid "Firewall Settings"
 msgstr "Nastavení firewallu"
 
@@ -1973,7 +2033,7 @@ msgstr "Nastavení firewallu"
 msgid "Firewall Status"
 msgstr "Stav firewallu"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:137
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:860
 msgid "Firmware File"
 msgstr ""
 
@@ -1981,7 +2041,7 @@ msgstr ""
 msgid "Firmware Version"
 msgstr "Verze firmwaru"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:225
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:226
 msgid "Fixed source port for outbound DNS queries"
 msgstr "Pevný zdrojový port pro odchozí DNS dotazy"
 
@@ -2001,35 +2061,35 @@ msgstr "Nahrát nový obraz s firmwarem"
 msgid "Flash operations"
 msgstr "Operace nad flash pamětí"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:194
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:192
 msgid "Flashing..."
 msgstr "Nahrávám..."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:498
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:550
 msgid "Force"
 msgstr "Vynutit"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:258
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:782
 msgid "Force 40MHz mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:622
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1031
 msgid "Force CCMP (AES)"
 msgstr "Vynutit CCMP (AES)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:499
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:550
 msgid "Force DHCP on this network even if another server is detected."
 msgstr "Na této síti vynutit DHCP i v případě detekování jiného serveru."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:623
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1032
 msgid "Force TKIP"
 msgstr "Vynutit TKIP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:624
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1033
 msgid "Force TKIP and CCMP (AES)"
 msgstr "Vynutit TKIP a CCMP (AES)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:795
 msgid "Force link"
 msgstr ""
 
@@ -2037,7 +2097,7 @@ msgstr ""
 msgid "Force upgrade"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:60
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:90
 msgid "Force use of NAT-T"
 msgstr ""
 
@@ -2045,7 +2105,7 @@ msgstr ""
 msgid "Form token mismatch"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:34
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:164
 msgid "Forward DHCP traffic"
 msgstr "Přeposílat DHCP provoz"
 
@@ -2053,46 +2113,41 @@ msgstr "Přeposílat DHCP provoz"
 msgid "Forward Error Correction Seconds (FECS)"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:28
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:161
 msgid "Forward broadcast traffic"
 msgstr "Přeposílat broadcasty"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:375
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:809
 msgid "Forward mesh peer traffic"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:186
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:908
 msgid "Forwarding mode"
 msgstr "Režim přeposílání"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:255
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:596
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:774
 msgid "Fragmentation Threshold"
 msgstr "Hranice fragmentace"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:332
-msgid "Frame Bursting"
-msgstr "Dávkování rámců"
-
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:17
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:28
 msgid "Free"
 msgstr "Volné"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:91
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:89
 msgid ""
-"Further information about WireGuard interfaces and peers at <a href=\"http://"
-"wireguard.com\">wireguard.com</a>."
+"Further information about WireGuard interfaces and peers at <a href='http://"
+"wireguard.com'>wireguard.com</a>."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:45
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:130
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:186
 msgid "GHz"
 msgstr "GHz"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:29
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:36
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:91
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:77
 msgid "GPRS only"
 msgstr "Pouze GPRS"
 
@@ -2101,28 +2156,28 @@ msgstr "Pouze GPRS"
 msgid "Gateway"
 msgstr "Brána"
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:35
+msgid "Gateway Ports"
+msgstr "Porty brány"
+
 #: modules/luci-base/htdocs/luci-static/resources/network.js:9
 #: modules/luci-base/luasrc/model/network.lua:29
 msgid "Gateway address is invalid"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:46
-msgid "Gateway ports"
-msgstr "Porty brány"
-
-#: 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:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:275
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:23
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:112
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:103
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:49
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:33
 msgid "General Settings"
 msgstr "Obecná nastavení"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:188
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:462
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:175
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:141
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:361
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:504
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:895
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:741
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:796
 msgid "General Setup"
 msgstr "Obecné nastavení"
 
@@ -2130,7 +2185,7 @@ msgstr "Obecné nastavení"
 msgid "Generate Config"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:945
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1355
 msgid "Generate PMK locally"
 msgstr ""
 
@@ -2138,11 +2193,7 @@ msgstr ""
 msgid "Generate archive"
 msgstr "Vytvorǐt archív"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:63
-msgid "Generic 802.11%s Wireless Controller"
-msgstr "Generic 802.11%s Wireless Controller"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:26
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:74
 msgid "Given password confirmation did not match, password not changed!"
 msgstr "Heslo nezměněno z důvodu nesouhlasu nového hesla a ověření hesla!"
 
@@ -2150,7 +2201,7 @@ msgstr "Heslo nezměněno z důvodu nesouhlasu nového hesla a ověření hesla!
 msgid "Global Settings"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:806
 msgid "Global network options"
 msgstr ""
 
@@ -2161,33 +2212,29 @@ msgstr ""
 msgid "Go to password configuration..."
 msgstr "Přejít na nastavení hesla..."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:857
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1369
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1112
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1616
 #: modules/luci-base/luasrc/view/cbi/full_valueheader.htm:4
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:58
 msgid "Go to relevant configuration page"
 msgstr "Přejít na související konfigurační stránku"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:38
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:66
 msgid "Group Password"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:11
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:22
 msgid "Guest"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:73
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:81
 msgid "HE.net password"
 msgstr "Heslo HE.net"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:60
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:73
 msgid "HE.net username"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:310
-msgid "HT mode (802.11n)"
-msgstr ""
-
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:16
 msgid "Hang Up"
 msgstr "Zavěsit"
@@ -2196,7 +2243,7 @@ msgstr "Zavěsit"
 msgid "Header Error Code Errors (HEC)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:103
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 msgid ""
 "Here you can configure the basic aspects of your device like its hostname or "
 "the timezone."
@@ -2204,9 +2251,7 @@ msgstr ""
 "Nastavení základních vlastností zařízení jako je časová zóna nebo název "
 "zařízení."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:499
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:556
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:579
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:941
 msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "Skrývat <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 
@@ -2217,14 +2262,15 @@ msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:92
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1959
 msgid "Host"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:20
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:21
 msgid "Host entries"
 msgstr "Záznamy hostitelů"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:48
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:171
 msgid "Host expiry timeout"
 msgstr "Vypršení časového limitu hostitele"
 
@@ -2233,45 +2279,45 @@ msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
 msgstr ""
 "<abbr title=\"Internet Protocol Address\">IP</abbr> adresa hostitele nebo síť"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:118
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:102
 msgid "Host-Uniq tag content"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:71
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:31
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:316
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:25
+#: 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:317
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:26
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:17
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:125
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:116
 msgid "Hostname"
 msgstr "Jméno hostitele"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:12
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:22
 msgid "Hostname to send when requesting DHCP"
 msgstr "Jméno hostitele odesílané s DHCP požadavky"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:18
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:19
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:67
 msgid "Hostnames"
 msgstr "Jména hostitelů"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:13
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:24
 msgid "Hybrid"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:45
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:75
 msgid "IKE DH Group"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:41
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:59
 msgid "IP Addresses"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:40
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:80
 msgid "IP Protocol"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:29
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:30
 msgid "IP address"
 msgstr "IP adresy"
 
@@ -2290,6 +2336,11 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:20
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:21
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:22
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:79
+#: 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/network.js:89
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:90
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:91
@@ -2297,7 +2348,7 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:93
 #: 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/luasrc/model/cbi/admin_network/proto_ncm.lua:42
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:82
 msgid "IPv4"
 msgstr "IPv4"
 
@@ -2309,24 +2360,23 @@ msgstr "IPv4 firewall"
 msgid "IPv4 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:57
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:178
 msgid "IPv4 address"
 msgstr "IPv4 adresa"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:26
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:33
 msgid "IPv4 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:104
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:181
 msgid "IPv4 broadcast"
 msgstr "IPv4 broadcast"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:100
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:180
 msgid "IPv4 gateway"
 msgstr "IPv4 brána"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:92
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:179
 msgid "IPv4 netmask"
 msgstr "IPv4 maska sítě"
 
@@ -2334,24 +2384,25 @@ msgstr "IPv4 maska sítě"
 msgid "IPv4 network in address/netmask notation"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:25
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:52
 msgid "IPv4 prefix"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:42
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:30
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:55
 msgid "IPv4 prefix length"
 msgstr "Délka IPv4 prefixu"
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:43
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:83
 msgid "IPv4+IPv6"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:72
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:34
 msgid "IPv4-Address"
 msgstr "IPv4 adresa"
 
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:10
 #: protocols/luci-proto-ipip/luasrc/model/network/proto_ipip.lua:9
 msgid "IPv4-in-IPv4 (RFC2003)"
 msgstr ""
@@ -2366,6 +2417,16 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:30
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:31
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:32
+#: 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/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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:89
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:90
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:91
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:92
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:95
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:96
@@ -2378,7 +2439,7 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:103
 #: 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/luasrc/model/cbi/admin_network/proto_ncm.lua:44
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:84
 msgid "IPv6"
 msgstr "IPv6"
 
@@ -2390,11 +2451,11 @@ msgstr "IPv6 firewall"
 msgid "IPv6 Neighbours"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:464
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:506
 msgid "IPv6 Settings"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:195
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:810
 msgid "IPv6 ULA-Prefix"
 msgstr ""
 
@@ -2402,21 +2463,21 @@ msgstr ""
 msgid "IPv6 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:202
 msgid "IPv6 address"
 msgstr "IPv6 adresa"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:23
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:189
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:31
 msgid "IPv6 assignment hint"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:18
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:184
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:27
 msgid "IPv6 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:207
 msgid "IPv6 gateway"
 msgstr "IPv6 brána"
 
@@ -2424,22 +2485,22 @@ msgstr "IPv6 brána"
 msgid "IPv6 network in address/netmask notation"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:37
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:59
 msgid "IPv6 prefix"
 msgstr "IPv6 prefix"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:34
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:45
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:63
 msgid "IPv6 prefix length"
 msgstr "Délka IPv6 prefixu"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:33
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:211
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:57
 msgid "IPv6 routed prefix"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:143
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:215
 msgid "IPv6 suffix"
 msgstr ""
 
@@ -2449,31 +2510,35 @@ msgid "IPv6-Address"
 msgstr "IPv6 adresa"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:93
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:104
 msgid "IPv6-PD"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:10
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:13
 msgid "IPv6-in-IPv4 (RFC4213)"
 msgstr "IPv6-in-IPv4 (RFC4213)"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:17
 msgid "IPv6-over-IPv4 (6rd)"
 msgstr "IPv6-over-IPv4 (6rd)"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:15
 msgid "IPv6-over-IPv4 (6to4)"
 msgstr "IPv6-over-IPv4 (6to4)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1075
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1478
 msgid "Identity"
 msgstr "Identita"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:70
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:96
 msgid "If checked, 1DES is enabled"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:65
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:93
 msgid "If checked, encryption is disabled"
 msgstr ""
 
@@ -2490,36 +2555,36 @@ msgid ""
 "device node"
 msgstr "Namísto pevného uzlu zařízení připojovat pomocí názvu oddílu"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:27
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:71
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:18
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:82
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:52
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:17
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:29
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:33
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:68
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:85
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:32
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:45
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:45
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:24
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:44
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:116
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:48
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:85
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:65
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:33
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:80
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:108
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:146
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:74
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:97
 msgid "If unchecked, no default route is configured"
 msgstr "Pokud není povoleno, není nastaven žádný výchozí směrovací záznam"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:34
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:86
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:35
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:99
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:47
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:60
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:60
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:39
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:59
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:124
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:39
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:116
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:59
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:103
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:64
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:77
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:100
 msgid "If unchecked, the advertised DNS server addresses are ignored"
 msgstr "Pokud není povoleno, oznámené adresy DNS serverů budou ignorovány"
 
@@ -2538,15 +2603,15 @@ 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:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:102
 msgid "Ignore <code>/etc/hosts</code>"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:471
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:531
 msgid "Ignore interface"
 msgstr "Ignorovat rozhraní"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:90
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:91
 msgid "Ignore resolve file"
 msgstr "Ignorovat resolv soubor"
 
@@ -2564,12 +2629,12 @@ msgid ""
 "blocked. Click \"Continue »\" below to return to the previous page."
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:145
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:118
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:124
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:126
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:97
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:118
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:157
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:141
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:115
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:138
 msgid "Inactivity timeout"
 msgstr "Časový limit nečinnosti"
 
@@ -2577,23 +2642,25 @@ msgstr "Časový limit nečinnosti"
 msgid "Inbound:"
 msgstr "Příchozí:"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:170
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:161
 msgid "Info"
 msgstr "Info"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:105
 msgid "Information"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:25
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:67
 msgid "Initialization failure"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:34
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:87
 msgid "Initscript"
 msgstr "Initskript"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:26
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:122
 msgid "Initscripts"
 msgstr "Initskripty"
 
@@ -2601,55 +2668,74 @@ msgstr "Initskripty"
 msgid "Install iputils-traceroute6 for IPv6 traceroute"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:223
-msgid "Install package %q"
-msgstr "Instalovat balíček %q"
-
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:220
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:120
 msgid "Install protocol extensions..."
 msgstr "Instalovat protokolové rozšíření..."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:416
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:423
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:683
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:687
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:26
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:284
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:342
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:47
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:134
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:14
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:16
 msgid "Interface"
 msgstr "Rozhraní"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:58
 msgid "Interface %q device auto-migrated from %q to %q."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:356
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:792
 msgid "Interface Configuration"
 msgstr "Konfigurace rozhraní"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:51
-msgid "Interface Overview"
-msgstr "Přehled rozhraní"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:99
+msgid "Interface has %d pending changes"
+msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:57
+msgid "Interface is marked for deletion"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:162
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:3
 msgid "Interface is reconnecting..."
 msgstr "Rozhraní se znovu připojuje..."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:162
+msgid "Interface is shutting down..."
+msgstr "Rozhraní se vypíná..."
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:205
+msgid "Interface is starting..."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:208
+msgid "Interface is stopping..."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:954
 msgid "Interface name"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:34
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:224
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:131
 msgid "Interface not present or not connected yet."
 msgstr "Rozhraní není přítomné nebo je dosud nepřipojeno."
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:88
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:16
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:11
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:287
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:54
 msgid "Interfaces"
 msgstr "Rozhraní"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:9
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:20
 msgid "Internal"
 msgstr ""
 
@@ -2663,20 +2749,36 @@ msgstr "Vnitřní chyba serveru"
 msgid "Invalid"
 msgstr "Neplatná vstupní hodnota"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:311
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:10
+msgid "Invalid Base64 key string"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:281
 msgid "Invalid VLAN ID given! Only IDs between %d and %d are allowed."
 msgstr ""
 "Uvedené VLAN ID je neplatné! Jsou povolena pouze ID z rozsahu %d až %d."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:307
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:290
 msgid "Invalid VLAN ID given! Only unique IDs are allowed"
 msgstr "Uvedené VLAN ID je neplatné! Každé ID musí být jedinečné"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:195
+msgid "Invalid argument"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:194
+msgid "Invalid command"
+msgstr ""
+
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:80
+msgid "Invalid hexadecimal value"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/sysauth.htm:12
 msgid "Invalid username and/or password! Please try again."
 msgstr "Špatné uživatelské jméno a/nebo heslo! Prosím zkuste to znovu."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:508
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:950
 msgid "Isolate Clients"
 msgstr ""
 
@@ -2696,15 +2798,15 @@ msgstr ""
 msgid "JavaScript required!"
 msgstr "Vyžadován JavaScript!"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:52
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1691
 msgid "Join Network"
 msgstr "Připojit k síti"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:22
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1628
 msgid "Join Network: Wireless Scan"
 msgstr "Připojit k síti: Vyhledání bezdrátových sítí"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:19
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1833
 msgid "Joining Network: %q"
 msgstr ""
 
@@ -2721,15 +2823,15 @@ msgstr "Záznam jádra"
 msgid "Kernel Version"
 msgstr "Verze jádra"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:823
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1248
 msgid "Key"
 msgstr "Klíč"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:851
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:852
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:853
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:854
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:870
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1277
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1278
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1279
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1291
 msgid "Key #%d"
 msgstr "Klíč #%d"
 
@@ -2737,33 +2839,34 @@ msgstr "Klíč #%d"
 msgid "Kill"
 msgstr "Zabít"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:10
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:21
 msgid "L2TP"
 msgstr "L2TP"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:10
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:40
 msgid "L2TP Server"
 msgstr "L2TP Server"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:100
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:74
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:80
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:74
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:53
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:73
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:131
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:102
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:89
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:112
 msgid "LCP echo failure threshold"
 msgstr "LCP echo prahová hodnota selhání"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:118
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:89
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:95
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:89
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:68
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:91
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:144
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:102
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:125
 msgid "LCP echo interval"
 msgstr "LCP interval upozornění"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:181
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:902
 msgid "LLC"
 msgstr "LLC"
 
@@ -2772,11 +2875,11 @@ msgstr "LLC"
 msgid "Label"
 msgstr "Popis"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:213
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:204
 msgid "Language"
 msgstr "Jazyk"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:115
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:106
 msgid "Language and Style"
 msgstr "Jazyk a styl"
 
@@ -2784,51 +2887,51 @@ msgstr "Jazyk a styl"
 msgid "Latency"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:10
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:21
 msgid "Leaf"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:369
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:487
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:393
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:543
 msgid "Lease time"
 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:87
 msgid "Leasefile"
 msgstr "Soubor zájpůjček"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:74
 #: modules/luci-base/luasrc/view/lease_status.htm:95
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:34
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
 msgid "Leasetime remaining"
 msgstr "Zbývající doba trvání zápůjčky"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:9
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:20
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:27
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:50
 msgid "Leave empty to autodetect"
 msgstr "Ponechte prázdné pro automatickou detekci"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:21
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:45
 msgid "Leave empty to use the current WAN address"
 msgstr "Ponecháte-li prázdné, použije stávající WAN adresu"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1746
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2299
 msgid "Legend:"
 msgstr "Legenda:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:481
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:538
 msgid "Limit"
 msgstr "Limit"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:287
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:288
 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:299
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:300
 msgid "Limit listening to these interfaces, and loopback."
 msgstr ""
 
@@ -2848,11 +2951,11 @@ msgstr ""
 msgid "Line Uptime"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:101
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:88
 msgid "Link On"
 msgstr "Odkaz na"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:185
 msgid ""
 "List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
 "requests to"
@@ -2860,7 +2963,7 @@ msgstr ""
 "Seznam <abbr title=\"Domain Name System\">DNS</abbr> serverů, na které "
 "přeposílat požadavky"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:972
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1377
 msgid ""
 "List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-"
 "Identifier,128-bit key as hex string. <br />This list is used to map R0KH-ID "
@@ -2869,7 +2972,7 @@ msgid ""
 "Association."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:981
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1381
 msgid ""
 "List of R1KHs in the same Mobility Domain. <br />Format: MAC-address,R1KH-ID "
 "as 6 octets with colons,128-bit key as hex string. <br />This list is used "
@@ -2878,32 +2981,32 @@ msgid ""
 "PMK-R1 keys."
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:21
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:82
 msgid "List of SSH key files for auth"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:206
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:207
 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:173
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:174
 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:298
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:299
 msgid "Listen Interfaces"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:30
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:54
 msgid "Listen Port"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:15
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:16
 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:216
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:217
 msgid "Listening port for inbound DNS queries"
 msgstr "Port pro příchozí dotazy DNS"
 
@@ -2922,11 +3025,11 @@ msgstr "Zátěž průměrná"
 msgid "Loading"
 msgstr "Načítání"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:35
-msgid "Loading SSH keys…"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1819
+msgid "Loading directory contents…"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1204
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1296
 #: modules/luci-base/luasrc/view/view.htm:4
 msgid "Loading view…"
 msgstr ""
@@ -2936,41 +3039,41 @@ msgstr ""
 msgid "Local IP address is invalid"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:25
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:86
 msgid "Local IP address to assign"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:10
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:11
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:44
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:39
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:151
 msgid "Local IPv4 address"
 msgstr "Místní IPv4 adresa"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:20
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:54
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:45
 msgid "Local IPv6 address"
 msgstr "Místní IPv6 adresa"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:286
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:287
 msgid "Local Service Only"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:81
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:126
 msgid "Local Startup"
 msgstr "Místní startup"
 
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:25
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:121
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:112
 msgid "Local Time"
 msgstr "Místní čas"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:149
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
 msgid "Local domain"
 msgstr "Místní doména"
 
-#: 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:147
 #, fuzzy
 msgid ""
 "Local domain specification. Names matching this domain are never forwarded "
@@ -2979,16 +3082,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:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:151
 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:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
 msgid "Local server"
 msgstr "Místní server"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:129
 msgid ""
 "Localise hostname depending on the requesting subnet if multiple IPs are "
 "available"
@@ -2996,23 +3099,19 @@ 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:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:128
 msgid "Localise queries"
 msgstr "Lokalizační dotazy"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:175
-msgid "Locked to channel %s used by: %s"
-msgstr ""
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:168
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:159
 msgid "Log output level"
 msgstr "Úroveň logování"
 
-#: 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:181
 msgid "Log queries"
 msgstr "Dotazy pro logování"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:113
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:104
 msgid "Logging"
 msgstr "Logování"
 
@@ -3020,7 +3119,7 @@ msgstr "Logování"
 msgid "Login"
 msgstr "Přihlásit"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:95
+#: modules/luci-base/luasrc/controller/admin/index.lua:103
 msgid "Logout"
 msgstr "Odhlásit"
 
@@ -3028,11 +3127,13 @@ msgstr "Odhlásit"
 msgid "Loss of Signal Seconds (LOSS)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:476
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:533
 msgid "Lowest leased address as offset from the network address."
 msgstr "Nejnižší zapůjčenou adresu použít jako offset síťové adresy."
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:40
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:75
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:35
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:86
 msgid "MAC"
@@ -3040,32 +3141,32 @@ msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:73
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:109
-#: 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:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1958
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:86
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:133
 msgid "MAC-Address"
 msgstr "MAC-Adresa"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:457
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:586
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:886
 msgid "MAC-Address Filter"
 msgstr "Filtr MAC adres"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:142
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:363
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:798
 msgid "MAC-Filter"
 msgstr "Filtr MAC"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:464
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:590
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:893
 msgid "MAC-List"
 msgstr "Seznam Mac"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:13
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:16
 msgid "MAP / LW4over6"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:62
 msgid "MAP rule is invalid"
 msgstr ""
@@ -3083,8 +3184,8 @@ msgid "MHz"
 msgstr "MHz"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:53
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:29
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:66
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:53
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:71
 msgid "MTU"
 msgstr "MTU"
 
@@ -3094,16 +3195,17 @@ msgid ""
 "below:"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:55
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:69
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:26
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:38
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:38
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:108
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:52
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:96
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:83
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:57
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:70
 msgid "Manual"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1949
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2188
 msgid "Master"
 msgstr ""
 
@@ -3111,48 +3213,46 @@ msgstr ""
 msgid "Max. Attainable Data Rate (ATTNDR)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:539
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:982
 msgid "Maximum allowed Listen Interval"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:234
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
 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:252
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:253
 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:243
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:244
 msgid "Maximum allowed size of EDNS.0 UDP packets"
 msgstr "Nejvyšší povolená velikost EDNS.0 UDP paketů"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:63
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:77
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:57
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:112
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:104
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:93
 msgid "Maximum amount of seconds to wait for the modem to become ready"
 msgstr "Nejvyšší počet sekund čekání, než bude modem připraven"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:27
-msgid ""
-"Maximum length of the name is 15 characters including the automatic protocol/"
-"bridge prefix (br-, 6in4-, pppoe- etc.)"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:482
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:538
 msgid "Maximum number of leased addresses."
 msgstr "Maximální počet zapůjčených adres."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:761
+msgid "Maximum transmit power"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:21
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:49
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:134
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:187
 #: modules/luci-mod-status/luasrc/view/admin_status/bandwidth.htm:79
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:284
 msgid "Mbit/s"
 msgstr "Mbit/s"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:18
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:32
 msgid "Medium"
 msgstr ""
 
@@ -3164,42 +3264,43 @@ msgstr "Paměť"
 msgid "Memory usage (%)"
 msgstr "Využití paměti (%)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1952
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2191
 msgid "Mesh"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:372
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:806
 msgid "Mesh Id"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:196
+msgid "Method not found"
+msgstr ""
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:45
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:76
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:104
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:54
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:66
 msgid "Metric"
 msgstr "Metrika"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:154
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:198
 msgid "Mirror monitor port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:153
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:197
 msgid "Mirror source port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:408
-msgid "Missing protocol extension for proto %q"
-msgstr "Chybějící rozšíření protokolu %q"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:923
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1337
 msgid "Mobility Domain"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:154
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:41
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:74
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:366
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:31
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:360
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:801
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1619
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:175
 msgid "Mode"
 msgstr "Mód"
@@ -3208,39 +3309,38 @@ msgstr "Mód"
 msgid "Model"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:31
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:72
 msgid "Modem default"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:11
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:19
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:11
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:10
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:73
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:73
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:57
 msgid "Modem device"
 msgstr "Modemové zařízení"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:24
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:66
 msgid "Modem information query failed"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:62
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:76
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:56
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:112
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:104
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:93
 msgid "Modem init timeout"
 msgstr "Časový limit inicializace modemu"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1953
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:452
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:554
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:577
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2192
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:880
 msgid "Monitor"
 msgstr "Sledování"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:14
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
 msgid "More Characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:802
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1057
 msgid "More…"
 msgstr ""
 
@@ -3253,7 +3353,7 @@ msgstr "Připojit vstup"
 msgid "Mount Point"
 msgstr "Přípojný bod"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:26
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:36
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:137
 msgid "Mount Points"
@@ -3303,46 +3403,44 @@ msgstr "Přesunout dolů"
 msgid "Move up"
 msgstr "Přesunout nahoru"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:912
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
 msgid "NAS ID"
 msgstr "NAS ID"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:57
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:87
 msgid "NAT-T Mode"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:9
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 msgid "NAT64 Prefix"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:31
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:26
 msgid "NCM"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:535
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:589
 msgid "NDP-Proxy"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:43
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:72
 msgid "NT Domain"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:273
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:264
 msgid "NTP server candidates"
 msgstr "Kandidáti NTP serveru"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:837
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1092
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:27
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:502
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:65
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:553
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:658
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:49
 msgid "Name"
 msgstr "Název"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:17
-msgid "Name of the new interface"
-msgstr "Název nového rozhraní"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1808
 msgid "Name of the new network"
 msgstr "Název nové sítě"
 
@@ -3350,9 +3448,10 @@ msgstr "Název nové sítě"
 msgid "Navigation"
 msgstr "Navigace"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:62
+#: modules/luci-base/luasrc/controller/admin/index.lua:69
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:108
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:402
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:834
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1957
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:389
 #: modules/luci-mod-status/luasrc/view/admin_status/index/30-network.htm:8
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:73
@@ -3364,7 +3463,7 @@ msgstr "Síť"
 msgid "Network Utilities"
 msgstr "Síťové nástroje"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:278
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:279
 msgid "Network boot image"
 msgstr "Síťový bootovací obraz"
 
@@ -3377,53 +3476,59 @@ msgstr ""
 msgid "Network without interfaces."
 msgstr "Síť bez rozhraní."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:661
+msgid "New interface name…"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:11
 msgid "Next »"
 msgstr "Další »"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1507
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1754
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:108
 msgid "No"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:453
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:514
 msgid "No DHCP Server configured for this interface"
 msgstr "Pro toto rozhraní není nastaven žádný DHCP server"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1162
+msgid "No Encryption"
+msgstr ""
+
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:89
 msgid "No NAT-T"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:198
+msgid "No data received"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1764
+msgid "No entries in this directory"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/backupfiles.lua:82
 msgid "No files found"
 msgstr "Nebyly nalezeny žádné soubory"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:550
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:191
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:180
 msgid "No information available"
 msgstr "Údaje nejsou k dispozici"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:8
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:63
 msgid "No matching prefix delegation"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:157
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
 msgid "No negative cache"
 msgstr "Žádná negativní mezipaměť"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:53
-msgid "No network configured on this device"
-msgstr "Síť není nastavena na tomto zařízení"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:65
-msgid "No network name specified"
-msgstr "Neuvedeno jméno sítě"
-
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:147
-msgid "No networks in range"
-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
@@ -3431,7 +3536,12 @@ msgstr ""
 msgid "No password set!"
 msgstr "Žádné heslo!"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:116
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:104
+msgid "No peers defined yet"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:129
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:271
 msgid "No public keys present yet."
 msgstr ""
 
@@ -3439,19 +3549,19 @@ msgstr ""
 msgid "No rules in this chain."
 msgstr "Žádná pravidla v tomto řetězci"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:150
-msgid "No scan results available yet..."
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:53
+msgid "No signal"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:7
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:756
 msgid "No zone assigned"
 msgstr "Žádná zóna nepřiřazena"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:111
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:35
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:48
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:133
 msgid "Noise"
 msgstr "Å um"
 
@@ -3467,16 +3577,16 @@ msgstr "Å um:"
 msgid "Non Pre-emtive CRC errors (CRC_P)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:292
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:293
 msgid "Non-wildcard"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:129
 msgid "None"
 msgstr "Žádný"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:181
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:172
 msgid "Normal"
 msgstr "Normální"
 
@@ -3484,25 +3594,29 @@ msgstr "Normální"
 msgid "Not Found"
 msgstr "Nenalezeno"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:27
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:5
-msgid "Not associated"
-msgstr "Neasociováno"
-
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:87
 msgid "Not connected"
 msgstr "Nepřipojeno"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:38
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:139
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:232
+msgid "Not present"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:105
 msgid "Not started on boot"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:26
-msgid "Note: interface name length"
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:201
+msgid "Not supported"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:171
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:162
 msgid "Notice"
 msgstr "Oznámení"
 
@@ -3510,62 +3624,50 @@ msgstr "Oznámení"
 msgid "Nslookup"
 msgstr "Nslookup"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:261
 msgid "Number of cached DNS entries (max is 10000, 0 is no caching)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:203
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:194
 msgid "Number of parallel threads used for compression"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:40
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:69
 msgid "Obfuscated Group Password"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:35
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:61
 msgid "Obfuscated Password"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:22
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:34
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:40
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:105
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:97
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:49
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:80
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:54
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:67
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:93
 msgid "Obtain IPv6-Address"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:83
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:68
 msgid "Off-State Delay"
 msgstr "Vypnutí prodlevy"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:16
-msgid ""
-"On this page you can configure the network interfaces. You can bridge "
-"several interfaces by ticking the \"bridge interfaces\" field and enter the "
-"names of several network interfaces separated by spaces. You can also use "
-"<abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
-"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
-"<samp>eth0.1</samp>)."
-msgstr ""
-"Na této stránce můžete nastavit síťová rozhraní. Můžete přemostit několik "
-"rozhraní zaškrtnutím pole \"přemostit rozhraní\" a zápisem názvů rozhraní, "
-"vzájemně oddělených mezerami. Také můžete použít <abbr title=\"Virtual Local "
-"Area Network\">VLAN</abbr> zápis <samp>INTERFACE.VLANNR</samp> (<abbr title="
-"\"například\">např.</abbr>: <samp>eth0.1</samp>)."
-
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:95
 msgid "On-Link route"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:80
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:64
 msgid "On-State Delay"
 msgstr "Zapnutí prodlevy"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:360
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:382
 msgid "One of hostname or mac address must be specified!"
 msgstr "Jedno jméno nebo mac adresa, musí být zadáno!"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:456
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:462
 msgid "One of the following: %s"
 msgstr ""
 
@@ -3587,34 +3689,35 @@ msgstr "Jedno nebo více požadovaných polí neobsahuje hodnotu!"
 msgid "Open list..."
 msgstr "Otevřít seznam..."
 
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:61
 #: protocols/luci-proto-openconnect/luasrc/model/network/proto_openconnect.lua:9
 msgid "OpenConnect (CISCO AnyConnect)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:757
 msgid "Operating frequency"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1753
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2306
 msgid "Option changed"
 msgstr "Volba změněna"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1755
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2308
 msgid "Option removed"
 msgstr "Volba odstraněna"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1140
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:55
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1535
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:66
 msgid "Optional"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:78
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:76
 msgid ""
 "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, "
 "starting with <code>0x</code>."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:144
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:215
 msgid ""
 "Optional. Allowed values: 'eui64', 'random', fixed value like '::1' or "
 "'::1:2'. When IPv6 prefix (like 'a:b:c:d::') is received from a delegating "
@@ -3622,41 +3725,41 @@ msgid ""
 "for the interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:123
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:117
 msgid ""
 "Optional. Base64-encoded preshared key. Adds in an additional layer of "
 "symmetric-key cryptography for post-quantum resistance."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:148
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:126
 msgid "Optional. Create routes for Allowed IPs for this peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:103
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:108
 msgid "Optional. Description of peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:156
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:128
 msgid ""
 "Optional. Host of peer. Names are resolved prior to bringing up the "
 "interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:67
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:71
 msgid "Optional. Maximum Transmission Unit of tunnel interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:166
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:132
 msgid "Optional. Port of peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:175
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:136
 msgid ""
 "Optional. Seconds between keep alive messages. Default is 0 (disabled). "
 "Recommended value if this device is behind a NAT is 25."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:31
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:54
 msgid "Optional. UDP port used for outgoing and incoming packets."
 msgstr ""
 
@@ -3677,7 +3780,7 @@ msgstr "Ven"
 msgid "Outbound:"
 msgstr "Odchozí:"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:26
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:50
 msgid "Output Interface"
 msgstr ""
 
@@ -3686,45 +3789,45 @@ msgstr ""
 msgid "Output zone"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:63
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:155
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:33
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:54
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:54
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:219
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:50
 msgid "Override MAC address"
 msgstr "Přepsat MAC adresu"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:66
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:35
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:56
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:88
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:125
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:131
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:133
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:104
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:61
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:58
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:223
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:44
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:54
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:154
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:71
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:145
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:132
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:110
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:119
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:97
 msgid "Override MTU"
 msgstr "Přepsat MTU"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:30
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:63
 msgid "Override TOS"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:25
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:58
 msgid "Override TTL"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:954
 msgid "Override default interface name"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:41
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:167
 msgid "Override the gateway in DHCP responses"
 msgstr "Přepsat bránu v DHCP odpovědích"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:507
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:555
 msgid ""
 "Override the netmask sent to clients. Normally it is calculated from the "
 "subnet that is served."
@@ -3732,7 +3835,7 @@ msgstr ""
 "Přepsat síťovou masku, odesílanou klientům. Obvykle je spočítána podle "
 "subsítě, která je obsluhována."
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:65
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:179
 msgid "Override the table used for internal routes"
 msgstr "Přepsat tabulku, používanou pro vnitřní cesty"
 
@@ -3740,29 +3843,33 @@ msgstr "Přepsat tabulku, používanou pro vnitřní cesty"
 msgid "Overview"
 msgstr "Přehled"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1606
+msgid "Overwrite existing file \"%s\" ?"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:11
 msgid "Owner"
 msgstr "Vlastník"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:42
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:56
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:17
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:28
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:34
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:14
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:18
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:43
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:98
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:45
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:44
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:63
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:82
 msgid "PAP/CHAP password"
 msgstr "Heslo PAP/CHAP"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:39
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:53
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:14
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:11
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:15
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:96
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:88
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:43
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:74
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:42
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:61
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:77
 msgid "PAP/CHAP username"
 msgstr "Uživatelské jméno PAP/CHAP"
 
@@ -3770,9 +3877,9 @@ msgstr "Uživatelské jméno PAP/CHAP"
 msgid "PID"
 msgstr "PID"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:36
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:50
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:26
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:95
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:87
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:68
 msgid "PIN"
 msgstr "PIN"
 
@@ -3781,114 +3888,116 @@ msgstr "PIN"
 msgid "PIN code rejected"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:966
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1372
 msgid "PMK R1 Push"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:43
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:13
 msgid "PPP"
 msgstr "PPP"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:11
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:58
 msgid "PPPoA Encapsulation"
 msgstr "Zapouzdření PPPoA"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:19
 msgid "PPPoATM"
 msgstr "PPPoATM"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:17
 msgid "PPPoE"
 msgstr "PPPoE"
 
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:28
 #: protocols/luci-proto-pppossh/luasrc/model/network/proto_pppossh.lua:9
 msgid "PPPoSSH"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:15
 msgid "PPtP"
 msgstr "PPtP"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:59
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:73
 msgid "PSID offset"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:56
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:70
 msgid "PSID-bits length"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:123
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:846
 msgid "PTM/EFM (Packet Transfer Mode)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:78
-msgid "Package libiwinfo required!"
-msgstr "Vyžadován balíček libiwinfo!"
-
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:45
 msgid "Packets"
 msgstr "Pakety"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:7
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:756
 msgid "Part of zone %q"
 msgstr "Část zóny %q"
 
 #: modules/luci-base/luasrc/view/sysauth.htm:29
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1111
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:35
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:42
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1514
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:46
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:104
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:58
 msgid "Password"
 msgstr "Heslo"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:29
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:24
 msgid "Password authentication"
 msgstr "Autentizace heslem"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1019
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1414
 msgid "Password of Private Key"
 msgstr "Heslo privátního klíče"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1067
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1471
 msgid "Password of inner Private Key"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:14
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:16
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:18
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:20
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:32
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:34
 msgid "Password strength"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:44
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:107
 msgid "Password2"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:37
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:244
 msgid "Paste or drag SSH key file…"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1000
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1396
 msgid "Path to CA-Certificate"
 msgstr "Cesta k certifikátu CA"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1007
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1402
 msgid "Path to Client-Certificate"
 msgstr "Cesta k certifikátu klienta"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1013
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1408
 msgid "Path to Private Key"
 msgstr "Cesta k privátnímu klíči"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1049
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1453
 msgid "Path to inner CA-Certificate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1055
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1459
 msgid "Path to inner Client-Certificate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1061
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1465
 msgid "Path to inner Private Key"
 msgstr ""
 
@@ -3906,7 +4015,7 @@ msgstr ""
 msgid "Peak:"
 msgstr "Špička:"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:28
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:89
 msgid "Peer IP address to assign"
 msgstr ""
 
@@ -3915,11 +4024,11 @@ msgstr ""
 msgid "Peer address is missing"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:90
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:89
 msgid "Peers"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:50
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:80
 msgid "Perfect Forward Secrecy"
 msgstr ""
 
@@ -3931,7 +4040,11 @@ msgstr "Provést restart"
 msgid "Perform reset"
 msgstr "Provést reset"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:174
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:199
+msgid "Permission denied"
+msgstr ""
+
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:136
 msgid "Persistent Keep Alive"
 msgstr ""
 
@@ -3939,7 +4052,7 @@ msgstr ""
 msgid "Phy Rate:"
 msgstr "Fyzická rychlost:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:190
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:277
 msgid "Physical Settings"
 msgstr "Fyzické nastavení"
 
@@ -3950,6 +4063,10 @@ msgstr "Ping"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:16
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:17
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:41
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:77
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:87
@@ -3967,15 +4084,19 @@ msgstr "Prosím vložte vaše uživatelské jméno a heslo."
 msgid "Policy"
 msgstr "Politika"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:22
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:20
 msgid "Port"
 msgstr "Port"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:18
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:133
+msgid "Port %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:274
 msgid "Port status:"
 msgstr "Stav portu:"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:482
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:488
 msgid "Potential negation of: %s"
 msgstr ""
 
@@ -3987,11 +4108,11 @@ msgstr ""
 msgid "Pre-emtive CRC errors (CRCP_P)"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:32
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:73
 msgid "Prefer LTE"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:33
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:74
 msgid "Prefer UMTS"
 msgstr ""
 
@@ -3999,16 +4120,16 @@ msgstr ""
 msgid "Prefix Delegated"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:122
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:117
 msgid "Preshared Key"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:101
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:75
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:81
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:75
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:54
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:74
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:131
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:102
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:89
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:112
 msgid ""
 "Presume peer to be dead after given amount of LCP echo failures, use 0 to "
 "ignore failures"
@@ -4016,16 +4137,15 @@ 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:304
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:305
 msgid "Prevent listening on these interfaces."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:509
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:562
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:950
 msgid "Prevents client-to-client communication"
 msgstr "Zabraňuje komunikaci klient-klient"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:18
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:49
 msgid "Private Key"
 msgstr ""
 
@@ -4046,39 +4166,33 @@ msgstr ""
 msgid "Prot."
 msgstr "Prot."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:72
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:349
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:675
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:84
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:216
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:87
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:390
 msgid "Protocol"
 msgstr "Protokol"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:31
-msgid "Protocol of the new interface"
-msgstr "Protokol nového rozhraní"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:222
-msgid "Protocol support is not installed"
-msgstr "Podpora pro protokol není nainstalována"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:269
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:260
 msgid "Provide NTP server"
 msgstr "Poskytování NTP serveru"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:701
 msgid "Provide new network"
 msgstr "Poskytování nové sítě"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:451
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:879
 msgid "Pseudo Ad-Hoc (ahdemo)"
 msgstr "Pseudo Ad-Hoc (ahdemo)"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:112
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:113
 msgid "Public Key"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:278
 msgid ""
 "Public keys allow for the passwordless SSH logins with a higher security "
 "compared to the use of plain passwords. In order to upload a new key to the "
@@ -4086,47 +4200,48 @@ msgid ""
 "code> file into the input field."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:139
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:211
 msgid "Public prefix routed to this device for distribution to clients."
 msgstr ""
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:27
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:9
 msgid "QMI Cellular"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:173
 msgid "Quality"
 msgstr "Kvalita"
 
-#: 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:171
 msgid ""
 "Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> "
 "servers"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:952
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1360
 msgid "R0 Key Lifetime"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:959
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1366
 msgid "R1 Key Holder"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:58
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:88
 msgid "RFC3947 NAT-T mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:381
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:814
 msgid "RSSI threshold for joining"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:256
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:597
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:778
 msgid "RTS/CTS Threshold"
 msgstr "Práh RTS/CTS"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:41
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:76
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:87
 msgid "RX"
@@ -4136,35 +4251,39 @@ msgstr "RX"
 msgid "RX Rate"
 msgstr "RX Rate"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:783
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1961
+msgid "RX Rate / TX Rate"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1207
 msgid "Radius-Accounting-Port"
 msgstr "Port pro Radius-Accounting"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:791
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1215
 msgid "Radius-Accounting-Secret"
 msgstr "Tajný klíč pro Radius-Accounting"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:775
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1199
 msgid "Radius-Accounting-Server"
 msgstr "Server Radius-Accounting"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:759
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1183
 msgid "Radius-Authentication-Port"
 msgstr "Výběr ověřování portů"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:767
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1191
 msgid "Radius-Authentication-Secret"
 msgstr "Tajný klíč pro Radius-Authentication"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:751
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1175
 msgid "Radius-Authentication-Server"
 msgstr "Server Radius-Authentication"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:119
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:102
 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:83
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:84
 msgid ""
 "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-Server"
@@ -4178,20 +4297,11 @@ msgid ""
 "access to this device if you are connected via this interface"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2
-msgid ""
-"Really delete this wireless network? The deletion cannot be undone! You "
-"might lose access to this device if you are connected via this network."
-msgstr ""
-"Opravdu odstranit bezdrátovou síť? Odstranění nelze vrátit zpět!\n"
-"Můžete ztratit přístup k zařízení, pokud jste připojeni prostřednictvím této "
-"sítě."
-
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:40
 msgid "Really reset all changes?"
 msgstr "Opravdu resetovat všechny změny?"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:237
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:354
 msgid "Really switch protocol?"
 msgstr "Opravdu prohodit protokol?"
 
@@ -4215,15 +4325,15 @@ msgstr "Provoz v reálném čase"
 msgid "Realtime Wireless"
 msgstr "Wireless v reálném čase"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:931
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1343
 msgid "Reassociation Deadline"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:191
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
 msgid "Rebind protection"
 msgstr "Opětovné nastavení ochrany"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:48
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:46
 #: modules/luci-mod-system/luasrc/view/admin_system/reboot.htm:9
 msgid "Reboot"
 msgstr "Reboot"
@@ -4237,21 +4347,15 @@ msgstr "Rebootuji..."
 msgid "Reboots the operating system of your device"
 msgstr "Rebootuje operační systém vašeho zařízení"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:103
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:90
 msgid "Receive"
 msgstr "Přijmout"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:325
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:350
-msgid "Receiver Antenna"
-msgstr "Přijímací anténa"
-
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:42
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:59
 msgid "Recommended. IP addresses of the WireGuard interface."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:28
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:300
 msgid "Reconnect this interface"
 msgstr "Přepojit toto rozhraní"
 
@@ -4259,93 +4363,135 @@ msgstr "Přepojit toto rozhraní"
 msgid "References"
 msgstr "Reference"
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:39
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:153
 msgid "Relay"
 msgstr "Přenos"
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:36
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:157
 msgid "Relay Bridge"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:17
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:154
 msgid "Relay between networks"
 msgstr "Přenášet mezi sítěmi"
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:64
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:12
 msgid "Relay bridge"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:18
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:50
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:49
 msgid "Remote IPv4 address"
 msgstr "Vzdálená IPv4 adresa"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:8
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:40
 msgid "Remote IPv4 address or FQDN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:45
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:725
 msgid "Remove"
 msgstr "Odstranit"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:53
-msgid "Repeat scan"
-msgstr "Opakovat skenování"
-
-#: modules/luci-base/luasrc/view/cbi/upload.htm:11
-msgid "Replace entry"
-msgstr "Nahradit vstup"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:46
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:51
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1806
 msgid "Replace wireless configuration"
 msgstr "Nahradit bezdrátovou konfiguraci"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:8
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:17
 msgid "Request IPv6-address"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:16
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:23
 msgid "Request IPv6-prefix of length"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1141
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:200
+msgid "Request timeout"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1536
 msgid "Required"
 msgstr ""
 
 # Charter je poskytovate
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:20
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:31
 msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3"
 msgstr "Vyžadováno u některých ISP, např. Charter s DocSIS 3"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:19
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:49
 msgid "Required. Base64-encoded private key for this interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:113
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:113
 msgid "Required. Base64-encoded public key of peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:136
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:122
 msgid ""
 "Required. IP addresses and prefixes that this peer is allowed to use inside "
 "the tunnel. Usually the peer's tunnel IP addresses and the networks the peer "
 "routes through the tunnel."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1134
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1095
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1096
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1097
+msgid "Requires hostapd"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1101
+msgid "Requires hostapd with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1102
+msgid "Requires hostapd with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1098
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1099
+msgid "Requires hostapd with SAE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1533
 msgid ""
 "Requires the 'full' version of wpad/hostapd and support from the wifi driver "
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:141
 msgid ""
 "Requires upstream supports DNSSEC; verify unsigned domain responses really "
 "come from unsigned domains"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1268
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1109
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1119
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1120
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1121
+msgid "Requires wpa-supplicant"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1113
+msgid "Requires wpa-supplicant with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1114
+msgid "Requires wpa-supplicant with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1111
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1124
+msgid "Requires wpa-supplicant with SAE support"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1355
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:17
 #: modules/luci-base/luasrc/view/cbi/footer.htm:30
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:66
@@ -4361,17 +4507,22 @@ 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:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:68
 msgid "Resolv and Hosts Files"
 msgstr "Soubory Resolv a Hosts"
 
-#: 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:94
 msgid "Resolve file"
 msgstr "Soubor resolve"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:28
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:14
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:71
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:197
+msgid "Resource not found"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:302
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:693
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:90
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:112
 msgid "Restart"
 msgstr "Restart"
 
@@ -4379,7 +4530,7 @@ msgstr "Restart"
 msgid "Restart Firewall"
 msgstr "Restartovat firewall"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:14
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:691
 msgid "Restart radio interface"
 msgstr ""
 
@@ -4391,26 +4542,24 @@ msgstr "Obnovit"
 msgid "Restore backup"
 msgstr "Obnovit zálohu"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:113
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:114
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:38
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:46
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:119
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:120
 msgid "Reveal/hide password"
 msgstr "Odhalit/skrýt heslo"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1774
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2322
 msgid "Revert"
 msgstr "Vrátit zpět"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1861
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2405
 msgid "Revert changes"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2013
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2554
 msgid "Revert request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1993
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2534
 msgid "Reverting configuration…"
 msgstr ""
 
@@ -4418,7 +4567,7 @@ msgstr ""
 msgid "Root"
 msgstr "Root"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:271
 msgid "Root directory for files served via TFTP"
 msgstr "Kořenový adresář souborů, přístupných přes TFTP"
 
@@ -4426,7 +4575,7 @@ msgstr "Kořenový adresář souborů, přístupných přes TFTP"
 msgid "Root preparation"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:147
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:126
 msgid "Route Allowed IPs"
 msgstr ""
 
@@ -4438,12 +4587,12 @@ msgstr ""
 msgid "Route type"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:523
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:577
 msgid "Router Advertisement-Service"
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:43
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:15
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:27
 msgid "Router Password"
 msgstr "Heslo routeru"
 
@@ -4472,7 +4621,7 @@ msgstr "Spustit kontrolu souborového systému před připojením zařízení"
 msgid "Run filesystem check"
 msgstr "Spustit kontrolu souborového systému"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:651
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:669
 msgid "Runtime error"
 msgstr ""
 
@@ -4484,31 +4633,31 @@ msgstr ""
 msgid "SNR"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:5
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:18
 msgid "SSH Access"
 msgstr "Přístup přes SSH"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:10
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:70
 msgid "SSH server address"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:13
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:74
 msgid "SSH server port"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:8
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:58
 msgid "SSH username"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:27
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:277
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
 msgid "SSH-Keys"
 msgstr "SSH klíče"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:42
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:73
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:29
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1617
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:174
 msgid "SSID"
 msgstr "SSID"
@@ -4517,17 +4666,17 @@ msgstr "SSID"
 msgid "SWAP"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1127
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1262
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1379
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1351
 #: modules/luci-base/luasrc/view/cbi/error.htm:17
 #: modules/luci-base/luasrc/view/cbi/footer.htm:26
 #: modules/luci-base/luasrc/view/cbi/header.htm:17
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:54
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:133
 msgid "Save"
 msgstr "Uložit"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1256
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1768
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1347
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2318
 #: modules/luci-base/luasrc/view/cbi/footer.htm:22
 msgid "Save & Apply"
 msgstr "Uložit & použít"
@@ -4540,28 +4689,20 @@ msgstr ""
 msgid "Save mtdblock contents"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
-msgid "Saving keys…"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:698
 msgid "Scan"
 msgstr "Skenovat"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:109
-msgid "Scan request failed"
-msgstr ""
-
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:8
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:39
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:23
 msgid "Scheduled Tasks"
 msgstr "Naplánované úlohy"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1749
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2302
 msgid "Section added"
 msgstr "Přidána sekce"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1751
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2304
 msgid "Section removed"
 msgstr "Sekce odebrána"
 
@@ -4576,12 +4717,18 @@ msgid ""
 "your device!"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:119
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:90
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:96
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:90
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:69
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:92
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1516
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1646
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1809
+msgid "Select file…"
+msgstr ""
+
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:144
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:102
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:125
 msgid ""
 "Send LCP echo requests at the given interval in seconds, only effective in "
 "conjunction with failure threshold"
@@ -4589,50 +4736,49 @@ msgstr ""
 "Odesílat LCP echo požadaveky každých x sekund, účinné pouze ve spojení s "
 "prahem selhání."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:561
-msgid "Separate Clients"
-msgstr "Oddělovat klienty"
-
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:62
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:63
 msgid "Server Settings"
 msgstr "Nastavení serveru"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:26
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:50
 msgid "Service Name"
 msgstr "Název služby"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:25
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:30
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:87
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:71
 msgid "Service Type"
 msgstr "Typ služby"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:55
+#: modules/luci-base/luasrc/controller/admin/index.lua:62
 msgid "Services"
 msgstr "Služby"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:815
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:861
 msgid "Session expired"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:83
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:107
 msgid "Set VPN as Default Route"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:258
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:795
 msgid ""
 "Set interface properties regardless of the link carrier (If set, carrier "
 "sense events do not invoke hotplug handlers)."
 msgstr ""
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:23
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:55
 msgid "Setting PLMN failed"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:26
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:68
 msgid "Setting operation mode failed"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:454
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:517
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:527
 msgid "Setup DHCP Server"
 msgstr "Nastavit DHCP server"
 
@@ -4644,7 +4790,7 @@ msgstr ""
 msgid "Short GI"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:516
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:960
 msgid "Short Preamble"
 msgstr ""
 
@@ -4656,21 +4802,23 @@ msgstr "Ukázat aktuální seznam záložních souborů"
 msgid "Show empty chains"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:306
 msgid "Shutdown this interface"
 msgstr "Shodit toho rozhraní"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:111
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:34
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:47
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:132
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1616
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:173
 msgid "Signal"
 msgstr "Signál"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1960
+msgid "Signal / Noise"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:125
 msgid "Signal Attenuation (SATN)"
 msgstr ""
@@ -4683,11 +4831,11 @@ msgstr "Signál:"
 msgid "Size"
 msgstr "Velikost"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:259
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:260
 msgid "Size of DNS query cache"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:191
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
 msgid "Size of the ZRam device in megabytes"
 msgstr ""
 
@@ -4704,11 +4852,7 @@ msgstr "Skočit na obsah"
 msgid "Skip to navigation"
 msgstr "Skočit na navigaci"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:335
-msgid "Slot time"
-msgstr "Time sloty"
-
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1640
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1846
 #: modules/luci-base/luasrc/model/network.lua:1427
 msgid "Software VLAN"
 msgstr ""
@@ -4749,11 +4893,7 @@ msgstr ""
 msgid "Specifies the directory the device is attached to"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:23
-msgid "Specifies the listening port of this <em>Dropbear</em> instance"
-msgstr "Určuje port na kterém bude tato instance <em>Dropbearu</em> naslouchat"
-
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:57
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:175
 msgid ""
 "Specifies the maximum amount of failed ARP requests until hosts are presumed "
 "to be dead"
@@ -4761,51 +4901,59 @@ msgstr ""
 "Určuje množství neúspěšných ARP požadavků, po kterém je hostitel považován "
 "za mrtvého"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:49
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:171
 msgid ""
 "Specifies the maximum amount of seconds after which hosts are presumed to be "
 "dead"
 msgstr "Určuje počet sekund, po kterém je hostitel považovám za mrtvého"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:761
+msgid ""
+"Specifies the maximum transmit power the wireless radio may use. Depending "
+"on regulatory requirements and wireless usage, the actual transmit power may "
+"be reduced by the driver."
+msgstr ""
+
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:63
 msgid "Specify a TOS (Type of Service)."
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:25
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:58
 msgid ""
 "Specify a TTL (Time to Live) for the encapsulating packet other than the "
 "default (64)."
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:53
 msgid ""
 "Specify an MTU (Maximum Transmission Unit) other than the default (1280 "
 "bytes)."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:60
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "Specify the secret encryption key here."
 msgstr "Zde nastavte soukromý šifrovací klíč."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:475
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:64
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:533
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:89
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:111
 msgid "Start"
 msgstr "Start"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:33
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:86
 msgid "Start priority"
 msgstr "Priorita spouštění"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1958
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2499
 msgid "Starting configuration apply…"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1626
 msgid "Starting wireless scan..."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:24
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:120
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
 msgid "Startup"
 msgstr "Po spuštění"
 
@@ -4817,20 +4965,21 @@ msgstr "Statické IPv4 trasy"
 msgid "Static IPv6 Routes"
 msgstr "Statické IPv6 trasy"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:70
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:71
 msgid "Static Leases"
 msgstr "Statické zápůjčky"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:118
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:73
 msgid "Static Routes"
 msgstr "Statické trasy"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1194
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1384
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:172
 #: modules/luci-base/luasrc/model/network.lua:966
 msgid "Static address"
 msgstr "Statická adresa"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:308
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:309
 msgid ""
 "Static leases are used to assign fixed IP addresses and symbolic hostnames "
 "to DHCP clients. They are also required for non-dynamic interface "
@@ -4840,39 +4989,41 @@ msgstr ""
 "jmen DHCP klientům. Jsou také vyžadovány pro nedynamické konfigurace "
 "rozhraní, kde jsou povoleni pouze hosté s odpovídajícím nastavením."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:534
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:977
 msgid "Station inactivity limit"
 msgstr ""
 
 #: modules/luci-base/luasrc/controller/admin/index.lua:40
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:197
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:337
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:746
 #: modules/luci-mod-status/luasrc/view/admin_status/index.htm:128
 msgid "Status"
 msgstr "Stav"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:35
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:75
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:308
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:91
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:113
 msgid "Stop"
 msgstr "Stop"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:165
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Strict order"
 msgstr "Striktní výběr"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:16
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:30
 msgid "Strong"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1843
 msgid "Submit"
 msgstr "Odeslat"
 
-#: 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:108
 msgid "Suppress logging"
 msgstr "Potlačit logování"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:109
 msgid "Suppress logging of the routine operation of these protocols"
 msgstr ""
 
@@ -4884,42 +5035,44 @@ msgstr ""
 msgid "Swap Entry"
 msgstr "Vstupní bod"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:23
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:5
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:135
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:21
 msgid "Switch"
 msgstr "Směrovač"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:129
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:168
 msgid "Switch %q"
 msgstr "Směrovač číslo %q"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:128
-msgid "Switch %q (%s)"
-msgstr "Směrovač číslo %q (%s)"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:66
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:146
 msgid ""
 "Switch %q has an unknown topology - the VLAN settings might not be accurate."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:146
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:142
 msgid "Switch Port Mask"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1640
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1846
 #: modules/luci-base/luasrc/model/network.lua:1425
 msgid "Switch VLAN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:238
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:355
 msgid "Switch protocol"
 msgstr "Směrovací protokol"
 
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:103
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:104
 #: modules/luci-base/luasrc/view/cbi/ipaddr.htm:26
 msgid "Switch to CIDR list notation"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:77
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1547
+msgid "Symbolic link"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:71
 msgid "Sync with NTP-Server"
 msgstr ""
 
@@ -4929,7 +5082,7 @@ msgstr "Synchronizovat s prohlížečem"
 
 #: modules/luci-base/luasrc/controller/admin/index.lua:47
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:14
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:102
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:94
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
 #: modules/luci-mod-system/luasrc/view/admin_system/applyreboot.htm:39
 msgid "System"
@@ -4940,11 +5093,11 @@ msgstr "Systém"
 msgid "System Log"
 msgstr "Systémový log"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:108
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:99
 msgid "System Properties"
 msgstr "Vlastnosti systému"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:145
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:136
 msgid "System log buffer size"
 msgstr "Velikost bufferu systémového logu"
 
@@ -4952,15 +5105,17 @@ msgstr "Velikost bufferu systémového logu"
 msgid "TCP:"
 msgstr "TCP:"
 
-#: 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:69
 msgid "TFTP Settings"
 msgstr "Nastavení TFTP"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:269
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
 msgid "TFTP server root"
 msgstr "Kořenový adresář TFTP serveru"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:17
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:77
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:88
 msgid "TX"
@@ -4983,7 +5138,7 @@ msgstr ""
 msgid "Target"
 msgstr "Cíl"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:77
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:103
 msgid "Target network"
 msgstr ""
 
@@ -4991,48 +5146,24 @@ msgstr ""
 msgid "Terminate"
 msgstr "Ukončit"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:27
-#, fuzzy
-msgid ""
-"The <em>Device Configuration</em> section covers physical settings of the "
-"radio hardware such as channel, transmit power or antenna selection which "
-"are shared among all defined wireless networks (if the radio hardware is "
-"multi-SSID capable). Per network settings like encryption or operation mode "
-"are grouped in the <em>Interface Configuration</em>."
-msgstr ""
-"Sekce <em>Nastavení zařízení</em> pokrývá fyzické nastavení radiového "
-"hardwaru jako kanál, vysílací výkon nebo výběr antény, které je sdíleno mezi "
-"všemi bezdrátovými sítěmi (pokud hardware podporuje multi-SSID). Nastavení "
-"konkrétní sítě jako šifrování, operační mód jsou seskupeny v sekci "
-"<em>Nastavení rozhraní</em>."
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:79
-msgid ""
-"The <em>libiwinfo-lua</em> package is not installed. You must install this "
-"component for working wireless configuration!"
-msgstr ""
-"Balíček <em>libiwinfo-lua</em> není nainstalován. Tato komponenta musí být "
-"nainstalována, aby fungovalo nastavení bezdátové sítě!"
-
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:66
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:77
 msgid ""
 "The HE.net endpoint update configuration changed, you must now use the plain "
 "username instead of the user ID!"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:8
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:40
 msgid ""
 "The IPv4 address or the fully-qualified domain name of the remote tunnel end."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:27
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:38
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:59
 msgid ""
 "The IPv6 prefix assigned to the provider, usually ends with <code>::</code>"
 msgstr "IPv6 prefix přidělený poskytovatelm většinou končí  <code>::</code>"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:18
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1808
 msgid ""
 "The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
 "code> and <code>_</code>"
@@ -5048,7 +5179,7 @@ msgstr ""
 msgid "The configuration file could not be loaded due to the following error:"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1849
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2396
 msgid ""
 "The device could not be reached within %d seconds after applying the pending "
 "changes, which caused the configuration to be rolled back for safety "
@@ -5068,6 +5199,12 @@ msgstr ""
 "Soubor zařízení paměti nebo oddílu (<abbr title=\"například\">např.</abbr> "
 "<code>/dev/sda1</code>)"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:612
+msgid ""
+"The existing wireless configuration needs to be changed for LuCI to function "
+"properly."
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:127
 msgid ""
 "The filesystem that was used to format the memory (<abbr title=\"for example"
@@ -5092,46 +5229,49 @@ msgstr ""
 msgid "The following rules are currently active on this system."
 msgstr "Následující pravidla jsou v nyní na tomto systému aktivní."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:144
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:154
+msgid "The gateway address must not be a local IP address"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:154
 msgid "The given SSH public key has already been added."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:150
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:160
 msgid ""
 "The given SSH public key is invalid. Please supply proper public RSA or "
 "ECDSA keys."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:67
-msgid "The given network name is not unique"
-msgstr "Zadané jméno sítě není jedinečné"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:664
+msgid "The interface name is already used"
+msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:52
-#, fuzzy
-msgid ""
-"The hardware is not multi-SSID capable and the existing configuration will "
-"be replaced if you proceed."
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:670
+msgid "The interface name is too long"
 msgstr ""
-"Tento hardware nepodporuje multi-SSID. Pokud budete pokračovat, existující "
-"konfigurace bude nahrazena."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:43
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:31
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:55
 msgid ""
 "The length of the IPv4 prefix in bits, the remainder is used in the IPv6 "
 "addresses."
 msgstr "Délka IPv4 prefixu v bitech, zbytek se používá v IPv6 adresách"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:35
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:46
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:63
 msgid "The length of the IPv6 prefix in bits"
 msgstr "Délka IPv6 prefixu v bitech"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:12
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:44
 msgid "The local IPv4 address over which the tunnel is created (optional)."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:5
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1814
+msgid "The network name is already used"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:135
 msgid ""
 "The network ports on this device can be combined to several <abbr title="
 "\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
@@ -5147,16 +5287,15 @@ msgstr ""
 "jeden port pro připojení k vyšší síti (Uplink) jako třeba internet a "
 "zbývající porty pro místní síť."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:77
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:395
-msgid "The selected protocol needs a device assigned"
-msgstr "Vybraný protokol potřebuje mít přiřazeno zařízení"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1149
+msgid "The selected %s mode is incompatible with %s encryption"
+msgstr ""
 
 #: modules/luci-base/luasrc/view/csrftoken.htm:11
 msgid "The submitted security token is invalid or already expired!"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:274
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:272
 msgid ""
 "The system is erasing the configuration partition now and will reboot itself "
 "when finished."
@@ -5164,7 +5303,7 @@ msgstr ""
 "Systém maže konfigurační oddíl, po skončení procesu bude automaticky "
 "restartován."
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:195
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:193
 #, fuzzy
 msgid ""
 "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
@@ -5177,7 +5316,7 @@ msgstr ""
 "nastavení, bude možná nutné obnovit adresu vašeho počítače, aby jste se "
 "mohli znovu připojit."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:15
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:80
 msgid "The system password has been successfully changed."
 msgstr ""
 
@@ -5187,7 +5326,7 @@ msgid ""
 "you choose the generic image format for your platform."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:427
 msgid "There are no active leases"
 msgstr ""
 
@@ -5196,18 +5335,10 @@ msgstr ""
 msgid "There are no active leases."
 msgstr "Nejsou žádné aktivní zápůjčky."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1973
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2514
 msgid "There are no changes to apply"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:204
-msgid ""
-"There is no device assigned yet, please attach a network device in the "
-"\"Physical Settings\" tab"
-msgstr ""
-"Zatím zde není přiřazeno zařízení, prosím připojte nějaké v záložce "
-"\"Fyzické nastavení\""
-
 #: 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
@@ -5219,11 +5350,19 @@ msgstr ""
 "Na tomto routeru není nastaveno heslo. Prosím, nastavte heslo uživatele root "
 "tak, abyste ochránili webové rozhraní a mohli povolit SSH."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:19
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:49
 msgid "This IPv4 address of the relay"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1448
+msgid "This authentication type is not applicable to the selected EAP method."
+msgstr ""
+
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:54
+msgid "This does not look like a valid PEM file"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
 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 "
@@ -5237,13 +5376,13 @@ msgid ""
 "configurations are automatically preserved."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:74
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:81
 msgid ""
 "This is either the \"Update Key\" configured for the tunnel or the account "
 "password if no update key has been configured"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:82
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:127
 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."
@@ -5251,13 +5390,13 @@ msgstr ""
 "Zde vidíte obsah souboru /etc/rc.local. Příkazy, které sem vložíte (před "
 "příkaz 'exit 0') budou spuštěny na konci bootovacího procesu."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:27
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:54
 msgid ""
 "This is the local endpoint address assigned by the tunnel broker, it usually "
 "ends with <code>...:2/64</code>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:79
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> in the local network"
@@ -5265,22 +5404,22 @@ msgstr ""
 "Toto je jediný <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> v mistní síti"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:73
 msgid "This is the plain username for logging into the account"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:34
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:57
 msgid ""
 "This is the prefix routed to you by the tunnel broker for use by clients"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:9
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:41
 msgid "This is the system crontab in which scheduled tasks can be defined."
 msgstr ""
 "Toto je systémový crontab, v němž můžete nastavit naplánované úlohy. "
 "Podrobnosti naleznete v crontab(5)."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:19
+#: 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 ""
@@ -5297,26 +5436,26 @@ msgstr ""
 msgid "This page gives an overview over currently active network connections."
 msgstr "Tato stránka zobrazuje přehled aktivních síťových spojení."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:726
-#: modules/luci-base/htdocs/luci-static/resources/form.js:809
+#: modules/luci-base/htdocs/luci-static/resources/form.js:936
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1064
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:172
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:32
 msgid "This section contains no values yet"
 msgstr "Tato sekce zatím neobsahuje žádné hodnoty"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:114
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:105
 msgid "Time Synchronization"
 msgstr "Synchronizace času"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:525
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:968
 msgid "Time interval for rekeying GTK"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:128
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:119
 msgid "Timezone"
 msgstr "Časové pásmo"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:825
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:871
 msgid "To login…"
 msgstr ""
 
@@ -5330,7 +5469,7 @@ msgstr ""
 "konfigurační soubory. Pro obnovení továrního nastavení stiskněte \"Obnovit "
 "výchozí\" (možné pouze s obrazy squashfs)."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:835
 msgid "Tone"
 msgstr ""
 
@@ -5354,55 +5493,41 @@ msgstr "Provoz"
 msgid "Transfer"
 msgstr "Přenos"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:595
-msgid "Transmission Rate"
-msgstr "Vysílací rychlost"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:102
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:89
 msgid "Transmit"
 msgstr "Přenos"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:211
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:273
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:345
-msgid "Transmit Power"
-msgstr "Vysílací výkon"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:318
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:349
-msgid "Transmitter Antenna"
-msgstr "Anténa vysílače"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:73
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:57
 msgid "Trigger"
 msgstr "Spouštění"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:98
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:84
 msgid "Trigger Mode"
 msgstr "Trigger mód"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:54
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:69
 msgid "Tunnel ID"
 msgstr "ID tunelu"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1643
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1849
 #: modules/luci-base/luasrc/model/network.lua:1430
 msgid "Tunnel Interface"
 msgstr "Rozhraní tunelu"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:44
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:55
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:76
 msgid "Tunnel Link"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:46
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:131
 msgid "Tx-Power"
 msgstr "Tx-Power"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:32
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:185
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:11
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:43
 msgid "Type"
 msgstr "Typ"
 
@@ -5410,19 +5535,20 @@ msgstr "Typ"
 msgid "UDP:"
 msgstr "UDP:"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:28
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:90
 msgid "UMTS only"
 msgstr "Pouze UMTS"
 
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:43
 #: protocols/luci-proto-3g/luasrc/model/network/proto_3g.lua:10
 msgid "UMTS/GPRS/EV-DO"
 msgstr "UMTS/GPRS/EV-DO"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:106
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:93
 msgid "USB Device"
 msgstr "USB zařízení"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:122
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:110
 msgid "USB Ports"
 msgstr ""
 
@@ -5452,10 +5578,12 @@ msgstr ""
 msgid "Unable to dispatch"
 msgstr ""
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:22
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:54
 msgid "Unable to obtain client ID"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:61
 msgid "Unable to resolve AFTR host name"
 msgstr ""
@@ -5465,21 +5593,31 @@ msgstr ""
 msgid "Unable to resolve peer host name"
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:33
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:68
+msgid "Unable to save contents: %s"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:132
 msgid "Unavailable Seconds (UAS)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1196
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1386
 #: modules/luci-base/luasrc/model/network.lua:970
 msgid "Unknown"
 msgstr "Neznámý"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1349
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1539
 #: modules/luci-base/luasrc/model/network.lua:1137
 msgid "Unknown error (%s)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1193
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:204
+msgid "Unknown error code"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1383
+#: modules/luci-base/htdocs/luci-static/resources/protocol/none.js:6
 #: modules/luci-base/luasrc/model/network.lua:964
 msgid "Unmanaged"
 msgstr "Nespravovaný"
@@ -5489,22 +5627,30 @@ msgstr "Nespravovaný"
 msgid "Unmount"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:107
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:262
 msgid "Unnamed key"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1708
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2261
 msgid "Unsaved Changes"
 msgstr "Neuložené změny"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:202
+msgid "Unspecified error"
+msgstr ""
+
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:64
 msgid "Unsupported MAP type"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:27
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:69
 msgid "Unsupported modem"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:219
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:119
 msgid "Unsupported protocol type."
 msgstr "Nepodporovaný typ protokolu."
@@ -5527,56 +5673,70 @@ msgstr ""
 msgid "Upload archive..."
 msgstr "Nahrát archiv..."
 
-#: modules/luci-base/luasrc/view/cbi/upload.htm:8
-msgid "Uploaded File"
-msgstr "Nahrát soubor"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1703
+msgid "Upload file"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1678
+msgid "Upload file…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1623
+msgid "Upload request failed: %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:613
+msgid ""
+"Upon pressing \"Continue\", anonymous \"wifi-iface\" sections will be "
+"assigned with a name in the form <em>wifinet#</em> and the network will be "
+"restarted to apply the updated configuration."
+msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:14
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:74
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:85
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:26
 msgid "Uptime"
 msgstr "Uptime"
 
-#: 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:83
 msgid "Use <code>/etc/ethers</code>"
 msgstr "Použít <code>/etc/ethers</code>"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:40
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:167
 msgid "Use DHCP gateway"
 msgstr "Použít DHCP bránu"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:33
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:85
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:34
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:98
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:46
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:65
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:38
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:58
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:124
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:39
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:116
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:59
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:103
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:64
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:77
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:100
 msgid "Use DNS servers advertised by peer"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:227
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:233
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:479
 msgid "Use ISO/IEC 3166 alpha2 country codes."
 msgstr "Pomocí ISO/IEC 3166 alpha2 kódů zemí."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:31
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:100
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:70
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:35
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:51
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:86
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:56
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:97
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:77
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:75
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:92
 msgid "Use MTU on tunnel interface"
 msgstr "Použít MTU na rozhraní tunelu"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:95
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:65
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:30
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:46
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:81
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:93
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:73
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:88
 msgid "Use TTL on tunnel interface"
 msgstr "Použít TTL na rozhraní tunelu"
 
@@ -5588,68 +5748,65 @@ msgstr ""
 msgid "Use as root filesystem (/)"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:19
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:31
 msgid "Use broadcast flag"
 msgstr "Použít příznak broadcastu"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:253
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:791
 msgid "Use builtin IPv6-management"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:40
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:109
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:92
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:45
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:105
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:53
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:72
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:45
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:65
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:40
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:182
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:127
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:42
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:119
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:62
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:67
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:80
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:103
 msgid "Use custom DNS servers"
 msgstr "Použít vlastní DNS servery"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:26
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:70
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:16
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:28
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:84
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:24
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:50
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:23
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:43
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:116
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:33
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:74
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:97
 msgid "Use default gateway"
 msgstr "Použít výchozí bránu"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:48
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:164
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:77
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:24
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:88
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:58
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:23
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:39
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:74
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:90
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:38
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:57
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:30
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:50
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:45
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:227
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:119
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:51
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:88
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:68
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:52
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:70
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:83
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:111
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:149
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:67
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:111
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:98
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:72
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:85
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:108
 msgid "Use gateway metric"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:64
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:179
 msgid "Use routing table"
 msgstr "Použít směrovací tabulku"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:309
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:310
 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 "
@@ -5665,77 +5822,78 @@ msgstr ""
 msgid "Used"
 msgstr "Použit"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:848
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1273
 msgid "Used Key Slot"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:913
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
 msgid ""
 "Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not "
 "needed with normal WPA(2)-PSK."
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:48
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:110
 msgid "User certificate (PEM encoded)"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:61
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:122
 msgid "User key (PEM encoded)"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/sysauth.htm:23
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:41
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:32
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:102
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:56
 msgid "Username"
 msgstr "Uživatelské jméno"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:182
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:903
 msgid "VC-Mux"
 msgstr "VC-Mux"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:851
 msgid "VDSL"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:172
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:169
 msgid "VLANs on %q"
 msgstr "VLANy na %q"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:171
-msgid "VLANs on %q (%s)"
-msgstr "VLANy na %q (%s)"
+#: modules/luci-base/luasrc/controller/admin/index.lua:55
+msgid "VPN"
+msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:18
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:42
 msgid "VPN Local address"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:22
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:46
 msgid "VPN Local port"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:15
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:11
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:15
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:58
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:39
 msgid "VPN Server"
 msgstr "VPN server"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:18
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:96
 msgid "VPN Server port"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:37
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:100
 msgid "VPN Server's certificate SHA1 hash"
 msgstr ""
 
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:9
 #: protocols/luci-proto-vpnc/luasrc/model/network/proto_vpnc.lua:9
 msgid "VPNC (CISCO 3000 (and others) VPN)"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:44
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:73
 msgid "Vendor"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:60
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:52
 msgid "Vendor Class to send when requesting DHCP"
 msgstr ""
 
@@ -5743,41 +5901,37 @@ msgstr ""
 msgid "Verify"
 msgstr "Ověřit"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:52
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:76
 msgid "Virtual dynamic interface"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:470
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:471
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:553
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:576
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:908
 msgid "WDS"
 msgstr "WDS"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:667
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1160
 msgid "WEP Open System"
 msgstr "WEP Open System"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:668
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1161
 msgid "WEP Shared Key"
 msgstr "Sdílený klíč WEP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "WEP passphrase"
 msgstr "WEP heslo"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:503
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:566
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:945
 msgid "WMM Mode"
 msgstr "WMM mód"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "WPA passphrase"
 msgstr "WPA heslo"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:716
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:735
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:740
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1074
 msgid ""
 "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
 "and ad-hoc mode) to be installed."
@@ -5793,7 +5947,7 @@ msgstr "Čekání na realizaci změn..."
 msgid "Waiting for command to complete..."
 msgstr "Čekání na dokončení příkazu..."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1940
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2481
 msgid "Waiting for configuration to get applied… %ds"
 msgstr ""
 
@@ -5801,8 +5955,8 @@ msgstr ""
 msgid "Waiting for device..."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:172
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:163
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:173
 msgid "Warning"
 msgstr "Varování"
 
@@ -5810,11 +5964,11 @@ msgstr "Varování"
 msgid "Warning: There are unsaved changes that will get lost on reboot!"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:20
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:34
 msgid "Weak"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:946
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1355
 msgid ""
 "When using a PSK, the PMK can be automatically generated. When enabled, the "
 "R0/R1 key options below are not applied. Disable this to use the R0 and R1 "
@@ -5822,78 +5976,85 @@ msgid ""
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:383
 msgid "Width"
 msgstr ""
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:17
 #: protocols/luci-proto-wireguard/luasrc/model/network/proto_wireguard.lua:9
 msgid "WireGuard VPN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:58
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:40
 #: modules/luci-mod-status/luasrc/controller/admin/status.lua:28
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:14
 msgid "Wireless"
 msgstr "Bezdrátová síť"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1631
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1837
 #: modules/luci-base/luasrc/model/network.lua:1418
 msgid "Wireless Adapter"
 msgstr "Bezdrátový adaptér"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1617
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2052
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1823
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2288
 #: modules/luci-base/luasrc/model/network.lua:1404
 #: modules/luci-base/luasrc/model/network.lua:1865
 msgid "Wireless Network"
 msgstr "Bezdrátová síť"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:629
 msgid "Wireless Overview"
 msgstr "Přehled bezdrátových sití"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:362
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:797
 msgid "Wireless Security"
 msgstr "Zabezpečení bezdrátové sítě"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:54
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:611
+msgid "Wireless configuration migration"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:139
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:179
 msgid "Wireless is disabled"
 msgstr "Bezdrátová síť vypnuta"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:54
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:139
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:179
 msgid "Wireless is not associated"
 msgstr "Bezdrátová síť nespojena"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:15
-msgid "Wireless is restarting..."
-msgstr "Probíhá restartování bezdrátové sítě..."
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:752
 msgid "Wireless network is disabled"
 msgstr "Bezdrátová síť je zakázána"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:752
 msgid "Wireless network is enabled"
 msgstr "Bezdrátová síť je povolena"
 
-#: 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:182
 msgid "Write received DNS requests to syslog"
 msgstr "Zapisovat přijaté požadavky DNS do systemového logu"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:164
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:155
 msgid "Write system log to file"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1507
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:85
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1754
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:109
 msgid "Yes"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:26
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:943
+msgid ""
+"You appear to be currently connected to the device via the \"%h\" interface. "
+"Do you really want to shut down the interface?"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:123
 msgid ""
 "You can enable or disable installed init scripts here. Changes will applied "
 "after a device reboot.<br /><strong>Warning: If you disable essential init "
@@ -5912,38 +6073,34 @@ msgid ""
 msgstr ""
 "Aby LuCI fungoval správně, musíte mít v prohlížeči povolený JavaScript."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:196
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:187
 msgid "ZRam Compression Algorithm"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:203
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:194
 msgid "ZRam Compression Streams"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:189
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:180
 msgid "ZRam Settings"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:191
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
 msgid "ZRam Size"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:229
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:230
 msgid "any"
 msgstr "libovolný"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:113
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:121
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:126
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:218
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:282
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:321
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:328
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:621
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:37
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:22
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:29
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:121
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:836
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:844
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:849
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1030
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:78
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:48
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:51
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:103
 msgid "auto"
 msgstr "auto"
 
@@ -5951,11 +6108,11 @@ msgstr "auto"
 msgid "automatic"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:45
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:78
 msgid "baseT"
 msgstr "baseT"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:909
 msgid "bridged"
 msgstr "přemostěný"
 
@@ -5971,22 +6128,21 @@ msgstr ""
 msgid "create:"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:264
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:368
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:678
 msgid "creates a bridge over specified interface(s)"
 msgstr "vytvoří most přes vybraná rozhraní"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:277
 msgid "dB"
 msgstr "dB"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:34
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:35
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:46
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:47
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:48
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:131
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:132
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:133
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:277
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:279
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:331
@@ -5998,26 +6154,30 @@ msgstr "dB"
 msgid "dBm"
 msgstr "dBm"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:460
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:587
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:889
 msgid "disable"
 msgstr "zakázat"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:119
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:524
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:530
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:536
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:18
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:578
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:584
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:590
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:25
 msgid "disabled"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:433
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:467
+msgid "driver default"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/lease_status.htm:17
 #: modules/luci-base/luasrc/view/lease_status.htm:46
-#: 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:416
 msgid "expired"
 msgstr "expirované"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:88
 msgid ""
 "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr>-leases will be stored"
@@ -6031,25 +6191,21 @@ msgstr ""
 msgid "forward"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:80
 msgid "full-duplex"
 msgstr "plný-duplex"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:80
 msgid "half-duplex"
 msgstr "poloviční-duplex"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:559
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:565
 msgid "hexadecimal encoded value"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:138
-msgid "hidden"
-msgstr "skrytý"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:527
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:533
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:538
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:581
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:587
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:592
 msgid "hybrid mode"
 msgstr ""
 
@@ -6057,6 +6213,10 @@ msgstr ""
 msgid "if target is a network"
 msgstr "pokud cílem je síť"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:63
+msgid "ignore"
+msgstr ""
+
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:177
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
@@ -6091,25 +6251,26 @@ msgstr ""
 msgid "key with either 5 or 13 characters"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:94
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:95
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr "místní <abbr title=\"Domain Name System\">DNS</abbr> soubor"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:952
-msgid "minutes"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1168
+msgid "medium security"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:43
-msgid "mixed WPA/WPA2"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1360
+msgid "minutes"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:225
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:232
 msgid "no"
 msgstr "ne"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:54
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:72
 msgid "no link"
 msgstr "žádné spojení"
 
@@ -6117,7 +6278,7 @@ msgstr "žádné spojení"
 msgid "non-empty value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1195
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1446
 msgid "none"
 msgstr "žádný"
 
@@ -6127,7 +6288,9 @@ msgstr "žádný"
 msgid "not present"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:363
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:341
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:776
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:780
 #: 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
@@ -6142,8 +6305,8 @@ msgstr "off"
 msgid "on"
 msgstr "on"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
-msgid "open"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1169
+msgid "open network"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
@@ -6163,73 +6326,77 @@ msgstr ""
 msgid "positive integer value"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:34
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:56
 msgid "random"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:526
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:532
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:537
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:580
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:586
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:591
 msgid "relay mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:910
 msgid "routed"
 msgstr "směrované"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:525
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:534
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:968
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:977
 msgid "sec"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:525
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:531
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:579
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:585
 msgid "server mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:544
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:597
 msgid "stateful-only"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:542
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:595
 msgid "stateless"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:543
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:596
 msgid "stateless + stateful"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:369
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1167
+msgid "strong security"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:346
 msgid "tagged"
 msgstr "označený"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:932
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1343
 msgid "time units (TUs / 1.024 ms) [1000-65535]"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:549
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:555
 msgid "unique value"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:448
 msgid "unknown"
 msgstr "neznámý"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:15
 #: modules/luci-base/luasrc/view/lease_status.htm:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:238
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:390
+#: 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:414
 msgid "unlimited"
 msgstr "neomezený"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1401
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1648
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:63
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:355
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:378
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:413
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:446
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:512
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:450
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:545
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:53
 #: modules/luci-base/luasrc/view/cbi/network_netlist.htm:38
 msgid "unspecified"
@@ -6239,7 +6406,7 @@ msgstr "nespecifikovaný"
 msgid "unspecified -or- create:"
 msgstr "nespecifikovaný -nebo- vytvořit:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:366
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:344
 msgid "untagged"
 msgstr "neoznačený"
 
@@ -6320,8 +6487,8 @@ msgstr ""
 msgid "valid address:port"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:523
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:527
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:529
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:533
 msgid "valid date (YYYY-MM-DD)"
 msgstr ""
 
@@ -6358,7 +6525,7 @@ msgstr ""
 msgid "valid network in address/netmask notation"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:498
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:504
 msgid "valid phone digit (0-9, \"*\", \"#\", \"!\" or \".\")"
 msgstr ""
 
@@ -6371,11 +6538,11 @@ msgstr ""
 msgid "valid port value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:503
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:509
 msgid "valid time (HH:MM:SS)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:425
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:431
 msgid "value between %d and %d characters"
 msgstr ""
 
@@ -6391,14 +6558,23 @@ msgstr ""
 msgid "value smaller or equal to %f"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:430
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:425
+msgid "value with %d characters"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:436
 msgid "value with at least %d characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:435
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:441
 msgid "value with at most %d characters"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1169
+msgid "weak security"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:221
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:232
@@ -6409,6 +6585,197 @@ msgstr "ano"
 msgid "« Back"
 msgstr "« Zpět"
 
+#~ msgid "Specifies the listening port of this <em>Dropbear</em> instance"
+#~ msgstr ""
+#~ "Určuje port na kterém bude tato instance <em>Dropbearu</em> naslouchat"
+
+#~ msgid "Switch %q (%s)"
+#~ msgstr "Směrovač číslo %q (%s)"
+
+#~ msgid "VLANs on %q (%s)"
+#~ msgstr "VLANy na %q (%s)"
+
+#~ msgid "Antenna 1"
+#~ msgstr "Anténa 1"
+
+#~ msgid "Antenna 2"
+#~ msgstr "Anténa 2"
+
+#~ msgid "Antenna Configuration"
+#~ msgstr "Konfigurace antén"
+
+#~ msgid "Back to overview"
+#~ msgstr "Zpět k přehledu"
+
+#~ msgid "Back to scan results"
+#~ msgstr "Zpět k výsledkům vyhledávání"
+
+#~ msgid "Broadcom 802.11%s Wireless Controller"
+#~ msgstr "Broadcom 802.11%s bezdrátový ovladač"
+
+#~ msgid "Broadcom BCM%04x 802.11 Wireless Controller"
+#~ msgstr "Broadcom modul BCM%04x 802.11 bezdrátový ovladač"
+
+#~ msgid "Common Configuration"
+#~ msgstr "Společná nastavení"
+
+#~ msgid "Connect"
+#~ msgstr "Připojit"
+
+#~ msgid "Connection Limit"
+#~ msgstr "Omezení počtu připojení"
+
+#~ msgid "Cover the following interface"
+#~ msgstr "Pokrýt následující rozhraní"
+
+#~ msgid "Cover the following interfaces"
+#~ msgstr "Pokrýt následující rozhraní"
+
+#~ msgid "Create Interface"
+#~ msgstr "Vytvořit rozhraní"
+
+#~ msgid "Create a bridge over multiple interfaces"
+#~ msgstr "Vytvořit síťový most přes více rozhraní"
+
+#~ msgid "Diversity"
+#~ msgstr "Diverzita"
+
+#~ msgid "Edit this interface"
+#~ msgstr "Upravit toto rozhraní"
+
+#~ msgid "Frame Bursting"
+#~ msgstr "Dávkování rámců"
+
+#~ msgid "Generic 802.11%s Wireless Controller"
+#~ msgstr "Generic 802.11%s Wireless Controller"
+
+#~ msgid "Install package %q"
+#~ msgstr "Instalovat balíček %q"
+
+#~ msgid "Interface Overview"
+#~ msgstr "Přehled rozhraní"
+
+#~ msgid "Missing protocol extension for proto %q"
+#~ msgstr "Chybějící rozšíření protokolu %q"
+
+#~ msgid "Name of the new interface"
+#~ msgstr "Název nového rozhraní"
+
+#~ msgid "No network configured on this device"
+#~ msgstr "Síť není nastavena na tomto zařízení"
+
+#~ msgid "No network name specified"
+#~ msgstr "Neuvedeno jméno sítě"
+
+#~ msgid "Not associated"
+#~ msgstr "Neasociováno"
+
+#~ msgid ""
+#~ "On this page you can configure the network interfaces. You can bridge "
+#~ "several interfaces by ticking the \"bridge interfaces\" field and enter "
+#~ "the names of several network interfaces separated by spaces. You can also "
+#~ "use <abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
+#~ "<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
+#~ "<samp>eth0.1</samp>)."
+#~ msgstr ""
+#~ "Na této stránce můžete nastavit síťová rozhraní. Můžete přemostit několik "
+#~ "rozhraní zaškrtnutím pole \"přemostit rozhraní\" a zápisem názvů "
+#~ "rozhraní, vzájemně oddělených mezerami. Také můžete použít <abbr title="
+#~ "\"Virtual Local Area Network\">VLAN</abbr> zápis <samp>INTERFACE.VLANNR</"
+#~ "samp> (<abbr title=\"například\">např.</abbr>: <samp>eth0.1</samp>)."
+
+#~ msgid "Package libiwinfo required!"
+#~ msgstr "Vyžadován balíček libiwinfo!"
+
+#~ msgid "Protocol of the new interface"
+#~ msgstr "Protokol nového rozhraní"
+
+#~ msgid "Protocol support is not installed"
+#~ msgstr "Podpora pro protokol není nainstalována"
+
+#~ msgid ""
+#~ "Really delete this wireless network? The deletion cannot be undone! You "
+#~ "might lose access to this device if you are connected via this network."
+#~ msgstr ""
+#~ "Opravdu odstranit bezdrátovou síť? Odstranění nelze vrátit zpět!\n"
+#~ "Můžete ztratit přístup k zařízení, pokud jste připojeni prostřednictvím "
+#~ "této sítě."
+
+#~ msgid "Receiver Antenna"
+#~ msgstr "Přijímací anténa"
+
+#~ msgid "Repeat scan"
+#~ msgstr "Opakovat skenování"
+
+#~ msgid "Replace entry"
+#~ msgstr "Nahradit vstup"
+
+#~ msgid "Separate Clients"
+#~ msgstr "Oddělovat klienty"
+
+#~ msgid "Slot time"
+#~ msgstr "Time sloty"
+
+#, fuzzy
+#~ msgid ""
+#~ "The <em>Device Configuration</em> section covers physical settings of the "
+#~ "radio hardware such as channel, transmit power or antenna selection which "
+#~ "are shared among all defined wireless networks (if the radio hardware is "
+#~ "multi-SSID capable). Per network settings like encryption or operation "
+#~ "mode are grouped in the <em>Interface Configuration</em>."
+#~ msgstr ""
+#~ "Sekce <em>Nastavení zařízení</em> pokrývá fyzické nastavení radiového "
+#~ "hardwaru jako kanál, vysílací výkon nebo výběr antény, které je sdíleno "
+#~ "mezi všemi bezdrátovými sítěmi (pokud hardware podporuje multi-SSID). "
+#~ "Nastavení konkrétní sítě jako šifrování, operační mód jsou seskupeny v "
+#~ "sekci <em>Nastavení rozhraní</em>."
+
+#~ msgid ""
+#~ "The <em>libiwinfo-lua</em> package is not installed. You must install "
+#~ "this component for working wireless configuration!"
+#~ msgstr ""
+#~ "Balíček <em>libiwinfo-lua</em> není nainstalován. Tato komponenta musí "
+#~ "být nainstalována, aby fungovalo nastavení bezdátové sítě!"
+
+#~ msgid "The given network name is not unique"
+#~ msgstr "Zadané jméno sítě není jedinečné"
+
+#, fuzzy
+#~ msgid ""
+#~ "The hardware is not multi-SSID capable and the existing configuration "
+#~ "will be replaced if you proceed."
+#~ msgstr ""
+#~ "Tento hardware nepodporuje multi-SSID. Pokud budete pokračovat, "
+#~ "existující konfigurace bude nahrazena."
+
+#~ msgid "The selected protocol needs a device assigned"
+#~ msgstr "Vybraný protokol potřebuje mít přiřazeno zařízení"
+
+#~ msgid ""
+#~ "There is no device assigned yet, please attach a network device in the "
+#~ "\"Physical Settings\" tab"
+#~ msgstr ""
+#~ "Zatím zde není přiřazeno zařízení, prosím připojte nějaké v záložce "
+#~ "\"Fyzické nastavení\""
+
+#~ msgid "Transmission Rate"
+#~ msgstr "Vysílací rychlost"
+
+#~ msgid "Transmit Power"
+#~ msgstr "Vysílací výkon"
+
+#~ msgid "Transmitter Antenna"
+#~ msgstr "Anténa vysílače"
+
+#~ msgid "Uploaded File"
+#~ msgstr "Nahrát soubor"
+
+#~ msgid "Wireless is restarting..."
+#~ msgstr "Probíhá restartování bezdrátové sítě..."
+
+#~ msgid "hidden"
+#~ msgstr "skrytý"
+
 #~ msgid "Back"
 #~ msgstr "Zpět"
 
@@ -6539,9 +6906,6 @@ msgstr "« Zpět"
 #~ msgid "Hermes 802.11b Wireless Controller"
 #~ msgstr "Hermes 802.11b bezdrátový ovladač"
 
-#~ msgid "Interface is shutting down..."
-#~ msgstr "Rozhraní se vypíná..."
-
 #~ msgid "Interface reconnected"
 #~ msgstr "Rozhraní bylo znovu připojeno"
 
diff --git a/modules/luci-base/po/de/base.po b/modules/luci-base/po/de/base.po
index 9d4a05425..26911c5b3 100644
--- a/modules/luci-base/po/de/base.po
+++ b/modules/luci-base/po/de/base.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-05-26 17:57+0200\n"
-"PO-Revision-Date: 2019-07-19 18:17+0200\n"
+"PO-Revision-Date: 2019-09-11 14:00+0200\n"
 "Last-Translator: Jo-Philipp Wich <jo@mein.io>\n"
 "Language-Team: \n"
 "Language: de\n"
@@ -13,19 +13,20 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.2.1\n"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:133
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:857
 msgid "%.1f dB"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:109
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:122
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 msgid "%d Bit"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1641
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2194
 msgid "%d invalid field(s)"
 msgstr "%d ungültige Felder"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:281
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:31
 msgid "%s is untagged in multiple VLANs!"
 msgstr "%s darf nicht ohne VLAN-Tag in mehreren VLAN-Gruppen vorkommen!"
 
@@ -63,19 +64,19 @@ msgid "-- Additional Field --"
 msgstr "-- Zusätzliches Feld --"
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:258
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1401
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1533
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:250
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:350
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1114
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1648
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1780
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:314
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:414
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1178
 #: modules/luci-base/luasrc/view/cbi/header.htm:5
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:26
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:88
 msgid "-- Please choose --"
 msgstr "-- Bitte auswählen --"
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:259
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:351
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1115
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:415
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1179
 #: modules/luci-base/luasrc/view/cbi/header.htm:6
 msgid "-- custom --"
 msgstr "-- benutzerdefiniert --"
@@ -98,7 +99,7 @@ msgstr "-- UUID vergleichen --"
 msgid "-- please select --"
 msgstr "-- Bitte auswählen --"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:382
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:814
 msgid "0 = not using RSSI threshold, 1 = do not change driver default"
 msgstr ""
 "0 = keinen Signal-Schwellwert benutzen, 1 = Treiber-Default nicht ändern"
@@ -111,10 +112,11 @@ msgstr "Systemlast (1 Minute):"
 msgid "15 Minute Load:"
 msgstr "Systemlast (15 Minuten):"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:924
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1337
 msgid "4-character hexadecimal ID"
 msgstr "vierstellige hexadezimale ID"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:11
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:18
 msgid "464XLAT (CLAT)"
 msgstr ""
@@ -123,47 +125,47 @@ msgstr ""
 msgid "5 Minute Load:"
 msgstr "Systemlast (5 Minuten):"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:960
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1366
 msgid "6-octet identifier as a hex string - no colons"
 msgstr "sechstellige hexadezimale ID (ohne Doppelpunkte)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:891
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1310
 msgid "802.11r Fast Transition"
 msgstr "802.11r: Schnelle Client-Übergabe"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1157
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1567
 msgid "802.11w Association SA Query maximum timeout"
 msgstr "Maximales Timeout für Quelladressprüfungen (SA Query)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1574
 msgid "802.11w Association SA Query retry timeout"
 msgstr "Wiederholungsintervall für Quelladressprüfungen (SA Query)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1133
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1533
 msgid "802.11w Management Frame Protection"
 msgstr "802.11w: Schutz von Management-Frames aktivieren"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1156
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1567
 msgid "802.11w maximum timeout"
 msgstr "802.11w: Maximales Timeout"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1165
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1574
 msgid "802.11w retry timeout"
 msgstr "802.11w: Wiederholungsintervall"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:399
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:831
 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:224
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:225
 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:215
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:216
 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:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
 msgid ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
 "order of the resolvfile"
@@ -171,11 +173,11 @@ msgstr ""
 "<abbr title=\"Domain Name System\">DNS</abbr>-Server in der Reihenfolge der "
 "Resolv-Datei abfragen"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:388
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:820
 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:351
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:373
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:45
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
 msgstr "IPv4-Adresse"
@@ -185,8 +187,8 @@ msgstr "IPv4-Adresse"
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
 msgstr "IPv4-Gateway"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:555
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:35
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:506
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr "IPv4-Netzmaske"
 
@@ -200,31 +202,31 @@ msgstr "IPv6 Host- oder Netzwerk-Addresse (CIDR)"
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 msgstr "IPv6-Gateway"
 
-#: 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:402
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
 msgstr "IPv6-Suffix (hexadezimal)"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:58
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:35
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:33
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "LED Konfiguration"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:67
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:51
 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:328
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:329
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:46
 msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr "MAC-Adresse"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:372
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 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:233
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:234
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> leases"
@@ -232,7 +234,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:242
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> packet size"
@@ -240,11 +242,11 @@ 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:251
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:252
 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
 msgstr "<abbr title=\"maximal\">Max.</abbr> Anzahl gleichzeitiger Abfragen"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:10
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:42
 msgid ""
 "<br/>Note: you need to manually restart the cron service if the crontab file "
 "was empty before editing."
@@ -252,56 +254,60 @@ msgstr ""
 "<br/>Hinweis: Der Cron-Dienst muss manuell neu gestartet werden wenn die "
 "Crontab-Datei vor der Bearbeitung leer war."
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:817
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1605
+msgid "A directory with the same name already exists."
+msgstr "Es existiert bereits ein Verzeichnis mit dem gleichen Namen."
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:863
 msgid "A new login is required since the authentication session expired."
 msgstr ""
 "Ein neuer Login ist erforderlich da die Benutzersitzung abgelaufen ist."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:114
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:837
 msgid "A43C + J43 + A43"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:838
 msgid "A43C + J43 + A43 + V43"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:850
 msgid "ADSL"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:826
 msgid "ANSI T1.413"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:33
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:47
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:23
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:94
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:86
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:67
 msgid "APN"
 msgstr "APN"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:56
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:175
 msgid "ARP retry threshold"
 msgstr "Grenzwert für ARP-Auflösungsversuche"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:122
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:845
 msgid "ATM (Asynchronous Transfer Mode)"
 msgstr "ATM (Asynchroner Transfer-Modus)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:144
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:866
 msgid "ATM Bridges"
 msgstr "ATM Brücken"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:178
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:21
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:898
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:66
 msgid "ATM Virtual Channel Identifier (VCI)"
 msgstr "ATM Virtual Channel Identifier (VCI)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:179
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:26
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:899
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:70
 msgid "ATM Virtual Path Identifier (VPI)"
 msgstr "ATM Virtual Path Identifier (VPI)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:866
 msgid ""
 "ATM bridges expose encapsulated ethernet in AAL5 connections as virtual "
 "Linux network interfaces which can be used in conjunction with DHCP or PPP "
@@ -311,8 +317,8 @@ msgstr ""
 "Linux Netzwerkschnittstellen welche z.B. in Verbindung mit DHCP oder PPP "
 "genutzt werden können um sich in das Providernetzwerk einzuwählen."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:184
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:905
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:62
 msgid "ATM device number"
 msgstr "ATM Geräteindex"
 
@@ -321,17 +327,17 @@ msgid "ATU-C System Vendor ID"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:251
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:495
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:499
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:528
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:532
 msgid "Absent Interface"
-msgstr ""
+msgstr "Nicht vorhandene Schnittstelle"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:19
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
 msgid "Access Concentrator"
 msgstr "Access Concentrator"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:368
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:470
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:802
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
 msgid "Access Point"
 msgstr "Access Point"
 
@@ -354,7 +360,7 @@ msgid "Active Connections"
 msgstr "Aktive Verbindungen"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:68
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:30
 msgid "Active DHCP Leases"
 msgstr "Aktive DHCP-Leases"
 
@@ -362,55 +368,75 @@ msgstr "Aktive DHCP-Leases"
 msgid "Active DHCPv6 Leases"
 msgstr "Aktive DHCPv6-Leases"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1951
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:370
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:12
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2190
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:804
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:23
 msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:650
-#: modules/luci-base/htdocs/luci-static/resources/form.js:651
-#: modules/luci-base/htdocs/luci-static/resources/form.js:666
-#: modules/luci-base/htdocs/luci-static/resources/form.js:667
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1290
+#: modules/luci-base/htdocs/luci-static/resources/form.js:902
+#: modules/luci-base/htdocs/luci-static/resources/form.js:904
+#: modules/luci-base/htdocs/luci-static/resources/form.js:917
+#: modules/luci-base/htdocs/luci-static/resources/form.js:918
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1539
 #: modules/luci-base/luasrc/view/cbi/nsection.htm:25
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:189
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:197
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:39
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:47
 #: modules/luci-base/luasrc/view/cbi/ucisection.htm:54
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:703
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:60
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:870
+msgid "Add ATM Bridge"
+msgstr "ATM-Brücke hinzufügen"
+
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:92
 msgid "Add IPv4 address…"
 msgstr "IPv4-Adresse hinzufügen…"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:129
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:204
 msgid "Add IPv6 address…"
 msgstr "IPv6-Adresse hinzufügen…"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:143
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:149
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:38
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:47
+msgid "Add LED action"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:215
+msgid "Add VLAN"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:14
+msgid "Add instance"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:153
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:159
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:250
 msgid "Add key"
 msgstr "Schlüssel hinzufügen"
 
-#: 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:155
 msgid "Add local domain suffix to names served from hosts files"
 msgstr "Lokalen Domainsuffx an Namen aus der Hosts-Datei anhängen"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:705
 msgid "Add new interface..."
 msgstr "Neue Schnittstelle hinzufügen..."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:104
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:99
+msgid "Add peer"
+msgstr "Peer hinzufügen"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:105
 msgid "Additional Hosts files"
 msgstr "Zusätzliche Hosts-Dateien"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:161
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
 msgid "Additional servers file"
 msgstr "Zusätzliche Nameserver-Datei"
 
@@ -437,7 +463,7 @@ msgstr "Zusätzliche Nameserver-Datei"
 msgid "Address"
 msgstr "Adresse"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:12
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:151
 msgid "Address to access local relay bridge"
 msgstr "Adresse der lokalen Relay-Brücke"
 
@@ -446,13 +472,13 @@ msgstr "Adresse der lokalen Relay-Brücke"
 msgid "Administration"
 msgstr "Administration"
 
-#: 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:70
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:505
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:896
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:24
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:189
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:463
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:176
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:143
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:364
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:742
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:799
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:50
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:34
 msgid "Advanced Settings"
@@ -462,25 +488,27 @@ msgstr "Erweiterte Einstellungen"
 msgid "Aggregate Transmit Power(ACTATP)"
 msgstr "Vollständige Sendeleistung (ACTATP)"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:175
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:166
 msgid "Alert"
 msgstr "Alarm"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1628
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1834
 #: modules/luci-base/luasrc/model/network.lua:1416
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:54
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:78
 msgid "Alias Interface"
 msgstr "Alias-Schnittstelle"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:138
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:66
 msgid "Alias of \"%s\""
 msgstr "Alias von \"%s\""
 
-#: 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:170
 msgid "All Servers"
 msgstr "Alle Server"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:114
 msgid ""
 "Allocate IP addresses sequentially, starting from the lowest available "
 "address"
@@ -488,68 +516,66 @@ msgstr ""
 "IP-Adressen sequenziell vergeben, beginnend mit der kleinsten verfügbaren "
 "Adresse"
 
-#: 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:113
 msgid "Allocate IP sequentially"
 msgstr "IPs sequenziell vergeben"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:24
 msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
 msgstr "Erlaube Anmeldung per Passwort"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:545
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:987
 msgid "Allow AP mode to disconnect STAs based on low ACK condition"
 msgstr ""
 "Erlaube dem Access-Point die Trennung von Clients mit schlechter "
 "Signalqualität"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:462
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:589
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:891
 msgid "Allow all except listed"
 msgstr "Alle außer gelistete erlauben"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:236
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:767
 msgid "Allow legacy 802.11b rates"
 msgstr "Veraltete 802.11b-Raten erlauben"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:461
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:588
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:890
 msgid "Allow listed only"
 msgstr "Nur gelistete erlauben"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:198
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:199
 msgid "Allow localhost"
 msgstr "Erlaube localhost"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:47
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:35
 msgid "Allow remote hosts to connect to local SSH forwarded ports"
 msgstr "Entfernten Hosts erlauben zu lokale SSH-Tunnel-Ports zu verbinden"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:38
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:30
 msgid "Allow root logins with password"
 msgstr "\"root\" Login mit Passwort aktivieren"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:39
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:30
 msgid "Allow the <em>root</em> user to login with password"
 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:199
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:200
 msgid ""
 "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
 msgstr ""
 "Dies erlaubt DNS-Antworten im 127.0.0.0/8 Bereich der z.B. für RBL Dienste "
 "genutzt wird"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:135
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:122
 msgid "Allowed IPs"
 msgstr "Erlaubte IP-Adressen"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:549
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:602
 msgid "Always announce default router"
 msgstr "Immer Defaultrouter ankündigen"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:259
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:782
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
 "option does not comply with IEEE 802.11n-2009!"
@@ -558,106 +584,92 @@ msgstr ""
 "benachbarten Funkzellen überlappt. Die Benutzung dieser Option ist eine "
 "Verletzung des IEEE 802.11n-2009 Standards!"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:95
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:818
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:119
 msgid "Annex"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:96
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:819
 msgid "Annex A + L + M (all)"
 msgstr "Annex A, L und M (alle)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:827
 msgid "Annex A G.992.1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:828
 msgid "Annex A G.992.2"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:829
 msgid "Annex A G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:830
 msgid "Annex A G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:97
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:820
 msgid "Annex B (all)"
 msgstr "Annex B (alle Arten)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:823
 msgid "Annex B G.992.1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:824
 msgid "Annex B G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:102
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:825
 msgid "Annex B G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:98
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:821
 msgid "Annex J (all)"
 msgstr "Annex J (alle Arten)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:831
 msgid "Annex L G.992.3 POTS 1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:99
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:822
 msgid "Annex M (all)"
 msgstr "Annex M (alle Arten)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:109
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:832
 msgid "Annex M G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:833
 msgid "Annex M G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:550
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:602
 msgid "Announce as default router even if no public prefix is available."
 msgstr ""
 "Kündigt im Netzwerk einen Defaultrouter an, auch wenn kein öffentlicher "
 "Adressbereich verfügbar ist."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:555
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:607
 msgid "Announced DNS domains"
 msgstr "Angekündigte Suchdomains"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:554
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:606
 msgid "Announced DNS servers"
 msgstr "Angekündigte DNS Server"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1093
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1496
 msgid "Anonymous Identity"
 msgstr "Anonyme Identität"
 
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:53
 msgid "Anonymous Mount"
-msgstr "automatische Mountpunkte"
+msgstr "Automatische Mountpunkte"
 
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:49
 msgid "Anonymous Swap"
-msgstr "automatische Swap-Aktivierung"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:322
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:329
-msgid "Antenna 1"
-msgstr "Antenne 1"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:323
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:330
-msgid "Antenna 2"
-msgstr "Antenne 2"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:246
-msgid "Antenna Configuration"
-msgstr "Antennenkonfiguration"
+msgstr "Automatische Swap-Aktivierung"
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:71
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:160
@@ -666,13 +678,13 @@ msgstr "Antennenkonfiguration"
 msgid "Any zone"
 msgstr "Beliebige Zone"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1981
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2522
 msgid "Apply request failed with status <code>%h</code>"
 msgstr ""
 "Anforderung zur Anwendung der Änderungen mit Status <code>%h</code> "
 "fehlgeschlagen"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1867
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2409
 msgid "Apply unchecked"
 msgstr "Ungeprüft übernehmen"
 
@@ -680,8 +692,8 @@ msgstr "Ungeprüft übernehmen"
 msgid "Architecture"
 msgstr "Architektur"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:19
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:184
+#: 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 ""
@@ -692,15 +704,15 @@ msgstr ""
 msgid "Assign interfaces..."
 msgstr "Schnittstellen zuweisen..."
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:124
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:24
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:189
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:31
 msgid ""
 "Assign prefix parts using this hexadecimal subprefix ID for this interface."
 msgstr ""
 "Der Schnittstelle zugewiesene Partitionen des Adressraums werden anhand "
 "dieser hexadezimalen ID gewählt."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:148
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1967
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:22
 msgid "Associated Stations"
 msgstr "Assoziierte Clients"
@@ -709,20 +721,20 @@ msgstr "Assoziierte Clients"
 msgid "Associations"
 msgstr "Assoziierungen"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:39
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:37
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:101
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:64
 msgid "Auth Group"
 msgstr "Berechtigungsgruppe"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1027
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1421
 msgid "Authentication"
 msgstr "Authentifizierung"
 
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:29
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:70
 msgid "Authentication Type"
 msgstr "Authentifizierungstyp"
 
-#: 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:78
 msgid "Authoritative"
 msgstr "Authoritativ"
 
@@ -740,20 +752,22 @@ msgstr "Autorisierung benötigt"
 msgid "Auto Refresh"
 msgstr "Automatisches Neuladen"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:53
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:7
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:17
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:67
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:24
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:36
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:42
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:36
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:106
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:24
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:98
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:50
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:94
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:81
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:55
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:68
 msgid "Automatic"
 msgstr "Automatisch"
 
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:7
 #: protocols/luci-proto-hnet/luasrc/model/network/proto_hnet.lua:7
 msgid "Automatic Homenet (HNCP)"
-msgstr "automatisches Homenet-Protokoll (HNCP)"
+msgstr "Automatisches Homenet-Protokoll (HNCP)"
 
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:65
 msgid "Automatically check filesystem for errors before mounting"
@@ -793,21 +807,21 @@ msgstr "Verfügbar"
 msgid "Average:"
 msgstr "Durchschnitt:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:116
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:839
 msgid "B43 + B43C"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:840
 msgid "B43 + B43C + V43"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:48
 msgid "BR / DMR / AFTR"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:43
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:75
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1620
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:176
 msgid "BSSID"
 msgstr "BSSID"
@@ -821,19 +835,11 @@ msgstr "Zurück zur Übersicht"
 msgid "Back to configuration"
 msgstr "Zurück zur Konfiguration"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:48
-msgid "Back to overview"
-msgstr "Zurück zur Übersicht"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:20
-msgid "Back to scan results"
-msgstr "Zurück zu den Scan-Ergebnissen"
-
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:17
 msgid "Backup"
 msgstr "Sichern"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:38
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:36
 msgid "Backup / Flash Firmware"
 msgstr "Backup / Firmware Update"
 
@@ -846,11 +852,11 @@ msgid "Bad address specified!"
 msgstr "Ungültige Adresse angegeben!"
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:158
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:288
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:368
 msgid "Band"
 msgstr "Frequenztyp"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:261
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:785
 msgid "Beacon Interval"
 msgstr "Beacon-Intervall"
 
@@ -865,7 +871,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:293
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:294
 msgid ""
 "Bind dynamically to interfaces rather than wildcard address (recommended as "
 "linux default)"
@@ -873,75 +879,81 @@ msgstr ""
 "Dynamisch an Schnittstellen binden statt die globale Standardadresse zu "
 "benutzen (als Standard für Linux-Systeme empfohlen)"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:16
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:48
 msgid "Bind interface"
 msgstr "An Schnittstelle binden"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:16
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:48
 msgid "Bind the tunnel to this interface (optional)."
 msgstr "Tunnelendpunkt an diese Schnittstelle binden (optional)"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:49
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:134
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:187
 msgid "Bitrate"
 msgstr "Bitrate"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:172
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
 msgid "Bogus NX Domain Override"
 msgstr "Ungültige \"NX-Domain\" Antworten ignorieren"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1634
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1840
 #: modules/luci-base/luasrc/model/network.lua:1420
 msgid "Bridge"
 msgstr "Bridge"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:264
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:368
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:678
 msgid "Bridge interfaces"
 msgstr "Netzwerkbrücke"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:906
 msgid "Bridge unit number"
 msgstr "Geräteindex der Brücke"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:250
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:364
 msgid "Bring up on boot"
 msgstr "Während des Bootvorgangs starten"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:35
-msgid "Broadcom 802.11%s Wireless Controller"
-msgstr "Broadcom 802.11%s W-LAN Adapter"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:45
-msgid "Broadcom BCM%04x 802.11 Wireless Controller"
-msgstr "Broadcom BCM%04x 802.11 W-LAN Adapter"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1697
+msgid "Browse…"
+msgstr "Durchsuchen…"
 
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:18
 msgid "Buffered"
 msgstr "Gepuffert"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:75
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:134
 msgid "CA certificate; if empty it will be saved after the first connection."
 msgstr ""
 "CA-Zertifikat (wird beim ersten Verbindungsaufbau automatisch gespeichert "
-"wenn leer). "
+"wenn leer)."
+
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:7
+msgid "CLAT configuration failed"
+msgstr "CLAT-Konfiguration fehlgeschlagen"
 
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:13
 msgid "CPU usage (%)"
 msgstr "CPU-Nutzung (%)"
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:21
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:53
 msgid "Call failed"
 msgstr "Anruf fehlgeschlagen"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1789
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:14
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:52
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:711
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:948
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1839
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:191
 #: modules/luci-mod-system/luasrc/view/admin_system/upgrade.htm:60
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:6
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:17
 msgid "Category"
 msgstr "Kategorie"
 
@@ -959,13 +971,7 @@ msgstr "Achtung: Systemupgrade wird erzwungen"
 msgid "Chain"
 msgstr "Kette"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:9
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:14
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:24
-msgid "Change login password"
-msgstr "Login-Passwort ändern"
-
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1744
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 msgid "Changes"
 msgstr "Änderungen"
 
@@ -973,35 +979,23 @@ msgstr "Änderungen"
 msgid "Changes applied."
 msgstr "Änderungen angewendet."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2004
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2545
 msgid "Changes have been reverted."
-msgstr "Änderungen wurden verworfen"
+msgstr "Änderungen wurden verworfen."
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:43
 msgid "Changes the administrator password for accessing the device"
 msgstr "Ändert das Administratorpasswort für den Zugriff auf dieses Gerät"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:10
-msgid "Changing password…"
-msgstr "Ändere Passwort…"
-
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:162
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:45
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:87
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:174
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:376
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1618
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:186
 msgid "Channel"
 msgstr "Kanal"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:119
-msgid ""
-"Channel %d is not available in the %s regulatory domain and has been auto-"
-"adjusted to %d."
-msgstr ""
-"Kanal %d ist in der Regulierungszone \"%s\" nicht verfügbar und wurde "
-"automatisch auf %d gesetzt."
-
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:229
 msgid "Check"
 msgstr "Prüfen"
@@ -1010,7 +1004,7 @@ msgstr "Prüfen"
 msgid "Check filesystems before mount"
 msgstr "Dateisysteme prüfen"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1806
 msgid "Check this option to delete the existing networks from this radio."
 msgstr ""
 "Diese Option setzen um existierende Netzwerke auf dem Radio zu löschen."
@@ -1023,8 +1017,8 @@ msgstr "Prüfsumme"
 msgid "Choose mtdblock"
 msgstr "Wähle \"mtdblock\" Datei"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:358
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:443
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1829
 msgid ""
 "Choose the firewall zone you want to assign to this interface. Select "
 "<em>unspecified</em> to remove the interface from the associated zone or "
@@ -1033,10 +1027,10 @@ msgid ""
 msgstr ""
 "Ordnet dieser Schnittstelle eine Firewallzone zu. Den Wert "
 "<em>unspezifiziert</em> wählen um die Schnittstelle von der Zone zu lösen "
-"oder das <em>erstellen</em> Feld ausfüllen um eine neue Zone direkt "
-"anzulegen und zuzuweisen."
+"oder das <em>erzeugen</em> Feld ausfüllen um eine neue Zone direkt anzulegen "
+"und zuzuweisen."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:834
 msgid ""
 "Choose the network(s) you want to attach to this wireless interface or fill "
 "out the <em>create</em> field to define a new network."
@@ -1044,11 +1038,11 @@ msgstr ""
 "Wählt die Netzwerke die dieser WLAN-Schnittstelle zugeordnet werden. Das "
 "<em>erstelle</em>-Feld ausfüllen um ein neues Netzwerk zu erzeugen."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:614
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1023
 msgid "Cipher"
 msgstr "Verschlüsselungsalgorithmus"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:61
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:91
 msgid "Cisco UDP encapsulation"
 msgstr "Cisco UDP-Kapselung"
 
@@ -1069,34 +1063,34 @@ msgstr ""
 "herunterzuladen. (Hinweis: Diese Funktionalität ist nur für Experten "
 "gedacht!)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1950
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:369
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:471
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2189
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:803
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:908
 msgid "Client"
 msgstr "Client"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:55
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:52
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:47
 msgid "Client ID to send when requesting DHCP"
 msgstr "Zu sendende Client-ID bei DHCP Anfragen"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:145
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:151
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:155
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:161
 msgid "Close"
 msgstr "Schließen"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:146
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:119
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:125
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:127
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:98
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:119
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:157
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:141
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:115
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:138
 msgid ""
 "Close inactive connection after the given amount of seconds, use 0 to "
 "persist connection"
 msgstr ""
 "Inaktive Verbindungen nach Ablauf dieser Zeit in Sekunden schließen (0 um "
-"die Verbindung immer aufrecht zu erhalten)."
+"die Verbindung immer aufrecht zu erhalten)"
 
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/backupfiles.lua:49
 msgid "Close list..."
@@ -1105,12 +1099,9 @@ msgstr "Schließe Liste..."
 #: modules/luci-base/luasrc/view/lease_status.htm:77
 #: modules/luci-base/luasrc/view/lease_status.htm:98
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:118
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:37
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:24
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1965
 #: modules/luci-mod-network/luasrc/view/admin_network/iface_status.htm:6
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:40
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:30
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:8
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:398
 #: modules/luci-mod-status/luasrc/view/admin_status/index/30-network.htm:11
 #: modules/luci-mod-status/luasrc/view/admin_status/index/50-dsl.htm:17
@@ -1124,15 +1115,19 @@ msgstr "Sammle Daten..."
 msgid "Command"
 msgstr "Befehl"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:193
+msgid "Command OK"
+msgstr "Kommando OK"
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:41
+msgid "Command failed"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:64
 msgid "Comment"
 msgstr "Kommentar"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:185
-msgid "Common Configuration"
-msgstr "Allgemeine Konfiguration"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
 msgid ""
 "Complicates key reinstallation attacks on the client side by disabling "
 "retransmission of EAPOL-Key frames that are used to install keys. This "
@@ -1144,13 +1139,14 @@ msgstr ""
 "Kompatibilitätsprobleme verursachen und die Zuverlässigkeit von "
 "Schlüsselerneuerungen in ausgelasteten Umgebungen verringern."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1744
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 #: modules/luci-base/luasrc/controller/admin/uci.lua:11
 #: modules/luci-mod-system/luasrc/view/admin_system/backupfiles.htm:9
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:13
 msgid "Configuration"
 msgstr "Konfiguration"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:21
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:63
 msgid "Configuration failed"
 msgstr "Konfiguration fehlgeschlagen"
@@ -1159,42 +1155,52 @@ msgstr "Konfiguration fehlgeschlagen"
 msgid "Configuration files will be kept"
 msgstr "Konfigurationsdateien werden beibehalten"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1915
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2456
 msgid "Configuration has been applied."
 msgstr "Die Konfiguration wurde angewendet."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1848
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2395
 msgid "Configuration has been rolled back!"
 msgstr "Die Konfiguration wurde zurückgerollt!"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:43
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:942
+msgid "Confirm disconnect"
+msgstr "Verbindungstrennung bestätigen"
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:50
 msgid "Confirmation"
 msgstr "Bestätigung"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:32
-msgid "Connect"
-msgstr "Verbinden"
-
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:72
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:105
 msgid "Connected"
 msgstr "Verbunden"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:338
-msgid "Connection Limit"
-msgstr "Verbindungslimit"
-
 #: modules/luci-base/htdocs/luci-static/resources/network.js:7
 #: modules/luci-base/luasrc/model/network.lua:27
 msgid "Connection attempt failed"
 msgstr "Verbindungsversuch fehlgeschlagen"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:203
+msgid "Connection lost"
+msgstr "Verbindung verloren"
+
 #: modules/luci-mod-status/luasrc/controller/admin/status.lua:32
 msgid "Connections"
 msgstr "Verbindungen"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1890
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:66
+msgid "Contents have been saved."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:618
+msgid "Continue"
+msgstr "Fortfahren"
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2431
 msgid ""
 "Could not regain access to the device after applying the configuration "
 "changes. You might need to reconnect if you modified network related "
@@ -1205,47 +1211,37 @@ msgstr ""
 "netzwerkbezogene Einstellungen wie die IP-Adresse oder W-LAN Passwörter "
 "geändert wurden."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:135
 msgid "Country"
 msgstr "Land"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:227
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:233
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:337
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:764
 msgid "Country Code"
 msgstr "Ländercode"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:36
-msgid "Cover the following interface"
-msgstr "Die folgende Schnittstelle abdecken"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:43
-msgid "Cover the following interfaces"
-msgstr "Die folgende Schnittstellen abdecken"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:357
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:86
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:443
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1829
 msgid "Create / Assign firewall-zone"
 msgstr "Firewallzone anlegen / zuweisen"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:9
-msgid "Create Interface"
-msgstr "Erzeuge Schnittstelle"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:735
+msgid "Create interface"
+msgstr "Schnittstelle anlegen"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:33
-msgid "Create a bridge over multiple interfaces"
-msgstr "Erzeuge Netzwerkbrücke über mehrere Schnittstellen"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:174
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:165
 msgid "Critical"
 msgstr "Kritisch"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:178
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:169
 msgid "Cron Log Level"
 msgstr "Cron Protokoll-Level"
 
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:519
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:521
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:447
+msgid "Current power"
+msgstr "Aktuelle Sendeleistung"
+
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:552
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:554
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:51
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:53
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:82
@@ -1253,7 +1249,7 @@ msgstr "Cron Protokoll-Level"
 msgid "Custom Interface"
 msgstr "Benutzerdefinierte Schnittstelle"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:36
 msgid "Custom delegated IPv6-prefix"
 msgstr "Delegiertes IPv6-Präfix"
 
@@ -1266,52 +1262,53 @@ msgstr ""
 "System verbleiben. Um dies zu vermeiden, sollte zuerst auf "
 "Werkseinstellungen zurückgesetzt werden."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:59
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:41
 msgid ""
 "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
 "\">LED</abbr>s if possible."
 msgstr "Passt das Verhalten der Geräte-LEDs an - wenn dies möglich ist."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:799
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1223
 msgid "DAE-Client"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:807
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1231
 msgid "DAE-Port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:815
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1239
 msgid "DAE-Secret"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:448
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:459
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:279
 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:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:61
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:62
 msgid "DHCP and DNS"
 msgstr "DHCP und DNS"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1195
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1385
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:16
 #: modules/luci-base/luasrc/model/network.lua:968
 msgid "DHCP client"
 msgstr "DHCP Client"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:571
 msgid "DHCP-Options"
 msgstr "DHCP-Optionen"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_dhcpv6.lua:7
 msgid "DHCPv6 client"
 msgstr "DHCPv6 Client"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:540
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:594
 msgid "DHCPv6-Mode"
 msgstr "DHCPv6-Modus"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:529
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:583
 msgid "DHCPv6-Service"
 msgstr "DHCPv6-Dienst"
 
@@ -1328,31 +1325,31 @@ msgstr "DHCPv6-Dienst"
 msgid "DNS"
 msgstr "DNS"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:183
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
 msgid "DNS forwardings"
 msgstr "DNS-Weiterleitungen"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:30
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:37
 msgid "DNS-Label / FQDN"
 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:136
 msgid "DNSSEC"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:139
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
 msgid "DNSSEC check unsigned"
 msgstr "DNSSEC Signaturstatus prüfen"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:73
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:99
 msgid "DPD Idle Timeout"
 msgstr "DPD Inaktivitätstimeout"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:14
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:41
 msgid "DS-Lite AFTR address"
 msgstr "DS-Lite AFTR-Adresse"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:92
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:815
 #: modules/luci-mod-status/luasrc/view/admin_status/index/50-dsl.htm:14
 msgid "DSL"
 msgstr ""
@@ -1361,11 +1358,11 @@ msgstr ""
 msgid "DSL Status"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:125
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:848
 msgid "DSL line mode"
 msgstr "DSL Leitungsmodus"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:519
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:963
 msgid "DTIM Interval"
 msgstr ""
 
@@ -1377,42 +1374,45 @@ msgstr "DUID"
 msgid "Data Rate"
 msgstr "Datenrate"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:169
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:180
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:160
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:171
 msgid "Debug"
 msgstr "Debug"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:759
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:783
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:807
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1183
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1207
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1231
 msgid "Default %d"
 msgstr "Standard %d"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:82
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:107
 msgid "Default Route"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:17
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:81
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:51
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:32
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:48
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:85
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:65
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:80
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:108
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:146
 msgid "Default gateway"
 msgstr "Default Gateway"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:541
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:594
 msgid "Default is stateless + stateful"
 msgstr "Der Standardwert ist zustandslos und zustandsorientiert"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:70
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:54
 msgid "Default state"
 msgstr "Ausgangszustand"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:503
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:553
 msgid "Define a name for this network."
-msgstr "Definiert einen Namen für dieses Netzwerk"
+msgstr "Definiert einen Namen für dieses Netzwerk."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:514
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:571
 msgid ""
 "Define additional DHCP options, for example "
 "\"<code>6,192.168.2.1,192.168.2.2</code>\" which advertises different DNS "
@@ -1421,35 +1421,47 @@ msgstr ""
 "Definiert zusätzliche DHCP-Optionen, z.B. \"<code>6,192.168.2.1,192.168.2.2</"
 "code>\" um einen anderen DNS-Server an Clients zu verteilen."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:705
-#: modules/luci-base/htdocs/luci-static/resources/form.js:958
-#: modules/luci-base/htdocs/luci-static/resources/form.js:959
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1271
+#: modules/luci-base/htdocs/luci-static/resources/form.js:966
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1210
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1216
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1524
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1758
 #: modules/luci-base/luasrc/view/cbi/nsection.htm:11
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:162
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:16
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:41
 msgid "Delete"
 msgstr "Löschen"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:178
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:187
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:193
 msgid "Delete key"
 msgstr "Schlüssel löschen"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:45
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1654
+msgid "Delete permission denied"
+msgstr "Löscherlaubnis verweigert"
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1656
+msgid "Delete request failed: %d %s"
+msgstr "Löschanforderung fehlgeschlagen: %d %s"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:723
 msgid "Delete this network"
 msgstr "Dieses Netzwerk löschen"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:519
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:963
 msgid "Delivery Traffic Indication Message Interval"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:102
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:108
 msgid "Description"
 msgstr "Beschreibung"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:224
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1754
+msgid "Deselect"
+msgstr "Abwählen"
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:215
 msgid "Design"
 msgstr "Design"
 
@@ -1461,16 +1473,18 @@ msgstr "Ziel"
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:46
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:151
 msgid "Destination zone"
-msgstr ""
+msgstr "Ziel-Zone"
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:54
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:177
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:43
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:13
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:38
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:73
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:33
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:52
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:85
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:86
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:72
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:154
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:253
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:86
@@ -1478,115 +1492,119 @@ msgstr ""
 msgid "Device"
 msgstr "Gerät"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:138
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:737
 msgid "Device Configuration"
 msgstr "Gerätekonfiguration"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:81
+msgid "Device is not active"
+msgstr "Netzwerkadapter ist nicht aktiv"
+
 #: modules/luci-mod-system/luasrc/view/admin_system/reboot.htm:23
 msgid "Device is rebooting..."
 msgstr "Das Gerät startet neu..."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1889
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:167
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:513
+msgid "Device is restarting…"
+msgstr "Netzwerkadapter startet neu…"
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2430
 msgid "Device unreachable!"
-msgstr "Das Gerät ist nicht erreichbar"
+msgstr "Das Gerät ist nicht erreichbar!"
 
 #: modules/luci-mod-system/luasrc/view/admin_system/reboot.htm:49
 msgid "Device unreachable! Still waiting for device..."
 msgstr "Gerät nicht erreichbar! Wartet immer noch..."
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:123
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:78
 #: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:61
 msgid "Diagnostics"
 msgstr "Diagnosen"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:45
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:60
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:101
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:93
 msgid "Dial number"
 msgstr "Einwahlnummer"
 
-#: modules/luci-base/luasrc/view/cbi/filebrowser.htm:99
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1554
 msgid "Directory"
 msgstr "Verzeichnis"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:131
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:715
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:754
 msgid "Disable"
 msgstr "Deaktivieren"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:472
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:531
 msgid ""
 "Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for "
 "this interface."
 msgstr ""
 "<abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Server auf "
-"dieser Schnittstelle deaktivieren"
+"dieser Schnittstelle deaktivieren."
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:64
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:93
 msgid "Disable Encryption"
 msgstr "Verschlüsselung deaktivieren"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:530
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:973
 msgid "Disable Inactivity Polling"
 msgstr "Inaktivitäts-Proben deaktivieren"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:713
 msgid "Disable this network"
 msgstr "Dieses Netzwerk deaktivieren"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:44
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:54
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:68
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:37
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:43
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:37
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1534
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:76
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:107
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:99
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:51
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:95
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:82
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:69
 msgid "Disabled"
 msgstr "Deaktiviert"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1139
-msgid "Disabled (default)"
-msgstr "Deaktiviert (Standard)"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:544
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:987
 msgid "Disassociate On Low Acknowledgement"
 msgstr "Trennung bei schlechtem Antwortverhalten"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:193
 msgid "Discard upstream RFC1918 responses"
 msgstr "Eingehende RFC1918-Antworten verwerfen"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:92
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:114
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:956
 msgid "Disconnect"
 msgstr "Trennen"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:22
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:64
 msgid "Disconnection attempt failed"
 msgstr "Verbindungstrennung fehlgeschlagen"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1121
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1762
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1855
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:17
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1375
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1995
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2314
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2401
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1634
 msgid "Dismiss"
 msgstr "Schließen"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:240
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:334
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:770
 msgid "Distance Optimization"
 msgstr "Distanzoptimierung"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:241
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:770
 msgid "Distance to farthest network member in meters."
 msgstr "Distanz zum am weitesten entfernten Funkpartner in Metern."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:347
-msgid "Diversity"
-msgstr "Diversität"
-
 # 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:61
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
@@ -1598,40 +1616,48 @@ 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:158
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:159
 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:123
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:124
 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:118
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
 msgid "Do not forward reverse lookups for local networks"
 msgstr "Keine Rückwärtsauflösungen für lokale Netzwerke weiterleiten"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:173
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1639
+msgid "Do you really want to delete \"%s\" ?"
+msgstr "Soll \"%s\" wirklich gelöscht werden?"
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:188
 msgid "Do you really want to delete the following SSH key?"
 msgstr ""
 "Soll der untenstehende SSH-Schlüssel wirklich vom System entfernt werden?"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1637
+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:74
 msgid "Domain required"
 msgstr "Anfragen nur mit Domain"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:205
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:206
 msgid "Domain whitelist"
 msgstr "Domain-Whitelist"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:34
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:67
 msgid "Don't Fragment"
 msgstr "Nicht fragmentieren"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:74
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:75
 msgid ""
 "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
 "<abbr title=\"Domain Name System\">DNS</abbr>-Name"
@@ -1649,19 +1675,19 @@ msgstr "Backup herunterladen"
 msgid "Download mtdblock"
 msgstr "Mtdblock-Datei herunterladen"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:853
 msgid "Downstream SNR offset"
 msgstr "Downstream SNR-Offset"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:914
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1169
 msgid "Drag to reorder"
 msgstr "Ziehen zum Umsortieren"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:9
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:11
 msgid "Dropbear Instance"
 msgstr "Dropbear Instanz"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:6
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 msgid ""
 "Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access "
 "and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
@@ -1669,19 +1695,20 @@ msgstr ""
 "Der SSH-Server ermöglicht Shell-Zugriff über das Netzwerk und bietet einen "
 "integrierten SCP-Dienst."
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:11
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:14
 msgid "Dual-Stack Lite (RFC6333)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:493
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:547
 msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 msgstr "Dynamisches DHCP"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:60
 msgid "Dynamic tunnel"
 msgstr "Dynamischer Tunnel"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:494
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:547
 msgid ""
 "Dynamically allocate DHCP addresses for clients. If disabled, only clients "
 "having static leases will be served."
@@ -1689,21 +1716,21 @@ msgstr ""
 "DHCP Adressen dynamisch erzeugen. Wenn dies deaktiviert ist, werden nur "
 "Clients mit konfigurierten statischen Leases bedient"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:67
 msgid "EA-bits length"
 msgstr "EA-Bitlänge"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:990
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1386
 msgid "EAP-Method"
 msgstr "EAP-Methode"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:934
-#: modules/luci-base/htdocs/luci-static/resources/form.js:935
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1199
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1188
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1191
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1450
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:154
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:160
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:38
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:291
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:720
 msgid "Edit"
 msgstr "Bearbeiten"
 
@@ -1715,24 +1742,24 @@ msgstr ""
 "Um die Syntaxfehler zu beheben, bitte die obige unformatierte Konfiguration "
 "anpassen und \"Speichern\" klicken um die Seite neu zu laden."
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:38
-msgid "Edit this interface"
-msgstr "Diese Schnittstelle bearbeiten"
-
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:718
 msgid "Edit this network"
 msgstr "Dieses Netzwerk bearbeiten"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:669
+msgid "Edit wireless network"
+msgstr "Drahtlosnetzwerk bearbeiten"
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:167
 msgid "Emergency"
 msgstr "Notfall"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:127
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:715
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:754
 msgid "Enable"
 msgstr "Aktivieren"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:414
 msgid ""
 "Enable <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> "
 "snooping"
@@ -1740,67 +1767,68 @@ msgstr ""
 "<abbr title=\"Internet Group Management Protocol\">IGMP</abbr>-Erkennung "
 "aktivieren"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:271
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:412
 msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 msgstr "<abbr title=\"Spanning Tree Protocol\">STP</abbr> aktivieren"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:41
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:60
 msgid "Enable HE.net dynamic endpoint update"
 msgstr "Dynamisches HE.net IP-Adress-Update aktivieren"
 
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:51
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:89
 msgid "Enable IPv6 negotiation"
 msgstr "IPv6 anfordern"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:23
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:35
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:41
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:35
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:37
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:49
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:80
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:54
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:67
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:93
 msgid "Enable IPv6 negotiation on the PPP link"
 msgstr "Aushandeln von IPv6-Adressen auf der PPP-Verbindung aktivieren"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:143
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:188
 msgid "Enable Jumbo Frame passthrough"
 msgstr "Aktiviere Jumbo Frame Durchleitung"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:244
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:235
 msgid "Enable NTP client"
 msgstr "Aktiviere NTP-Client"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:69
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:96
 msgid "Enable Single DES"
 msgstr "Single-DES aktivieren"
 
-#: 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:267
 msgid "Enable TFTP server"
 msgstr "TFTP-Server aktivieren"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:134
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:180
 msgid "Enable VLAN functionality"
 msgstr "VLAN-Funktionalität aktivieren"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1595
 msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
 msgstr "WPS-via-Knopfdruck aktivieren, erfordert WPA(2)-PSK"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1175
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
 msgid "Enable key reinstallation (KRACK) countermeasures"
 msgstr "Key Reinstallation (KRACK) Gegenmaßnahmen aktivieren"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:138
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:183
 msgid "Enable learning and aging"
 msgstr "Learning und Aging aktivieren"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:194
 msgid "Enable mirroring of incoming packets"
 msgstr "Port-Mirroring für eingehende Pakete aktivieren"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:151
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:195
 msgid "Enable mirroring of outgoing packets"
 msgstr "Port-Mirroring für ausgehende Pakete aktivieren"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:34
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:67
 msgid "Enable the DF (Don't Fragment) flag of the encapsulating packets."
 msgstr "Das DF-Bit (Nicht fragmentieren) auf gekapselten Paketen setzen."
 
@@ -1808,7 +1836,7 @@ msgstr "Das DF-Bit (Nicht fragmentieren) auf gekapselten Paketen setzen."
 msgid "Enable this mount"
 msgstr "Diesen Mountpunkt aktivieren"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:713
 msgid "Enable this network"
 msgstr "Dieses Netzwerk aktivieren"
 
@@ -1816,21 +1844,21 @@ msgstr "Dieses Netzwerk aktivieren"
 msgid "Enable this swap"
 msgstr "Diesen Auslagerungsspeicher aktivieren"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:37
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:88
 msgid "Enable/Disable"
 msgstr "Aktivieren/Deaktivieren"
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:76
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:152
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:251
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:41
 msgid "Enabled"
 msgstr "Aktiviert"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:277
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:414
 msgid "Enables IGMP snooping on this bridge"
 msgstr "Aktiviert die automatische IGMP-Erkennung auf dieser Netzwerkbrücke"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:892
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1310
 msgid ""
 "Enables fast roaming among access points that belong to the same Mobility "
 "Domain"
@@ -1838,28 +1866,32 @@ msgstr ""
 "Aktiviert schnelles Roaming zwischen Access-Points des selben "
 "Mobilitätsbereiches"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:272
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:412
 msgid "Enables the Spanning Tree Protocol on this bridge"
 msgstr "Aktiviert das Spanning Tree Protokoll auf dieser Netzwerkbrücke"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:120
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:180
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:59
+msgid "Encapsulation limit"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:843
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:901
 msgid "Encapsulation mode"
 msgstr "Kapselung"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:76
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:603
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:129
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:992
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1621
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:177
 msgid "Encryption"
 msgstr "Verschlüsselung"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:155
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:128
 msgid "Endpoint Host"
 msgstr "Entfernter Server"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:165
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:132
 msgid "Endpoint Port"
 msgstr "Entfernter Port"
 
@@ -1871,16 +1903,21 @@ msgstr "Eigenen Wert angeben"
 msgid "Enter custom values"
 msgstr "Eigene Werte angeben"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:273
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:271
 msgid "Erasing..."
 msgstr "Lösche..."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:95
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:96
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:97
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:98
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:99
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:106
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:107
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:108
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:109
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:110
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:173
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:164
 msgid "Error"
 msgstr "Fehler"
 
@@ -1888,24 +1925,28 @@ msgstr "Fehler"
 msgid "Errored seconds (ES)"
 msgstr "Fehlersekunden (ES)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1646
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1852
 #: modules/luci-base/luasrc/model/network.lua:1432
 msgid "Ethernet Adapter"
 msgstr "Netzwerkschnittstelle"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1637
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1843
 #: modules/luci-base/luasrc/model/network.lua:1422
 msgid "Ethernet Switch"
 msgstr "Netzwerk Switch"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:303
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
 msgid "Exclude interfaces"
 msgstr "Schnittstellen ausschließen"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:153
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
 msgid "Expand hosts"
 msgstr "Hosts vervollständigen"
 
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:195
+msgid "Expecting an hexadecimal assignment hint"
+msgstr ""
+
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:59
 msgid "Expecting: %s"
 msgstr "Erwarte: %s"
@@ -1914,7 +1955,7 @@ msgstr "Erwarte: %s"
 msgid "Expires"
 msgstr "Verfällt"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:488
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:543
 #, fuzzy
 msgid ""
 "Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
@@ -1922,57 +1963,73 @@ msgstr ""
 "Gültigkeitsdauer von vergebenen Adressen. Das Minimum sind 2 Minuten "
 "(<code>2m</code>)."
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:8
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:19
 msgid "External"
 msgstr "Extern"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:971
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1377
 msgid "External R0 Key Holder List"
 msgstr "Externe R0-Key-Holder-List"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:980
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1381
 msgid "External R1 Key Holder List"
 msgstr "Externe R1-Key-Holder-List"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:150
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:141
 msgid "External system log server"
 msgstr "Externer Protokollserver IP"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:155
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:146
 msgid "External system log server port"
 msgstr "Externer Protokollserver Port"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:160
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:151
 msgid "External system log server protocol"
 msgstr "Externes Protokollserver Protokoll"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:18
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:79
 msgid "Extra SSH command options"
 msgstr "Zusätzliche SSH-Kommando-Optionen"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:940
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1351
 msgid "FT over DS"
 msgstr "FT-über-DS"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:941
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1352
 msgid "FT over the Air"
 msgstr "FT-drahtlos"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:938
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1349
 msgid "FT protocol"
 msgstr "FT Protokoll"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1842
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:82
+msgid "Failed to change the system password."
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2389
 msgid "Failed to confirm apply within %ds, waiting for rollback…"
 msgstr ""
 "Konnte nicht innerhalb von %d Sekunden bestätigen, warte auf Zurückrollen "
 "der Änderungen..."
 
-#: modules/luci-base/luasrc/view/cbi/filebrowser.htm:106
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:45
+msgid "Failed to execute \"/etc/init.d/%s %s\" action: %s"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1561
 msgid "File"
 msgstr "Datei"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:279
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1514
+msgid "File not accessible"
+msgstr "Datei nicht verfügbar"
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1698
+msgid "Filename"
+msgstr "Dateiname"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:280
 msgid "Filename of the boot image advertised to clients"
 msgstr "Dateiname des Boot-Images welches den Clients mitgeteilt wird."
 
@@ -1982,14 +2039,15 @@ 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:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:118
 msgid "Filter private"
 msgstr "Private Anfragen filtern"
 
-#: 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:123
 msgid "Filter useless"
 msgstr "Windowsanfragen filtern"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:23
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:65
 msgid "Finalizing failed"
 msgstr "Finalisierung fehlgeschlagen"
@@ -2003,7 +2061,7 @@ msgstr ""
 "die Konfiguration mit passenden Standardwerten für alle gefundenen Geräte "
 "neu."
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:696
 msgid "Find and join network"
 msgstr "Suchen und Verbinden von Netzwerken"
 
@@ -2015,11 +2073,11 @@ msgstr "Fertigstellen"
 msgid "Firewall"
 msgstr "Firewall"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:77
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:76
 msgid "Firewall Mark"
 msgstr "Firewall-Markierung"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:193
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:278
 msgid "Firewall Settings"
 msgstr "Firewall Einstellungen"
 
@@ -2027,7 +2085,7 @@ msgstr "Firewall Einstellungen"
 msgid "Firewall Status"
 msgstr "Firewall-Status"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:137
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:860
 msgid "Firmware File"
 msgstr "Firmware-Datei"
 
@@ -2035,7 +2093,7 @@ msgstr "Firmware-Datei"
 msgid "Firmware Version"
 msgstr "Firmware Version"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:225
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:226
 msgid "Fixed source port for outbound DNS queries"
 msgstr "Fester Port für ausgehende DNS-Anfragen"
 
@@ -2055,37 +2113,37 @@ msgstr "Neues Firmware Image schreiben"
 msgid "Flash operations"
 msgstr "Flash-Operationen"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:194
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:192
 msgid "Flashing..."
 msgstr "Firmware wird installiert..."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:498
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:550
 msgid "Force"
 msgstr "Start erzwingen"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:258
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:782
 msgid "Force 40MHz mode"
 msgstr "40MHz-Modus forcieren"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:622
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1031
 msgid "Force CCMP (AES)"
 msgstr "CCMP (AES) erzwingen"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:499
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:550
 msgid "Force DHCP on this network even if another server is detected."
 msgstr ""
 "Aktiviere DHCP-Server für dieses Netzwerk, selbst wenn ein anderer aktiver "
 "Server erkannt wurde."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:623
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1032
 msgid "Force TKIP"
 msgstr "Erzwinge TKIP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:624
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1033
 msgid "Force TKIP and CCMP (AES)"
 msgstr "Erzwinge TKIP und CCMP (AES)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:795
 msgid "Force link"
 msgstr "Erzwinge Verbindung"
 
@@ -2093,7 +2151,7 @@ msgstr "Erzwinge Verbindung"
 msgid "Force upgrade"
 msgstr "Erzwinge Upgrade"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:60
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:90
 msgid "Force use of NAT-T"
 msgstr "Benutzung von NAT-T erzwingen"
 
@@ -2101,7 +2159,7 @@ msgstr "Benutzung von NAT-T erzwingen"
 msgid "Form token mismatch"
 msgstr "Abweichendes Formular-Token"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:34
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:164
 msgid "Forward DHCP traffic"
 msgstr "DHCP Traffic weiterleiten"
 
@@ -2109,48 +2167,43 @@ msgstr "DHCP Traffic weiterleiten"
 msgid "Forward Error Correction Seconds (FECS)"
 msgstr "Fehlerkorrektursekunden (FECS)"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:28
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:161
 msgid "Forward broadcast traffic"
 msgstr "Broadcasts weiterleiten"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:375
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:809
 msgid "Forward mesh peer traffic"
 msgstr "Mesh-Nachbar-Traffic weiterleiten"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:186
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:908
 msgid "Forwarding mode"
 msgstr "Weiterleitungstyp"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:255
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:596
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:774
 msgid "Fragmentation Threshold"
 msgstr "Fragmentierungsschwelle"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:332
-msgid "Frame Bursting"
-msgstr "Frame Bursting"
-
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:17
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:28
 msgid "Free"
 msgstr "Frei"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:91
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:89
 msgid ""
-"Further information about WireGuard interfaces and peers at <a href=\"http://"
-"wireguard.com\">wireguard.com</a>."
+"Further information about WireGuard interfaces and peers at <a href='http://"
+"wireguard.com'>wireguard.com</a>."
 msgstr ""
-"Weitere Informationen zu WireGuard-Schnittstellen und Peers unter <a href="
-"\"http://wireguard.com\">wireguard.com</a>."
+"Weitere Informationen über WireGuard-Schnittstellen und Peers unter <a "
+"href='http://wireguard.com'>wireguard.com</a>."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:45
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:130
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:186
 msgid "GHz"
 msgstr "GHz"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:29
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:36
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:91
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:77
 msgid "GPRS only"
 msgstr "Nur GPRS"
 
@@ -2159,28 +2212,28 @@ msgstr "Nur GPRS"
 msgid "Gateway"
 msgstr "Gateway"
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:35
+msgid "Gateway Ports"
+msgstr "Gateway-Ports"
+
 #: modules/luci-base/htdocs/luci-static/resources/network.js:9
 #: modules/luci-base/luasrc/model/network.lua:29
 msgid "Gateway address is invalid"
 msgstr "Gateway-Adresse ist ungültig"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:46
-msgid "Gateway ports"
-msgstr "Gateway-Ports"
-
-#: 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:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:275
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:23
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:112
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:103
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:49
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:33
 msgid "General Settings"
 msgstr "Allgemeine Einstellungen"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:188
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:462
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:175
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:141
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:361
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:504
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:895
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:741
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:796
 msgid "General Setup"
 msgstr "Allgemeine Einstellungen"
 
@@ -2188,7 +2241,7 @@ msgstr "Allgemeine Einstellungen"
 msgid "Generate Config"
 msgstr "Konfiguration generieren"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:945
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1355
 msgid "Generate PMK locally"
 msgstr "PMK lokal generieren"
 
@@ -2196,11 +2249,7 @@ msgstr "PMK lokal generieren"
 msgid "Generate archive"
 msgstr "Sicherung erstellen"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:63
-msgid "Generic 802.11%s Wireless Controller"
-msgstr "Generischer 802.11%s W-LAN Adapter"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:26
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:74
 msgid "Given password confirmation did not match, password not changed!"
 msgstr ""
 "Die angegebenen Passwörter stimmen nicht überein, das Systempasswort wurde "
@@ -2210,7 +2259,7 @@ msgstr ""
 msgid "Global Settings"
 msgstr "Globale Einstellungen"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:806
 msgid "Global network options"
 msgstr "Globale Netzwerkeinstellungen"
 
@@ -2221,33 +2270,29 @@ msgstr "Globale Netzwerkeinstellungen"
 msgid "Go to password configuration..."
 msgstr "Zur Passwortkonfiguration..."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:857
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1369
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1112
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1616
 #: modules/luci-base/luasrc/view/cbi/full_valueheader.htm:4
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:58
 msgid "Go to relevant configuration page"
 msgstr "Gehe zur entsprechenden Konfigurationsseite"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:38
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:66
 msgid "Group Password"
 msgstr "Gruppenpasswort"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:11
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:22
 msgid "Guest"
 msgstr "Gast"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:73
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:81
 msgid "HE.net password"
 msgstr "HE.net Passwort"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:60
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:73
 msgid "HE.net username"
 msgstr "HE.net Benutzername"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:310
-msgid "HT mode (802.11n)"
-msgstr "HT-Modus (802.11n)"
-
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:16
 msgid "Hang Up"
 msgstr "Auflegen"
@@ -2256,7 +2301,7 @@ msgstr "Auflegen"
 msgid "Header Error Code Errors (HEC)"
 msgstr "Anzahl Header-Error-Code-Fehler (HEC)"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:103
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 msgid ""
 "Here you can configure the basic aspects of your device like its hostname or "
 "the timezone."
@@ -2264,9 +2309,7 @@ msgstr ""
 "An dieser Stelle können Grundeinstellungen des Systems wie Hostname oder "
 "Zeitzone vorgenommen werden."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:499
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:556
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:579
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:941
 msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "ESSID verstecken"
 
@@ -2277,14 +2320,15 @@ msgstr "Leere Chains ausblenden"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:92
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1959
 msgid "Host"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:20
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:21
 msgid "Host entries"
 msgstr "Host-Einträge"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:48
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:171
 msgid "Host expiry timeout"
 msgstr "Host Verfallsdatum"
 
@@ -2292,45 +2336,45 @@ msgstr "Host Verfallsdatum"
 msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
 msgstr "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> oder Netzwerk"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:118
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:102
 msgid "Host-Uniq tag content"
 msgstr "\"Host-Uniq\"-Bezeichner"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:71
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:31
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:316
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:25
+#: 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:317
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:26
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:17
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:125
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:116
 msgid "Hostname"
 msgstr "Hostname"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:12
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:22
 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:18
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:19
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:67
 msgid "Hostnames"
 msgstr "Rechnernamen"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:13
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:24
 msgid "Hybrid"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:45
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:75
 msgid "IKE DH Group"
 msgstr "IKE-DH-Gruppe"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:41
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:59
 msgid "IP Addresses"
 msgstr "IP-Adressen"
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:40
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:80
 msgid "IP Protocol"
 msgstr "IP-Protokoll"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:29
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:30
 msgid "IP address"
 msgstr "IP-Adresse"
 
@@ -2349,6 +2393,11 @@ msgstr "IP-Adresse fehlt"
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:20
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:21
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:22
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:79
+#: 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/network.js:89
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:90
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:91
@@ -2356,7 +2405,7 @@ msgstr "IP-Adresse fehlt"
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:93
 #: 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/luasrc/model/cbi/admin_network/proto_ncm.lua:42
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:82
 msgid "IPv4"
 msgstr "IPv4"
 
@@ -2368,24 +2417,23 @@ msgstr "IPv4 Firewall"
 msgid "IPv4 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:57
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:178
 msgid "IPv4 address"
 msgstr "IPv4 Adresse"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:26
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:33
 msgid "IPv4 assignment length"
 msgstr "IPv4 Zuweisungslänge"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:104
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:181
 msgid "IPv4 broadcast"
 msgstr "IPv4 Broadcast"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:100
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:180
 msgid "IPv4 gateway"
 msgstr "IPv4 Gateway"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:92
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:179
 msgid "IPv4 netmask"
 msgstr "IPv4 Netzmaske"
 
@@ -2393,24 +2441,25 @@ msgstr "IPv4 Netzmaske"
 msgid "IPv4 network in address/netmask notation"
 msgstr "IPv4-Netzwerk in Addresse/Netzmaske-Notation"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:25
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:52
 msgid "IPv4 prefix"
 msgstr "IPv4 Bereich"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:42
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:30
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:55
 msgid "IPv4 prefix length"
 msgstr "Länge des IPv4-Präfix"
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:43
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:83
 msgid "IPv4+IPv6"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:72
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:34
 msgid "IPv4-Address"
 msgstr "IPv4-Adresse"
 
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:10
 #: protocols/luci-proto-ipip/luasrc/model/network/proto_ipip.lua:9
 msgid "IPv4-in-IPv4 (RFC2003)"
 msgstr ""
@@ -2425,6 +2474,16 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:30
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:31
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:32
+#: 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/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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:89
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:90
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:91
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:92
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:95
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:96
@@ -2437,7 +2496,7 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:103
 #: 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/luasrc/model/cbi/admin_network/proto_ncm.lua:44
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:84
 msgid "IPv6"
 msgstr "IPv6"
 
@@ -2449,11 +2508,11 @@ msgstr "IPv6 Firewall"
 msgid "IPv6 Neighbours"
 msgstr "IPv6 Nachbarn"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:464
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:506
 msgid "IPv6 Settings"
 msgstr "IPv6 Einstellungen"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:195
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:810
 msgid "IPv6 ULA-Prefix"
 msgstr "IPv6 ULA-Präfix"
 
@@ -2461,21 +2520,21 @@ msgstr "IPv6 ULA-Präfix"
 msgid "IPv6 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:202
 msgid "IPv6 address"
 msgstr "IPv6 Adresse"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:23
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:189
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:31
 msgid "IPv6 assignment hint"
 msgstr "IPv6 Zuweisungshinweis"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:18
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:184
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:27
 msgid "IPv6 assignment length"
 msgstr "IPv6 Zuweisungslänge"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:207
 msgid "IPv6 gateway"
 msgstr "IPv6 Gateway"
 
@@ -2483,22 +2542,22 @@ msgstr "IPv6 Gateway"
 msgid "IPv6 network in address/netmask notation"
 msgstr "IPv6-Netzwerk in Addresse/Netzmaske-Notation"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:37
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:59
 msgid "IPv6 prefix"
 msgstr "IPv6-Präfix"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:34
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:45
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:63
 msgid "IPv6 prefix length"
 msgstr "Länge des IPv6-Präfix"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:33
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:211
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:57
 msgid "IPv6 routed prefix"
 msgstr "Geroutetes IPv6-Präfix"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:143
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:215
 msgid "IPv6 suffix"
 msgstr "IPv6 Endung"
 
@@ -2508,31 +2567,35 @@ msgid "IPv6-Address"
 msgstr "IPv6-Adresse"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:93
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:104
 msgid "IPv6-PD"
 msgstr "IPv6 Präfix-Delegation (PD)"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:10
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:13
 msgid "IPv6-in-IPv4 (RFC4213)"
 msgstr "IPv6-in-IPv4 (RFC4213)"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:17
 msgid "IPv6-over-IPv4 (6rd)"
 msgstr "IPv6-über-IPv4 (6rd)"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:15
 msgid "IPv6-over-IPv4 (6to4)"
 msgstr "IPv6-über-IPv4 (6to4)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1075
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1478
 msgid "Identity"
 msgstr "Identität"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:70
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:96
 msgid "If checked, 1DES is enabled"
 msgstr "Aktiviert die Benutzung von 1DES, wenn ausgewählt"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:65
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:93
 msgid "If checked, encryption is disabled"
 msgstr "Deaktiviert die Verschlüsselung, wenn ausgewählt"
 
@@ -2553,36 +2616,36 @@ msgstr ""
 "Wenn angegeben, wird das Gerät nach anhhand des Partitionslabels statt "
 "fester Gerätedatei gemounted"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:27
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:71
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:18
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:82
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:52
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:17
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:29
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:33
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:68
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:85
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:32
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:45
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:45
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:24
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:44
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:116
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:48
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:85
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:65
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:33
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:80
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:108
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:146
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:74
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:97
 msgid "If unchecked, no default route is configured"
 msgstr "Wenn deaktiviert, wird keine Default-Route gesetzt"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:34
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:86
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:35
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:99
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:47
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:60
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:60
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:39
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:59
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:124
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:39
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:116
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:59
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:103
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:64
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:77
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:100
 msgid "If unchecked, the advertised DNS server addresses are ignored"
 msgstr "Falls deaktiviert werden die zugewiesenen DNS-Server ignoriert"
 
@@ -2599,15 +2662,15 @@ 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:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:102
 msgid "Ignore <code>/etc/hosts</code>"
 msgstr "Ignoriere /etc/hosts"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:471
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:531
 msgid "Ignore interface"
 msgstr "Schnittstelle ignorieren"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:90
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:91
 msgid "Ignore resolve file"
 msgstr "Resolv-Datei ignorieren"
 
@@ -2628,12 +2691,12 @@ msgstr ""
 "Request blockiert. Auf \"Weiter\" klicken um zur vorherigen Seite "
 "zurückzukehren."
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:145
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:118
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:124
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:126
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:97
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:118
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:157
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:141
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:115
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:138
 msgid "Inactivity timeout"
 msgstr "Timeout bei Inaktivität"
 
@@ -2641,23 +2704,25 @@ msgstr "Timeout bei Inaktivität"
 msgid "Inbound:"
 msgstr "Eingehend:"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:170
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:161
 msgid "Info"
 msgstr "Info"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:105
 msgid "Information"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:25
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:67
 msgid "Initialization failure"
 msgstr "Initialisierung fehlgeschlagen"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:34
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:87
 msgid "Initscript"
 msgstr "Startscript"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:26
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:122
 msgid "Initscripts"
 msgstr "Startscripte"
 
@@ -2667,56 +2732,75 @@ msgstr ""
 "Bitte \"iputils-traceroute6\" installieren um IPv6-Routenverfolgung nutzen "
 "zu können"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:223
-msgid "Install package %q"
-msgstr "Installiere Paket %q"
-
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:220
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:120
 msgid "Install protocol extensions..."
 msgstr "Installiere Protokoll-Erweiterungen"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:416
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:423
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:683
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:687
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:26
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:284
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:342
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:47
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:134
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:14
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:16
 msgid "Interface"
 msgstr "Schnittstelle"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:58
 msgid "Interface %q device auto-migrated from %q to %q."
 msgstr ""
 "Das Gerät der Schnittstelle %q wurde automatisch von %q auf %q geändert."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:356
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:792
 msgid "Interface Configuration"
 msgstr "Schnittstellenkonfiguration"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:51
-msgid "Interface Overview"
-msgstr "Schnittstellenübersicht"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:99
+msgid "Interface has %d pending changes"
+msgstr "Der Netzwerkadapter hat %d ausstehende Änderungen"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:57
+msgid "Interface is marked for deletion"
+msgstr "Der Netzwerkadapter ist zum Löschen vorgemerkt"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:162
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:3
 msgid "Interface is reconnecting..."
 msgstr "Schnittstelle verbindet neu..."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:162
+msgid "Interface is shutting down..."
+msgstr "Schnittstelle fährt herunter..."
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:205
+msgid "Interface is starting..."
+msgstr "Netzwerkadapter startet..."
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:208
+msgid "Interface is stopping..."
+msgstr "Netzwerkadapter stoppt..."
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:954
 msgid "Interface name"
 msgstr "Schnittstellenname"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:34
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:224
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:131
 msgid "Interface not present or not connected yet."
 msgstr "Schnittstelle existiert nicht oder ist nicht verbunden."
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:88
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:16
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:11
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:287
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:54
 msgid "Interfaces"
 msgstr "Schnittstellen"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:9
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:20
 msgid "Internal"
 msgstr "Intern"
 
@@ -2729,20 +2813,36 @@ msgstr "Interner Serverfehler"
 msgid "Invalid"
 msgstr "Ungültige Eingabe"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:311
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:10
+msgid "Invalid Base64 key string"
+msgstr "Ungültige Base64-Zeichenkette"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:281
 msgid "Invalid VLAN ID given! Only IDs between %d and %d are allowed."
 msgstr "Ungültige VLAN ID angegeben! Nur IDs zwischen %d und %d sind erlaubt."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:307
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:290
 msgid "Invalid VLAN ID given! Only unique IDs are allowed"
 msgstr "Ungültige VLAN ID angegeben! Die ID ist muß eindeutig sein!"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:195
+msgid "Invalid argument"
+msgstr "Ungültiges Argument"
+
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:194
+msgid "Invalid command"
+msgstr "Ungültiges Kommando"
+
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:80
+msgid "Invalid hexadecimal value"
+msgstr "Ungültiger Hexadezimalwert"
+
 #: modules/luci-base/luasrc/view/sysauth.htm:12
 msgid "Invalid username and/or password! Please try again."
 msgstr ""
 "Ungültiger Benutzername oder ungültiges Passwort! Bitte erneut versuchen. "
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:508
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:950
 msgid "Isolate Clients"
 msgstr "Clients isolieren"
 
@@ -2762,15 +2862,15 @@ msgstr ""
 msgid "JavaScript required!"
 msgstr "JavaScript benötigt!"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:52
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1691
 msgid "Join Network"
 msgstr "Netzwerk beitreten"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:22
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1628
 msgid "Join Network: Wireless Scan"
 msgstr "Netzwerk beitreten: Suche nach Netzwerken"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:19
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1833
 msgid "Joining Network: %q"
 msgstr "Trete Netzwerk %q bei"
 
@@ -2787,15 +2887,15 @@ msgstr "Kernelprotokoll"
 msgid "Kernel Version"
 msgstr "Kernel Version"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:823
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1248
 msgid "Key"
 msgstr "Schlüssel"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:851
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:852
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:853
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:854
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:870
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1277
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1278
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1279
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1291
 msgid "Key #%d"
 msgstr "Schlüssel Nr. %d"
 
@@ -2803,33 +2903,34 @@ msgstr "Schlüssel Nr. %d"
 msgid "Kill"
 msgstr "Töten"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:10
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:21
 msgid "L2TP"
 msgstr "L2TP"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:10
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:40
 msgid "L2TP Server"
 msgstr "L2TP Server"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:100
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:74
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:80
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:74
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:53
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:73
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:131
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:102
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:89
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:112
 msgid "LCP echo failure threshold"
 msgstr "LCP Echo Fehler Schwellenwert"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:118
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:89
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:95
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:89
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:68
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:91
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:144
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:102
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:125
 msgid "LCP echo interval"
 msgstr "LCP Echo Intervall"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:181
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:902
 msgid "LLC"
 msgstr "LLC"
 
@@ -2838,11 +2939,11 @@ msgstr "LLC"
 msgid "Label"
 msgstr "Label"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:213
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:204
 msgid "Language"
 msgstr "Sprache"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:115
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:106
 msgid "Language and Style"
 msgstr "Sprache und Aussehen"
 
@@ -2850,53 +2951,53 @@ msgstr "Sprache und Aussehen"
 msgid "Latency"
 msgstr "Latenz"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:10
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:21
 msgid "Leaf"
 msgstr "Zweigstelle"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:369
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:487
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:393
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:543
 msgid "Lease time"
 msgstr "Laufzeit"
 
-#: 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:87
 msgid "Leasefile"
 msgstr "Leasedatei"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:74
 #: modules/luci-base/luasrc/view/lease_status.htm:95
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:34
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
 msgid "Leasetime remaining"
 msgstr "Verbleibende Gültigkeit"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:9
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:20
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:27
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:50
 msgid "Leave empty to autodetect"
 msgstr "Zur automatischen Erkennung leer lassen"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:21
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:45
 msgid "Leave empty to use the current WAN address"
 msgstr "Leer lassen um die aktuelle WAN-Adresse zu verwenden"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1746
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2299
 msgid "Legend:"
 msgstr "Legende:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:481
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:538
 msgid "Limit"
 msgstr "Limit"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:287
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:288
 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:299
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:300
 msgid "Limit listening to these interfaces, and loopback."
 msgstr "Dienste auf die angegeben Schnittstellen plus Loopback beschränken."
 
@@ -2916,11 +3017,11 @@ msgstr "Verbindungsstatus"
 msgid "Line Uptime"
 msgstr "Verbindungsdauer"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:101
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:88
 msgid "Link On"
 msgstr "Verbindung hergestellt"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:185
 msgid ""
 "List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
 "requests to"
@@ -2928,7 +3029,7 @@ msgstr ""
 "Liste von <abbr title=\"Domain Name System\">DNS</abbr>-Servern an welche "
 "Requests weitergeleitet werden"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:972
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1377
 msgid ""
 "List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-"
 "Identifier,128-bit key as hex string. <br />This list is used to map R0KH-ID "
@@ -2943,7 +3044,7 @@ msgstr ""
 "werden kann, mit der sich der Client wärend der anfänglichen "
 "Mobilitätsdomänen-Assoziation verbunden hat."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:981
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1381
 msgid ""
 "List of R1KHs in the same Mobility Domain. <br />Format: MAC-address,R1KH-ID "
 "as 6 octets with colons,128-bit key as hex string. <br />This list is used "
@@ -2958,33 +3059,33 @@ msgstr ""
 "versendet wird. Die Liste dient auch zur Authorisierung von R1KH-IDs, welche "
 "innerhalb der Mobilitätsdomain PMK-R1-Schlüssel anfordern dürfen."
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:21
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:82
 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:206
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:207
 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:173
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:174
 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:298
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:299
 msgid "Listen Interfaces"
 msgstr "Aktive Schnittstellen"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:30
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:54
 msgid "Listen Port"
 msgstr "Aktive Ports"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:15
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:16
 msgid "Listen only on the given interface or, if unspecified, on all"
 msgstr ""
 "Nur auf die gegebene Schnittstelle reagieren, nutze alle wenn nicht "
 "spezifiziert"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:216
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:217
 msgid "Listening port for inbound DNS queries"
 msgstr "Serverport für eingehende DNS Abfragen"
 
@@ -3003,11 +3104,11 @@ msgstr "Durchschnittslast"
 msgid "Loading"
 msgstr "Lade"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:35
-msgid "Loading SSH keys…"
-msgstr "Lade SSH-Schlüssel…"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1819
+msgid "Loading directory contents…"
+msgstr "Lade Verzeichniseinträge…"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1204
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1296
 #: modules/luci-base/luasrc/view/view.htm:4
 msgid "Loading view…"
 msgstr "Lade Seite…"
@@ -3017,41 +3118,41 @@ msgstr "Lade Seite…"
 msgid "Local IP address is invalid"
 msgstr "Lokale IP-Adresse ist ungültig"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:25
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:86
 msgid "Local IP address to assign"
 msgstr "Lokale IP-Adresse"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:10
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:11
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:44
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:39
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:151
 msgid "Local IPv4 address"
 msgstr "Lokale IPv4 Adresse"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:20
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:54
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:45
 msgid "Local IPv6 address"
 msgstr "Lokale IPv6 Adresse"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:286
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:287
 msgid "Local Service Only"
 msgstr "Nur lokale Dienste"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:81
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:126
 msgid "Local Startup"
 msgstr "Lokales Startskript"
 
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:25
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:121
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:112
 msgid "Local Time"
 msgstr "Lokale Zeit"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:149
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
 msgid "Local domain"
 msgstr "Lokale Domain"
 
-#: 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:147
 #, fuzzy
 msgid ""
 "Local domain specification. Names matching this domain are never forwarded "
@@ -3061,17 +3162,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:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:151
 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:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
 msgid "Local server"
 msgstr "Lokaler Server"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:129
 msgid ""
 "Localise hostname depending on the requesting subnet if multiple IPs are "
 "available"
@@ -3079,23 +3180,19 @@ 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:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:128
 msgid "Localise queries"
 msgstr "Lokalisiere Anfragen"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:175
-msgid "Locked to channel %s used by: %s"
-msgstr "Festgelegt auf Kanal %s, verwendet durch: %s"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:168
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:159
 msgid "Log output level"
 msgstr "Protokolllevel"
 
-#: 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:181
 msgid "Log queries"
 msgstr "Schreibe Abfragelog"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:113
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:104
 msgid "Logging"
 msgstr "Protokollierung"
 
@@ -3103,7 +3200,7 @@ msgstr "Protokollierung"
 msgid "Login"
 msgstr "Anmelden"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:95
+#: modules/luci-base/luasrc/controller/admin/index.lua:103
 msgid "Logout"
 msgstr "Abmelden"
 
@@ -3111,11 +3208,13 @@ msgstr "Abmelden"
 msgid "Loss of Signal Seconds (LOSS)"
 msgstr "Signalverlustsekunden (LOSS)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:476
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:533
 msgid "Lowest leased address as offset from the network address."
 msgstr "Kleinste vergebene Adresse (Netzwerkadresse + x)"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:40
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:75
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:35
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:86
 msgid "MAC"
@@ -3123,32 +3222,32 @@ msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:73
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:109
-#: 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:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1958
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:86
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:133
 msgid "MAC-Address"
 msgstr "MAC-Adresse"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:457
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:586
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:886
 msgid "MAC-Address Filter"
 msgstr "MAC-Adressfilter"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:142
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:363
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:798
 msgid "MAC-Filter"
 msgstr "MAC-Filter"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:464
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:590
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:893
 msgid "MAC-List"
 msgstr "MAC-Adressliste"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:13
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:16
 msgid "MAP / LW4over6"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:62
 msgid "MAP rule is invalid"
 msgstr "MAP-Regel ist ungültig"
@@ -3166,8 +3265,8 @@ msgid "MHz"
 msgstr "MHz"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:53
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:29
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:66
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:53
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:71
 msgid "MTU"
 msgstr "MTU"
 
@@ -3177,16 +3276,17 @@ msgid ""
 "below:"
 msgstr "Das Root-Dateisystem muss mit folgenden Kommandsos vorbereitet werden:"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:55
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:69
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:26
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:38
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:38
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:108
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:52
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:96
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:83
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:57
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:70
 msgid "Manual"
 msgstr "Manuell"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1949
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2188
 msgid "Master"
 msgstr ""
 
@@ -3194,51 +3294,46 @@ msgstr ""
 msgid "Max. Attainable Data Rate (ATTNDR)"
 msgstr "Maximal erreichbare Datenrate (ATTNDR)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:539
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:982
 msgid "Maximum allowed Listen Interval"
 msgstr "Maximal erlaubter Inaktivitätszeitraum"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:234
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
 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:252
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:253
 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:243
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:244
 msgid "Maximum allowed size of EDNS.0 UDP packets"
 msgstr "Maximal zulässige Größe von EDNS.0 UDP Paketen"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:63
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:77
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:57
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:112
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:104
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:93
 msgid "Maximum amount of seconds to wait for the modem to become ready"
 msgstr "Maximale Zeit die gewartet wird bis das Modem bereit ist (in Sekunden)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:27
-msgid ""
-"Maximum length of the name is 15 characters including the automatic protocol/"
-"bridge prefix (br-, 6in4-, pppoe- etc.)"
-msgstr ""
-"Die maximale Länge des Names ist auf 15 Zeichen beschränkt, abzüglich des "
-"automatischen Protokoll- oder Bridge-Prefixes wie \"br-\" oder \"pppoe-\" "
-"etc."
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:482
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:538
 msgid "Maximum number of leased addresses."
 msgstr "Maximal zulässige Anzahl von vergeben DHCP-Adressen"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:761
+msgid "Maximum transmit power"
+msgstr "Maximale Sendeleistung"
+
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:21
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:49
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:134
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:187
 #: modules/luci-mod-status/luasrc/view/admin_status/bandwidth.htm:79
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:284
 msgid "Mbit/s"
 msgstr "Mbit/s"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:18
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:32
 msgid "Medium"
 msgstr "Mittel"
 
@@ -3250,42 +3345,43 @@ msgstr "Hauptspeicher"
 msgid "Memory usage (%)"
 msgstr "Speichernutzung (%)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1952
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2191
 msgid "Mesh"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:372
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:806
 msgid "Mesh Id"
 msgstr "Mesh-ID"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:196
+msgid "Method not found"
+msgstr "Methode nicht gefunden"
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:45
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:76
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:104
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:54
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:66
 msgid "Metric"
 msgstr "Metrik"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:154
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:198
 msgid "Mirror monitor port"
 msgstr "Spiegel-Monitor-Port"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:153
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:197
 msgid "Mirror source port"
 msgstr "Spiegel-Quell-Port"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:408
-msgid "Missing protocol extension for proto %q"
-msgstr "Erweiterung für Protokoll %q fehlt"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:923
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1337
 msgid "Mobility Domain"
 msgstr "Mobilitätsbereich"
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:154
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:41
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:74
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:366
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:31
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:360
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:801
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1619
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:175
 msgid "Mode"
 msgstr "Modus"
@@ -3294,39 +3390,38 @@ msgstr "Modus"
 msgid "Model"
 msgstr "Modell"
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:31
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:72
 msgid "Modem default"
 msgstr "Modem-Grundeinstellung"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:11
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:19
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:11
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:10
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:73
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:73
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:57
 msgid "Modem device"
 msgstr "Modemgerät"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:24
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:66
 msgid "Modem information query failed"
 msgstr "Modem-Informationsabfrage fehlgeschlagen"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:62
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:76
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:56
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:112
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:104
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:93
 msgid "Modem init timeout"
 msgstr "Wartezeit für Modeminitialisierung"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1953
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:452
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:554
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:577
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2192
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:880
 msgid "Monitor"
 msgstr "Monitor"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:14
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
 msgid "More Characters"
 msgstr "Mehr Zeichen"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:802
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1057
 msgid "More…"
 msgstr "Mehr…"
 
@@ -3339,7 +3434,7 @@ msgstr "Mount-Eintrag"
 msgid "Mount Point"
 msgstr "Einhängepunkt"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:26
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:36
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:137
 msgid "Mount Points"
@@ -3389,46 +3484,44 @@ msgstr "Nach unten schieben"
 msgid "Move up"
 msgstr "Nach oben schieben"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:912
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
 msgid "NAS ID"
 msgstr "NAS ID"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:57
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:87
 msgid "NAT-T Mode"
 msgstr "NAT-T Modus"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:9
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 msgid "NAT64 Prefix"
 msgstr "NAT64-Präfix"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:31
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:26
 msgid "NCM"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:535
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:589
 msgid "NDP-Proxy"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:43
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:72
 msgid "NT Domain"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:273
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:264
 msgid "NTP server candidates"
 msgstr "NTP Server Kandidaten"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:837
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1092
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:27
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:502
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:65
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:553
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:658
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:49
 msgid "Name"
 msgstr "Name"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:17
-msgid "Name of the new interface"
-msgstr "Name der neuen Schnittstelle"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1808
 msgid "Name of the new network"
 msgstr "Name des neuen Netzwerkes"
 
@@ -3436,9 +3529,10 @@ msgstr "Name des neuen Netzwerkes"
 msgid "Navigation"
 msgstr "Navigation"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:62
+#: modules/luci-base/luasrc/controller/admin/index.lua:69
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:108
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:402
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:834
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1957
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:389
 #: modules/luci-mod-status/luasrc/view/admin_status/index/30-network.htm:8
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:73
@@ -3450,7 +3544,7 @@ msgstr "Netzwerk"
 msgid "Network Utilities"
 msgstr "Netzwerk-Werkzeuge"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:278
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:279
 msgid "Network boot image"
 msgstr "Netzwerk-Boot-Image"
 
@@ -3463,53 +3557,59 @@ msgstr "Netzwerkgerät ist nicht vorhanden"
 msgid "Network without interfaces."
 msgstr "Netzwerk ohne Schnittstellen."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:661
+msgid "New interface name…"
+msgstr "Name der neuen Schnittstelle…"
+
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:11
 msgid "Next »"
 msgstr "Weiter »"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1507
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1754
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:108
 msgid "No"
 msgstr "Nein"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:453
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:514
 msgid "No DHCP Server configured for this interface"
 msgstr "Kein DHCP Server auf dieser Schnittstelle eingerichtet"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1162
+msgid "No Encryption"
+msgstr "Keine Verschlüsselung"
+
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:89
 msgid "No NAT-T"
 msgstr "Kein NAT-T"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:198
+msgid "No data received"
+msgstr "Keine Daten empfangen"
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1764
+msgid "No entries in this directory"
+msgstr "Keine Einträge in diesem Verzeichnis"
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/backupfiles.lua:82
 msgid "No files found"
 msgstr "Keine Dateien gefunden"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:550
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:191
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:180
 msgid "No information available"
 msgstr "Keine Informationen verfügbar"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:8
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:63
 msgid "No matching prefix delegation"
 msgstr "Kein passendes delegiertes Prefix"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:157
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
 msgid "No negative cache"
 msgstr "Kein Negativ-Cache"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:53
-msgid "No network configured on this device"
-msgstr "Keine Netzwerke auf diesem Gerät konfiguriert"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:65
-msgid "No network name specified"
-msgstr "Netzwerkname nicht angegeben"
-
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:147
-msgid "No networks in range"
-msgstr "Keine Netzwerke in Reichweite"
-
 #: 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
@@ -3517,7 +3617,12 @@ msgstr "Keine Netzwerke in Reichweite"
 msgid "No password set!"
 msgstr "Kein Passwort gesetzt!"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:116
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:104
+msgid "No peers defined yet"
+msgstr "Noch keine Peers definiert."
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:129
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:271
 msgid "No public keys present yet."
 msgstr "Bisher keine SSH-Schlüssel hinterlegt."
 
@@ -3525,19 +3630,19 @@ msgstr "Bisher keine SSH-Schlüssel hinterlegt."
 msgid "No rules in this chain."
 msgstr "Keine Regeln in dieser Kette"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:150
-msgid "No scan results available yet..."
-msgstr "Noch keine Scan-Ergebnisse verfügbar..."
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:53
+msgid "No signal"
+msgstr "Kein Signal"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:7
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:756
 msgid "No zone assigned"
 msgstr "Keine Zone zugewiesen"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:111
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:35
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:48
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:133
 msgid "Noise"
 msgstr "Rauschen"
 
@@ -3553,16 +3658,16 @@ msgstr "Noise:"
 msgid "Non Pre-emtive CRC errors (CRC_P)"
 msgstr "Nicht-präemptive CRC-Fehler (CRC_P)"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:292
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:293
 msgid "Non-wildcard"
 msgstr "An Schnittstellen binden"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:129
 msgid "None"
 msgstr "keine"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:181
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:172
 msgid "Normal"
 msgstr "Normal"
 
@@ -3570,25 +3675,29 @@ msgstr "Normal"
 msgid "Not Found"
 msgstr "Nicht Gefunden"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:27
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:5
-msgid "Not associated"
-msgstr "Nicht assoziiert"
-
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:87
 msgid "Not connected"
 msgstr "Nicht verbunden"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:38
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:139
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:232
+msgid "Not present"
+msgstr "Nicht vorhanden"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:105
 msgid "Not started on boot"
 msgstr "Beim Hochfahren nicht starten"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:26
-msgid "Note: interface name length"
-msgstr "Hinweis: Länge des Namens beachten"
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:201
+msgid "Not supported"
+msgstr "Nicht unterstützt"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:171
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:162
 msgid "Notice"
 msgstr "Notiz"
 
@@ -3596,65 +3705,52 @@ msgstr "Notiz"
 msgid "Nslookup"
 msgstr "DNS-Auflösung"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:261
 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, "
 "\"0\" deaktiviert die Zwischenspeicherung."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:203
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:194
 msgid "Number of parallel threads used for compression"
 msgstr "Für Kompression benutze parallele Prozessanzahl"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:40
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:69
 msgid "Obfuscated Group Password"
 msgstr "Chiffriertes Gruppenpasswort"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:35
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:61
 msgid "Obfuscated Password"
 msgstr "Chiffriertes Passwort"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:22
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:34
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:40
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:105
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:97
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:49
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:80
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:54
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:67
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:93
 msgid "Obtain IPv6-Address"
 msgstr "IPv6-Adresse beziehen"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:83
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:68
 msgid "Off-State Delay"
 msgstr "Verzögerung für Ausschalt-Zustand"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:16
-msgid ""
-"On this page you can configure the network interfaces. You can bridge "
-"several interfaces by ticking the \"bridge interfaces\" field and enter the "
-"names of several network interfaces separated by spaces. You can also use "
-"<abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
-"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
-"<samp>eth0.1</samp>)."
-msgstr ""
-"An dieser Stelle können die einzelnen Schnittstellen des Netzwerkes "
-"konfiguriert werden. Es können mehrere Schnittstellen zu einer Brücke "
-"zusammengefasst werden, indem diese durch Leerzeichen getrennt aufgezählt "
-"werden und ein entsprechender Haken im Feld Netzwerkbrücke gesetzt wird. Es "
-"können VLANs in der Notation SCHNITTSTELLE.VLANNR (z.B.: eth0.1) verwendet "
-"werden."
-
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:95
 msgid "On-Link route"
 msgstr "Link-lokale Route"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:80
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:64
 msgid "On-State Delay"
 msgstr "Verzögerung für Anschalt-Zustand"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:360
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:382
 msgid "One of hostname or mac address must be specified!"
 msgstr "Es muss entweder ein Hostname oder eine MAC-Adresse angegeben werden!"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:456
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:462
 msgid "One of the following: %s"
 msgstr "Eine der folgenden Möglichkeiten: %s"
 
@@ -3676,28 +3772,29 @@ msgstr "Ein oder mehr benötigte Felder sind nicht ausgefüllt!"
 msgid "Open list..."
 msgstr "Liste öffnen..."
 
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:61
 #: protocols/luci-proto-openconnect/luasrc/model/network/proto_openconnect.lua:9
 msgid "OpenConnect (CISCO AnyConnect)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:757
 msgid "Operating frequency"
 msgstr "Betriebsfrequenz"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1753
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2306
 msgid "Option changed"
 msgstr "Option geändert"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1755
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2308
 msgid "Option removed"
 msgstr "Option entfernt"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1140
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:55
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1535
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:66
 msgid "Optional"
 msgstr "Optional"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:78
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:76
 msgid ""
 "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, "
 "starting with <code>0x</code>."
@@ -3705,7 +3802,7 @@ msgstr ""
 "Optional. 32-Bit-Marke für ausgehende, verschlüsselte Pakete. Wert in "
 "hexadezimal mit führendem <code>0x</code> angeben."
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:144
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:215
 msgid ""
 "Optional. Allowed values: 'eui64', 'random', fixed value like '::1' or "
 "'::1:2'. When IPv6 prefix (like 'a:b:c:d::') is received from a delegating "
@@ -3717,7 +3814,7 @@ msgstr ""
 "Server empfangen wird, kombiniert das System das Suffix mit dem Präfix um "
 "eine IPv6-Adresse (z.B. 'a:b:c:d::1') für die Schnittstelle zu formen."
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:123
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:117
 msgid ""
 "Optional. Base64-encoded preshared key. Adds in an additional layer of "
 "symmetric-key cryptography for post-quantum resistance."
@@ -3725,15 +3822,15 @@ msgstr ""
 "Optional. Base64-kodierter, vorhab ausgetauschter Schlüssel um eine weitere "
 "Ebene an symmetrischer Verschlüsselung für erhöhte Sicherheit hinzuzufügen."
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:148
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:126
 msgid "Optional. Create routes for Allowed IPs for this peer."
 msgstr "Optional. Routen für erlaubte IP-Adressen erzeugen."
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:103
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:108
 msgid "Optional. Description of peer."
 msgstr "Optionale Beschreibung des entfernten VPN-Partners."
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:156
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:128
 msgid ""
 "Optional. Host of peer. Names are resolved prior to bringing up the "
 "interface."
@@ -3741,15 +3838,15 @@ msgstr ""
 "Optional. Hostname oder Adresse des Verbindungspartners. Namen werden vor "
 "dem Verbindungsaufbau aufgelöst."
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:67
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:71
 msgid "Optional. Maximum Transmission Unit of tunnel interface."
 msgstr "Optional. Maximale MTU für Tunnelschnittstellen."
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:166
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:132
 msgid "Optional. Port of peer."
 msgstr "Optional. Port-Nummer des Verbindungspartners."
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:175
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:136
 msgid ""
 "Optional. Seconds between keep alive messages. Default is 0 (disabled). "
 "Recommended value if this device is behind a NAT is 25."
@@ -3758,7 +3855,7 @@ msgstr ""
 "(deaktiviert). Der empfohlene Wert für Geräte hinter einem NAT sind 25 "
 "Sekunden."
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:31
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:54
 msgid "Optional. UDP port used for outgoing and incoming packets."
 msgstr ""
 "Optional. Benutzte UDP-Port-Nummer für ausgehende und eingehende Pakete."
@@ -3780,54 +3877,54 @@ msgstr "Aus"
 msgid "Outbound:"
 msgstr "Ausgehend:"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:26
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:50
 msgid "Output Interface"
 msgstr "Ausgehende Schnittstelle"
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:46
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:151
 msgid "Output zone"
-msgstr ""
+msgstr "Output-Zone"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:63
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:155
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:33
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:54
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:54
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:219
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:50
 msgid "Override MAC address"
 msgstr "MAC-Adresse überschreiben"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:66
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:35
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:56
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:88
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:125
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:131
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:133
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:104
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:61
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:58
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:223
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:44
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:54
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:154
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:71
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:145
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:132
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:110
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:119
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:97
 msgid "Override MTU"
 msgstr "MTU-Wert überschreiben"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:30
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:63
 msgid "Override TOS"
 msgstr "TOS-Wert überschreiben"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:25
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:58
 msgid "Override TTL"
 msgstr "TTL-Wert überschreiben"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:954
 msgid "Override default interface name"
 msgstr "Standard Schnittstellennamen überschreiben"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:41
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:167
 msgid "Override the gateway in DHCP responses"
 msgstr "Gateway-Adresse in DHCP-Antworten überschreiben"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:507
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:555
 msgid ""
 "Override the netmask sent to clients. Normally it is calculated from the "
 "subnet that is served."
@@ -3835,7 +3932,7 @@ msgstr ""
 "Überschreibt die Netzmaske welche an Clients geschickt wird. Normalerweise "
 "wird diese vom bedienten Subnetz abgeleitet."
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:65
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:179
 msgid "Override the table used for internal routes"
 msgstr "Überschreibt die benutzte Tabelle für interne Routen"
 
@@ -3843,29 +3940,33 @@ msgstr "Überschreibt die benutzte Tabelle für interne Routen"
 msgid "Overview"
 msgstr "Übersicht"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1606
+msgid "Overwrite existing file \"%s\" ?"
+msgstr "Existierende Datei \"%s\" überschreiben?"
+
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:11
 msgid "Owner"
 msgstr "Besitzer"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:42
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:56
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:17
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:28
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:34
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:14
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:18
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:43
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:98
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:45
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:44
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:63
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:82
 msgid "PAP/CHAP password"
 msgstr "PAP/CHAP Passwort"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:39
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:53
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:14
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:11
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:15
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:96
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:88
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:43
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:74
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:42
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:61
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:77
 msgid "PAP/CHAP username"
 msgstr "PAP/CHAP Benutzername"
 
@@ -3873,9 +3974,9 @@ msgstr "PAP/CHAP Benutzername"
 msgid "PID"
 msgstr "PID"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:36
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:50
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:26
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:95
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:87
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:68
 msgid "PIN"
 msgstr "PIN"
 
@@ -3884,114 +3985,116 @@ msgstr "PIN"
 msgid "PIN code rejected"
 msgstr "PIN-Code abgelehnt"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:966
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1372
 msgid "PMK R1 Push"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:43
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:13
 msgid "PPP"
 msgstr "PPP"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:11
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:58
 msgid "PPPoA Encapsulation"
 msgstr "PPPoA Kapselung"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:19
 msgid "PPPoATM"
 msgstr "PPPoATM"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:17
 msgid "PPPoE"
 msgstr "PPPoE"
 
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:28
 #: protocols/luci-proto-pppossh/luasrc/model/network/proto_pppossh.lua:9
 msgid "PPPoSSH"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:15
 msgid "PPtP"
 msgstr "PPtP"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:59
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:73
 msgid "PSID offset"
 msgstr "PSID-Offset"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:56
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:70
 msgid "PSID-bits length"
 msgstr "PSID-Bitlänge"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:123
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:846
 msgid "PTM/EFM (Packet Transfer Mode)"
 msgstr "PTM/EFM (Paket-Transfer-Modus)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:78
-msgid "Package libiwinfo required!"
-msgstr "Benötige das libiwinfo Paket!"
-
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:45
 msgid "Packets"
 msgstr "Pakete"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:7
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:756
 msgid "Part of zone %q"
 msgstr "Teil von Zone %q"
 
 #: modules/luci-base/luasrc/view/sysauth.htm:29
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1111
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:35
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:42
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1514
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:46
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:104
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:58
 msgid "Password"
 msgstr "Passwort"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:29
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:24
 msgid "Password authentication"
 msgstr "Passwortanmeldung"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1019
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1414
 msgid "Password of Private Key"
 msgstr "Passwort des privaten Schlüssels"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1067
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1471
 msgid "Password of inner Private Key"
 msgstr "Password des inneren, privaten Schlüssels"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:14
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:16
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:18
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:20
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:32
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:34
 msgid "Password strength"
 msgstr "Passwortstärke"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:44
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:107
 msgid "Password2"
 msgstr "Passwort Bestätigung"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:37
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:244
 msgid "Paste or drag SSH key file…"
 msgstr "Schlüssel einfügen oder Schlüsseldatei hereinziehen…"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1000
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1396
 msgid "Path to CA-Certificate"
 msgstr "Pfad zum CA-Zertifikat"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1007
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1402
 msgid "Path to Client-Certificate"
 msgstr "Pfad zu Client-Zertifikat"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1013
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1408
 msgid "Path to Private Key"
 msgstr "Pfad zum Privaten Schlüssel"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1049
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1453
 msgid "Path to inner CA-Certificate"
 msgstr "Pfad zum inneren CA-Zertifikat"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1055
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1459
 msgid "Path to inner Client-Certificate"
 msgstr "Pfad zum inneren Client-Zertifikat"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1061
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1465
 msgid "Path to inner Private Key"
 msgstr "Pfad zum inneren, privaten Schlüssel"
 
@@ -4009,7 +4112,7 @@ msgstr "Pfad zum inneren, privaten Schlüssel"
 msgid "Peak:"
 msgstr "Spitze:"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:28
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:89
 msgid "Peer IP address to assign"
 msgstr "Entfernte IP-Adresse"
 
@@ -4018,11 +4121,11 @@ msgstr "Entfernte IP-Adresse"
 msgid "Peer address is missing"
 msgstr "Entfernte IP-Adresse fehlt"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:90
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:89
 msgid "Peers"
 msgstr "Verbindungspartner"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:50
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:80
 msgid "Perfect Forward Secrecy"
 msgstr ""
 
@@ -4034,7 +4137,11 @@ msgstr "Neustart durchführen"
 msgid "Perform reset"
 msgstr "Reset durchführen"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:174
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:199
+msgid "Permission denied"
+msgstr "Zugriff verweigert"
+
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:136
 msgid "Persistent Keep Alive"
 msgstr "Persistentes Keep-Alive"
 
@@ -4042,7 +4149,7 @@ msgstr "Persistentes Keep-Alive"
 msgid "Phy Rate:"
 msgstr "Phy-Rate:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:190
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:277
 msgid "Physical Settings"
 msgstr "Physische Einstellungen"
 
@@ -4053,6 +4160,10 @@ msgstr "Ping-Anfrage"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:16
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:17
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:41
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:77
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:87
@@ -4070,15 +4181,19 @@ msgstr "Bitte Benutzernamen und Passwort eingeben."
 msgid "Policy"
 msgstr "Standardregel"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:22
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:20
 msgid "Port"
 msgstr "Port"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:18
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:133
+msgid "Port %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:274
 msgid "Port status:"
 msgstr "Port-Status:"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:482
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:488
 msgid "Potential negation of: %s"
 msgstr "Mögliche Negation von: %s"
 
@@ -4090,11 +4205,11 @@ msgstr "Energiesparmodus"
 msgid "Pre-emtive CRC errors (CRCP_P)"
 msgstr "Präemptive CRC-Fehler (CRCP_P)"
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:32
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:73
 msgid "Prefer LTE"
 msgstr "LTE bevorzugen"
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:33
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:74
 msgid "Prefer UMTS"
 msgstr "UMTS bevorzugen"
 
@@ -4102,16 +4217,16 @@ msgstr "UMTS bevorzugen"
 msgid "Prefix Delegated"
 msgstr "Delegiertes Präfix"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:122
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:117
 msgid "Preshared Key"
 msgstr "Gemeinsamer Schlüssel"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:101
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:75
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:81
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:75
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:54
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:74
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:131
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:102
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:89
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:112
 msgid ""
 "Presume peer to be dead after given amount of LCP echo failures, use 0 to "
 "ignore failures"
@@ -4119,16 +4234,15 @@ 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:304
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:305
 msgid "Prevent listening on these interfaces."
 msgstr "Verhindert das Binden an diese Schnittstellen"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:509
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:562
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:950
 msgid "Prevents client-to-client communication"
 msgstr "Unterbindet Client-Client-Verkehr"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:18
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:49
 msgid "Private Key"
 msgstr "Privater Schlüssel"
 
@@ -4149,39 +4263,33 @@ msgstr "Profil"
 msgid "Prot."
 msgstr "Prot."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:72
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:349
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:675
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:84
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:216
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:87
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:390
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:31
-msgid "Protocol of the new interface"
-msgstr "Protokoll für die neue Schnittstelle"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:222
-msgid "Protocol support is not installed"
-msgstr "Protokollunterstützung ist nicht installiert"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:269
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:260
 msgid "Provide NTP server"
 msgstr "NTP-Server anbieten"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:701
 msgid "Provide new network"
 msgstr "Neues Netzwerk anbieten"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:451
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:879
 msgid "Pseudo Ad-Hoc (ahdemo)"
 msgstr "Pseudo Ad-Hoc (ahdemo)"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:112
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:113
 msgid "Public Key"
 msgstr "Öffentlicher Schlüssel"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:278
 msgid ""
 "Public keys allow for the passwordless SSH logins with a higher security "
 "compared to the use of plain passwords. In order to upload a new key to the "
@@ -4195,50 +4303,51 @@ msgstr ""
 "eine Schlüsseldatei mit der Endung <code>.pub</code> in das Eingabefeld "
 "gezogen werden."
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:139
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:211
 msgid "Public prefix routed to this device for distribution to clients."
 msgstr ""
 "Zu diesem Gerät geroutetes öffentliches Präfix zur Weiterverteilung an "
 "Clients."
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:27
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:9
 msgid "QMI Cellular"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:173
 msgid "Quality"
 msgstr "Qualität"
 
-#: 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:171
 msgid ""
 "Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> "
 "servers"
 msgstr "Alle verfügbaren übergeordneten DNS-Server abfragen"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:952
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1360
 msgid "R0 Key Lifetime"
 msgstr "R0-Schlüsselgültigkeit"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:959
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1366
 msgid "R1 Key Holder"
 msgstr "R1-Schlüsselinhaber"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:58
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:88
 msgid "RFC3947 NAT-T mode"
 msgstr "RFC3947 \"NAT-T\"-Modus"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:381
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:814
 msgid "RSSI threshold for joining"
 msgstr "RSSI-Schwellwert für Assoziationen"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:256
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:597
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:778
 msgid "RTS/CTS Threshold"
 msgstr "RTS/CTS-Schwelle"
 
 # Ein / Aus, eingehend / ausgehend?
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:41
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:76
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:87
 msgid "RX"
@@ -4248,37 +4357,41 @@ msgstr "RX"
 msgid "RX Rate"
 msgstr "RX-Rate"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:783
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1961
+msgid "RX Rate / TX Rate"
+msgstr "RX-Rate / TX-Rate"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1207
 msgid "Radius-Accounting-Port"
 msgstr "Radius-Accounting-Port"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:791
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1215
 msgid "Radius-Accounting-Secret"
 msgstr "Radius-Accounting-Secret"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:775
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1199
 msgid "Radius-Accounting-Server"
 msgstr "Radius-Accounting-Server"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:759
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1183
 msgid "Radius-Authentication-Port"
 msgstr "Radius-Authentication-Port"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:767
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1191
 msgid "Radius-Authentication-Secret"
 msgstr "Radius-Authentication-Secret"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:751
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1175
 msgid "Radius-Authentication-Server"
 msgstr "Radius-Authentication-Server"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:119
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:102
 msgid "Raw hex-encoded bytes. Leave empty unless your ISP require this"
 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:83
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:84
 msgid ""
 "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-Server"
@@ -4293,21 +4406,11 @@ msgstr ""
 "gemacht werden! Der Kontakt zum Gerät könnte verloren gehen wenn die "
 "Verbindung über diese Schnittstelle erfolgt."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2
-msgid ""
-"Really delete this wireless network? The deletion cannot be undone! You "
-"might lose access to this device if you are connected via this network."
-msgstr ""
-"Dieses Drahtlosnetzwerk wirklich löschen? Der Schritt kann nicht rückgängig "
-"gemacht werden!\n"
-"Der Zugriff auf das Gerät könnte verlorengehen wenn Sie über dieses Netzwerk "
-"verbunden sind."
-
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:40
 msgid "Really reset all changes?"
 msgstr "Sollen wirklich alle Änderungen verworfen werden?"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:237
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:354
 msgid "Really switch protocol?"
 msgstr "Protokoll wirklich wechseln?"
 
@@ -4331,15 +4434,15 @@ msgstr "Echtzeitverkehr"
 msgid "Realtime Wireless"
 msgstr "Echtzeit-WLAN-Signal"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:931
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1343
 msgid "Reassociation Deadline"
 msgstr "Reassoziierungsfrist"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:191
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
 msgid "Rebind protection"
 msgstr "DNS-Rebind-Schutz"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:48
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:46
 #: modules/luci-mod-system/luasrc/view/admin_system/reboot.htm:9
 msgid "Reboot"
 msgstr "Neu Starten"
@@ -4353,21 +4456,15 @@ msgstr "Das System wird neu gestartet..."
 msgid "Reboots the operating system of your device"
 msgstr "Startet das Betriebssystem des Routers neu."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:103
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:90
 msgid "Receive"
 msgstr "Empfangen"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:325
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:350
-msgid "Receiver Antenna"
-msgstr "Empfangsantenne"
-
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:42
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:59
 msgid "Recommended. IP addresses of the WireGuard interface."
 msgstr "Empfohlen. IP-Adresse der WireGuard-Schnittstelle."
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:28
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:300
 msgid "Reconnect this interface"
 msgstr "Diese Schnittstelle neu verbinden"
 
@@ -4375,75 +4472,73 @@ msgstr "Diese Schnittstelle neu verbinden"
 msgid "References"
 msgstr "Verweise"
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:39
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:153
 msgid "Relay"
 msgstr "Relay"
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:36
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:157
 msgid "Relay Bridge"
 msgstr "Relay-Brücke"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:17
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:154
 msgid "Relay between networks"
 msgstr "Zwischen folgenden Netzwerken weiterleiten"
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:64
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:12
 msgid "Relay bridge"
 msgstr "Relay-Brücke"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:18
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:50
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:49
 msgid "Remote IPv4 address"
 msgstr "Entfernte IPv4-Adresse"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:8
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:40
 msgid "Remote IPv4 address or FQDN"
 msgstr "Entfernte IPv4-Adresse oder Hostname"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:45
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:725
 msgid "Remove"
 msgstr "Entfernen"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:53
-msgid "Repeat scan"
-msgstr "Scan wiederholen"
-
-#: modules/luci-base/luasrc/view/cbi/upload.htm:11
-msgid "Replace entry"
-msgstr "Eintrag ersetzen"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:46
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:51
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1806
 msgid "Replace wireless configuration"
 msgstr "Drahtloskonfiguration ersetzen"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:8
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:17
 msgid "Request IPv6-address"
 msgstr "IPv6-Adresse anfordern"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:16
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:23
 msgid "Request IPv6-prefix of length"
 msgstr "IPv6-Präfix dieser Länge anfordern"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1141
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:200
+msgid "Request timeout"
+msgstr "Anfrage-Timeout"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1536
 msgid "Required"
 msgstr "Benötigt"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:20
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:31
 msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3"
 msgstr ""
 "Wird von bestimmten Internet-Providern benötigt, z.B. Charter mit DOCSIS 3"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:19
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:49
 msgid "Required. Base64-encoded private key for this interface."
 msgstr "Benötigt. Base64-kodierter privater Schlüssel für diese Schnittstelle"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:113
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:113
 msgid "Required. Base64-encoded public key of peer."
 msgstr ""
 "Benötigt. Base64-kodierter öffentlicher Schlüssel für diese Schnittstelle"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:136
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:122
 msgid ""
 "Required. IP addresses and prefixes that this peer is allowed to use inside "
 "the tunnel. Usually the peer's tunnel IP addresses and the networks the peer "
@@ -4453,7 +4548,27 @@ msgstr ""
 "Tunnels nutzen darf. Entspricht üblicherweise der Tunnel-IP-Adresse des "
 "Verbindungspartners und den Netzwerken, die dieser durch den Tunnel routet."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1134
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1095
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1096
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1097
+msgid "Requires hostapd"
+msgstr "Benötigt \"hostapd\""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1101
+msgid "Requires hostapd with EAP support"
+msgstr "Benötigt \"hostapd\" mit EAP-Support"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1102
+msgid "Requires hostapd with OWE support"
+msgstr "Benötigt \"hostapd\" mit OWE-Support"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1098
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1099
+msgid "Requires hostapd with SAE support"
+msgstr "Benötigt \"hostapd\" mit SAE-Support"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1533
 msgid ""
 "Requires the 'full' version of wpad/hostapd and support from the wifi driver "
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
@@ -4461,7 +4576,7 @@ msgstr ""
 "Benötigt die \"volle\" Variante des wpad oder hostapd Paketes und "
 "Unterstützung vom WLAN-Treiber."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:141
 msgid ""
 "Requires upstream supports DNSSEC; verify unsigned domain responses really "
 "come from unsigned domains"
@@ -4469,7 +4584,31 @@ msgstr ""
 "Setzt DNSSEC-Unterstützung im DNS-Zielserver vorraus; überprüft ob "
 "unsignierte Antworten wirklich von unsignierten Domains kommen."
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1268
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1109
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1119
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1120
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1121
+msgid "Requires wpa-supplicant"
+msgstr "Benötigt \"wpa-supplicant\""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1113
+msgid "Requires wpa-supplicant with EAP support"
+msgstr "Benötigt \"wpa-supplicant\" mit EAP-Support"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1114
+msgid "Requires wpa-supplicant with OWE support"
+msgstr "Benötigt \"wpa-supplicant\" mit OWE-Support"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1111
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1124
+msgid "Requires wpa-supplicant with SAE support"
+msgstr "Benötigt \"wpa-supplicant\" mit SAE-Support"
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1355
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:17
 #: modules/luci-base/luasrc/view/cbi/footer.htm:30
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:66
@@ -4485,17 +4624,22 @@ msgstr "Zähler zurücksetzen"
 msgid "Reset to defaults"
 msgstr "Auslieferungszustand wiederherstellen"
 
-#: 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:68
 msgid "Resolv and Hosts Files"
 msgstr "Resolv- und Hosts-Dateien"
 
-#: 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:94
 msgid "Resolve file"
 msgstr "Resolv-Datei"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:28
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:14
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:71
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:197
+msgid "Resource not found"
+msgstr "Resource nicht gefunden"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:302
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:693
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:90
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:112
 msgid "Restart"
 msgstr "Neustarten"
 
@@ -4503,7 +4647,7 @@ msgstr "Neustarten"
 msgid "Restart Firewall"
 msgstr "Firewall neu starten"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:14
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:691
 msgid "Restart radio interface"
 msgstr "W-LAN-Gerät neu starten"
 
@@ -4515,26 +4659,24 @@ msgstr "Wiederherstellen"
 msgid "Restore backup"
 msgstr "Sicherung wiederherstellen"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:113
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:114
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:38
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:46
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:119
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:120
 msgid "Reveal/hide password"
 msgstr "Passwort zeigen/verstecken"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1774
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2322
 msgid "Revert"
 msgstr "Verwerfen"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1861
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2405
 msgid "Revert changes"
 msgstr "Änderungen verwerfen"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2013
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2554
 msgid "Revert request failed with status <code>%h</code>"
 msgstr "Anforderung zum Verwerfen mit Status <code>%h</code> fehlgeschlagen"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1993
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2534
 msgid "Reverting configuration…"
 msgstr "Verwerfe Konfigurationsänderungen..."
 
@@ -4542,7 +4684,7 @@ msgstr "Verwerfe Konfigurationsänderungen..."
 msgid "Root"
 msgstr "Root"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:271
 msgid "Root directory for files served via TFTP"
 msgstr "Wurzelverzeichnis für über TFTP ausgelieferte Dateien "
 
@@ -4550,7 +4692,7 @@ msgstr "Wurzelverzeichnis für über TFTP ausgelieferte Dateien "
 msgid "Root preparation"
 msgstr "Wurzelverzeichnis erzeugen"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:147
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:126
 msgid "Route Allowed IPs"
 msgstr "Erlaubte IP-Addressen routen"
 
@@ -4562,12 +4704,12 @@ msgstr "Routen-Tabelle"
 msgid "Route type"
 msgstr "Routen-Typ"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:523
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:577
 msgid "Router Advertisement-Service"
 msgstr "Router-Advertisement-Dienst"
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:43
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:15
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:27
 msgid "Router Password"
 msgstr "Routerpasswort"
 
@@ -4597,7 +4739,7 @@ msgstr "Vor dem Einhängen Dateisystemprüfung starten "
 msgid "Run filesystem check"
 msgstr "Dateisystemprüfung durchführen"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:651
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:669
 msgid "Runtime error"
 msgstr "Laufzeitfehler"
 
@@ -4609,31 +4751,31 @@ msgstr ""
 msgid "SNR"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:5
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:18
 msgid "SSH Access"
 msgstr "SSH-Zugriff"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:10
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:70
 msgid "SSH server address"
 msgstr "SSH-Server-Adresse"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:13
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:74
 msgid "SSH server port"
 msgstr "SSH-Server-Port"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:8
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:58
 msgid "SSH username"
 msgstr "SSH Benutzername"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:27
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:277
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
 msgid "SSH-Keys"
 msgstr "SSH-Schlüssel"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:42
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:73
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:29
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1617
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:174
 msgid "SSID"
 msgstr "SSID"
@@ -4642,17 +4784,17 @@ msgstr "SSID"
 msgid "SWAP"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1127
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1262
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1379
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1351
 #: modules/luci-base/luasrc/view/cbi/error.htm:17
 #: modules/luci-base/luasrc/view/cbi/footer.htm:26
 #: modules/luci-base/luasrc/view/cbi/header.htm:17
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:54
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:133
 msgid "Save"
 msgstr "Speichern"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1256
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1768
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1347
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2318
 #: modules/luci-base/luasrc/view/cbi/footer.htm:22
 msgid "Save & Apply"
 msgstr "Speichern & Anwenden"
@@ -4665,28 +4807,20 @@ msgstr "Speichere mtdblock"
 msgid "Save mtdblock contents"
 msgstr "Inhalte von mtdblock-Partitionen speichern"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
-msgid "Saving keys…"
-msgstr "Speichere Schlüssel…"
-
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:698
 msgid "Scan"
 msgstr "Scan"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:109
-msgid "Scan request failed"
-msgstr "Scan-Anforderung fehlgeschlagen"
-
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:8
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:39
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:23
 msgid "Scheduled Tasks"
 msgstr "Geplante Aufgaben"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1749
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2302
 msgid "Section added"
 msgstr "Sektion hinzugefügt"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1751
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2304
 msgid "Section removed"
 msgstr "Sektion entfernt"
 
@@ -4704,12 +4838,18 @@ msgstr ""
 "wenn die Formatüberprüfung fehlschlägt. Diese Option nur benutzen wenn das "
 "Abbild korrekt und für dieses Gerät bestimmt ist!"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:119
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:90
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:96
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:90
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:69
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:92
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1516
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1646
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1809
+msgid "Select file…"
+msgstr "Datei auswählen…"
+
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:144
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:102
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:125
 msgid ""
 "Send LCP echo requests at the given interval in seconds, only effective in "
 "conjunction with failure threshold"
@@ -4717,36 +4857,32 @@ msgstr ""
 "Sende LCP Echo Anforderungen im angegebenem Interval in Sekunden, nur "
 "effektiv in Verbindung mit einem Fehler-Schwellwert"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:561
-msgid "Separate Clients"
-msgstr "Clients isolieren"
-
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:62
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:63
 msgid "Server Settings"
 msgstr "Servereinstellungen"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:26
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:50
 msgid "Service Name"
 msgstr "Service-Name"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:25
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:30
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:87
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:71
 msgid "Service Type"
 msgstr "Service-Typ"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:55
+#: modules/luci-base/luasrc/controller/admin/index.lua:62
 msgid "Services"
 msgstr "Dienste"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:815
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:861
 msgid "Session expired"
 msgstr "Sitzung abgelaufen"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:83
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:107
 msgid "Set VPN as Default Route"
 msgstr "VPN als Defaultroute benutzen"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:258
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:795
 msgid ""
 "Set interface properties regardless of the link carrier (If set, carrier "
 "sense events do not invoke hotplug handlers)."
@@ -4755,15 +4891,18 @@ msgstr ""
 "Option ausgewählt, so werden die Hotplug-Skripte bei Änderung nicht "
 "aufgerufen)"
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:23
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:55
 msgid "Setting PLMN failed"
 msgstr "Setzen der PLMN fehlgeschlagen"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:26
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:68
 msgid "Setting operation mode failed"
 msgstr "Setzen des Betriebsmodus fehlgeschlagen"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:454
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:517
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:527
 msgid "Setup DHCP Server"
 msgstr "DHCP Server einrichten"
 
@@ -4775,7 +4914,7 @@ msgstr "schwerwiegende Fehlersekunden (SES)"
 msgid "Short GI"
 msgstr "kurzes Guardintervall"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:516
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:960
 msgid "Short Preamble"
 msgstr "Kurze Präambel"
 
@@ -4787,21 +4926,23 @@ msgstr "Zeige aktuelle Liste der gesicherten Dateien"
 msgid "Show empty chains"
 msgstr "Leere Chains anzeigen"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:306
 msgid "Shutdown this interface"
 msgstr "Diese Schnittstelle herunterfahren"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:111
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:34
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:47
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:132
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1616
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:173
 msgid "Signal"
 msgstr "Signal"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1960
+msgid "Signal / Noise"
+msgstr "Signal / Rauschen"
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:125
 msgid "Signal Attenuation (SATN)"
 msgstr "Signaldämpfung (SATN)"
@@ -4814,11 +4955,11 @@ msgstr "Signal:"
 msgid "Size"
 msgstr "Größe"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:259
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:260
 msgid "Size of DNS query cache"
 msgstr "Größe des DNS-Caches"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:191
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
 msgid "Size of the ZRam device in megabytes"
 msgstr "Größe der ZRAM-Gerätedatei in Megabytes."
 
@@ -4835,11 +4976,7 @@ msgstr "Zum Inhalt springen"
 msgid "Skip to navigation"
 msgstr "Zur Navigation springen"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:335
-msgid "Slot time"
-msgstr "Zeitslot"
-
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1640
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1846
 #: modules/luci-base/luasrc/model/network.lua:1427
 msgid "Software VLAN"
 msgstr "Software-VLAN"
@@ -4881,11 +5018,7 @@ msgstr "Quelladresse"
 msgid "Specifies the directory the device is attached to"
 msgstr "Nennt das Verzeichnis, an welches das Gerät angebunden ist"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:23
-msgid "Specifies the listening port of this <em>Dropbear</em> instance"
-msgstr "Gibt den Server-Port dieser <em>Dropbear</em>-Instanz an"
-
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:57
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:175
 msgid ""
 "Specifies the maximum amount of failed ARP requests until hosts are presumed "
 "to be dead"
@@ -4893,7 +5026,7 @@ msgstr ""
 "Maximale Anzahl fehlgeschlagener ARP-Anfragen bis ein Host als nicht "
 "verfügbar gilt"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:49
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:171
 msgid ""
 "Specifies the maximum amount of seconds after which hosts are presumed to be "
 "dead"
@@ -4901,11 +5034,21 @@ msgstr ""
 "Spezifiziert die maximale Anzahl an Sekunde nach denen Hoss als tot erachtet "
 "werden"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:761
+msgid ""
+"Specifies the maximum transmit power the wireless radio may use. Depending "
+"on regulatory requirements and wireless usage, the actual transmit power may "
+"be reduced by the driver."
+msgstr ""
+"Beschränkt die maximal zu verwendende Sendeleistung des Radio-Moduls. "
+"Abhängig von regulatorischen Einschränkungen, Modulation und Betriebsmodus "
+"kann die eigentliche Leistung durch den Treiber weiter reduziert werden."
+
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:63
 msgid "Specify a TOS (Type of Service)."
 msgstr "Setzt einen spezifischen TOS (Type of Service) Wert"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:25
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:58
 msgid ""
 "Specify a TTL (Time to Live) for the encapsulating packet other than the "
 "default (64)."
@@ -4913,7 +5056,7 @@ msgstr ""
 "Setzt eine spezifische TTL (Time to Live) für gekapselte Pakete, anstatt der "
 "standardmäßigen 64."
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:53
 msgid ""
 "Specify an MTU (Maximum Transmission Unit) other than the default (1280 "
 "bytes)."
@@ -4921,29 +5064,30 @@ msgstr ""
 "Setzt eine spezifische MTU (Maximum Transmission Unit) abweichend von den "
 "standardmäßigen 1280 Bytes."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:60
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "Specify the secret encryption key here."
 msgstr "Geben Sie hier den geheimen Netzwerkschlüssel an"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:475
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:64
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:533
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:89
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:111
 msgid "Start"
 msgstr "Start"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:33
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:86
 msgid "Start priority"
 msgstr "Startpriorität"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1958
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2499
 msgid "Starting configuration apply…"
 msgstr "Starte Anwendung der Konfigurationsänderungen..."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1626
 msgid "Starting wireless scan..."
 msgstr "Starte WLAN Scan..."
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:24
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:120
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
 msgid "Startup"
 msgstr "Systemstart"
 
@@ -4955,20 +5099,21 @@ msgstr "Statische IPv4 Routen"
 msgid "Static IPv6 Routes"
 msgstr "Statische IPv6 Routen"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:70
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:71
 msgid "Static Leases"
 msgstr "Statische Einträge"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:118
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:73
 msgid "Static Routes"
 msgstr "Statische Routen"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1194
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1384
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:172
 #: modules/luci-base/luasrc/model/network.lua:966
 msgid "Static address"
 msgstr "Statische Adresse"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:308
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:309
 msgid ""
 "Static leases are used to assign fixed IP addresses and symbolic hostnames "
 "to DHCP clients. They are also required for non-dynamic interface "
@@ -4979,39 +5124,41 @@ msgstr ""
 "Konfigurationen benötigt auf denen lediglich Hosts mit zugehörigem "
 "statischem Lease-Eintrag bedient werden."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:534
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:977
 msgid "Station inactivity limit"
 msgstr "Client-Inaktivitäts-Limit"
 
 #: modules/luci-base/luasrc/controller/admin/index.lua:40
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:197
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:337
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:746
 #: modules/luci-mod-status/luasrc/view/admin_status/index.htm:128
 msgid "Status"
 msgstr "Status"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:35
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:75
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:308
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:91
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:113
 msgid "Stop"
 msgstr "Stoppen"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:165
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Strict order"
 msgstr "Strikte Reihenfolge"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:16
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:30
 msgid "Strong"
 msgstr "Stark"
 
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1843
 msgid "Submit"
 msgstr "Absenden"
 
-#: 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:108
 msgid "Suppress logging"
 msgstr "Logeinträge unterdrücken"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:109
 msgid "Suppress logging of the routine operation of these protocols"
 msgstr ""
 "Logeinträge für erfolgreiche Operationen dieser Protokolle unterdrücken"
@@ -5024,44 +5171,46 @@ msgstr "Auslagerungsspeicher"
 msgid "Swap Entry"
 msgstr "Auslagerungsdatei"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:23
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:5
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:135
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:21
 msgid "Switch"
 msgstr "Switch"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:129
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:168
 msgid "Switch %q"
 msgstr "Switch %q"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:128
-msgid "Switch %q (%s)"
-msgstr "Switch %q (%s)"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:66
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:146
 msgid ""
 "Switch %q has an unknown topology - the VLAN settings might not be accurate."
 msgstr ""
 "Der Switch %q hat eine unbekannte Struktur, die VLAN Settings könnten "
 "unpassend sein."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:146
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:142
 msgid "Switch Port Mask"
 msgstr "Switch-Port-Maske"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1640
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1846
 #: modules/luci-base/luasrc/model/network.lua:1425
 msgid "Switch VLAN"
 msgstr "Switch-VLAN"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:238
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:355
 msgid "Switch protocol"
 msgstr "Wechsle Protokoll"
 
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:103
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:104
 #: modules/luci-base/luasrc/view/cbi/ipaddr.htm:26
 msgid "Switch to CIDR list notation"
 msgstr "Auf CIDR-Listen-Notation wechseln"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:77
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1547
+msgid "Symbolic link"
+msgstr "Symbolischer Link"
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:71
 msgid "Sync with NTP-Server"
 msgstr "Mit NTP-Server synchronisieren"
 
@@ -5071,7 +5220,7 @@ msgstr "Mit Browser synchronisieren"
 
 #: modules/luci-base/luasrc/controller/admin/index.lua:47
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:14
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:102
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:94
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
 #: modules/luci-mod-system/luasrc/view/admin_system/applyreboot.htm:39
 msgid "System"
@@ -5082,11 +5231,11 @@ msgstr "System"
 msgid "System Log"
 msgstr "Systemprotokoll"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:108
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:99
 msgid "System Properties"
 msgstr "Systemeigenschaften"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:145
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:136
 msgid "System log buffer size"
 msgstr "Größe des Systemprotokoll-Puffers"
 
@@ -5094,16 +5243,18 @@ msgstr "Größe des Systemprotokoll-Puffers"
 msgid "TCP:"
 msgstr "TCP:"
 
-#: 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:69
 msgid "TFTP Settings"
 msgstr "TFTP Einstellungen"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:269
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
 msgid "TFTP server root"
 msgstr "TFTP Wurzelverzeichnis"
 
 # same as RX
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:17
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:77
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:88
 msgid "TX"
@@ -5126,7 +5277,7 @@ msgstr "Tabelle"
 msgid "Target"
 msgstr "Ziel"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:77
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:103
 msgid "Target network"
 msgstr "Zielnetzwerk"
 
@@ -5134,29 +5285,7 @@ msgstr "Zielnetzwerk"
 msgid "Terminate"
 msgstr "Beenden"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:27
-msgid ""
-"The <em>Device Configuration</em> section covers physical settings of the "
-"radio hardware such as channel, transmit power or antenna selection which "
-"are shared among all defined wireless networks (if the radio hardware is "
-"multi-SSID capable). Per network settings like encryption or operation mode "
-"are grouped in the <em>Interface Configuration</em>."
-msgstr ""
-"Die <em>Gerätekonfiguration</em> deckt physische Einstellungen der WLAN-"
-"Hardware wie Kanal, Sendestärke oder Antennenauswahl ab. Diese Einstellungen "
-"werden von allen Netzwerken auf dem Gerät geteilt. Netzwerk-spezifische "
-"Einstellungen wie Verschlüsselung oder Betriebsmodus sind in der "
-"<em>Schnittstellenkonfiguration</em> gruppiert."
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:79
-msgid ""
-"The <em>libiwinfo-lua</em> package is not installed. You must install this "
-"component for working wireless configuration!"
-msgstr ""
-"Das <em>libiwinfo-lua</em> Paket ist nicht installiert. Dieses Paket muss "
-"für eine funktionierende WLAN-Konfiguration vorhanden sein!"
-
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:66
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:77
 msgid ""
 "The HE.net endpoint update configuration changed, you must now use the plain "
 "username instead of the user ID!"
@@ -5164,22 +5293,21 @@ msgstr ""
 "Die Updateprozedur für HE.net Tunnel-IP-Adrerssen hat sich geändert, statt "
 "der numerischen User-ID muss nun der normale Benutzername angegeben werden."
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:8
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:40
 msgid ""
 "The IPv4 address or the fully-qualified domain name of the remote tunnel end."
 msgstr ""
 "Die IPv4-Adresse oder der volle Domain Name des entfernten Tunnel-Endpunktes."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:27
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:38
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:59
 msgid ""
 "The IPv6 prefix assigned to the provider, usually ends with <code>::</code>"
 msgstr ""
 "Vom Provider zugewiesenes IPv6-Präfix, endet normalerweise mit <code>::</"
 "code>"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:18
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1808
 msgid ""
 "The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
 "code> and <code>_</code>"
@@ -5197,8 +5325,7 @@ msgstr ""
 "Die Konfigurationsdatei konnte aufgrund der folgenden Fehler nicht geladen "
 "werden:"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1849
-#, fuzzy
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2396
 msgid ""
 "The device could not be reached within %d seconds after applying the pending "
 "changes, which caused the configuration to be rolled back for safety "
@@ -5208,10 +5335,14 @@ msgid ""
 "or revert all pending changes to keep the currently working configuration "
 "state."
 msgstr ""
-"Das Gerät konnte nach Anwendung der ausstehenden Konfigurationsänderungen "
-"nicht mehr innerhalb von %d Sekunden erreicht werden, daher wurde die "
-"Konfiguration aus Sicherheitsgründen zurückgerollt. Wenn die Änderungen "
-"dennoch korrekt sind, kann die Konfiguration ungeprüft "
+"Das Gerät konnte nach dem Anwenden der ausstehenden Änderungen innerhalb von "
+"%d Sekunden nicht mehr erreicht werden, daher wurde die Änderungen aus "
+"Sicherheitsgründen zurückgerollt. Wenn Sie der Meinung sind, dass die "
+"Änderungen trotzdem korrekt sind, wenden sie die Änderungen ungeprüft an. "
+"Alternativ können Sie diese Meldung schließen und die Konfiguration weiter "
+"bearbeiten bevor Sie das Anwenden neu versuchen oder alle austehenden "
+"Änderungen verwerfen um den aktuell funktionierenden Konfigurationsstand "
+"beizubehalten."
 
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:87
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:41
@@ -5220,6 +5351,14 @@ msgid ""
 "</abbr> <code>/dev/sda1</code>)"
 msgstr "Die Gerätedatei des Speichers oder der Partition (z.B.: /dev/sda)"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:612
+msgid ""
+"The existing wireless configuration needs to be changed for LuCI to function "
+"properly."
+msgstr ""
+"Die existierende Drahtlos-Konfiguration muss geändert werden damit LuCI "
+"richtig funktioniert."
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:127
 msgid ""
 "The filesystem that was used to format the memory (<abbr title=\"for example"
@@ -5242,11 +5381,15 @@ msgstr ""
 msgid "The following rules are currently active on this system."
 msgstr "Die folgenden Regeln sind zur Zeit auf dem System aktiv."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:144
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:154
+msgid "The gateway address must not be a local IP address"
+msgstr "Das Gateway darf keine lokale IP-Addresse des Routers sein"
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:154
 msgid "The given SSH public key has already been added."
 msgstr "Der angegebene öffentliche SSH-Schlüssel wurde bereits hinzugefügt."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:150
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:160
 msgid ""
 "The given SSH public key is invalid. Please supply proper public RSA or "
 "ECDSA keys."
@@ -5254,21 +5397,16 @@ msgstr ""
 "Der angegebene öffentliche SSH Schlüssel ist ungültig, bitte OpenSSH-"
 "kompatible öffentliche RSA oder ECDSA-Schlüssel verwenden."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:67
-msgid "The given network name is not unique"
-msgstr "Der angebene Netzwerk-Name ist nicht eindeutig"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:664
+msgid "The interface name is already used"
+msgstr "Der Schnittstellenname wird bereits verwendet"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:52
-#, fuzzy
-msgid ""
-"The hardware is not multi-SSID capable and the existing configuration will "
-"be replaced if you proceed."
-msgstr ""
-"Die Hardware ist nicht Multi-SSID fähig und die existierende Konfiguration "
-"wird beim Fortfahren ersetzt."
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:670
+msgid "The interface name is too long"
+msgstr "Der Schnittstellenname ist zu lang"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:43
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:31
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:55
 msgid ""
 "The length of the IPv4 prefix in bits, the remainder is used in the IPv6 "
 "addresses."
@@ -5276,16 +5414,20 @@ msgstr ""
 "Länge des IPv4-Präfix in Bits, die übrigen Bits werden in der IPv6-Adresse "
 "verwendet."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:35
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:46
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:63
 msgid "The length of the IPv6 prefix in bits"
 msgstr "Länge des IPv6-Präfix in Bits"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:12
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:44
 msgid "The local IPv4 address over which the tunnel is created (optional)."
 msgstr "Die lokale IPv4-Adresse über die der Tunnel aufgebaut wird (optional)."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:5
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1814
+msgid "The network name is already used"
+msgstr "Der Netzwerkname wird bereits verwendet"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:135
 msgid ""
 "The network ports on this device can be combined to several <abbr title="
 "\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
@@ -5303,17 +5445,18 @@ msgstr ""
 "Schnittstellen bilden ein <abbr title=\"Virtual Local Area Network\">VLAN</"
 "abbr> für das lokale Netzwerk."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:77
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:395
-msgid "The selected protocol needs a device assigned"
-msgstr "Dem ausgewähltem Protokoll muss ein Gerät zugeordnet werden"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1149
+msgid "The selected %s mode is incompatible with %s encryption"
+msgstr ""
+"Der ausgewählte \"%s\" Betriebsmodus ist nicht kompatibel mit %s-"
+"Verschlüsselung"
 
 #: modules/luci-base/luasrc/view/csrftoken.htm:11
 msgid "The submitted security token is invalid or already expired!"
 msgstr ""
 "Das mitgesendete Sicherheits-Token ist ungültig oder bereits abgelaufen!"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:274
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:272
 msgid ""
 "The system is erasing the configuration partition now and will reboot itself "
 "when finished."
@@ -5321,7 +5464,7 @@ msgstr ""
 "Die Einstellungen werden nun gelöscht! Anschließend wird ein Neustart des "
 "Systems durchgeführt."
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:195
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:193
 #, fuzzy
 msgid ""
 "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
@@ -5334,7 +5477,7 @@ msgstr ""
 "Konfiguration ist es notwendig, dass Sie auf Ihrem Computer eine neue IP-"
 "Adresse beziehen müssen um auf das Gerät zugreifen zu können."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:15
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:80
 msgid "The system password has been successfully changed."
 msgstr "Das Systempasswort wurde erfolgreich geändert."
 
@@ -5346,7 +5489,7 @@ 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:403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:427
 msgid "There are no active leases"
 msgstr "Es gibt keine aktiven Leases"
 
@@ -5355,18 +5498,10 @@ msgstr "Es gibt keine aktiven Leases"
 msgid "There are no active leases."
 msgstr "Es gibt z.Z. keine aktiven Leases."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1973
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2514
 msgid "There are no changes to apply"
 msgstr "Es gibt keine anzuwendenden Änderungen"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:204
-msgid ""
-"There is no device assigned yet, please attach a network device in the "
-"\"Physical Settings\" tab"
-msgstr ""
-"Es wurde noch kein Netzwerkgerät zugeordnet, bitte ein Gerät im \"Physische "
-"Einstellungen\" Bereich anfügen"
-
 #: 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
@@ -5378,11 +5513,21 @@ msgstr ""
 "Es ist kein Passwort auf diesem Router gesetzt. Bitte konfigurieren Sie ein "
 "Root-Passwort um das Web-Interface zu schützen und SSH zu aktivieren."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:19
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:49
 msgid "This IPv4 address of the relay"
 msgstr "IPv4-Adresse des Relais"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1448
+msgid "This authentication type is not applicable to the selected EAP method."
+msgstr ""
+"Dieser Authentifizierungstyp ist nicht mit der ausgewählten EAP-Methode "
+"kombinierbar."
+
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:54
+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:163
 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 "
@@ -5403,7 +5548,7 @@ msgstr ""
 "Modifizierte Dateien in /etc/config/ und bestimmte andere essenzielle "
 "Konfigurationsdateien werden automatisch gesichert."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:74
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:81
 msgid ""
 "This is either the \"Update Key\" configured for the tunnel or the account "
 "password if no update key has been configured"
@@ -5412,7 +5557,7 @@ msgstr ""
 "wurde oder das normale Account-Passwort wenn kein separater Schlüssel "
 "gesetzt wurde."
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:82
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:127
 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."
@@ -5420,7 +5565,7 @@ msgstr ""
 "Dies ist der Inhalt von /etc/rc.local. Hier kann man eigene Befehle einfügen "
 "(vor 'exit 0'), die dann am Ende des Bootvorgangs ausgeführt werden."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:27
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:54
 msgid ""
 "This is the local endpoint address assigned by the tunnel broker, it usually "
 "ends with <code>...:2/64</code>"
@@ -5428,29 +5573,29 @@ 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:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:79
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> in the local network"
 msgstr "Dies ist der einzige DHCP im lokalen Netz"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:73
 msgid "This is the plain username for logging into the account"
 msgstr "Das ist der normale Login-Name für den Account."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:34
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:57
 msgid ""
 "This is the prefix routed to you by the tunnel broker for use by clients"
 msgstr ""
 "Dies ist das vom Tunnel-Broker geroutete öffentliche Präfix zur Verwendung "
 "durch nachgelagerte Clients."
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:9
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:41
 msgid "This is the system crontab in which scheduled tasks can be defined."
 msgstr ""
 "Dies ist die System-Crontab in der geplante Aufgaben definiert werden können."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:19
+#: 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 ""
@@ -5469,26 +5614,26 @@ msgstr ""
 msgid "This page gives an overview over currently active network connections."
 msgstr "Diese Seite gibt eine Übersicht über aktive Netzwerkverbindungen."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:726
-#: modules/luci-base/htdocs/luci-static/resources/form.js:809
+#: modules/luci-base/htdocs/luci-static/resources/form.js:936
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1064
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:172
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:32
 msgid "This section contains no values yet"
 msgstr "Diese Sektion enthält noch keine Einträge"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:114
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:105
 msgid "Time Synchronization"
 msgstr "Zeitsynchronisation"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:525
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:968
 msgid "Time interval for rekeying GTK"
 msgstr "Zeitintervall für die neubestimmung des Gruppenschlüssels"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:128
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:119
 msgid "Timezone"
 msgstr "Zeitzone"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:825
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:871
 msgid "To login…"
 msgstr "Zum Login…"
 
@@ -5499,11 +5644,11 @@ msgid ""
 "reset\" (only possible with squashfs images)."
 msgstr ""
 "Zum Wiederherstellen der Konfiguration kann hier ein bereits vorhandenes "
-"Backup-Archiv hochgeladen werden. \"Konfiguration zurücksetzen\" stellt den "
+"Backup-Archiv hochgeladen werden. \"Reset durchführen\" stellt den "
 "Auslieferungszustand des Systems wieder her (nur möglich bei squashfs-"
 "Images)."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:835
 msgid "Tone"
 msgstr "Ton"
 
@@ -5528,55 +5673,41 @@ msgstr "Traffic"
 msgid "Transfer"
 msgstr "Transfer"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:595
-msgid "Transmission Rate"
-msgstr "Übertragungsrate"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:102
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:89
 msgid "Transmit"
 msgstr "Senden"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:211
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:273
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:345
-msgid "Transmit Power"
-msgstr "Sendeleistung"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:318
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:349
-msgid "Transmitter Antenna"
-msgstr "Sendeantenne"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:73
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:57
 msgid "Trigger"
 msgstr "Auslöser"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:98
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:84
 msgid "Trigger Mode"
 msgstr "Auslösmechanismus"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:54
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:69
 msgid "Tunnel ID"
 msgstr "Tunnel-ID"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1643
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1849
 #: modules/luci-base/luasrc/model/network.lua:1430
 msgid "Tunnel Interface"
 msgstr "Tunnelschnittstelle"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:44
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:55
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:76
 msgid "Tunnel Link"
 msgstr "Basisschnittstelle"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:46
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:131
 msgid "Tx-Power"
 msgstr "Sendestärke"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:32
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:185
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:11
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:43
 msgid "Type"
 msgstr "Typ"
 
@@ -5584,19 +5715,20 @@ msgstr "Typ"
 msgid "UDP:"
 msgstr "UDP:"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:28
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:90
 msgid "UMTS only"
 msgstr "Nur UMTS"
 
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:43
 #: protocols/luci-proto-3g/luasrc/model/network/proto_3g.lua:10
 msgid "UMTS/GPRS/EV-DO"
 msgstr "UMTS/GPRS/EV-DO"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:106
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:93
 msgid "USB Device"
 msgstr "USB-Gerät"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:122
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:110
 msgid "USB Ports"
 msgstr "USB Anschlüsse"
 
@@ -5626,10 +5758,12 @@ msgstr "Externe Netzwerkschnittstelle konnte nicht bestimmt werden"
 msgid "Unable to dispatch"
 msgstr "Kann Anfrage nicht zustellen"
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:22
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:54
 msgid "Unable to obtain client ID"
 msgstr "Client-ID konnte nicht bezogen werden"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:61
 msgid "Unable to resolve AFTR host name"
 msgstr "Der AFTR-Hostname konnte nicht aufgelöst werden"
@@ -5639,21 +5773,31 @@ msgstr "Der AFTR-Hostname konnte nicht aufgelöst werden"
 msgid "Unable to resolve peer host name"
 msgstr "Der Name des entfernten Hosts konnte nicht aufgelöst werden"
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:33
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:68
+msgid "Unable to save contents: %s"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:132
 msgid "Unavailable Seconds (UAS)"
 msgstr "Nicht verfügbare Sekunden (UAS)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1196
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1386
 #: modules/luci-base/luasrc/model/network.lua:970
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1349
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1539
 #: modules/luci-base/luasrc/model/network.lua:1137
 msgid "Unknown error (%s)"
 msgstr "Protokollfehler: %s"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1193
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:204
+msgid "Unknown error code"
+msgstr "Unbekannter Fehlercode"
+
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1383
+#: modules/luci-base/htdocs/luci-static/resources/protocol/none.js:6
 #: modules/luci-base/luasrc/model/network.lua:964
 msgid "Unmanaged"
 msgstr "Ignoriert"
@@ -5663,22 +5807,30 @@ msgstr "Ignoriert"
 msgid "Unmount"
 msgstr "Aushängen"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:107
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:262
 msgid "Unnamed key"
 msgstr "Unbenannter Schlüssel"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1708
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2261
 msgid "Unsaved Changes"
 msgstr "Ungespeicherte Änderungen"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:202
+msgid "Unspecified error"
+msgstr "Unbestimmter Fehler"
+
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:64
 msgid "Unsupported MAP type"
 msgstr "Nicht unterstützter MAP-Typ"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:27
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:69
 msgid "Unsupported modem"
 msgstr "Nicht unterstütztes Modem"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:219
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:119
 msgid "Unsupported protocol type."
 msgstr "Nicht unterstützter Protokolltyp."
@@ -5701,56 +5853,73 @@ msgstr ""
 msgid "Upload archive..."
 msgstr "Backup wiederherstellen..."
 
-#: modules/luci-base/luasrc/view/cbi/upload.htm:8
-msgid "Uploaded File"
-msgstr "hochgeladene Datei"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1703
+msgid "Upload file"
+msgstr "Datei hochladen"
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1678
+msgid "Upload file…"
+msgstr "Datei hochladen…"
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1623
+msgid "Upload request failed: %s"
+msgstr "Upload-Anfrage fehlgeschlagen: %s"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:613
+msgid ""
+"Upon pressing \"Continue\", anonymous \"wifi-iface\" sections will be "
+"assigned with a name in the form <em>wifinet#</em> and the network will be "
+"restarted to apply the updated configuration."
+msgstr ""
+"Beim Fortfahren werden unbenannte \"wifi-iface\" Sektionen in der "
+"Drahtloskonfiguration mit Namen in der Form <em>wifinet#</em> versehen und "
+"das Netzwerk wird neu gestartet um die geänderte Konfiguration anzuwenden."
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:14
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:74
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:85
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:26
 msgid "Uptime"
 msgstr "Laufzeit"
 
-#: 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:83
 msgid "Use <code>/etc/ethers</code>"
 msgstr "Verwende /etc/ethers"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:40
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:167
 msgid "Use DHCP gateway"
 msgstr "Benutze DHCP-Gateway"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:33
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:85
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:34
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:98
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:46
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:65
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:38
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:58
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:124
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:39
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:116
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:59
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:103
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:64
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:77
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:100
 msgid "Use DNS servers advertised by peer"
 msgstr "Benutze die von der Gegenstelle zugewiesenen DNS-Server"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:227
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:233
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:479
 msgid "Use ISO/IEC 3166 alpha2 country codes."
 msgstr "Muss ein ISO/IEC 3166 Länderkürzel sein."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:31
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:100
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:70
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:35
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:51
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:86
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:56
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:97
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:77
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:75
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:92
 msgid "Use MTU on tunnel interface"
 msgstr "Benutze MTU auf der Tunnelschnittstelle"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:95
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:65
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:30
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:46
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:81
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:93
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:73
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:88
 msgid "Use TTL on tunnel interface"
 msgstr "Benutze TTL auf der Tunnelschnittstelle"
 
@@ -5762,68 +5931,65 @@ msgstr "Als externes Overlay benutzen (/overlay)"
 msgid "Use as root filesystem (/)"
 msgstr "Als Root-Dateisystem benutzen (/)"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:19
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:31
 msgid "Use broadcast flag"
 msgstr "Benutze Broadcast-Flag"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:253
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:791
 msgid "Use builtin IPv6-management"
 msgstr "Eingebautes IPv6-Management nutzen"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:40
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:109
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:92
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:45
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:105
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:53
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:72
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:45
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:65
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:40
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:182
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:127
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:42
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:119
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:62
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:67
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:80
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:103
 msgid "Use custom DNS servers"
 msgstr "Benutze eigene DNS-Server"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:26
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:70
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:16
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:28
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:84
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:24
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:50
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:23
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:43
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:116
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:33
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:74
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:97
 msgid "Use default gateway"
 msgstr "Benutze Standard-Gateway"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:48
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:164
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:77
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:24
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:88
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:58
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:23
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:39
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:74
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:90
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:38
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:57
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:30
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:50
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:45
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:227
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:119
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:51
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:88
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:68
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:52
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:70
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:83
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:111
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:149
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:67
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:111
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:98
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:72
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:85
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:108
 msgid "Use gateway metric"
 msgstr "Benutze Gateway-Metrik"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:64
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:179
 msgid "Use routing table"
 msgstr "Benutze Routing-Tabelle"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:309
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:310
 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 "
@@ -5840,11 +6006,11 @@ msgstr ""
 msgid "Used"
 msgstr "Belegt"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:848
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1273
 msgid "Used Key Slot"
 msgstr "Benutzer Schlüsselindex"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:913
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
 msgid ""
 "Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not "
 "needed with normal WPA(2)-PSK."
@@ -5852,67 +6018,68 @@ msgstr ""
 "Wird als RADIUS-NAS-ID und als 802.11r R0KH-ID verwendet. Nicht benötigt für "
 "WPA(2)-PSK."
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:48
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:110
 msgid "User certificate (PEM encoded)"
 msgstr "PEM-kodiertes Benutzerzertifikat"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:61
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:122
 msgid "User key (PEM encoded)"
 msgstr "PEM-kodierter Benutzerschlüssel"
 
 #: modules/luci-base/luasrc/view/sysauth.htm:23
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:41
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:32
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:102
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:56
 msgid "Username"
 msgstr "Benutzername"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:182
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:903
 msgid "VC-Mux"
 msgstr "VC-Mux"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:851
 msgid "VDSL"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:172
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:169
 msgid "VLANs on %q"
 msgstr "VLANs auf %q"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:171
-msgid "VLANs on %q (%s)"
-msgstr "VLANs auf %q (%s)"
+#: modules/luci-base/luasrc/controller/admin/index.lua:55
+msgid "VPN"
+msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:18
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:42
 msgid "VPN Local address"
 msgstr "Lokale VPN-Adresse"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:22
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:46
 msgid "VPN Local port"
 msgstr "Lokaler VPN-Port"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:15
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:11
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:15
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:58
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:39
 msgid "VPN Server"
 msgstr "VPN-Server"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:18
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:96
 msgid "VPN Server port"
 msgstr "VPN-Server Port"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:37
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:100
 msgid "VPN Server's certificate SHA1 hash"
 msgstr "SHA1-Hash des VPN-Server-Zertifikates"
 
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:9
 #: protocols/luci-proto-vpnc/luasrc/model/network/proto_vpnc.lua:9
 msgid "VPNC (CISCO 3000 (and others) VPN)"
 msgstr "VPNC (VPN für CISCO 3000 und Ähnliche)"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:44
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:73
 msgid "Vendor"
 msgstr "Hersteller"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:60
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:52
 msgid "Vendor Class to send when requesting DHCP"
 msgstr "Bei DHCP-Anfragen gesendete Vendor-Klasse"
 
@@ -5920,41 +6087,37 @@ msgstr "Bei DHCP-Anfragen gesendete Vendor-Klasse"
 msgid "Verify"
 msgstr "Verifizieren"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:52
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:76
 msgid "Virtual dynamic interface"
 msgstr "Virtuelle dynamisches Schnittstelle"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:470
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:471
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:553
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:576
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:908
 msgid "WDS"
 msgstr "WDS"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:667
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1160
 msgid "WEP Open System"
 msgstr "WEP Open System"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:668
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1161
 msgid "WEP Shared Key"
 msgstr "WEP Shared Key"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "WEP passphrase"
 msgstr "WEP Schlüssel"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:503
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:566
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:945
 msgid "WMM Mode"
 msgstr "WMM Modus"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "WPA passphrase"
 msgstr "WPA Schlüssel"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:716
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:735
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:740
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1074
 msgid ""
 "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
 "and ad-hoc mode) to be installed."
@@ -5970,7 +6133,7 @@ msgstr "Änderungen werden angewandt..."
 msgid "Waiting for command to complete..."
 msgstr "Der Befehl wird ausgeführt..."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1940
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2481
 msgid "Waiting for configuration to get applied… %ds"
 msgstr "Warte auf das Anwenden der Konfiguration… %d Sek."
 
@@ -5978,8 +6141,8 @@ msgstr "Warte auf das Anwenden der Konfiguration… %d Sek."
 msgid "Waiting for device..."
 msgstr "Warte auf Gerät..."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:172
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:163
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:173
 msgid "Warning"
 msgstr "Warnung"
 
@@ -5989,11 +6152,11 @@ msgstr ""
 "Achtung: Es gibt ungespeicherte Änderungen die bei einem Neustart verloren "
 "gehen!"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:20
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:34
 msgid "Weak"
 msgstr "Schwach"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:946
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1355
 msgid ""
 "When using a PSK, the PMK can be automatically generated. When enabled, the "
 "R0/R1 key options below are not applied. Disable this to use the R0 and R1 "
@@ -6004,78 +6167,87 @@ msgstr ""
 "R0/R1-Schlüsseloptionen nicht verwendet."
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:383
 msgid "Width"
 msgstr "Breite"
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:17
 #: protocols/luci-proto-wireguard/luasrc/model/network/proto_wireguard.lua:9
 msgid "WireGuard VPN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:58
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:40
 #: modules/luci-mod-status/luasrc/controller/admin/status.lua:28
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:14
 msgid "Wireless"
 msgstr "WLAN"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1631
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1837
 #: modules/luci-base/luasrc/model/network.lua:1418
 msgid "Wireless Adapter"
 msgstr "WLAN-Gerät"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1617
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2052
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1823
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2288
 #: modules/luci-base/luasrc/model/network.lua:1404
 #: modules/luci-base/luasrc/model/network.lua:1865
 msgid "Wireless Network"
 msgstr "Drahtlosnetzwerk"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:629
 msgid "Wireless Overview"
 msgstr "Drahtlosübersicht"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:362
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:797
 msgid "Wireless Security"
 msgstr "WLAN-Verschlüsselung"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:54
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:611
+msgid "Wireless configuration migration"
+msgstr "Drahtloskonfiguration migrieren"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:139
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:179
 msgid "Wireless is disabled"
 msgstr "W-LAN ist deaktiviert"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:54
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:139
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:179
 msgid "Wireless is not associated"
 msgstr "W-LAN ist nicht assoziiert"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:15
-msgid "Wireless is restarting..."
-msgstr "WLAN startet neu..."
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:752
 msgid "Wireless network is disabled"
 msgstr "Das WLAN-Netzwerk ist deaktiviert"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:752
 msgid "Wireless network is enabled"
 msgstr "Das WLAN-Netzwerk ist aktiviert"
 
-#: 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:182
 msgid "Write received DNS requests to syslog"
 msgstr "Empfangene DNS-Anfragen in das Systemprotokoll schreiben"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:164
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:155
 msgid "Write system log to file"
 msgstr "Systemprotokoll in Datei schreiben"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1507
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:85
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1754
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:109
 msgid "Yes"
 msgstr "Ja"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:26
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:943
+msgid ""
+"You appear to be currently connected to the device via the \"%h\" interface. "
+"Do you really want to shut down the interface?"
+msgstr ""
+"Sie scheinen mit dem Gerät über die \"%h\" Schnittstelle verbunden zu sein. "
+"Wollen sie diese Schnittstelle wirklich herunterfahren?"
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:123
 msgid ""
 "You can enable or disable installed init scripts here. Changes will applied "
 "after a device reboot.<br /><strong>Warning: If you disable essential init "
@@ -6096,38 +6268,34 @@ msgstr ""
 "Im Browser muss JavaScript aktiviert sein oder LuCI wird nicht richtig "
 "funktionieren."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:196
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:187
 msgid "ZRam Compression Algorithm"
 msgstr "ZRAM Kompressionsalgorithmus"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:203
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:194
 msgid "ZRam Compression Streams"
 msgstr "ZRAM Kompressionsprozesse"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:189
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:180
 msgid "ZRam Settings"
 msgstr "ZRAM Einstellungen"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:191
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
 msgid "ZRam Size"
 msgstr "ZRAM Größe"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:229
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:230
 msgid "any"
 msgstr "beliebig"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:113
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:121
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:126
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:218
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:282
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:321
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:328
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:621
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:37
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:22
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:29
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:121
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:836
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:844
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:849
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1030
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:78
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:48
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:51
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:103
 msgid "auto"
 msgstr "auto"
 
@@ -6135,11 +6303,11 @@ msgstr "auto"
 msgid "automatic"
 msgstr "automatisch"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:45
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:78
 msgid "baseT"
 msgstr "baseT"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:909
 msgid "bridged"
 msgstr "bridged"
 
@@ -6155,22 +6323,21 @@ msgstr "erzeugen"
 msgid "create:"
 msgstr "erstelle:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:264
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:368
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:678
 msgid "creates a bridge over specified interface(s)"
-msgstr "überbrückt angegebene Schnittstelle(n)"
+msgstr "erstellt eine Netzwerkbrücke über die angegebe(n) Schnittstelle(n)"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:277
 msgid "dB"
 msgstr "dB"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:34
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:35
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:46
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:47
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:48
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:131
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:132
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:133
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:277
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:279
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:331
@@ -6182,26 +6349,30 @@ msgstr "dB"
 msgid "dBm"
 msgstr "dBm"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:460
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:587
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:889
 msgid "disable"
 msgstr "deaktivieren"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:119
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:524
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:530
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:536
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:18
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:578
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:584
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:590
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:25
 msgid "disabled"
 msgstr "deaktiviert"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:433
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:467
+msgid "driver default"
+msgstr "Treiber-Standardwert"
+
 #: modules/luci-base/luasrc/view/lease_status.htm:17
 #: modules/luci-base/luasrc/view/lease_status.htm:46
-#: 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:416
 msgid "expired"
 msgstr "abgelaufen"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:88
 msgid ""
 "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr>-leases will be stored"
@@ -6213,25 +6384,21 @@ msgstr "Speicherort für vergebenen DHCP-Adressen"
 msgid "forward"
 msgstr "weitergeleitet"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:80
 msgid "full-duplex"
 msgstr "Voll-Duplex"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:80
 msgid "half-duplex"
 msgstr "Halb-Duplex"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:559
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:565
 msgid "hexadecimal encoded value"
 msgstr "hexadezimal kodierten Wert"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:138
-msgid "hidden"
-msgstr "versteckt"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:527
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:533
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:538
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:581
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:587
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:592
 msgid "hybrid mode"
 msgstr "hybrider Modus"
 
@@ -6239,6 +6406,10 @@ msgstr "hybrider Modus"
 msgid "if target is a network"
 msgstr "falls Ziel ein Netzwerk ist"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:63
+msgid "ignore"
+msgstr "ignorieren"
+
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:177
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
@@ -6273,25 +6444,26 @@ 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:94
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:95
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr "Lokale DNS-Datei"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:952
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1168
+msgid "medium security"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1360
 msgid "minutes"
 msgstr "Minuten"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:43
-msgid "mixed WPA/WPA2"
-msgstr "gemischtes WPA/WPA2"
-
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:225
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:232
 msgid "no"
 msgstr "nein"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:54
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:72
 msgid "no link"
 msgstr "nicht verbunden"
 
@@ -6299,7 +6471,7 @@ msgstr "nicht verbunden"
 msgid "non-empty value"
 msgstr "nicht-leeren Wert"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1195
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1446
 msgid "none"
 msgstr "keine"
 
@@ -6309,7 +6481,9 @@ msgstr "keine"
 msgid "not present"
 msgstr "nicht vorhanden"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:363
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:341
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:776
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:780
 #: 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
@@ -6324,9 +6498,9 @@ msgstr "aus"
 msgid "on"
 msgstr "ein"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
-msgid "open"
-msgstr "offen"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1169
+msgid "open network"
+msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
@@ -6345,73 +6519,77 @@ msgstr "positiven Dezimalwert"
 msgid "positive integer value"
 msgstr "positive Ganzzahl"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:34
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:56
 msgid "random"
 msgstr "zufällig"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:526
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:532
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:537
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:580
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:586
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:591
 msgid "relay mode"
 msgstr "Relay-Modus"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:910
 msgid "routed"
 msgstr "routed"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:525
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:534
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:968
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:977
 msgid "sec"
 msgstr "Sekunden"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:525
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:531
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:579
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:585
 msgid "server mode"
 msgstr "Server-Modus"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:544
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:597
 msgid "stateful-only"
 msgstr "nur zustandsorientiert"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:542
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:595
 msgid "stateless"
 msgstr "nur zustandlos"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:543
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:596
 msgid "stateless + stateful"
 msgstr "zustandslos + zustandsorientiert"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:369
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1167
+msgid "strong security"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:346
 msgid "tagged"
 msgstr "tagged"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:932
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1343
 msgid "time units (TUs / 1.024 ms) [1000-65535]"
 msgstr "Zeiteinheiten (TUs / 1024 ms) [1000-65535]"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:549
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:555
 msgid "unique value"
 msgstr "eindeutigen Wert"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:448
 msgid "unknown"
 msgstr "unbekannt"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:15
 #: modules/luci-base/luasrc/view/lease_status.htm:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:238
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:390
+#: 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:414
 msgid "unlimited"
 msgstr "unbegrenzt"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1401
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1648
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:63
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:355
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:378
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:413
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:446
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:512
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:450
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:545
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:53
 #: modules/luci-base/luasrc/view/cbi/network_netlist.htm:38
 msgid "unspecified"
@@ -6421,7 +6599,7 @@ msgstr "unspezifiziert"
 msgid "unspecified -or- create:"
 msgstr "nichts auswählen -oder- erstellen:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:366
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:344
 msgid "untagged"
 msgstr "untagged"
 
@@ -6502,8 +6680,8 @@ msgstr "gültigen UCI-Bezeichner, Hostnamen oder IP-Adresse"
 msgid "valid address:port"
 msgstr "gültige \"Adresse:Port\" Notation"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:523
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:527
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:529
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:533
 msgid "valid date (YYYY-MM-DD)"
 msgstr "gültiges Datum (JJJJ-MM-DD)"
 
@@ -6540,7 +6718,7 @@ msgstr "gültige Ganzzahl"
 msgid "valid network in address/netmask notation"
 msgstr "gültiges Netzwerk in \"Addresse/Netzmaske\" Notation"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:498
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:504
 msgid "valid phone digit (0-9, \"*\", \"#\", \"!\" or \".\")"
 msgstr "gültige Telefonnummernziffer (0-0, \"*\", \"#\", \"!\" oder \".\")"
 
@@ -6553,11 +6731,11 @@ msgstr "gültigen Netzwerkport oder Port-Bereich (von-bis)"
 msgid "valid port value"
 msgstr "gültigen Netzwerkport"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:503
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:509
 msgid "valid time (HH:MM:SS)"
 msgstr "gültige Zeit (SS:MM:ss)"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:425
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:431
 msgid "value between %d and %d characters"
 msgstr "Wert zwischen %d und %d Zeichen"
 
@@ -6573,14 +6751,23 @@ msgstr "Wert größer oder gleich %f"
 msgid "value smaller or equal to %f"
 msgstr "Wert kleiner oder gleich %f"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:430
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:425
+msgid "value with %d characters"
+msgstr "Wert mit %d Zeichen"
+
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:436
 msgid "value with at least %d characters"
 msgstr "Wert mit mindestens %d Zeichen"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:435
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:441
 msgid "value with at most %d characters"
 msgstr "Wert mit maximal %d Zeichen"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1169
+msgid "weak security"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:221
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:232
@@ -6591,6 +6778,258 @@ msgstr "ja"
 msgid "« Back"
 msgstr "« Zurück"
 
+#~ msgid "Change login password"
+#~ msgstr "Login-Passwort ändern"
+
+#~ msgid "Changing password…"
+#~ msgstr "Ändere Passwort…"
+
+#~ msgid "Disabled (default)"
+#~ msgstr "Deaktiviert (Standard)"
+
+#~ msgid "Loading SSH keys…"
+#~ msgstr "Lade SSH-Schlüssel…"
+
+#~ msgid "Saving keys…"
+#~ msgstr "Speichere Schlüssel…"
+
+#~ msgid "Specifies the listening port of this <em>Dropbear</em> instance"
+#~ msgstr "Gibt den Server-Port dieser <em>Dropbear</em>-Instanz an"
+
+#~ msgid "Switch %q (%s)"
+#~ msgstr "Switch %q (%s)"
+
+#~ msgid "VLANs on %q (%s)"
+#~ msgstr "VLANs auf %q (%s)"
+
+#~ msgid "Antenna 1"
+#~ msgstr "Antenne 1"
+
+#~ msgid "Antenna 2"
+#~ msgstr "Antenne 2"
+
+#~ msgid "Antenna Configuration"
+#~ msgstr "Antennenkonfiguration"
+
+#~ msgid "Back to overview"
+#~ msgstr "Zurück zur Übersicht"
+
+#~ msgid "Back to scan results"
+#~ msgstr "Zurück zu den Scan-Ergebnissen"
+
+#~ msgid "Broadcom 802.11%s Wireless Controller"
+#~ msgstr "Broadcom 802.11%s W-LAN Adapter"
+
+#~ msgid "Broadcom BCM%04x 802.11 Wireless Controller"
+#~ msgstr "Broadcom BCM%04x 802.11 W-LAN Adapter"
+
+#~ msgid ""
+#~ "Channel %d is not available in the %s regulatory domain and has been auto-"
+#~ "adjusted to %d."
+#~ msgstr ""
+#~ "Kanal %d ist in der Regulierungszone \"%s\" nicht verfügbar und wurde "
+#~ "automatisch auf %d gesetzt."
+
+#~ msgid "Common Configuration"
+#~ msgstr "Allgemeine Konfiguration"
+
+#~ msgid "Connect"
+#~ msgstr "Verbinden"
+
+#~ msgid "Connection Limit"
+#~ msgstr "Verbindungslimit"
+
+#~ msgid "Cover the following interface"
+#~ msgstr "Die folgende Schnittstelle abdecken"
+
+#~ msgid "Cover the following interfaces"
+#~ msgstr "Die folgende Schnittstellen abdecken"
+
+#~ msgid "Create Interface"
+#~ msgstr "Erzeuge Schnittstelle"
+
+#~ msgid "Create a bridge over multiple interfaces"
+#~ msgstr "Erzeuge Netzwerkbrücke über mehrere Schnittstellen"
+
+#~ msgid "Diversity"
+#~ msgstr "Diversität"
+
+#~ msgid "Edit this interface"
+#~ msgstr "Diese Schnittstelle bearbeiten"
+
+#~ msgid "Frame Bursting"
+#~ msgstr "Frame Bursting"
+
+#~ msgid ""
+#~ "Further information about WireGuard interfaces and peers at <a href="
+#~ "\"http://wireguard.com\">wireguard.com</a>."
+#~ msgstr ""
+#~ "Weitere Informationen zu WireGuard-Schnittstellen und Peers unter <a href="
+#~ "\"http://wireguard.com\">wireguard.com</a>."
+
+#~ msgid "Generic 802.11%s Wireless Controller"
+#~ msgstr "Generischer 802.11%s W-LAN Adapter"
+
+#~ msgid "HT mode (802.11n)"
+#~ msgstr "HT-Modus (802.11n)"
+
+#~ msgid "Install package %q"
+#~ msgstr "Installiere Paket %q"
+
+#~ msgid "Interface Overview"
+#~ msgstr "Schnittstellenübersicht"
+
+#~ msgid "Locked to channel %s used by: %s"
+#~ msgstr "Festgelegt auf Kanal %s, verwendet durch: %s"
+
+#~ msgid ""
+#~ "Maximum length of the name is 15 characters including the automatic "
+#~ "protocol/bridge prefix (br-, 6in4-, pppoe- etc.)"
+#~ msgstr ""
+#~ "Die maximale Länge des Names ist auf 15 Zeichen beschränkt, abzüglich des "
+#~ "automatischen Protokoll- oder Bridge-Prefixes wie \"br-\" oder \"pppoe-\" "
+#~ "etc."
+
+#~ msgid "Missing protocol extension for proto %q"
+#~ msgstr "Erweiterung für Protokoll %q fehlt"
+
+#~ msgid "Name of the new interface"
+#~ msgstr "Name der neuen Schnittstelle"
+
+#~ msgid "No network configured on this device"
+#~ msgstr "Keine Netzwerke auf diesem Gerät konfiguriert"
+
+#~ msgid "No network name specified"
+#~ msgstr "Netzwerkname nicht angegeben"
+
+#~ msgid "No networks in range"
+#~ msgstr "Keine Netzwerke in Reichweite"
+
+#~ msgid "No scan results available yet..."
+#~ msgstr "Noch keine Scan-Ergebnisse verfügbar..."
+
+#~ msgid "Not associated"
+#~ msgstr "Nicht assoziiert"
+
+#~ msgid "Note: interface name length"
+#~ msgstr "Hinweis: Länge des Namens beachten"
+
+#~ msgid ""
+#~ "On this page you can configure the network interfaces. You can bridge "
+#~ "several interfaces by ticking the \"bridge interfaces\" field and enter "
+#~ "the names of several network interfaces separated by spaces. You can also "
+#~ "use <abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
+#~ "<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
+#~ "<samp>eth0.1</samp>)."
+#~ msgstr ""
+#~ "An dieser Stelle können die einzelnen Schnittstellen des Netzwerkes "
+#~ "konfiguriert werden. Es können mehrere Schnittstellen zu einer Brücke "
+#~ "zusammengefasst werden, indem diese durch Leerzeichen getrennt aufgezählt "
+#~ "werden und ein entsprechender Haken im Feld Netzwerkbrücke gesetzt wird. "
+#~ "Es können VLANs in der Notation SCHNITTSTELLE.VLANNR (z.B.: eth0.1) "
+#~ "verwendet werden."
+
+#~ msgid "Package libiwinfo required!"
+#~ msgstr "Benötige das libiwinfo Paket!"
+
+#~ msgid "Protocol of the new interface"
+#~ msgstr "Protokoll für die neue Schnittstelle"
+
+#~ msgid "Protocol support is not installed"
+#~ msgstr "Protokollunterstützung ist nicht installiert"
+
+#~ msgid ""
+#~ "Really delete this wireless network? The deletion cannot be undone! You "
+#~ "might lose access to this device if you are connected via this network."
+#~ msgstr ""
+#~ "Dieses Drahtlosnetzwerk wirklich löschen? Der Schritt kann nicht "
+#~ "rückgängig gemacht werden!\n"
+#~ "Der Zugriff auf das Gerät könnte verlorengehen wenn Sie über dieses "
+#~ "Netzwerk verbunden sind."
+
+#~ msgid "Receiver Antenna"
+#~ msgstr "Empfangsantenne"
+
+#~ msgid "Repeat scan"
+#~ msgstr "Scan wiederholen"
+
+#~ msgid "Replace entry"
+#~ msgstr "Eintrag ersetzen"
+
+#~ msgid "Scan request failed"
+#~ msgstr "Scan-Anforderung fehlgeschlagen"
+
+#~ msgid "Separate Clients"
+#~ msgstr "Clients isolieren"
+
+#~ msgid "Slot time"
+#~ msgstr "Zeitslot"
+
+#~ msgid ""
+#~ "The <em>Device Configuration</em> section covers physical settings of the "
+#~ "radio hardware such as channel, transmit power or antenna selection which "
+#~ "are shared among all defined wireless networks (if the radio hardware is "
+#~ "multi-SSID capable). Per network settings like encryption or operation "
+#~ "mode are grouped in the <em>Interface Configuration</em>."
+#~ msgstr ""
+#~ "Die <em>Gerätekonfiguration</em> deckt physische Einstellungen der WLAN-"
+#~ "Hardware wie Kanal, Sendestärke oder Antennenauswahl ab. Diese "
+#~ "Einstellungen werden von allen Netzwerken auf dem Gerät geteilt. Netzwerk-"
+#~ "spezifische Einstellungen wie Verschlüsselung oder Betriebsmodus sind in "
+#~ "der <em>Schnittstellenkonfiguration</em> gruppiert."
+
+#~ msgid ""
+#~ "The <em>libiwinfo-lua</em> package is not installed. You must install "
+#~ "this component for working wireless configuration!"
+#~ msgstr ""
+#~ "Das <em>libiwinfo-lua</em> Paket ist nicht installiert. Dieses Paket muss "
+#~ "für eine funktionierende WLAN-Konfiguration vorhanden sein!"
+
+#~ msgid "The given network name is not unique"
+#~ msgstr "Der angebene Netzwerk-Name ist nicht eindeutig"
+
+#, fuzzy
+#~ msgid ""
+#~ "The hardware is not multi-SSID capable and the existing configuration "
+#~ "will be replaced if you proceed."
+#~ msgstr ""
+#~ "Die Hardware ist nicht Multi-SSID fähig und die existierende "
+#~ "Konfiguration wird beim Fortfahren ersetzt."
+
+#~ msgid "The selected protocol needs a device assigned"
+#~ msgstr "Dem ausgewähltem Protokoll muss ein Gerät zugeordnet werden"
+
+#~ msgid ""
+#~ "There is no device assigned yet, please attach a network device in the "
+#~ "\"Physical Settings\" tab"
+#~ msgstr ""
+#~ "Es wurde noch kein Netzwerkgerät zugeordnet, bitte ein Gerät im "
+#~ "\"Physische Einstellungen\" Bereich anfügen"
+
+#~ msgid "Transmission Rate"
+#~ msgstr "Übertragungsrate"
+
+#~ msgid "Transmit Power"
+#~ msgstr "Sendeleistung"
+
+#~ msgid "Transmitter Antenna"
+#~ msgstr "Sendeantenne"
+
+#~ msgid "Uploaded File"
+#~ msgstr "hochgeladene Datei"
+
+#~ msgid "Wireless is restarting..."
+#~ msgstr "WLAN startet neu..."
+
+#~ msgid "hidden"
+#~ msgstr "versteckt"
+
+#~ msgid "mixed WPA/WPA2"
+#~ msgstr "gemischtes WPA/WPA2"
+
+#~ msgid "open"
+#~ msgstr "offen"
+
 #~ msgid "Advanced"
 #~ msgstr "Erweitert"
 
@@ -6856,9 +7295,6 @@ msgstr "« Zurück"
 #~ msgid "Hermes 802.11b Wireless Controller"
 #~ msgstr "Hermes 802.11b W-LAN Adapter"
 
-#~ msgid "Interface is shutting down..."
-#~ msgstr "Schnittstelle fährt herunter..."
-
 #~ msgid "Interface reconnected"
 #~ msgstr "Schnittstelle neu verbunden"
 
diff --git a/modules/luci-base/po/el/base.po b/modules/luci-base/po/el/base.po
index 66b179ca8..800214236 100644
--- a/modules/luci-base/po/el/base.po
+++ b/modules/luci-base/po/el/base.po
@@ -13,19 +13,20 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.4\n"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:133
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:857
 msgid "%.1f dB"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:109
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:122
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 msgid "%d Bit"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1641
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2194
 msgid "%d invalid field(s)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:281
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:31
 msgid "%s is untagged in multiple VLANs!"
 msgstr ""
 
@@ -63,19 +64,19 @@ msgid "-- Additional Field --"
 msgstr "-- Επιπλέον Πεδίο --"
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:258
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1401
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1533
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:250
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:350
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1114
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1648
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1780
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:314
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:414
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1178
 #: modules/luci-base/luasrc/view/cbi/header.htm:5
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:26
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:88
 msgid "-- Please choose --"
 msgstr "-- Παρακαλώ επιλέξτε --"
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:259
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:351
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1115
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:415
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1179
 #: modules/luci-base/luasrc/view/cbi/header.htm:6
 msgid "-- custom --"
 msgstr "-- προσαρμοσμένο --"
@@ -98,7 +99,7 @@ msgstr ""
 msgid "-- please select --"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:382
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:814
 msgid "0 = not using RSSI threshold, 1 = do not change driver default"
 msgstr ""
 
@@ -110,10 +111,11 @@ msgstr "Φορτίο 1 λεπτού:"
 msgid "15 Minute Load:"
 msgstr "Φορτίο 15 λεπτών:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:924
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1337
 msgid "4-character hexadecimal ID"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:11
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:18
 msgid "464XLAT (CLAT)"
 msgstr ""
@@ -122,47 +124,47 @@ msgstr ""
 msgid "5 Minute Load:"
 msgstr "Φορτίο 5 λεπτών:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:960
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1366
 msgid "6-octet identifier as a hex string - no colons"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:891
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1310
 msgid "802.11r Fast Transition"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1157
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1567
 msgid "802.11w Association SA Query maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1574
 msgid "802.11w Association SA Query retry timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1133
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1533
 msgid "802.11w Management Frame Protection"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1156
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1567
 msgid "802.11w maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1165
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1574
 msgid "802.11w retry timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:399
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:831
 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:224
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:225
 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:215
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:216
 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:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
 msgid ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
 "order of the resolvfile"
@@ -170,11 +172,11 @@ msgstr ""
 "Οι <abbr title=\"Σύστημα Ονόματος Τομέα\">DNS</abbr> εξυπηρετητές θα "
 "ερωτηθούν με την σειρά εμφάνισης στο αρχείο resolvfile"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:388
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:820
 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:351
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:373
 #: 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>"
@@ -184,8 +186,8 @@ msgstr "Διεύθυνση <abbr title=\"Internet Protocol Version 4\">IPv4</abb
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
 msgstr "Πύλη <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:555
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:35
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:506
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr "Μάσκα <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
 
@@ -201,29 +203,29 @@ 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:378
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:402
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:58
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:35
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:33
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "Παραμετροποίηση <abbr title=\"Light Emitting Diode\">LED</abbr>"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:67
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:51
 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:328
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:329
 #: 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:372
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:233
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:234
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> leases"
@@ -231,7 +233,7 @@ msgstr ""
 "<abbr title=\"μέγιστο\">Μεγ.</abbr> πλήθος <abbr title=\"Πρωτόκολλο "
 "Παραμετροποίησης Δυναμικού Συστήματος\">DHCP</abbr> leases"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:242
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> packet size"
@@ -239,65 +241,69 @@ msgstr ""
 "<abbr title=\"μέγιστο\">Μεγ.</abbr> μέγεθος πακέτου <abbr title=\"Μηχανισμοί "
 "επεκτάσεων για Συστήματα Ονόματος Τομέα\">EDNS0</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:251
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:252
 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
 msgstr "<abbr title=\"μέγιστο\">Μεγ.</abbr> πλήθος ταυτόχρονων ερωτηματων"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:10
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:42
 msgid ""
 "<br/>Note: you need to manually restart the cron service if the crontab file "
 "was empty before editing."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:817
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1605
+msgid "A directory with the same name already exists."
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:863
 msgid "A new login is required since the authentication session expired."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:114
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:837
 msgid "A43C + J43 + A43"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:838
 msgid "A43C + J43 + A43 + V43"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:850
 msgid "ADSL"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:826
 msgid "ANSI T1.413"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:33
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:47
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:23
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:94
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:86
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:67
 msgid "APN"
 msgstr "APN"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:56
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:175
 msgid "ARP retry threshold"
 msgstr "Όριο επαναδοκιμών ARP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:122
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:845
 msgid "ATM (Asynchronous Transfer Mode)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:144
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:866
 msgid "ATM Bridges"
 msgstr "Γέφυρες ΑΤΜ"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:178
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:21
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:898
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:66
 msgid "ATM Virtual Channel Identifier (VCI)"
 msgstr "ATM Εικονικό Κανάλι Αναγνωριστή (VCI)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:179
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:26
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:899
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:70
 msgid "ATM Virtual Path Identifier (VPI)"
 msgstr "ATM Εικονικό μονοπάτι Αναγνωριστή (VPI)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:866
 msgid ""
 "ATM bridges expose encapsulated ethernet in AAL5 connections as virtual "
 "Linux network interfaces which can be used in conjunction with DHCP or PPP "
@@ -307,8 +313,8 @@ msgstr ""
 "εικονικές διεπαφές δικτύου Linux, οι οποίες μπορούν να χρησιμοποιηθούν σε "
 "συνδυασμό με DHCP ή PPP για την κλήση προς τον παροχέα δικτύου."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:184
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:905
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:62
 msgid "ATM device number"
 msgstr "Αριθμός συσκευής ATM"
 
@@ -317,17 +323,17 @@ msgid "ATU-C System Vendor ID"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:251
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:495
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:499
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:528
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:532
 msgid "Absent Interface"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:19
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
 msgid "Access Concentrator"
 msgstr "Συγκεντρωτής Πρόσβασης "
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:368
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:470
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:802
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
 msgid "Access Point"
 msgstr "Σημείο Πρόσβασης"
 
@@ -352,7 +358,7 @@ msgid "Active Connections"
 msgstr "Ενεργές Συνδέσεις"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:68
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:30
 msgid "Active DHCP Leases"
 msgstr ""
 
@@ -360,56 +366,76 @@ msgstr ""
 msgid "Active DHCPv6 Leases"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1951
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:370
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:12
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2190
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:804
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:23
 msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:650
-#: modules/luci-base/htdocs/luci-static/resources/form.js:651
-#: modules/luci-base/htdocs/luci-static/resources/form.js:666
-#: modules/luci-base/htdocs/luci-static/resources/form.js:667
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1290
+#: modules/luci-base/htdocs/luci-static/resources/form.js:902
+#: modules/luci-base/htdocs/luci-static/resources/form.js:904
+#: modules/luci-base/htdocs/luci-static/resources/form.js:917
+#: modules/luci-base/htdocs/luci-static/resources/form.js:918
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1539
 #: modules/luci-base/luasrc/view/cbi/nsection.htm:25
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:189
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:197
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:39
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:47
 #: modules/luci-base/luasrc/view/cbi/ucisection.htm:54
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:703
 msgid "Add"
 msgstr "Προσθήκη"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:60
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:870
+msgid "Add ATM Bridge"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:92
 msgid "Add IPv4 address…"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:129
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:204
 msgid "Add IPv6 address…"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:143
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:149
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:38
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:47
+msgid "Add LED action"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:215
+msgid "Add VLAN"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:14
+msgid "Add instance"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:153
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:159
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:250
 msgid "Add key"
 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:155
 msgid "Add local domain suffix to names served from hosts files"
 msgstr ""
 "Προσθήκη κατάληξης τοπικού τομέα για ονόματα εξυπηρετούμενα από αρχεία hosts "
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:705
 msgid "Add new interface..."
 msgstr "Προσθήκη νέας διεπαφής..."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:104
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:99
+msgid "Add peer"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:105
 msgid "Additional Hosts files"
 msgstr "Επιπλέον αρχεία Hosts"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:161
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
 msgid "Additional servers file"
 msgstr ""
 
@@ -436,7 +462,7 @@ msgstr ""
 msgid "Address"
 msgstr "Διεύθυνση"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:12
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:151
 msgid "Address to access local relay bridge"
 msgstr "Διεύθυνση για πρόσβαση σε την τοπική γέφυρα αναμετάδοσης"
 
@@ -445,13 +471,13 @@ msgstr "Διεύθυνση για πρόσβαση σε την τοπική γέ
 msgid "Administration"
 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:70
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:505
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:896
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:24
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:189
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:463
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:176
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:143
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:364
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:742
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:799
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:50
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:34
 msgid "Advanced Settings"
@@ -461,172 +487,172 @@ msgstr "Προχωρημένες Ρυθμίσεις"
 msgid "Aggregate Transmit Power(ACTATP)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:175
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:166
 msgid "Alert"
 msgstr "Ειδοποίηση"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1628
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1834
 #: modules/luci-base/luasrc/model/network.lua:1416
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:54
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:78
 msgid "Alias Interface"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:138
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:66
 msgid "Alias of \"%s\""
 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:170
 msgid "All Servers"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:114
 msgid ""
 "Allocate IP addresses sequentially, starting from the lowest available "
 "address"
 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:113
 msgid "Allocate IP sequentially"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:24
 msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
 msgstr ""
 "Επιτρέπει την εξουσιοδότηση <abbr title=\"Secure Shell\">SSH</abbr> με "
 "κωδικό πρόσβασης"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:545
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:987
 msgid "Allow AP mode to disconnect STAs based on low ACK condition"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:462
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:589
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:891
 msgid "Allow all except listed"
 msgstr "Να επιτρέπονται όλες, εκτός από αυτές στη λίστα"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:236
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:767
 msgid "Allow legacy 802.11b rates"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:461
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:588
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:890
 msgid "Allow listed only"
 msgstr "Να επιτρέπονται μόνο αυτές στην λίστα"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:198
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:199
 msgid "Allow localhost"
 msgstr "Να επιτρέπεται το localhost"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:47
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:35
 msgid "Allow remote hosts to connect to local SSH forwarded ports"
 msgstr ""
 "Να επιτρέπεται σε απομακρυσμένα συστήματα να συνδέονται σε τοπικά "
 "προωθημένες SSH θύρες"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:38
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:30
 msgid "Allow root logins with password"
 msgstr "Να επιτρέπονται root συνδέσεις με κωδικό πρόσβασης"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:39
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:30
 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:199
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:200
 msgid ""
 "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
 msgstr ""
 "Να επιτρέπονται απαντήσεις από ανώτερο επίπεδο εντός του εύρους 127.0.0.0/8, "
 "π.χ. για υπηρεσίες RBL"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:135
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:122
 msgid "Allowed IPs"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:549
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:602
 msgid "Always announce default router"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:259
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:782
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
 "option does not comply with IEEE 802.11n-2009!"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:95
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:818
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:119
 msgid "Annex"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:96
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:819
 msgid "Annex A + L + M (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:827
 msgid "Annex A G.992.1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:828
 msgid "Annex A G.992.2"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:829
 msgid "Annex A G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:830
 msgid "Annex A G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:97
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:820
 msgid "Annex B (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:823
 msgid "Annex B G.992.1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:824
 msgid "Annex B G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:102
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:825
 msgid "Annex B G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:98
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:821
 msgid "Annex J (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:831
 msgid "Annex L G.992.3 POTS 1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:99
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:822
 msgid "Annex M (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:109
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:832
 msgid "Annex M G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:833
 msgid "Annex M G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:550
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:602
 msgid "Announce as default router even if no public prefix is available."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:555
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:607
 msgid "Announced DNS domains"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:554
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:606
 msgid "Announced DNS servers"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1093
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1496
 msgid "Anonymous Identity"
 msgstr ""
 
@@ -638,20 +664,6 @@ msgstr ""
 msgid "Anonymous Swap"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:322
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:329
-msgid "Antenna 1"
-msgstr "Κεραία 1"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:323
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:330
-msgid "Antenna 2"
-msgstr "Κεραία 2"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:246
-msgid "Antenna Configuration"
-msgstr ""
-
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:71
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:160
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:181
@@ -659,11 +671,11 @@ msgstr ""
 msgid "Any zone"
 msgstr "Οιαδήποτε ζώνη"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1981
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2522
 msgid "Apply request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1867
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2409
 msgid "Apply unchecked"
 msgstr ""
 
@@ -671,8 +683,8 @@ msgstr ""
 msgid "Architecture"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:19
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:184
+#: 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 ""
@@ -681,13 +693,13 @@ msgstr ""
 msgid "Assign interfaces..."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:124
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:24
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:189
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:31
 msgid ""
 "Assign prefix parts using this hexadecimal subprefix ID for this interface."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:148
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1967
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:22
 msgid "Associated Stations"
 msgstr "Συνδεδεμένοι Σταθμοί"
@@ -696,20 +708,20 @@ msgstr "Συνδεδεμένοι Σταθμοί"
 msgid "Associations"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:39
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:37
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:101
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:64
 msgid "Auth Group"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1027
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1421
 msgid "Authentication"
 msgstr "Εξουσιοδότηση"
 
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:29
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:70
 msgid "Authentication Type"
 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:78
 msgid "Authoritative"
 msgstr "Κύριος"
 
@@ -727,17 +739,19 @@ msgstr "Απαιτείται Εξουσιοδότηση"
 msgid "Auto Refresh"
 msgstr "Αυτόματη Ανανέωση"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:53
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:7
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:17
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:67
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:24
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:36
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:42
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:36
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:106
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:24
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:98
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:50
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:94
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:81
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:55
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:68
 msgid "Automatic"
 msgstr ""
 
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:7
 #: protocols/luci-proto-hnet/luasrc/model/network/proto_hnet.lua:7
 msgid "Automatic Homenet (HNCP)"
 msgstr ""
@@ -780,21 +794,21 @@ msgstr "Διαθέσιμο"
 msgid "Average:"
 msgstr "Μέσος Όρος:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:116
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:839
 msgid "B43 + B43C"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:840
 msgid "B43 + B43C + V43"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:48
 msgid "BR / DMR / AFTR"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:43
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:75
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1620
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:176
 msgid "BSSID"
 msgstr "BSSID"
@@ -808,19 +822,11 @@ msgstr "Πίσω προς Επισκόπηση"
 msgid "Back to configuration"
 msgstr "Πίσω προς παραμετροποίηση"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:48
-msgid "Back to overview"
-msgstr "Πίσω προς επισκόπηση"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:20
-msgid "Back to scan results"
-msgstr "Πίσω στα αποτελέσματα σάρωσης"
-
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:17
 msgid "Backup"
 msgstr "Αποθήκευση"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:38
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:36
 msgid "Backup / Flash Firmware"
 msgstr "Αντίγραφο ασφαλείας / Εγγραφή FLASH Υλικολογισμικό"
 
@@ -834,11 +840,11 @@ msgid "Bad address specified!"
 msgstr "Μη έγκυρη διεύθυνση!"
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:158
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:288
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:368
 msgid "Band"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:261
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:785
 msgid "Beacon Interval"
 msgstr ""
 
@@ -853,79 +859,85 @@ msgstr ""
 "ουσιώδη βασικά αρχεία καθώς και καθορισμένα από το χρήστη μοτίβα αντιγράφων "
 "ασφαλείας."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:293
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:294
 msgid ""
 "Bind dynamically to interfaces rather than wildcard address (recommended as "
 "linux default)"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:16
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:48
 msgid "Bind interface"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:16
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:48
 msgid "Bind the tunnel to this interface (optional)."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:49
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:134
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:187
 msgid "Bitrate"
 msgstr "Ρυθμός δεδομένων"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:172
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
 msgid "Bogus NX Domain Override"
 msgstr "Παράκαμψη Ψευδούς Τομέα NX"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1634
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1840
 #: modules/luci-base/luasrc/model/network.lua:1420
 msgid "Bridge"
 msgstr "Γέφυρα"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:264
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:368
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:678
 msgid "Bridge interfaces"
 msgstr "Γεφύρωμα διεπαφών"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:906
 msgid "Bridge unit number"
 msgstr "Αριθμός μονάδας γέφυρας"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:250
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:364
 msgid "Bring up on boot"
 msgstr "Ανέβασμα κατά την εκκίνηση"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:35
-msgid "Broadcom 802.11%s Wireless Controller"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:45
-msgid "Broadcom BCM%04x 802.11 Wireless Controller"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1697
+msgid "Browse…"
 msgstr ""
 
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:18
 msgid "Buffered"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:75
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:134
 msgid "CA certificate; if empty it will be saved after the first connection."
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:7
+msgid "CLAT configuration failed"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:13
 msgid "CPU usage (%)"
 msgstr "Χρήση CPU (%)"
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:21
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:53
 msgid "Call failed"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1789
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:14
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:52
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:711
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:948
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1839
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:191
 #: modules/luci-mod-system/luasrc/view/admin_system/upgrade.htm:60
 msgid "Cancel"
 msgstr "Ακύρωση"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:6
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:17
 msgid "Category"
 msgstr ""
 
@@ -943,13 +955,7 @@ msgstr ""
 msgid "Chain"
 msgstr "Αλυσίδα"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:9
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:14
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:24
-msgid "Change login password"
-msgstr ""
-
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1744
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 msgid "Changes"
 msgstr "Αλλαγές"
 
@@ -957,33 +963,23 @@ msgstr "Αλλαγές"
 msgid "Changes applied."
 msgstr "Αλλαγές εφαρμόστηκαν."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2004
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2545
 msgid "Changes have been reverted."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:43
 msgid "Changes the administrator password for accessing the device"
 msgstr "Αλλάζει τον κωδικό διαχειριστή για πρόσβαση στη συσκευή"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:10
-msgid "Changing password…"
-msgstr ""
-
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:162
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:45
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:87
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:174
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:376
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1618
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:186
 msgid "Channel"
 msgstr "Κανάλι"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:119
-msgid ""
-"Channel %d is not available in the %s regulatory domain and has been auto-"
-"adjusted to %d."
-msgstr ""
-
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:229
 msgid "Check"
 msgstr "Έλεγχος"
@@ -992,7 +988,7 @@ msgstr "Έλεγχος"
 msgid "Check filesystems before mount"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1806
 msgid "Check this option to delete the existing networks from this radio."
 msgstr ""
 
@@ -1004,8 +1000,8 @@ msgstr "Άθροισμα Ελέγχου"
 msgid "Choose mtdblock"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:358
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:443
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1829
 msgid ""
 "Choose the firewall zone you want to assign to this interface. Select "
 "<em>unspecified</em> to remove the interface from the associated zone or "
@@ -1017,17 +1013,17 @@ msgstr ""
 "από την συσχετισμένη ζώνη ή συμπληρώστε το <em>δημιουργία</em> πεδίο για να "
 "προσδιορίσετε μία νέα ζώνη και να προσαρτήσετε την διεπαφή σε αυτό."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:834
 msgid ""
 "Choose the network(s) you want to attach to this wireless interface or fill "
 "out the <em>create</em> field to define a new network."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:614
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1023
 msgid "Cipher"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:61
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:91
 msgid "Cisco UDP encapsulation"
 msgstr ""
 
@@ -1045,28 +1041,28 @@ msgid ""
 "FEATURE IS FOR PROFESSIONALS! )"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1950
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:369
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:471
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2189
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:803
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:908
 msgid "Client"
 msgstr "Πελάτης"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:55
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:52
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:47
 msgid "Client ID to send when requesting DHCP"
 msgstr "Αναγνωριστικό πελάτη που αποστέλλετε κατά την αίτηση DHCP"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:145
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:151
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:155
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:161
 msgid "Close"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:146
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:119
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:125
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:127
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:98
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:119
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:157
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:141
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:115
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:138
 msgid ""
 "Close inactive connection after the given amount of seconds, use 0 to "
 "persist connection"
@@ -1082,12 +1078,9 @@ msgstr "Κλείσιμο λίστας..."
 #: modules/luci-base/luasrc/view/lease_status.htm:77
 #: modules/luci-base/luasrc/view/lease_status.htm:98
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:118
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:37
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:24
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1965
 #: modules/luci-mod-network/luasrc/view/admin_network/iface_status.htm:6
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:40
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:30
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:8
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:398
 #: modules/luci-mod-status/luasrc/view/admin_status/index/30-network.htm:11
 #: modules/luci-mod-status/luasrc/view/admin_status/index/50-dsl.htm:17
@@ -1101,15 +1094,19 @@ msgstr "Συλλογή δεδομένων..."
 msgid "Command"
 msgstr "Εντολή"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:193
+msgid "Command OK"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:41
+msgid "Command failed"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:64
 msgid "Comment"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:185
-msgid "Common Configuration"
-msgstr "Κοινή Παραμετροποίηση"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
 msgid ""
 "Complicates key reinstallation attacks on the client side by disabling "
 "retransmission of EAPOL-Key frames that are used to install keys. This "
@@ -1117,13 +1114,14 @@ msgid ""
 "negotiation especially in environments with heavy traffic load."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1744
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 #: modules/luci-base/luasrc/controller/admin/uci.lua:11
 #: modules/luci-mod-system/luasrc/view/admin_system/backupfiles.htm:9
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:13
 msgid "Configuration"
 msgstr "Παραμετροποίηση"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:21
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:63
 msgid "Configuration failed"
 msgstr ""
@@ -1132,89 +1130,89 @@ msgstr ""
 msgid "Configuration files will be kept"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1915
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2456
 msgid "Configuration has been applied."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1848
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2395
 msgid "Configuration has been rolled back!"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:43
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:942
+msgid "Confirm disconnect"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:50
 msgid "Confirmation"
 msgstr "Επιβεβαίωση"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:32
-msgid "Connect"
-msgstr "Σύνδεση"
-
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:72
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:105
 msgid "Connected"
 msgstr "Συνδεδεμένος"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:338
-msgid "Connection Limit"
-msgstr "Όριο Συνδέσεων"
-
 #: modules/luci-base/htdocs/luci-static/resources/network.js:7
 #: modules/luci-base/luasrc/model/network.lua:27
 msgid "Connection attempt failed"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:203
+msgid "Connection lost"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/controller/admin/status.lua:32
 msgid "Connections"
 msgstr "Συνδέσεις"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1890
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:66
+msgid "Contents have been saved."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:618
+msgid "Continue"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2431
 msgid ""
 "Could not regain access to the device after applying the configuration "
 "changes. You might need to reconnect if you modified network related "
 "settings such as the IP address or wireless security credentials."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:135
 msgid "Country"
 msgstr "Χώρα"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:227
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:233
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:337
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:764
 msgid "Country Code"
 msgstr "Κωδικός Χώρας"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:36
-msgid "Cover the following interface"
-msgstr "Κάλυψη της ακόλουθης διεπαφής"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:43
-msgid "Cover the following interfaces"
-msgstr "Κάλυψη των ακόλουθων διεπαφών"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:357
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:86
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:443
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1829
 msgid "Create / Assign firewall-zone"
 msgstr "Δημιουργία / Ανάθεση ζώνης τείχους προστασίας"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:9
-msgid "Create Interface"
-msgstr "Δημιουργία Διεπαφής"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:33
-msgid "Create a bridge over multiple interfaces"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:735
+msgid "Create interface"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:174
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:165
 msgid "Critical"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:178
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:169
 msgid "Cron Log Level"
 msgstr "Επίπεδο Καταγραφής Cron"
 
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:519
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:521
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:447
+msgid "Current power"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:552
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:554
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:51
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:53
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:82
@@ -1222,7 +1220,7 @@ msgstr "Επίπεδο Καταγραφής Cron"
 msgid "Custom Interface"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:36
 msgid "Custom delegated IPv6-prefix"
 msgstr ""
 
@@ -1232,7 +1230,7 @@ msgid ""
 "this, perform a factory-reset first."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:59
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:41
 msgid ""
 "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
 "\">LED</abbr>s if possible."
@@ -1240,46 +1238,47 @@ msgstr ""
 "Ρυθμίζει, αν είναι δυνατόν, την συμπεριφορά των <abbr title=\"Light Emitting "
 "Diode\">LED</abbr> της συσκευής."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:799
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1223
 msgid "DAE-Client"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:807
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1231
 msgid "DAE-Port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:815
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1239
 msgid "DAE-Secret"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:448
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:459
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:279
 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:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:61
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:62
 msgid "DHCP and DNS"
 msgstr "DHCP και DNS"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1195
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1385
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:16
 #: modules/luci-base/luasrc/model/network.lua:968
 msgid "DHCP client"
 msgstr "Πελάτης DHCP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:571
 msgid "DHCP-Options"
 msgstr "Επιλογές DHCP"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_dhcpv6.lua:7
 msgid "DHCPv6 client"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:540
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:594
 msgid "DHCPv6-Mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:529
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:583
 msgid "DHCPv6-Service"
 msgstr ""
 
@@ -1296,31 +1295,31 @@ msgstr ""
 msgid "DNS"
 msgstr "DNS"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:183
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
 msgid "DNS forwardings"
 msgstr "Προωθήσεις DNS"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:30
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:37
 msgid "DNS-Label / FQDN"
 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:136
 msgid "DNSSEC"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:139
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
 msgid "DNSSEC check unsigned"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:73
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:99
 msgid "DPD Idle Timeout"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:14
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:41
 msgid "DS-Lite AFTR address"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:92
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:815
 #: modules/luci-mod-status/luasrc/view/admin_status/index/50-dsl.htm:14
 msgid "DSL"
 msgstr ""
@@ -1329,11 +1328,11 @@ msgstr ""
 msgid "DSL Status"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:125
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:848
 msgid "DSL line mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:519
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:963
 msgid "DTIM Interval"
 msgstr ""
 
@@ -1345,42 +1344,45 @@ msgstr ""
 msgid "Data Rate"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:169
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:180
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:160
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:171
 msgid "Debug"
 msgstr "Αποσφαλμάτωση"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:759
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:783
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:807
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1183
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1207
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1231
 msgid "Default %d"
 msgstr "Προεπιλογή %d"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:82
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:107
 msgid "Default Route"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:17
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:81
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:51
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:32
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:48
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:85
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:65
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:80
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:108
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:146
 msgid "Default gateway"
 msgstr "Προεπιλεγμένη πύλη"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:541
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:594
 msgid "Default is stateless + stateful"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:70
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:54
 msgid "Default state"
 msgstr "Προεπιλεγμένη κατάσταση"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:503
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:553
 msgid "Define a name for this network."
 msgstr "Ορίστε ένα όνομα για αυτό το δίκτυο."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:514
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:571
 msgid ""
 "Define additional DHCP options, for example "
 "\"<code>6,192.168.2.1,192.168.2.2</code>\" which advertises different DNS "
@@ -1389,35 +1391,47 @@ msgstr ""
 "Ορίστε επιπλέον επιλογές DHCP, που διαφημίζουν διαφορετικούς εξυπηρετητές "
 "DNS στους πελάτες, για παράδειγμα \"<code>6,192.168.2.1,192.168.2.2</code>\"."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:705
-#: modules/luci-base/htdocs/luci-static/resources/form.js:958
-#: modules/luci-base/htdocs/luci-static/resources/form.js:959
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1271
+#: modules/luci-base/htdocs/luci-static/resources/form.js:966
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1210
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1216
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1524
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1758
 #: modules/luci-base/luasrc/view/cbi/nsection.htm:11
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:162
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:16
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:41
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:178
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:187
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:193
 msgid "Delete key"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:45
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1654
+msgid "Delete permission denied"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1656
+msgid "Delete request failed: %d %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:723
 msgid "Delete this network"
 msgstr "Διαγραφή αυτού του δικτύου"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:519
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:963
 msgid "Delivery Traffic Indication Message Interval"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:102
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:108
 msgid "Description"
 msgstr "Περιγραφή"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:224
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1754
+msgid "Deselect"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:215
 msgid "Design"
 msgstr "Εμφάνιση"
 
@@ -1435,10 +1449,12 @@ msgstr ""
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:177
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:43
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:13
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:38
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:73
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:33
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:52
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:85
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:86
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:72
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:154
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:253
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:86
@@ -1446,15 +1462,24 @@ msgstr ""
 msgid "Device"
 msgstr "Συσκευή"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:138
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:737
 msgid "Device Configuration"
 msgstr "Παραμετροποίηση Συσκευής"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:81
+msgid "Device is not active"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/reboot.htm:23
 msgid "Device is rebooting..."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1889
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:167
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:513
+msgid "Device is restarting…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2430
 msgid "Device unreachable!"
 msgstr ""
 
@@ -1462,26 +1487,26 @@ msgstr ""
 msgid "Device unreachable! Still waiting for device..."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:123
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:78
 #: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:61
 msgid "Diagnostics"
 msgstr "Διαγνωστικά"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:45
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:60
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:101
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:93
 msgid "Dial number"
 msgstr ""
 
-#: modules/luci-base/luasrc/view/cbi/filebrowser.htm:99
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1554
 msgid "Directory"
 msgstr "Κατάλογος"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:131
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:715
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:754
 msgid "Disable"
 msgstr "Απενεργοποίηση"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:472
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:531
 msgid ""
 "Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for "
 "this interface."
@@ -1489,71 +1514,66 @@ msgstr ""
 "Απενεργοποίηση <abbr title=\"Πρωτόκολλο Δυναμικής Απόδοσης Διεύθυνσης"
 "\">DHCP</abbr> για αυτή τη διεπαφή."
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:64
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:93
 msgid "Disable Encryption"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:530
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:973
 msgid "Disable Inactivity Polling"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:713
 msgid "Disable this network"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:44
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:54
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:68
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:37
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:43
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:37
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1534
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:76
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:107
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:99
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:51
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:95
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:82
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:69
 msgid "Disabled"
 msgstr "Απενεργοποιημένο"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1139
-msgid "Disabled (default)"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:544
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:987
 msgid "Disassociate On Low Acknowledgement"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:193
 msgid "Discard upstream RFC1918 responses"
 msgstr "Αγνόησε τις απαντήσεις ανοδικής ροής RFC1918"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:92
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:114
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:956
 msgid "Disconnect"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:22
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:64
 msgid "Disconnection attempt failed"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1121
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1762
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1855
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:17
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1375
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1995
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2314
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2401
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1634
 msgid "Dismiss"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:240
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:334
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:770
 msgid "Distance Optimization"
 msgstr "Βελτιστοποίηση Απόστασης"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:241
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:770
 msgid "Distance to farthest network member in meters."
 msgstr "Απόσταση σε μέτρα από το πιο απομακρυσμένο μέλος του δικτύου."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:347
-msgid "Diversity"
-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:61
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
@@ -1565,39 +1585,47 @@ msgstr ""
 "title=\"Σύστημα Ονόματος Τομέα\">DNS</abbr> για τείχη προστασίας <abbr title="
 "\"Μεταφραστή Διεύθυνσης Δικτύου\">NAT</abbr>"
 
-#: 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:159
 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:123
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:124
 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:118
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
 msgid "Do not forward reverse lookups for local networks"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:173
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1639
+msgid "Do you really want to delete \"%s\" ?"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:188
 msgid "Do you really want to delete the following SSH key?"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1637
+msgid "Do you really want to recursively delete the directory \"%s\" ?"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:74
 msgid "Domain required"
 msgstr "Απαίτηση για όνομα τομέα"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:205
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:206
 msgid "Domain whitelist"
 msgstr "Λευκή λίστα τομέων"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:34
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:67
 msgid "Don't Fragment"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:74
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:75
 msgid ""
 "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
 "<abbr title=\"Domain Name System\">DNS</abbr>-Name"
@@ -1617,19 +1645,19 @@ msgstr "Κατέβασμα αντιγράφου ασφαλείας"
 msgid "Download mtdblock"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:853
 msgid "Downstream SNR offset"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:914
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1169
 msgid "Drag to reorder"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:9
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:11
 msgid "Dropbear Instance"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:6
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 msgid ""
 "Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access "
 "and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
@@ -1638,20 +1666,21 @@ msgstr ""
 "κέλυφος μέσω δικτύου και έναν ενσωματωμένο εξυπηρετητή <abbr title=\"Secure "
 "Copy\">SCP</abbr>"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:11
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:14
 msgid "Dual-Stack Lite (RFC6333)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:493
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:547
 msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 msgstr ""
 "Δυναμικό <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:60
 msgid "Dynamic tunnel"
 msgstr "Δυναμικό τούνελ"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:494
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:547
 msgid ""
 "Dynamically allocate DHCP addresses for clients. If disabled, only clients "
 "having static leases will be served."
@@ -1659,21 +1688,21 @@ msgstr ""
 "Δυναμική απόδοση DHCP διευθύνσεων στους πελάτες. Σε περίπτωση "
 "απενεργοποίησης, μόνο πελάτες με στατικα leases θα εξυπηρετούνται."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:67
 msgid "EA-bits length"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:990
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1386
 msgid "EAP-Method"
 msgstr "Μέθοδος EAP"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:934
-#: modules/luci-base/htdocs/luci-static/resources/form.js:935
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1199
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1188
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1191
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1450
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:154
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:160
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:38
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:291
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:720
 msgid "Edit"
 msgstr "Επεξεργασία"
 
@@ -1683,90 +1712,91 @@ msgid ""
 "reload the page."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:38
-msgid "Edit this interface"
-msgstr "Επεξεργασία αυτής της διεπαφής"
-
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:718
 msgid "Edit this network"
 msgstr "Επεξεργασία αυτού του δικτύου"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:669
+msgid "Edit wireless network"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:167
 msgid "Emergency"
 msgstr "Έκτακτη ανάγκη"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:127
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:715
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:754
 msgid "Enable"
 msgstr "Ενεργοποίηση"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:414
 msgid ""
 "Enable <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> "
 "snooping"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:271
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:412
 msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 msgstr "Ενεργοποίηση <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:41
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:60
 msgid "Enable HE.net dynamic endpoint update"
 msgstr "Ενεργοποίηση ενημέρωσης δυναμικού τερματικού σημείου HE.net."
 
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:51
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:89
 msgid "Enable IPv6 negotiation"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:23
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:35
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:41
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:35
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:37
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:49
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:80
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:54
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:67
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:93
 msgid "Enable IPv6 negotiation on the PPP link"
 msgstr "Ενεργοποίηση διαπραγμάτευσης IPv6 πάνω στη PPP ζεύξη"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:143
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:188
 msgid "Enable Jumbo Frame passthrough"
 msgstr "Ενεργοποίηση διέλευσης Jumbo Frame"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:244
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:235
 msgid "Enable NTP client"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:69
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:96
 msgid "Enable Single DES"
 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:267
 msgid "Enable TFTP server"
 msgstr "Ενεργοποίηση εξυπηρετητή TFTP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:134
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:180
 msgid "Enable VLAN functionality"
 msgstr "Ενεργοποίηση λειτουργίας VLAN"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1595
 msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1175
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
 msgid "Enable key reinstallation (KRACK) countermeasures"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:138
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:183
 msgid "Enable learning and aging"
 msgstr "Ένεργοποίηση learning and aging"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:194
 msgid "Enable mirroring of incoming packets"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:151
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:195
 msgid "Enable mirroring of outgoing packets"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:34
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:67
 msgid "Enable the DF (Don't Fragment) flag of the encapsulating packets."
 msgstr ""
 
@@ -1774,7 +1804,7 @@ msgstr ""
 msgid "Enable this mount"
 msgstr "Ενεργοποίηση αυτής της προσάρτησης"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:713
 msgid "Enable this network"
 msgstr ""
 
@@ -1782,48 +1812,52 @@ msgstr ""
 msgid "Enable this swap"
 msgstr "Ενεργοποίηση αυτής της swap"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:37
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:88
 msgid "Enable/Disable"
 msgstr "Ενεργοποίηση/Απενεργοποίηση"
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:76
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:152
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:251
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:41
 msgid "Enabled"
 msgstr "Ενεργοποιημένο"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:277
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:414
 msgid "Enables IGMP snooping on this bridge"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:892
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1310
 msgid ""
 "Enables fast roaming among access points that belong to the same Mobility "
 "Domain"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:272
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:412
 msgid "Enables the Spanning Tree Protocol on this bridge"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:120
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:180
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:59
+msgid "Encapsulation limit"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:843
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:901
 msgid "Encapsulation mode"
 msgstr "Λειτουργία ενθυλάκωσης"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:76
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:603
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:129
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:992
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1621
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:177
 msgid "Encryption"
 msgstr "Κρυπτογράφηση"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:155
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:128
 msgid "Endpoint Host"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:165
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:132
 msgid "Endpoint Port"
 msgstr ""
 
@@ -1835,16 +1869,21 @@ msgstr ""
 msgid "Enter custom values"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:273
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:271
 msgid "Erasing..."
 msgstr "Διαγράφεται..."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:95
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:96
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:97
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:98
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:99
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:106
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:107
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:108
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:109
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:110
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:173
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:164
 msgid "Error"
 msgstr "Σφάλμα"
 
@@ -1852,24 +1891,28 @@ msgstr "Σφάλμα"
 msgid "Errored seconds (ES)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1646
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1852
 #: modules/luci-base/luasrc/model/network.lua:1432
 msgid "Ethernet Adapter"
 msgstr "Προσαρμογέας Ethernet"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1637
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1843
 #: modules/luci-base/luasrc/model/network.lua:1422
 msgid "Ethernet Switch"
 msgstr "Ethernet Switch"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:303
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
 msgid "Exclude interfaces"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:153
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
 msgid "Expand hosts"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:195
+msgid "Expecting an hexadecimal assignment hint"
+msgstr ""
+
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:59
 msgid "Expecting: %s"
 msgstr ""
@@ -1878,7 +1921,7 @@ msgstr ""
 msgid "Expires"
 msgstr "Λήγει"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:488
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:543
 #, fuzzy
 msgid ""
 "Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
@@ -1886,55 +1929,71 @@ msgstr ""
 "Ο ελάχιστος χρόνος λήξεως των διευθύνσεων lease είναι 2 λεπτά (<code>2m</"
 "code>)."
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:8
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:19
 msgid "External"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:971
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1377
 msgid "External R0 Key Holder List"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:980
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1381
 msgid "External R1 Key Holder List"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:150
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:141
 msgid "External system log server"
 msgstr "Εξωτερικός εξυπηρετητής καταγραφής συστήματος"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:155
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:146
 msgid "External system log server port"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:160
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:151
 msgid "External system log server protocol"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:18
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:79
 msgid "Extra SSH command options"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:940
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1351
 msgid "FT over DS"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:941
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1352
 msgid "FT over the Air"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:938
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1349
 msgid "FT protocol"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1842
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:82
+msgid "Failed to change the system password."
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2389
 msgid "Failed to confirm apply within %ds, waiting for rollback…"
 msgstr ""
 
-#: modules/luci-base/luasrc/view/cbi/filebrowser.htm:106
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:45
+msgid "Failed to execute \"/etc/init.d/%s %s\" action: %s"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1561
 msgid "File"
 msgstr "Αρχείο"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:279
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1514
+msgid "File not accessible"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1698
+msgid "Filename"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:280
 msgid "Filename of the boot image advertised to clients"
 msgstr "Όνομα αρχείου της εικόνας εκκίνησης που διαφημίζετε στους πελάτες"
 
@@ -1944,14 +2003,15 @@ msgstr "Όνομα αρχείου της εικόνας εκκίνησης πο
 msgid "Filesystem"
 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:118
 msgid "Filter private"
 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:123
 msgid "Filter useless"
 msgstr "Φιλτράρισμα άχρηστων"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:23
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:65
 msgid "Finalizing failed"
 msgstr ""
@@ -1962,7 +2022,7 @@ msgid ""
 "with defaults based on what was detected"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:696
 msgid "Find and join network"
 msgstr "Εύρεση και σύνδεση σε δίκτυο"
 
@@ -1974,11 +2034,11 @@ msgstr "Τέλος"
 msgid "Firewall"
 msgstr "Τείχος Προστασίας"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:77
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:76
 msgid "Firewall Mark"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:193
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:278
 msgid "Firewall Settings"
 msgstr "Ρυθμίσεις Τείχους Προστασίας"
 
@@ -1986,7 +2046,7 @@ msgstr "Ρυθμίσεις Τείχους Προστασίας"
 msgid "Firewall Status"
 msgstr "Κατάσταση Τείχους Προστασίας"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:137
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:860
 msgid "Firmware File"
 msgstr ""
 
@@ -1994,7 +2054,7 @@ msgstr ""
 msgid "Firmware Version"
 msgstr "Έκδοση Υλικολογισμικού"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:225
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:226
 msgid "Fixed source port for outbound DNS queries"
 msgstr ""
 
@@ -2014,36 +2074,36 @@ msgstr "Φλασάρισμα νέας εικόνας υλικολογισμικ
 msgid "Flash operations"
 msgstr "Λειτουργίες φλασάρισματος"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:194
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:192
 msgid "Flashing..."
 msgstr "Φλασάρεται..."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:498
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:550
 msgid "Force"
 msgstr "Επιβολή"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:258
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:782
 msgid "Force 40MHz mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:622
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1031
 msgid "Force CCMP (AES)"
 msgstr "Επιβολή CCMP (AES)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:499
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:550
 msgid "Force DHCP on this network even if another server is detected."
 msgstr ""
 "Επιβολή DHCP σε αυτό το δίκτυο ακόμα κι αν έχει εντοπιστεί άλλος εξυπηρετητής"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:623
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1032
 msgid "Force TKIP"
 msgstr "Επιβολή TKIP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:624
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1033
 msgid "Force TKIP and CCMP (AES)"
 msgstr "Επιβολή TKIP και CCMP (AES)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:795
 msgid "Force link"
 msgstr ""
 
@@ -2051,7 +2111,7 @@ msgstr ""
 msgid "Force upgrade"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:60
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:90
 msgid "Force use of NAT-T"
 msgstr ""
 
@@ -2059,7 +2119,7 @@ msgstr ""
 msgid "Form token mismatch"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:34
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:164
 msgid "Forward DHCP traffic"
 msgstr "Προώθηση κίνησης DHCP"
 
@@ -2067,46 +2127,41 @@ msgstr "Προώθηση κίνησης DHCP"
 msgid "Forward Error Correction Seconds (FECS)"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:28
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:161
 msgid "Forward broadcast traffic"
 msgstr "Προώθηση κίνησης broadcast"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:375
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:809
 msgid "Forward mesh peer traffic"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:186
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:908
 msgid "Forwarding mode"
 msgstr "Μέθοδος προώθησης"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:255
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:596
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:774
 msgid "Fragmentation Threshold"
 msgstr "Όριο Κατακερµατισµού"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:332
-msgid "Frame Bursting"
-msgstr "Bursting Πλαισίων"
-
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:17
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:28
 msgid "Free"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:91
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:89
 msgid ""
-"Further information about WireGuard interfaces and peers at <a href=\"http://"
-"wireguard.com\">wireguard.com</a>."
+"Further information about WireGuard interfaces and peers at <a href='http://"
+"wireguard.com'>wireguard.com</a>."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:45
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:130
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:186
 msgid "GHz"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:29
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:36
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:91
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:77
 msgid "GPRS only"
 msgstr ""
 
@@ -2115,28 +2170,28 @@ msgstr ""
 msgid "Gateway"
 msgstr "Πύλη"
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:35
+msgid "Gateway Ports"
+msgstr "Θύρες πύλης"
+
 #: modules/luci-base/htdocs/luci-static/resources/network.js:9
 #: modules/luci-base/luasrc/model/network.lua:29
 msgid "Gateway address is invalid"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:46
-msgid "Gateway ports"
-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:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:275
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:23
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:112
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:103
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:49
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:33
 msgid "General Settings"
 msgstr "Γενικές Ρυθμίσεις"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:188
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:462
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:175
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:141
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:361
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:504
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:895
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:741
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:796
 msgid "General Setup"
 msgstr ""
 
@@ -2144,7 +2199,7 @@ msgstr ""
 msgid "Generate Config"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:945
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1355
 msgid "Generate PMK locally"
 msgstr ""
 
@@ -2152,11 +2207,7 @@ msgstr ""
 msgid "Generate archive"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:63
-msgid "Generic 802.11%s Wireless Controller"
-msgstr ""
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:26
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:74
 msgid "Given password confirmation did not match, password not changed!"
 msgstr ""
 
@@ -2164,7 +2215,7 @@ msgstr ""
 msgid "Global Settings"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:806
 msgid "Global network options"
 msgstr ""
 
@@ -2175,33 +2226,29 @@ msgstr ""
 msgid "Go to password configuration..."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:857
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1369
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1112
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1616
 #: modules/luci-base/luasrc/view/cbi/full_valueheader.htm:4
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:58
 msgid "Go to relevant configuration page"
 msgstr "Μετάβαση στη σχετική σελίδα ρυθμίσεων"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:38
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:66
 msgid "Group Password"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:11
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:22
 msgid "Guest"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:73
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:81
 msgid "HE.net password"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:60
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:73
 msgid "HE.net username"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:310
-msgid "HT mode (802.11n)"
-msgstr ""
-
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:16
 msgid "Hang Up"
 msgstr "Κρέμασμα"
@@ -2210,7 +2257,7 @@ msgstr "Κρέμασμα"
 msgid "Header Error Code Errors (HEC)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:103
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 msgid ""
 "Here you can configure the basic aspects of your device like its hostname or "
 "the timezone."
@@ -2218,9 +2265,7 @@ msgstr ""
 "Εδώ μπορείτε να παραμετροποιήσετε βασικές πλευρές της συσκευής σας όπως το "
 "όνομα υπολογιστή ή τη ζώνη ώρας."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:499
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:556
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:579
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:941
 msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "Κρυφό <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 
@@ -2231,14 +2276,15 @@ msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:92
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1959
 msgid "Host"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:20
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:21
 msgid "Host entries"
 msgstr "Καταχωρήσεις Υπολογιστών"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:48
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:171
 msgid "Host expiry timeout"
 msgstr ""
 
@@ -2247,45 +2293,45 @@ msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
 msgstr ""
 "<abbr title=\"Internet Protocol Address\">IP</abbr> Υπολογιστή ή Δικτύου"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:118
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:102
 msgid "Host-Uniq tag content"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:71
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:31
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:316
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:25
+#: 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:317
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:26
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:17
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:125
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:116
 msgid "Hostname"
 msgstr "Όνομα Υπολογιστή"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:12
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:22
 msgid "Hostname to send when requesting DHCP"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:18
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:19
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:67
 msgid "Hostnames"
 msgstr "Ονόματα Υπολογιστών"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:13
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:24
 msgid "Hybrid"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:45
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:75
 msgid "IKE DH Group"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:41
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:59
 msgid "IP Addresses"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:40
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:80
 msgid "IP Protocol"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:29
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:30
 msgid "IP address"
 msgstr "Διεύθυνση IP"
 
@@ -2304,6 +2350,11 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:20
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:21
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:22
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:79
+#: 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/network.js:89
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:90
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:91
@@ -2311,7 +2362,7 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:93
 #: 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/luasrc/model/cbi/admin_network/proto_ncm.lua:42
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:82
 msgid "IPv4"
 msgstr "IPv4"
 
@@ -2323,24 +2374,23 @@ msgstr "IPv4 Τείχος Προστασίας"
 msgid "IPv4 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:57
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:178
 msgid "IPv4 address"
 msgstr "Διεύθυνση IPv4"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:26
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:33
 msgid "IPv4 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:104
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:181
 msgid "IPv4 broadcast"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:100
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:180
 msgid "IPv4 gateway"
 msgstr "Πύλη IPv4"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:92
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:179
 msgid "IPv4 netmask"
 msgstr "Μάσκα IPv4"
 
@@ -2348,24 +2398,25 @@ msgstr "Μάσκα IPv4"
 msgid "IPv4 network in address/netmask notation"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:25
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:52
 msgid "IPv4 prefix"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:42
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:30
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:55
 msgid "IPv4 prefix length"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:43
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:83
 msgid "IPv4+IPv6"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:72
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:34
 msgid "IPv4-Address"
 msgstr "IPv4-Διεύθυνση"
 
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:10
 #: protocols/luci-proto-ipip/luasrc/model/network/proto_ipip.lua:9
 msgid "IPv4-in-IPv4 (RFC2003)"
 msgstr ""
@@ -2380,6 +2431,16 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:30
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:31
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:32
+#: 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/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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:89
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:90
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:91
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:92
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:95
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:96
@@ -2392,7 +2453,7 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:103
 #: 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/luasrc/model/cbi/admin_network/proto_ncm.lua:44
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:84
 msgid "IPv6"
 msgstr "IPv6"
 
@@ -2404,11 +2465,11 @@ msgstr "IPv6 Τείχος Προστασίας"
 msgid "IPv6 Neighbours"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:464
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:506
 msgid "IPv6 Settings"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:195
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:810
 msgid "IPv6 ULA-Prefix"
 msgstr ""
 
@@ -2416,21 +2477,21 @@ msgstr ""
 msgid "IPv6 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:202
 msgid "IPv6 address"
 msgstr "Διεύθυνση IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:23
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:189
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:31
 msgid "IPv6 assignment hint"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:18
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:184
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:27
 msgid "IPv6 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:207
 msgid "IPv6 gateway"
 msgstr "Πύλη IPv6"
 
@@ -2438,22 +2499,22 @@ msgstr "Πύλη IPv6"
 msgid "IPv6 network in address/netmask notation"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:37
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:59
 msgid "IPv6 prefix"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:34
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:45
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:63
 msgid "IPv6 prefix length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:33
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:211
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:57
 msgid "IPv6 routed prefix"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:143
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:215
 msgid "IPv6 suffix"
 msgstr ""
 
@@ -2463,31 +2524,35 @@ msgid "IPv6-Address"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:93
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:104
 msgid "IPv6-PD"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:10
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:13
 msgid "IPv6-in-IPv4 (RFC4213)"
 msgstr "IPv6-in-IPv4 (RFC4213)"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:17
 msgid "IPv6-over-IPv4 (6rd)"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:15
 msgid "IPv6-over-IPv4 (6to4)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1075
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1478
 msgid "Identity"
 msgstr "Ταυτότητα"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:70
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:96
 msgid "If checked, 1DES is enabled"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:65
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:93
 msgid "If checked, encryption is disabled"
 msgstr ""
 
@@ -2508,36 +2573,36 @@ msgstr ""
 "Αν οριστεί, προσάρτησε τη συσκευή με βάση την ετικέτα της αντί για το "
 "καθορισμένο όνομα της"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:27
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:71
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:18
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:82
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:52
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:17
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:29
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:33
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:68
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:85
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:32
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:45
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:45
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:24
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:44
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:116
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:48
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:85
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:65
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:33
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:80
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:108
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:146
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:74
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:97
 msgid "If unchecked, no default route is configured"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:34
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:86
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:35
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:99
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:47
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:60
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:60
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:39
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:59
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:124
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:39
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:116
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:59
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:103
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:64
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:77
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:100
 msgid "If unchecked, the advertised DNS server addresses are ignored"
 msgstr ""
 
@@ -2556,15 +2621,15 @@ msgstr ""
 "προσπελαστεί με τους υψηλούς ρυθμούς μεταφοράς δεδομένων που διαθέτει η "
 "<abbr title=\"Random Access Memory\">RAM</abbr>."
 
-#: 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:102
 msgid "Ignore <code>/etc/hosts</code>"
 msgstr "Αγνόησε <code>/etc/hosts</code>"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:471
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:531
 msgid "Ignore interface"
 msgstr "Αγνόησε διεπαφή"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:90
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:91
 msgid "Ignore resolve file"
 msgstr "Αγνόησε αρχείο resolve"
 
@@ -2582,12 +2647,12 @@ msgid ""
 "blocked. Click \"Continue »\" below to return to the previous page."
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:145
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:118
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:124
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:126
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:97
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:118
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:157
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:141
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:115
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:138
 msgid "Inactivity timeout"
 msgstr ""
 
@@ -2595,23 +2660,25 @@ msgstr ""
 msgid "Inbound:"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:170
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:161
 msgid "Info"
 msgstr "Πληροφορίες"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:105
 msgid "Information"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:25
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:67
 msgid "Initialization failure"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:34
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:87
 msgid "Initscript"
 msgstr "Σενάριο εκκίνησης"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:26
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:122
 msgid "Initscripts"
 msgstr "Σενάρια Εκκίνησης"
 
@@ -2619,55 +2686,74 @@ msgstr "Σενάρια Εκκίνησης"
 msgid "Install iputils-traceroute6 for IPv6 traceroute"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:223
-msgid "Install package %q"
-msgstr "Εγκατάσταση πακέτου %q"
-
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:220
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:120
 msgid "Install protocol extensions..."
 msgstr "Εγκατάσταση επεκτάσεων πρωτοκόλλου..."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:416
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:423
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:683
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:687
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:26
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:284
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:342
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:47
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:134
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:14
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:16
 msgid "Interface"
 msgstr "Διεπαφή"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:58
 msgid "Interface %q device auto-migrated from %q to %q."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:356
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:792
 msgid "Interface Configuration"
 msgstr "Παραμετροποίηση Διεπαφής"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:51
-msgid "Interface Overview"
-msgstr "Επισκόπηση Διεπαφής"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:99
+msgid "Interface has %d pending changes"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:57
+msgid "Interface is marked for deletion"
+msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:162
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:3
 msgid "Interface is reconnecting..."
 msgstr "Η διεπαφή επανασυνδέεται..."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:162
+msgid "Interface is shutting down..."
+msgstr "Η διεπαφή απενεργοποιείται..."
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:205
+msgid "Interface is starting..."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:208
+msgid "Interface is stopping..."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:954
 msgid "Interface name"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:34
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:224
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:131
 msgid "Interface not present or not connected yet."
 msgstr "Η διεπαφή δεν υπάρχει ή δεν έχει συνδεθεί ακόμη."
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:88
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:16
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:11
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:287
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:54
 msgid "Interfaces"
 msgstr "Διεπαφές"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:9
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:20
 msgid "Internal"
 msgstr ""
 
@@ -2680,19 +2766,35 @@ msgstr ""
 msgid "Invalid"
 msgstr "Άκυρη τιμή εισόδου"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:311
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:10
+msgid "Invalid Base64 key string"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:281
 msgid "Invalid VLAN ID given! Only IDs between %d and %d are allowed."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:307
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:290
 msgid "Invalid VLAN ID given! Only unique IDs are allowed"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:195
+msgid "Invalid argument"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:194
+msgid "Invalid command"
+msgstr ""
+
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:80
+msgid "Invalid hexadecimal value"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/sysauth.htm:12
 msgid "Invalid username and/or password! Please try again."
 msgstr "Άκυρο όνομα χρήστη και/ή κωδικός πρόσβασης! Παρακαλώ προσπαθήστε ξανά."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:508
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:950
 msgid "Isolate Clients"
 msgstr ""
 
@@ -2712,15 +2814,15 @@ msgstr ""
 msgid "JavaScript required!"
 msgstr "Απαιτείται JavaScript!"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:52
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1691
 msgid "Join Network"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:22
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1628
 msgid "Join Network: Wireless Scan"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:19
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1833
 msgid "Joining Network: %q"
 msgstr ""
 
@@ -2737,15 +2839,15 @@ msgstr "Καταγραφή Πυρήνα"
 msgid "Kernel Version"
 msgstr "Έκδοση Πυρήνα"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:823
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1248
 msgid "Key"
 msgstr "Κλειδί"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:851
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:852
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:853
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:854
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:870
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1277
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1278
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1279
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1291
 msgid "Key #%d"
 msgstr "Κλειδί #%d"
 
@@ -2753,33 +2855,34 @@ msgstr "Κλειδί #%d"
 msgid "Kill"
 msgstr "Σκότωμα"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:10
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:21
 msgid "L2TP"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:10
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:40
 msgid "L2TP Server"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:100
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:74
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:80
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:74
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:53
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:73
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:131
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:102
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:89
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:112
 msgid "LCP echo failure threshold"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:118
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:89
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:95
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:89
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:68
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:91
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:144
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:102
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:125
 msgid "LCP echo interval"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:181
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:902
 msgid "LLC"
 msgstr "LLC"
 
@@ -2788,11 +2891,11 @@ msgstr "LLC"
 msgid "Label"
 msgstr "Ετικέτα"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:213
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:204
 msgid "Language"
 msgstr "Γλώσσα"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:115
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:106
 msgid "Language and Style"
 msgstr ""
 
@@ -2800,51 +2903,51 @@ msgstr ""
 msgid "Latency"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:10
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:21
 msgid "Leaf"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:369
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:487
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:393
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:543
 msgid "Lease time"
 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:87
 msgid "Leasefile"
 msgstr "Αρχείο Leases"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:74
 #: modules/luci-base/luasrc/view/lease_status.htm:95
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:34
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
 msgid "Leasetime remaining"
 msgstr "Υπόλοιπο χρόνου Lease"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:9
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:20
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:27
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:50
 msgid "Leave empty to autodetect"
 msgstr "Αφήστε το κενό για να γίνει αυτόματη ανίχνευση"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:21
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:45
 msgid "Leave empty to use the current WAN address"
 msgstr "Αφήστε το κενό για να γίνει χρήση της τρέχουσας διεύθυνσης WAN"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1746
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2299
 msgid "Legend:"
 msgstr "Υπόμνημα:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:481
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:538
 msgid "Limit"
 msgstr "Όριο"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:287
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:288
 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:299
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:300
 msgid "Limit listening to these interfaces, and loopback."
 msgstr ""
 
@@ -2864,17 +2967,17 @@ msgstr ""
 msgid "Line Uptime"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:101
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:88
 msgid "Link On"
 msgstr "Αναμμένο με Ζεύξη"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:185
 msgid ""
 "List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
 "requests to"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:972
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1377
 msgid ""
 "List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-"
 "Identifier,128-bit key as hex string. <br />This list is used to map R0KH-ID "
@@ -2883,7 +2986,7 @@ msgid ""
 "Association."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:981
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1381
 msgid ""
 "List of R1KHs in the same Mobility Domain. <br />Format: MAC-address,R1KH-ID "
 "as 6 octets with colons,128-bit key as hex string. <br />This list is used "
@@ -2892,31 +2995,31 @@ msgid ""
 "PMK-R1 keys."
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:21
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:82
 msgid "List of SSH key files for auth"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:206
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:207
 msgid "List of domains to allow RFC1918 responses for"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:174
 msgid "List of hosts that supply bogus NX domain results"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:298
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:299
 msgid "Listen Interfaces"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:30
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:54
 msgid "Listen Port"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:15
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:16
 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:216
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:217
 msgid "Listening port for inbound DNS queries"
 msgstr ""
 
@@ -2935,11 +3038,11 @@ msgstr "Μέσος όρος φόρτου"
 msgid "Loading"
 msgstr "Φόρτωση"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:35
-msgid "Loading SSH keys…"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1819
+msgid "Loading directory contents…"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1204
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1296
 #: modules/luci-base/luasrc/view/view.htm:4
 msgid "Loading view…"
 msgstr ""
@@ -2949,77 +3052,73 @@ msgstr ""
 msgid "Local IP address is invalid"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:25
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:86
 msgid "Local IP address to assign"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:10
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:11
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:44
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:39
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:151
 msgid "Local IPv4 address"
 msgstr "Τοπική διεύθυνση IPv4"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:20
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:54
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:45
 msgid "Local IPv6 address"
 msgstr "Τοπική διεύθυνση IPv6"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:286
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:287
 msgid "Local Service Only"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:81
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:126
 msgid "Local Startup"
 msgstr ""
 
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:25
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:121
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:112
 msgid "Local Time"
 msgstr "Τοπική Ώρα"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:149
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
 msgid "Local domain"
 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:147
 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:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:151
 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:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
 msgid "Local server"
 msgstr "Τοπικός εξυπηρετητής"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:129
 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:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:128
 msgid "Localise queries"
 msgstr "Τοπικά ερωτήματα"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:175
-msgid "Locked to channel %s used by: %s"
-msgstr ""
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:168
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:159
 msgid "Log output level"
 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:181
 msgid "Log queries"
 msgstr "Καταγραφή ερωτημάτων"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:113
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:104
 msgid "Logging"
 msgstr "Καταγραφή"
 
@@ -3027,7 +3126,7 @@ msgstr "Καταγραφή"
 msgid "Login"
 msgstr "Σύνδεση"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:95
+#: modules/luci-base/luasrc/controller/admin/index.lua:103
 msgid "Logout"
 msgstr "Αποσύνδεση"
 
@@ -3035,11 +3134,13 @@ msgstr "Αποσύνδεση"
 msgid "Loss of Signal Seconds (LOSS)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:476
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:533
 msgid "Lowest leased address as offset from the network address."
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:40
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:75
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:35
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:86
 msgid "MAC"
@@ -3047,32 +3148,32 @@ msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:73
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:109
-#: 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:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1958
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:86
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:133
 msgid "MAC-Address"
 msgstr "MAC-Διεύθυνση"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:457
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:586
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:886
 msgid "MAC-Address Filter"
 msgstr "Φίλτρο MAC Διευθύνσεων"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:142
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:363
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:798
 msgid "MAC-Filter"
 msgstr "MAC-Φίλτρο"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:464
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:590
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:893
 msgid "MAC-List"
 msgstr "Λίστα MAC"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:13
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:16
 msgid "MAP / LW4over6"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:62
 msgid "MAP rule is invalid"
 msgstr ""
@@ -3090,8 +3191,8 @@ msgid "MHz"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:53
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:29
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:66
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:53
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:71
 msgid "MTU"
 msgstr "MTU"
 
@@ -3101,16 +3202,17 @@ msgid ""
 "below:"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:55
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:69
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:26
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:38
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:38
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:108
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:52
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:96
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:83
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:57
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:70
 msgid "Manual"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1949
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2188
 msgid "Master"
 msgstr ""
 
@@ -3118,49 +3220,47 @@ msgstr ""
 msgid "Max. Attainable Data Rate (ATTNDR)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:539
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:982
 msgid "Maximum allowed Listen Interval"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:234
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
 msgid "Maximum allowed number of active DHCP leases"
 msgstr "Μέγιστος επιτρεπόμενος αριθμός ενεργών DHCP leases"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:252
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:253
 msgid "Maximum allowed number of concurrent DNS queries"
 msgstr "Μέγιστος επιτρεπόμενος αριθμός ταυτόχρονων ερωτημάτων DNS"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:244
 msgid "Maximum allowed size of EDNS.0 UDP packets"
 msgstr "Μέγιστο επιτρεπόμενο μέγεθος EDNS.0 UDP πακέτων"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:63
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:77
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:57
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:112
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:104
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:93
 msgid "Maximum amount of seconds to wait for the modem to become ready"
 msgstr ""
 "Μέγιστος αριθμός δευτερολέπτων αναμονής ώστε το modem να καταστεί έτοιμο"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:27
-msgid ""
-"Maximum length of the name is 15 characters including the automatic protocol/"
-"bridge prefix (br-, 6in4-, pppoe- etc.)"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:482
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:538
 msgid "Maximum number of leased addresses."
 msgstr "Μέγιστος αριθμός διευθύνσεων lease"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:761
+msgid "Maximum transmit power"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:21
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:49
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:134
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:187
 #: modules/luci-mod-status/luasrc/view/admin_status/bandwidth.htm:79
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:284
 msgid "Mbit/s"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:18
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:32
 msgid "Medium"
 msgstr ""
 
@@ -3172,42 +3272,43 @@ msgstr "Μνήμη"
 msgid "Memory usage (%)"
 msgstr "Χρήση Μνήμης (%)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1952
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2191
 msgid "Mesh"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:372
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:806
 msgid "Mesh Id"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:196
+msgid "Method not found"
+msgstr ""
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:45
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:76
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:104
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:54
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:66
 msgid "Metric"
 msgstr "Μέτρο"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:154
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:198
 msgid "Mirror monitor port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:153
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:197
 msgid "Mirror source port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:408
-msgid "Missing protocol extension for proto %q"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:923
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1337
 msgid "Mobility Domain"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:154
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:41
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:74
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:366
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:31
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:360
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:801
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1619
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:175
 msgid "Mode"
 msgstr "Λειτουργία"
@@ -3216,39 +3317,38 @@ msgstr "Λειτουργία"
 msgid "Model"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:31
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:72
 msgid "Modem default"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:11
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:19
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:11
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:10
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:73
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:73
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:57
 msgid "Modem device"
 msgstr "Συσκευή Modem"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:24
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:66
 msgid "Modem information query failed"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:62
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:76
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:56
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:112
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:104
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:93
 msgid "Modem init timeout"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1953
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:452
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:554
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:577
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2192
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:880
 msgid "Monitor"
 msgstr "Παρακολούθηση"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:14
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
 msgid "More Characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:802
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1057
 msgid "More…"
 msgstr ""
 
@@ -3262,7 +3362,7 @@ msgstr "Προσάρτηση"
 msgid "Mount Point"
 msgstr "Σημείο Προσάρτησης"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:26
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:36
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:137
 msgid "Mount Points"
@@ -3312,46 +3412,44 @@ msgstr "Μετακίνηση κάτω"
 msgid "Move up"
 msgstr "Μετακίνηση πάνω"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:912
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
 msgid "NAS ID"
 msgstr "NAS ID"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:57
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:87
 msgid "NAT-T Mode"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:9
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 msgid "NAT64 Prefix"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:31
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:26
 msgid "NCM"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:535
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:589
 msgid "NDP-Proxy"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:43
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:72
 msgid "NT Domain"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:273
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:264
 msgid "NTP server candidates"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:837
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1092
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:27
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:502
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:65
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:553
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:658
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:49
 msgid "Name"
 msgstr "Όνομα"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:17
-msgid "Name of the new interface"
-msgstr "Όνομα νέας διεπαφής"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1808
 msgid "Name of the new network"
 msgstr "Όνομα νέου δικτύου"
 
@@ -3359,9 +3457,10 @@ msgstr "Όνομα νέου δικτύου"
 msgid "Navigation"
 msgstr "Πλοήγηση"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:62
+#: modules/luci-base/luasrc/controller/admin/index.lua:69
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:108
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:402
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:834
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1957
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:389
 #: modules/luci-mod-status/luasrc/view/admin_status/index/30-network.htm:8
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:73
@@ -3373,7 +3472,7 @@ msgstr "Δίκτυο"
 msgid "Network Utilities"
 msgstr "Εργαλεία Δικτύου"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:278
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:279
 msgid "Network boot image"
 msgstr ""
 
@@ -3386,53 +3485,59 @@ msgstr ""
 msgid "Network without interfaces."
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:661
+msgid "New interface name…"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:11
 msgid "Next »"
 msgstr "Επόμενο »"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1507
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1754
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:108
 msgid "No"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:453
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:514
 msgid "No DHCP Server configured for this interface"
 msgstr "Δεν υπάρχει ρυθμισμένος DHCP εξυπηρετητής για αυτή τη διεπαφή"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1162
+msgid "No Encryption"
+msgstr ""
+
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:89
 msgid "No NAT-T"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:198
+msgid "No data received"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1764
+msgid "No entries in this directory"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/backupfiles.lua:82
 msgid "No files found"
 msgstr "Δε βρέθηκαν αρχεία"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:550
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:191
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:180
 msgid "No information available"
 msgstr "Δεν υπάρχουν πληροφορίες διαθέσιμες"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:8
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:63
 msgid "No matching prefix delegation"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:157
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
 msgid "No negative cache"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:53
-msgid "No network configured on this device"
-msgstr "Δεν υπάρχει παραμετροποιημένο δίκτυο σε αυτή τη συσκευή"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:65
-msgid "No network name specified"
-msgstr "Δεν έχει οριστεί όνομα δικτύου"
-
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:147
-msgid "No networks in range"
-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
@@ -3440,7 +3545,12 @@ msgstr ""
 msgid "No password set!"
 msgstr "Δεν έχει οριστεί κωδικός πρόσβασης!"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:116
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:104
+msgid "No peers defined yet"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:129
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:271
 msgid "No public keys present yet."
 msgstr ""
 
@@ -3448,19 +3558,19 @@ msgstr ""
 msgid "No rules in this chain."
 msgstr "Δεν υπάρχει κανόνας σε αυτή την αλυσίδα"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:150
-msgid "No scan results available yet..."
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:53
+msgid "No signal"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:7
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:756
 msgid "No zone assigned"
 msgstr "Δεν έχει ανατεθεί ζώνη"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:111
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:35
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:48
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:133
 msgid "Noise"
 msgstr "Θόρυβος"
 
@@ -3476,16 +3586,16 @@ msgstr "Θόρυβος:"
 msgid "Non Pre-emtive CRC errors (CRC_P)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:292
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:293
 msgid "Non-wildcard"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:129
 msgid "None"
 msgstr "Κανένα"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:181
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:172
 msgid "Normal"
 msgstr "Φυσιολογικό"
 
@@ -3493,25 +3603,29 @@ msgstr "Φυσιολογικό"
 msgid "Not Found"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:27
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:5
-msgid "Not associated"
-msgstr ""
-
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:87
 msgid "Not connected"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:38
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:139
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:232
+msgid "Not present"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:105
 msgid "Not started on boot"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:26
-msgid "Note: interface name length"
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:201
+msgid "Not supported"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:171
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:162
 msgid "Notice"
 msgstr "Επισήμανση"
 
@@ -3519,63 +3633,50 @@ msgstr "Επισήμανση"
 msgid "Nslookup"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:261
 msgid "Number of cached DNS entries (max is 10000, 0 is no caching)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:203
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:194
 msgid "Number of parallel threads used for compression"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:40
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:69
 msgid "Obfuscated Group Password"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:35
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:61
 msgid "Obfuscated Password"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:22
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:34
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:40
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:105
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:97
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:49
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:80
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:54
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:67
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:93
 msgid "Obtain IPv6-Address"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:83
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:68
 msgid "Off-State Delay"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:16
-msgid ""
-"On this page you can configure the network interfaces. You can bridge "
-"several interfaces by ticking the \"bridge interfaces\" field and enter the "
-"names of several network interfaces separated by spaces. You can also use "
-"<abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
-"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
-"<samp>eth0.1</samp>)."
-msgstr ""
-"Σε αυτή τη σελίδα μπορείτε να ρυθμίσετε τις διεπαφές δικτύου. Μπορείτε να "
-"γεφυρώσετε πολλαπλές διεπαφές τικάροντας το πεδίο \"γεφύρωμα διεπαφών\" και "
-"εισάγοντας τα ονόματα των διεπαφών δικτύου χωρισμένα με κενά. Μπορείτε "
-"επίσης να χρησιμοποιήσετε παράσταση τύπου <abbr title=\"Virtual Local Area "
-"Network\">VLAN</abbr> <samp>INTERFACE.VLANNR</samp> (<abbr title="
-"\"παραδείγματος χάριν\">π.χ.</abbr>: <samp>eth0.1</samp>)."
-
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:95
 msgid "On-Link route"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:80
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:64
 msgid "On-State Delay"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:360
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:382
 msgid "One of hostname or mac address must be specified!"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:456
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:462
 msgid "One of the following: %s"
 msgstr ""
 
@@ -3597,34 +3698,35 @@ msgstr "Ένα ή περισσότερα πεδία δεν περιέχουν τ
 msgid "Open list..."
 msgstr ""
 
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:61
 #: protocols/luci-proto-openconnect/luasrc/model/network/proto_openconnect.lua:9
 msgid "OpenConnect (CISCO AnyConnect)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:757
 msgid "Operating frequency"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1753
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2306
 msgid "Option changed"
 msgstr "Η επιλογή άλλαξε"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1755
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2308
 msgid "Option removed"
 msgstr "Η επιλογή αφαιρέθηκε"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1140
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:55
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1535
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:66
 msgid "Optional"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:78
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:76
 msgid ""
 "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, "
 "starting with <code>0x</code>."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:144
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:215
 msgid ""
 "Optional. Allowed values: 'eui64', 'random', fixed value like '::1' or "
 "'::1:2'. When IPv6 prefix (like 'a:b:c:d::') is received from a delegating "
@@ -3632,41 +3734,41 @@ msgid ""
 "for the interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:123
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:117
 msgid ""
 "Optional. Base64-encoded preshared key. Adds in an additional layer of "
 "symmetric-key cryptography for post-quantum resistance."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:148
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:126
 msgid "Optional. Create routes for Allowed IPs for this peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:103
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:108
 msgid "Optional. Description of peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:156
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:128
 msgid ""
 "Optional. Host of peer. Names are resolved prior to bringing up the "
 "interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:67
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:71
 msgid "Optional. Maximum Transmission Unit of tunnel interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:166
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:132
 msgid "Optional. Port of peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:175
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:136
 msgid ""
 "Optional. Seconds between keep alive messages. Default is 0 (disabled). "
 "Recommended value if this device is behind a NAT is 25."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:31
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:54
 msgid "Optional. UDP port used for outgoing and incoming packets."
 msgstr ""
 
@@ -3687,7 +3789,7 @@ msgstr "Έξοδος"
 msgid "Outbound:"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:26
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:50
 msgid "Output Interface"
 msgstr ""
 
@@ -3696,51 +3798,51 @@ msgstr ""
 msgid "Output zone"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:63
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:155
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:33
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:54
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:54
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:219
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:50
 msgid "Override MAC address"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:66
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:35
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:56
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:88
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:125
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:131
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:133
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:104
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:61
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:58
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:223
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:44
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:54
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:154
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:71
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:145
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:132
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:110
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:119
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:97
 msgid "Override MTU"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:30
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:63
 msgid "Override TOS"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:25
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:58
 msgid "Override TTL"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:954
 msgid "Override default interface name"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:41
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:167
 msgid "Override the gateway in DHCP responses"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:507
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:555
 msgid ""
 "Override the netmask sent to clients. Normally it is calculated from the "
 "subnet that is served."
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:65
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:179
 msgid "Override the table used for internal routes"
 msgstr ""
 
@@ -3748,29 +3850,33 @@ msgstr ""
 msgid "Overview"
 msgstr "Επισκόπηση"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1606
+msgid "Overwrite existing file \"%s\" ?"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:11
 msgid "Owner"
 msgstr "Κάτοχος"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:42
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:56
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:17
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:28
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:34
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:14
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:18
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:43
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:98
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:45
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:44
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:63
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:82
 msgid "PAP/CHAP password"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:39
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:53
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:14
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:11
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:15
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:96
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:88
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:43
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:74
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:42
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:61
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:77
 msgid "PAP/CHAP username"
 msgstr ""
 
@@ -3778,9 +3884,9 @@ msgstr ""
 msgid "PID"
 msgstr "PID"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:36
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:50
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:26
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:95
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:87
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:68
 msgid "PIN"
 msgstr "PIN"
 
@@ -3789,114 +3895,116 @@ msgstr "PIN"
 msgid "PIN code rejected"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:966
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1372
 msgid "PMK R1 Push"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:43
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:13
 msgid "PPP"
 msgstr "PPP"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:11
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:58
 msgid "PPPoA Encapsulation"
 msgstr "Ενθυλάκωση PPPoA"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:19
 msgid "PPPoATM"
 msgstr "PPPoATM"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:17
 msgid "PPPoE"
 msgstr "PPPoE"
 
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:28
 #: protocols/luci-proto-pppossh/luasrc/model/network/proto_pppossh.lua:9
 msgid "PPPoSSH"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:15
 msgid "PPtP"
 msgstr "PPtP"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:59
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:73
 msgid "PSID offset"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:56
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:70
 msgid "PSID-bits length"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:123
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:846
 msgid "PTM/EFM (Packet Transfer Mode)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:78
-msgid "Package libiwinfo required!"
-msgstr "Απαιτείται το πακέτο libiwinfo!"
-
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:45
 msgid "Packets"
 msgstr "Πακέτα"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:7
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:756
 msgid "Part of zone %q"
 msgstr "Μέρος της ζώνης %q"
 
 #: modules/luci-base/luasrc/view/sysauth.htm:29
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1111
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:35
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:42
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1514
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:46
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:104
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:58
 msgid "Password"
 msgstr "Κωδικός Πρόσβασης"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:29
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:24
 msgid "Password authentication"
 msgstr "Εξουσιοδότηση με κωδικό πρόσβασης"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1019
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1414
 msgid "Password of Private Key"
 msgstr "Κωδικός Πρόσβασης του Ιδιωτικού Κλειδιού"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1067
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1471
 msgid "Password of inner Private Key"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:14
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:16
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:18
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:20
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:32
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:34
 msgid "Password strength"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:44
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:107
 msgid "Password2"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:37
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:244
 msgid "Paste or drag SSH key file…"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1000
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1396
 msgid "Path to CA-Certificate"
 msgstr "Διαδρομή για Πιστοποιητικό CA"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1007
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1402
 msgid "Path to Client-Certificate"
 msgstr "Διαδρομή για Πιστοποιητικό-Πελάτη"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1013
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1408
 msgid "Path to Private Key"
 msgstr "Διαδρομή για Ιδιωτικό Κλειδί"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1049
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1453
 msgid "Path to inner CA-Certificate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1055
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1459
 msgid "Path to inner Client-Certificate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1061
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1465
 msgid "Path to inner Private Key"
 msgstr ""
 
@@ -3914,7 +4022,7 @@ msgstr ""
 msgid "Peak:"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:28
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:89
 msgid "Peer IP address to assign"
 msgstr ""
 
@@ -3923,11 +4031,11 @@ msgstr ""
 msgid "Peer address is missing"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:90
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:89
 msgid "Peers"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:50
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:80
 msgid "Perfect Forward Secrecy"
 msgstr ""
 
@@ -3939,7 +4047,11 @@ msgstr "Εκτέλεση επανεκκίνησης"
 msgid "Perform reset"
 msgstr "Διενέργεια αρχικοποίησης"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:174
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:199
+msgid "Permission denied"
+msgstr ""
+
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:136
 msgid "Persistent Keep Alive"
 msgstr ""
 
@@ -3947,7 +4059,7 @@ msgstr ""
 msgid "Phy Rate:"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:190
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:277
 msgid "Physical Settings"
 msgstr ""
 
@@ -3958,6 +4070,10 @@ msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:16
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:17
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:41
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:77
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:87
@@ -3975,15 +4091,19 @@ msgstr "Παρακαλώ εισάγετε όνομα χρήστη και κωδ
 msgid "Policy"
 msgstr "Πολιτική"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:22
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:20
 msgid "Port"
 msgstr "Θύρα"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:18
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:133
+msgid "Port %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:274
 msgid "Port status:"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:482
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:488
 msgid "Potential negation of: %s"
 msgstr ""
 
@@ -3995,11 +4115,11 @@ msgstr ""
 msgid "Pre-emtive CRC errors (CRCP_P)"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:32
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:73
 msgid "Prefer LTE"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:33
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:74
 msgid "Prefer UMTS"
 msgstr ""
 
@@ -4007,32 +4127,31 @@ msgstr ""
 msgid "Prefix Delegated"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:122
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:117
 msgid "Preshared Key"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:101
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:75
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:81
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:75
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:54
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:74
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:131
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:102
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:89
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:112
 msgid ""
 "Presume peer to be dead after given amount of LCP echo failures, use 0 to "
 "ignore failures"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:305
 msgid "Prevent listening on these interfaces."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:509
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:562
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:950
 #, fuzzy
 msgid "Prevents client-to-client communication"
 msgstr "Αποτρέπει την επικοινωνία μεταξύ πελατών"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:18
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:49
 msgid "Private Key"
 msgstr ""
 
@@ -4053,39 +4172,33 @@ msgstr ""
 msgid "Prot."
 msgstr "Πρωτ."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:72
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:349
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:675
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:84
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:216
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:87
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:390
 msgid "Protocol"
 msgstr "Πρωτόκολλο"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:31
-msgid "Protocol of the new interface"
-msgstr "Πρωτόκολλο νέας διεπαφής"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:222
-msgid "Protocol support is not installed"
-msgstr "Η υποστήριξη πρωτοκόλλου δεν έχει εκγατασταθεί"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:269
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:260
 msgid "Provide NTP server"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:701
 msgid "Provide new network"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:451
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:879
 msgid "Pseudo Ad-Hoc (ahdemo)"
 msgstr "Ψευδό Ad-Hoc (ahdemo)"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:112
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:113
 msgid "Public Key"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:278
 msgid ""
 "Public keys allow for the passwordless SSH logins with a higher security "
 "compared to the use of plain passwords. In order to upload a new key to the "
@@ -4093,47 +4206,48 @@ msgid ""
 "code> file into the input field."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:139
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:211
 msgid "Public prefix routed to this device for distribution to clients."
 msgstr ""
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:27
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:9
 msgid "QMI Cellular"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:173
 msgid "Quality"
 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:171
 msgid ""
 "Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> "
 "servers"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:952
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1360
 msgid "R0 Key Lifetime"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:959
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1366
 msgid "R1 Key Holder"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:58
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:88
 msgid "RFC3947 NAT-T mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:381
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:814
 msgid "RSSI threshold for joining"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:256
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:597
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:778
 msgid "RTS/CTS Threshold"
 msgstr "Όριο RTS/CTS"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:41
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:76
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:87
 msgid "RX"
@@ -4143,35 +4257,39 @@ msgstr "RX"
 msgid "RX Rate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:783
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1961
+msgid "RX Rate / TX Rate"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1207
 msgid "Radius-Accounting-Port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:791
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1215
 msgid "Radius-Accounting-Secret"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:775
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1199
 msgid "Radius-Accounting-Server"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:759
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1183
 msgid "Radius-Authentication-Port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:767
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1191
 msgid "Radius-Authentication-Secret"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:751
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1175
 msgid "Radius-Authentication-Server"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:119
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:102
 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:83
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:84
 msgid ""
 "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-Server"
@@ -4185,17 +4303,11 @@ msgid ""
 "access to this device if you are connected via this interface"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2
-msgid ""
-"Really delete this wireless network? The deletion cannot be undone! You "
-"might lose access to this device if you are connected via this network."
-msgstr ""
-
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:40
 msgid "Really reset all changes?"
 msgstr "Αρχικοποίηση όλων των αλλαγών;"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:237
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:354
 msgid "Really switch protocol?"
 msgstr "Αλλαγή πρωτοκόλλου;"
 
@@ -4219,15 +4331,15 @@ msgstr "Κίνηση πραγματικού χρόνου"
 msgid "Realtime Wireless"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:931
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1343
 msgid "Reassociation Deadline"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:191
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
 msgid "Rebind protection"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:48
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:46
 #: modules/luci-mod-system/luasrc/view/admin_system/reboot.htm:9
 msgid "Reboot"
 msgstr "Επανεκκίνηση"
@@ -4241,21 +4353,15 @@ msgstr "Επανεκκίνηση..."
 msgid "Reboots the operating system of your device"
 msgstr "Επανεκκίνηση του λειτουργικού συστήματος της συσκευής σας"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:103
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:90
 msgid "Receive"
 msgstr "Λήψη"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:325
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:350
-msgid "Receiver Antenna"
-msgstr "Κεραία Λήψης"
-
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:42
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:59
 msgid "Recommended. IP addresses of the WireGuard interface."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:28
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:300
 msgid "Reconnect this interface"
 msgstr "Επανασύνδεση της διεπαφής"
 
@@ -4263,92 +4369,134 @@ msgstr "Επανασύνδεση της διεπαφής"
 msgid "References"
 msgstr "Αναφορές"
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:39
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:153
 msgid "Relay"
 msgstr ""
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:36
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:157
 msgid "Relay Bridge"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:17
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:154
 msgid "Relay between networks"
 msgstr ""
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:64
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:12
 msgid "Relay bridge"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:18
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:50
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:49
 msgid "Remote IPv4 address"
 msgstr "Απομακρυσμένη διεύθυνση IPv4"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:8
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:40
 msgid "Remote IPv4 address or FQDN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:45
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:725
 msgid "Remove"
 msgstr "Αφαίρεση"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:53
-msgid "Repeat scan"
-msgstr "Επανάληψη σάρωσης"
-
-#: modules/luci-base/luasrc/view/cbi/upload.htm:11
-msgid "Replace entry"
-msgstr "Αντικατάσταση καταχώρησης"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:46
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:51
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1806
 msgid "Replace wireless configuration"
 msgstr "Αντικατάσταση ρυθμίσεων ασύρματης σύνδεσης"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:8
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:17
 msgid "Request IPv6-address"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:16
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:23
 msgid "Request IPv6-prefix of length"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1141
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:200
+msgid "Request timeout"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1536
 msgid "Required"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:20
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:31
 msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:19
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:49
 msgid "Required. Base64-encoded private key for this interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:113
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:113
 msgid "Required. Base64-encoded public key of peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:136
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:122
 msgid ""
 "Required. IP addresses and prefixes that this peer is allowed to use inside "
 "the tunnel. Usually the peer's tunnel IP addresses and the networks the peer "
 "routes through the tunnel."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1134
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1095
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1096
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1097
+msgid "Requires hostapd"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1101
+msgid "Requires hostapd with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1102
+msgid "Requires hostapd with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1098
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1099
+msgid "Requires hostapd with SAE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1533
 msgid ""
 "Requires the 'full' version of wpad/hostapd and support from the wifi driver "
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:141
 msgid ""
 "Requires upstream supports DNSSEC; verify unsigned domain responses really "
 "come from unsigned domains"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1268
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1109
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1119
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1120
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1121
+msgid "Requires wpa-supplicant"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1113
+msgid "Requires wpa-supplicant with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1114
+msgid "Requires wpa-supplicant with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1111
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1124
+msgid "Requires wpa-supplicant with SAE support"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1355
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:17
 #: modules/luci-base/luasrc/view/cbi/footer.htm:30
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:66
@@ -4364,17 +4512,22 @@ msgstr "Αρχικοποίηση Μετρητών"
 msgid "Reset to defaults"
 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:68
 msgid "Resolv and Hosts Files"
 msgstr "Αρχεία Resolv και Hosts"
 
-#: 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:94
 msgid "Resolve file"
 msgstr "Αρχείο Resolve"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:28
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:14
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:71
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:197
+msgid "Resource not found"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:302
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:693
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:90
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:112
 msgid "Restart"
 msgstr "Επανεκκίνηση"
 
@@ -4382,7 +4535,7 @@ msgstr "Επανεκκίνηση"
 msgid "Restart Firewall"
 msgstr "Επανεκκίνηση Τείχους Προστασίας"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:14
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:691
 msgid "Restart radio interface"
 msgstr ""
 
@@ -4394,26 +4547,24 @@ msgstr "Επαναφορά Αντίγραφου Ασφαλείας"
 msgid "Restore backup"
 msgstr "Επαναφορά αντιγράφου ασφαλείας"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:113
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:114
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:38
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:46
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:119
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:120
 msgid "Reveal/hide password"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1774
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2322
 msgid "Revert"
 msgstr "Αναίρεση"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1861
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2405
 msgid "Revert changes"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2013
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2554
 msgid "Revert request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1993
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2534
 msgid "Reverting configuration…"
 msgstr ""
 
@@ -4421,7 +4572,7 @@ msgstr ""
 msgid "Root"
 msgstr "Root"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:271
 msgid "Root directory for files served via TFTP"
 msgstr "Κατάλογος Root για αρχεία που σερβίρονται μέσω TFTP"
 
@@ -4429,7 +4580,7 @@ msgstr "Κατάλογος Root για αρχεία που σερβίροντα
 msgid "Root preparation"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:147
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:126
 msgid "Route Allowed IPs"
 msgstr ""
 
@@ -4441,12 +4592,12 @@ msgstr ""
 msgid "Route type"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:523
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:577
 msgid "Router Advertisement-Service"
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:43
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:15
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:27
 msgid "Router Password"
 msgstr "Κωδικός Πρόσβασης Δρομολογητή"
 
@@ -4477,7 +4628,7 @@ msgstr "Εκτέλεση ελέγχου του συστήματος αρχείω
 msgid "Run filesystem check"
 msgstr "Εκτέλεση ελέγχου συστήματος αρχείων"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:651
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:669
 msgid "Runtime error"
 msgstr ""
 
@@ -4489,31 +4640,31 @@ msgstr ""
 msgid "SNR"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:5
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:18
 msgid "SSH Access"
 msgstr "Πρόσβαση SSH"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:10
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:70
 msgid "SSH server address"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:13
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:74
 msgid "SSH server port"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:8
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:58
 msgid "SSH username"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:27
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:277
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
 msgid "SSH-Keys"
 msgstr "Κλειδιά SSH"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:42
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:73
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:29
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1617
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:174
 msgid "SSID"
 msgstr "SSID"
@@ -4522,17 +4673,17 @@ msgstr "SSID"
 msgid "SWAP"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1127
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1262
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1379
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1351
 #: modules/luci-base/luasrc/view/cbi/error.htm:17
 #: modules/luci-base/luasrc/view/cbi/footer.htm:26
 #: modules/luci-base/luasrc/view/cbi/header.htm:17
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:54
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:133
 msgid "Save"
 msgstr "Αποθήκευση"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1256
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1768
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1347
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2318
 #: modules/luci-base/luasrc/view/cbi/footer.htm:22
 msgid "Save & Apply"
 msgstr "Αποθήκευση & Εφαρμογή"
@@ -4545,28 +4696,20 @@ msgstr ""
 msgid "Save mtdblock contents"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
-msgid "Saving keys…"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:698
 msgid "Scan"
 msgstr "Σάρωση"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:109
-msgid "Scan request failed"
-msgstr ""
-
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:8
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:39
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:23
 msgid "Scheduled Tasks"
 msgstr "Προγραμματισμένες Εργασίες"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1749
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2302
 msgid "Section added"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1751
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2304
 msgid "Section removed"
 msgstr ""
 
@@ -4581,62 +4724,66 @@ msgid ""
 "your device!"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:119
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:90
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:96
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:90
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:69
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:92
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1516
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1646
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1809
+msgid "Select file…"
+msgstr ""
+
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:144
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:102
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:125
 msgid ""
 "Send LCP echo requests at the given interval in seconds, only effective in "
 "conjunction with failure threshold"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:561
-#, fuzzy
-msgid "Separate Clients"
-msgstr "Απομόνωση Πελατών"
-
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:62
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:63
 msgid "Server Settings"
 msgstr "Ρυθμίσεις Εξυπηρετητή"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:26
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:50
 msgid "Service Name"
 msgstr "Όνομα Υπηρεσίας"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:25
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:30
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:87
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:71
 msgid "Service Type"
 msgstr "Είδος Υπηρεσίας"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:55
+#: modules/luci-base/luasrc/controller/admin/index.lua:62
 msgid "Services"
 msgstr "Υπηρεσίες"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:815
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:861
 msgid "Session expired"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:83
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:107
 msgid "Set VPN as Default Route"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:258
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:795
 msgid ""
 "Set interface properties regardless of the link carrier (If set, carrier "
 "sense events do not invoke hotplug handlers)."
 msgstr ""
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:23
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:55
 msgid "Setting PLMN failed"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:26
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:68
 msgid "Setting operation mode failed"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:454
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:517
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:527
 msgid "Setup DHCP Server"
 msgstr "Ρύθμιση Εξυπηρετητή DHCP"
 
@@ -4648,7 +4795,7 @@ msgstr ""
 msgid "Short GI"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:516
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:960
 msgid "Short Preamble"
 msgstr ""
 
@@ -4660,21 +4807,23 @@ msgstr ""
 msgid "Show empty chains"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:306
 msgid "Shutdown this interface"
 msgstr "Απενεργοποίηση αυτής της διεπαφής"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:111
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:34
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:47
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:132
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1616
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:173
 msgid "Signal"
 msgstr "Σήμα"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1960
+msgid "Signal / Noise"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:125
 msgid "Signal Attenuation (SATN)"
 msgstr ""
@@ -4687,11 +4836,11 @@ msgstr "Σήμα:"
 msgid "Size"
 msgstr "Μέγεθος"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:259
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:260
 msgid "Size of DNS query cache"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:191
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
 msgid "Size of the ZRam device in megabytes"
 msgstr ""
 
@@ -4708,11 +4857,7 @@ msgstr "Παράκαμψη σε περιεχόμενο"
 msgid "Skip to navigation"
 msgstr "Παράκαμψη σε πλοήγηση"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:335
-msgid "Slot time"
-msgstr ""
-
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1640
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1846
 #: modules/luci-base/luasrc/model/network.lua:1427
 msgid "Software VLAN"
 msgstr ""
@@ -4750,63 +4895,65 @@ msgstr ""
 msgid "Specifies the directory the device is attached to"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:23
-#, fuzzy
-msgid "Specifies the listening port of this <em>Dropbear</em> instance"
-msgstr ""
-"Προσδιορίζει την θύρα ακρόασης αυτού του στιγμιοτύπου <em>Dropbear</em>"
-
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:57
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:175
 msgid ""
 "Specifies the maximum amount of failed ARP requests until hosts are presumed "
 "to be dead"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:49
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:171
 msgid ""
 "Specifies the maximum amount of seconds after which hosts are presumed to be "
 "dead"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:761
+msgid ""
+"Specifies the maximum transmit power the wireless radio may use. Depending "
+"on regulatory requirements and wireless usage, the actual transmit power may "
+"be reduced by the driver."
+msgstr ""
+
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:63
 msgid "Specify a TOS (Type of Service)."
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:25
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:58
 msgid ""
 "Specify a TTL (Time to Live) for the encapsulating packet other than the "
 "default (64)."
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:53
 msgid ""
 "Specify an MTU (Maximum Transmission Unit) other than the default (1280 "
 "bytes)."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:60
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "Specify the secret encryption key here."
 msgstr "Ορίστε το κρυφό κλειδί κρυπτογράφησης."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:475
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:64
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:533
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:89
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:111
 msgid "Start"
 msgstr "Αρχή"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:33
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:86
 msgid "Start priority"
 msgstr "Προτεραιότητα εκκίνησης"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1958
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2499
 msgid "Starting configuration apply…"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1626
 msgid "Starting wireless scan..."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:24
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:120
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
 msgid "Startup"
 msgstr "Εκκίνηση"
 
@@ -4818,59 +4965,62 @@ msgstr "Στατικές Διαδρομές IPv4"
 msgid "Static IPv6 Routes"
 msgstr "Στατικές Διαδρομές IPv6"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:70
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:71
 msgid "Static Leases"
 msgstr "Στατικά Leases"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:118
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:73
 msgid "Static Routes"
 msgstr "Στατικές Διαδρομές"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1194
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1384
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:172
 #: modules/luci-base/luasrc/model/network.lua:966
 msgid "Static address"
 msgstr "Στατική διεύθυνση"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:308
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:309
 msgid ""
 "Static leases are used to assign fixed IP addresses and symbolic hostnames "
 "to DHCP clients. They are also required for non-dynamic interface "
 "configurations where only hosts with a corresponding lease are served."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:534
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:977
 msgid "Station inactivity limit"
 msgstr ""
 
 #: modules/luci-base/luasrc/controller/admin/index.lua:40
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:197
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:337
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:746
 #: modules/luci-mod-status/luasrc/view/admin_status/index.htm:128
 msgid "Status"
 msgstr "Κατάσταση"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:35
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:75
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:308
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:91
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:113
 msgid "Stop"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:165
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Strict order"
 msgstr "Αυστηρή σειρά"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:16
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:30
 msgid "Strong"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1843
 msgid "Submit"
 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:108
 msgid "Suppress logging"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:109
 msgid "Suppress logging of the routine operation of these protocols"
 msgstr ""
 
@@ -4882,42 +5032,44 @@ msgstr ""
 msgid "Swap Entry"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:23
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:5
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:135
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:21
 msgid "Switch"
 msgstr "Switch"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:129
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:168
 msgid "Switch %q"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:128
-msgid "Switch %q (%s)"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:66
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:146
 msgid ""
 "Switch %q has an unknown topology - the VLAN settings might not be accurate."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:146
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:142
 msgid "Switch Port Mask"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1640
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1846
 #: modules/luci-base/luasrc/model/network.lua:1425
 msgid "Switch VLAN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:238
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:355
 msgid "Switch protocol"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:103
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:104
 #: modules/luci-base/luasrc/view/cbi/ipaddr.htm:26
 msgid "Switch to CIDR list notation"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:77
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1547
+msgid "Symbolic link"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:71
 msgid "Sync with NTP-Server"
 msgstr ""
 
@@ -4927,7 +5079,7 @@ msgstr ""
 
 #: modules/luci-base/luasrc/controller/admin/index.lua:47
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:14
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:102
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:94
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
 #: modules/luci-mod-system/luasrc/view/admin_system/applyreboot.htm:39
 msgid "System"
@@ -4938,11 +5090,11 @@ msgstr "Σύστημα"
 msgid "System Log"
 msgstr "Καταγραφή Συστήματος"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:108
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:99
 msgid "System Properties"
 msgstr "Ιδιότητες Συστήματος"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:145
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:136
 msgid "System log buffer size"
 msgstr ""
 
@@ -4950,15 +5102,17 @@ msgstr ""
 msgid "TCP:"
 msgstr "TCP:"
 
-#: 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:69
 msgid "TFTP Settings"
 msgstr "Ρυθμίσεις TFTP"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:269
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
 msgid "TFTP server root"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:17
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:77
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:88
 msgid "TX"
@@ -4981,7 +5135,7 @@ msgstr "Πίνακας"
 msgid "Target"
 msgstr "Στόχος"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:77
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:103
 msgid "Target network"
 msgstr ""
 
@@ -4989,40 +5143,24 @@ msgstr ""
 msgid "Terminate"
 msgstr "Τερματισμός"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:27
-msgid ""
-"The <em>Device Configuration</em> section covers physical settings of the "
-"radio hardware such as channel, transmit power or antenna selection which "
-"are shared among all defined wireless networks (if the radio hardware is "
-"multi-SSID capable). Per network settings like encryption or operation mode "
-"are grouped in the <em>Interface Configuration</em>."
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:79
-msgid ""
-"The <em>libiwinfo-lua</em> package is not installed. You must install this "
-"component for working wireless configuration!"
-msgstr ""
-
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:66
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:77
 msgid ""
 "The HE.net endpoint update configuration changed, you must now use the plain "
 "username instead of the user ID!"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:8
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:40
 msgid ""
 "The IPv4 address or the fully-qualified domain name of the remote tunnel end."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:27
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:38
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:59
 msgid ""
 "The IPv6 prefix assigned to the provider, usually ends with <code>::</code>"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:18
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1808
 msgid ""
 "The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
 "code> and <code>_</code>"
@@ -5038,7 +5176,7 @@ msgstr ""
 msgid "The configuration file could not be loaded due to the following error:"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1849
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2396
 msgid ""
 "The device could not be reached within %d seconds after applying the pending "
 "changes, which caused the configuration to be rolled back for safety "
@@ -5058,6 +5196,12 @@ msgstr ""
 "Το αρχείο συσκευής της μνήμης ή του διαμέρισματος (<abbr title="
 "\"παραδείγματος χάρην\">π.χ.</abbr> <code>/dev/sda1</code>)"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:612
+msgid ""
+"The existing wireless configuration needs to be changed for LuCI to function "
+"properly."
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:127
 msgid ""
 "The filesystem that was used to format the memory (<abbr title=\"for example"
@@ -5079,43 +5223,49 @@ msgstr ""
 msgid "The following rules are currently active on this system."
 msgstr "Οι παρακάτω κανόνες είναι αυτή τη στιγμή ενεργοί σε αυτό το σύστημα."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:144
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:154
+msgid "The gateway address must not be a local IP address"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:154
 msgid "The given SSH public key has already been added."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:150
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:160
 msgid ""
 "The given SSH public key is invalid. Please supply proper public RSA or "
 "ECDSA keys."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:67
-msgid "The given network name is not unique"
-msgstr "Το παρεχόμενο όνομα δικτύου δεν είναι μοναδικό"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:664
+msgid "The interface name is already used"
+msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:52
-msgid ""
-"The hardware is not multi-SSID capable and the existing configuration will "
-"be replaced if you proceed."
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:670
+msgid "The interface name is too long"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:43
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:31
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:55
 msgid ""
 "The length of the IPv4 prefix in bits, the remainder is used in the IPv6 "
 "addresses."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:35
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:46
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:63
 msgid "The length of the IPv6 prefix in bits"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:12
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:44
 msgid "The local IPv4 address over which the tunnel is created (optional)."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:5
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1814
+msgid "The network name is already used"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:135
 msgid ""
 "The network ports on this device can be combined to several <abbr title="
 "\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
@@ -5125,22 +5275,21 @@ msgid ""
 "next greater network like the internet and other ports for a local network."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:77
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:395
-msgid "The selected protocol needs a device assigned"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1149
+msgid "The selected %s mode is incompatible with %s encryption"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/csrftoken.htm:11
 msgid "The submitted security token is invalid or already expired!"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:274
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:272
 msgid ""
 "The system is erasing the configuration partition now and will reboot itself "
 "when finished."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:195
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:193
 #, fuzzy
 msgid ""
 "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
@@ -5153,7 +5302,7 @@ msgstr ""
 "είναι πιθανό να χρειαστεί να ανανεώσετε την διεύθυνση του υπολογιστή σας για "
 "να αποκτήσετε ξανά πρόσβαση στη συσκευή."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:15
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:80
 msgid "The system password has been successfully changed."
 msgstr ""
 
@@ -5165,7 +5314,7 @@ msgstr ""
 "Η εικόνα που ανεβάσατε δεν περιέχει κάποια υποστηριζόμενη μορφή. Βεβαιωθείτε "
 "ότι επιλέξατε την γενική μορφή εικόνας για την πλατφόρμα σας."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:427
 msgid "There are no active leases"
 msgstr ""
 
@@ -5174,16 +5323,10 @@ msgstr ""
 msgid "There are no active leases."
 msgstr "Δεν υπάρχουν ενεργά leases."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1973
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2514
 msgid "There are no changes to apply"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:204
-msgid ""
-"There is no device assigned yet, please attach a network device in the "
-"\"Physical Settings\" tab"
-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
@@ -5193,11 +5336,19 @@ msgid ""
 "protect the web interface and enable SSH."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:19
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:49
 msgid "This IPv4 address of the relay"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1448
+msgid "This authentication type is not applicable to the selected EAP method."
+msgstr ""
+
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:54
+msgid "This does not look like a valid PEM file"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
 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 "
@@ -5211,25 +5362,25 @@ msgid ""
 "configurations are automatically preserved."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:74
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:81
 msgid ""
 "This is either the \"Update Key\" configured for the tunnel or the account "
 "password if no update key has been configured"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:82
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:127
 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 ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:27
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:54
 msgid ""
 "This is the local endpoint address assigned by the tunnel broker, it usually "
 "ends with <code>...:2/64</code>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:79
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> in the local network"
@@ -5237,22 +5388,22 @@ msgstr ""
 "Αυτός είναι ο μόνος <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr> στο τοπικό δίκτυο"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:73
 msgid "This is the plain username for logging into the account"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:34
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:57
 msgid ""
 "This is the prefix routed to you by the tunnel broker for use by clients"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:9
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:41
 msgid "This is the system crontab in which scheduled tasks can be defined."
 msgstr ""
 "Αυτό είναι το crontab του συστήματος στο οποίο μπορούν να οριστούν "
 "προγραμματισμένες εργασίες."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:19
+#: 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 ""
@@ -5270,26 +5421,26 @@ msgid "This page gives an overview over currently active network connections."
 msgstr ""
 "Αυτή η σελίδα δίνει μία εικόνα για τις τρέχουσες ενεργές συνδέσεις δικτύου."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:726
-#: modules/luci-base/htdocs/luci-static/resources/form.js:809
+#: modules/luci-base/htdocs/luci-static/resources/form.js:936
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1064
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:172
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:32
 msgid "This section contains no values yet"
 msgstr "Αυτό το τμήμα δεν περιέχει τιμές ακόμη"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:114
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:105
 msgid "Time Synchronization"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:525
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:968
 msgid "Time interval for rekeying GTK"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:128
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:119
 msgid "Timezone"
 msgstr "Ζώνη ώρας"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:825
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:871
 msgid "To login…"
 msgstr ""
 
@@ -5304,7 +5455,7 @@ msgstr ""
 "κατάσταση, κάντε κλικ στο \"Εκτέλεσε επαναφορά\" (δυνατό μόνο σε squashfs "
 "εικόνες)."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:835
 msgid "Tone"
 msgstr ""
 
@@ -5328,55 +5479,41 @@ msgstr "Κίνηση"
 msgid "Transfer"
 msgstr "Μεταφέρθηκαν"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:595
-msgid "Transmission Rate"
-msgstr "Ρυθμός Εκπομπής"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:102
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:89
 msgid "Transmit"
 msgstr "Εκπομπή"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:211
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:273
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:345
-msgid "Transmit Power"
-msgstr "Ισχύς Εκπομπής"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:318
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:349
-msgid "Transmitter Antenna"
-msgstr "Κεραία Εκπομπής"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:73
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:57
 msgid "Trigger"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:98
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:84
 msgid "Trigger Mode"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:54
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:69
 msgid "Tunnel ID"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1643
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1849
 #: modules/luci-base/luasrc/model/network.lua:1430
 msgid "Tunnel Interface"
 msgstr "Διεπαφή Τούνελ"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:44
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:55
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:76
 msgid "Tunnel Link"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:46
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:131
 msgid "Tx-Power"
 msgstr "Ισχύς Εκπομπής"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:32
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:185
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:11
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:43
 msgid "Type"
 msgstr "Τύπος"
 
@@ -5384,19 +5521,20 @@ msgstr "Τύπος"
 msgid "UDP:"
 msgstr "UDP:"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:28
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:90
 msgid "UMTS only"
 msgstr ""
 
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:43
 #: protocols/luci-proto-3g/luasrc/model/network/proto_3g.lua:10
 msgid "UMTS/GPRS/EV-DO"
 msgstr "UMTS/GPRS/EV-DO"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:106
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:93
 msgid "USB Device"
 msgstr "Συσκευή USB"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:122
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:110
 msgid "USB Ports"
 msgstr ""
 
@@ -5426,10 +5564,12 @@ msgstr ""
 msgid "Unable to dispatch"
 msgstr ""
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:22
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:54
 msgid "Unable to obtain client ID"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:61
 msgid "Unable to resolve AFTR host name"
 msgstr ""
@@ -5439,21 +5579,31 @@ msgstr ""
 msgid "Unable to resolve peer host name"
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:33
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:68
+msgid "Unable to save contents: %s"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:132
 msgid "Unavailable Seconds (UAS)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1196
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1386
 #: modules/luci-base/luasrc/model/network.lua:970
 msgid "Unknown"
 msgstr "Άγνωστο"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1349
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1539
 #: modules/luci-base/luasrc/model/network.lua:1137
 msgid "Unknown error (%s)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1193
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:204
+msgid "Unknown error code"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1383
+#: modules/luci-base/htdocs/luci-static/resources/protocol/none.js:6
 #: modules/luci-base/luasrc/model/network.lua:964
 msgid "Unmanaged"
 msgstr ""
@@ -5463,22 +5613,30 @@ msgstr ""
 msgid "Unmount"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:107
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:262
 msgid "Unnamed key"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1708
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2261
 msgid "Unsaved Changes"
 msgstr "Μη-αποθηκευμένες Αλλαγές"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:202
+msgid "Unspecified error"
+msgstr ""
+
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:64
 msgid "Unsupported MAP type"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:27
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:69
 msgid "Unsupported modem"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:219
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:119
 msgid "Unsupported protocol type."
 msgstr ""
@@ -5498,56 +5656,70 @@ msgstr ""
 msgid "Upload archive..."
 msgstr ""
 
-#: modules/luci-base/luasrc/view/cbi/upload.htm:8
-msgid "Uploaded File"
-msgstr "Το Αρχείο Ανέβηκε"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1703
+msgid "Upload file"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1678
+msgid "Upload file…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1623
+msgid "Upload request failed: %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:613
+msgid ""
+"Upon pressing \"Continue\", anonymous \"wifi-iface\" sections will be "
+"assigned with a name in the form <em>wifinet#</em> and the network will be "
+"restarted to apply the updated configuration."
+msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:14
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:74
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:85
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:26
 msgid "Uptime"
 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:83
 msgid "Use <code>/etc/ethers</code>"
 msgstr "Χρήση <code>/etc/ethers</code>"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:40
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:167
 msgid "Use DHCP gateway"
 msgstr "Χρήση πύλης DHCP"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:33
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:85
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:34
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:98
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:46
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:65
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:38
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:58
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:124
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:39
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:116
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:59
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:103
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:64
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:77
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:100
 msgid "Use DNS servers advertised by peer"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:227
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:233
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:479
 msgid "Use ISO/IEC 3166 alpha2 country codes."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:31
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:100
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:70
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:35
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:51
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:86
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:56
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:97
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:77
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:75
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:92
 msgid "Use MTU on tunnel interface"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:95
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:65
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:30
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:46
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:81
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:93
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:73
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:88
 msgid "Use TTL on tunnel interface"
 msgstr ""
 
@@ -5559,68 +5731,65 @@ msgstr ""
 msgid "Use as root filesystem (/)"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:19
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:31
 msgid "Use broadcast flag"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:253
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:791
 msgid "Use builtin IPv6-management"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:40
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:109
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:92
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:45
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:105
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:53
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:72
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:45
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:65
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:40
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:182
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:127
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:42
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:119
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:62
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:67
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:80
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:103
 msgid "Use custom DNS servers"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:26
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:70
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:16
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:28
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:84
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:24
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:50
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:23
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:43
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:116
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:33
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:74
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:97
 msgid "Use default gateway"
 msgstr "Χρήση προεπιλεγμένης πύλης"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:48
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:164
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:77
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:24
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:88
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:58
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:23
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:39
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:74
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:90
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:38
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:57
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:30
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:50
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:45
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:227
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:119
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:51
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:88
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:68
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:52
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:70
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:83
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:111
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:149
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:67
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:111
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:98
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:72
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:85
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:108
 msgid "Use gateway metric"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:64
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:179
 msgid "Use routing table"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:309
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:310
 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 "
@@ -5633,77 +5802,78 @@ msgstr ""
 msgid "Used"
 msgstr "Σε χρήση"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:848
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1273
 msgid "Used Key Slot"
 msgstr "Χρησιμοποιούμενη Υποδοχή Κλειδιού"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:913
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
 msgid ""
 "Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not "
 "needed with normal WPA(2)-PSK."
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:48
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:110
 msgid "User certificate (PEM encoded)"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:61
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:122
 msgid "User key (PEM encoded)"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/sysauth.htm:23
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:41
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:32
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:102
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:56
 msgid "Username"
 msgstr "Όνομα Χρήστη"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:182
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:903
 msgid "VC-Mux"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:851
 msgid "VDSL"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:172
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:169
 msgid "VLANs on %q"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:171
-msgid "VLANs on %q (%s)"
+#: modules/luci-base/luasrc/controller/admin/index.lua:55
+msgid "VPN"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:18
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:42
 msgid "VPN Local address"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:22
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:46
 msgid "VPN Local port"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:15
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:11
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:15
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:58
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:39
 msgid "VPN Server"
 msgstr "Εξυπηρετητής VPN"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:18
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:96
 msgid "VPN Server port"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:37
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:100
 msgid "VPN Server's certificate SHA1 hash"
 msgstr ""
 
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:9
 #: protocols/luci-proto-vpnc/luasrc/model/network/proto_vpnc.lua:9
 msgid "VPNC (CISCO 3000 (and others) VPN)"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:44
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:73
 msgid "Vendor"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:60
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:52
 msgid "Vendor Class to send when requesting DHCP"
 msgstr ""
 
@@ -5711,41 +5881,37 @@ msgstr ""
 msgid "Verify"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:52
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:76
 msgid "Virtual dynamic interface"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:470
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:471
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:553
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:576
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:908
 msgid "WDS"
 msgstr "WDS"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:667
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1160
 msgid "WEP Open System"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:668
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1161
 msgid "WEP Shared Key"
 msgstr "Μοιραζόμενο κλειδί WEP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "WEP passphrase"
 msgstr "Κωδική φράση WEP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:503
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:566
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:945
 msgid "WMM Mode"
 msgstr "Υποστήριξη WMM"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "WPA passphrase"
 msgstr "Κωδική φράση WPA"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:716
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:735
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:740
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1074
 msgid ""
 "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
 "and ad-hoc mode) to be installed."
@@ -5759,7 +5925,7 @@ msgstr ""
 msgid "Waiting for command to complete..."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1940
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2481
 msgid "Waiting for configuration to get applied… %ds"
 msgstr ""
 
@@ -5767,8 +5933,8 @@ msgstr ""
 msgid "Waiting for device..."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:172
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:163
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:173
 msgid "Warning"
 msgstr "Προειδοποίηση"
 
@@ -5776,11 +5942,11 @@ msgstr "Προειδοποίηση"
 msgid "Warning: There are unsaved changes that will get lost on reboot!"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:20
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:34
 msgid "Weak"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:946
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1355
 msgid ""
 "When using a PSK, the PMK can be automatically generated. When enabled, the "
 "R0/R1 key options below are not applied. Disable this to use the R0 and R1 "
@@ -5788,78 +5954,85 @@ msgid ""
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:383
 msgid "Width"
 msgstr ""
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:17
 #: protocols/luci-proto-wireguard/luasrc/model/network/proto_wireguard.lua:9
 msgid "WireGuard VPN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:58
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:40
 #: modules/luci-mod-status/luasrc/controller/admin/status.lua:28
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:14
 msgid "Wireless"
 msgstr "Ασύρματο"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1631
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1837
 #: modules/luci-base/luasrc/model/network.lua:1418
 msgid "Wireless Adapter"
 msgstr "Ασύρματος Προσαρμογέας"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1617
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2052
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1823
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2288
 #: modules/luci-base/luasrc/model/network.lua:1404
 #: modules/luci-base/luasrc/model/network.lua:1865
 msgid "Wireless Network"
 msgstr "Ασύρματο Δίκτυο"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:629
 msgid "Wireless Overview"
 msgstr "Επισκόπηση Ασύρματου Δικτύου"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:362
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:797
 msgid "Wireless Security"
 msgstr "Ασφάλεια Ασύρματου Δικτύου"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:54
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:611
+msgid "Wireless configuration migration"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:139
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:179
 msgid "Wireless is disabled"
 msgstr "Το ασύρματο δίκτυο είναι απενεργοποιημένο"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:54
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:139
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:179
 msgid "Wireless is not associated"
 msgstr "Το ασύρματο δίκτυο μη συνδεδεμένο"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:15
-msgid "Wireless is restarting..."
-msgstr "Το ασύρματο δίκτυο επανεκκινείται..."
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:752
 msgid "Wireless network is disabled"
 msgstr "Το ασύρματο δίκτυο είναι ανενεργό"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:752
 msgid "Wireless network is enabled"
 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:182
 msgid "Write received DNS requests to syslog"
 msgstr "Καταγραφή των ληφθέντων DNS αιτήσεων στο syslog"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:164
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:155
 msgid "Write system log to file"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1507
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:85
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1754
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:109
 msgid "Yes"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:26
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:943
+msgid ""
+"You appear to be currently connected to the device via the \"%h\" interface. "
+"Do you really want to shut down the interface?"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:123
 msgid ""
 "You can enable or disable installed init scripts here. Changes will applied "
 "after a device reboot.<br /><strong>Warning: If you disable essential init "
@@ -5878,38 +6051,34 @@ msgid ""
 "You must enable JavaScript in your browser or LuCI will not work properly."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:196
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:187
 msgid "ZRam Compression Algorithm"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:203
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:194
 msgid "ZRam Compression Streams"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:189
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:180
 msgid "ZRam Settings"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:191
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
 msgid "ZRam Size"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:229
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:230
 msgid "any"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:113
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:121
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:126
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:218
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:282
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:321
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:328
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:621
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:37
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:22
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:29
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:121
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:836
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:844
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:849
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1030
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:78
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:48
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:51
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:103
 msgid "auto"
 msgstr "αυτόματα"
 
@@ -5918,11 +6087,11 @@ msgstr "αυτόματα"
 msgid "automatic"
 msgstr "στατικό"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:45
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:78
 msgid "baseT"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:909
 msgid "bridged"
 msgstr ""
 
@@ -5938,23 +6107,22 @@ msgstr ""
 msgid "create:"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:264
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:368
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:678
 #, fuzzy
 msgid "creates a bridge over specified interface(s)"
 msgstr "δημιουργεί μία γέφυρα μεταξύ των ορισμένων διεπαφών"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:277
 msgid "dB"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:34
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:35
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:46
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:47
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:48
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:131
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:132
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:133
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:277
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:279
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:331
@@ -5966,26 +6134,30 @@ msgstr ""
 msgid "dBm"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:460
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:587
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:889
 msgid "disable"
 msgstr "ανενεργό"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:119
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:524
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:530
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:536
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:18
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:578
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:584
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:590
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:25
 msgid "disabled"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:433
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:467
+msgid "driver default"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/lease_status.htm:17
 #: modules/luci-base/luasrc/view/lease_status.htm:46
-#: 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:416
 msgid "expired"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:88
 msgid ""
 "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr>-leases will be stored"
@@ -5999,25 +6171,21 @@ msgstr ""
 msgid "forward"
 msgstr "προώθηση"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:80
 msgid "full-duplex"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:80
 msgid "half-duplex"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:559
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:565
 msgid "hexadecimal encoded value"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:138
-msgid "hidden"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:527
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:533
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:538
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:581
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:587
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:592
 msgid "hybrid mode"
 msgstr ""
 
@@ -6025,6 +6193,10 @@ msgstr ""
 msgid "if target is a network"
 msgstr "αν ο στόχος είναι ένα δίκτυο"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:63
+msgid "ignore"
+msgstr ""
+
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:177
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
@@ -6059,25 +6231,26 @@ msgstr ""
 msgid "key with either 5 or 13 characters"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:94
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:95
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr "τοπικό αρχείο <abbr title=\"Domain Name System\">DNS</abbr>"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:952
-msgid "minutes"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1168
+msgid "medium security"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:43
-msgid "mixed WPA/WPA2"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1360
+msgid "minutes"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:225
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:232
 msgid "no"
 msgstr "όχι"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:54
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:72
 msgid "no link"
 msgstr ""
 
@@ -6085,7 +6258,7 @@ msgstr ""
 msgid "non-empty value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1195
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1446
 msgid "none"
 msgstr "κανένα"
 
@@ -6095,7 +6268,9 @@ msgstr "κανένα"
 msgid "not present"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:363
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:341
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:776
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:780
 #: 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
@@ -6110,8 +6285,8 @@ msgstr "κλειστό"
 msgid "on"
 msgstr "ανοιχτό"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
-msgid "open"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1169
+msgid "open network"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
@@ -6131,73 +6306,77 @@ msgstr ""
 msgid "positive integer value"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:34
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:56
 msgid "random"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:526
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:532
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:537
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:580
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:586
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:591
 msgid "relay mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:910
 msgid "routed"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:525
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:534
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:968
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:977
 msgid "sec"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:525
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:531
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:579
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:585
 msgid "server mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:544
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:597
 msgid "stateful-only"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:542
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:595
 msgid "stateless"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:543
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:596
 msgid "stateless + stateful"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:369
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1167
+msgid "strong security"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:346
 msgid "tagged"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:932
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1343
 msgid "time units (TUs / 1.024 ms) [1000-65535]"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:549
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:555
 msgid "unique value"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:448
 msgid "unknown"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:15
 #: modules/luci-base/luasrc/view/lease_status.htm:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:238
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:390
+#: 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:414
 msgid "unlimited"
 msgstr "απεριόριστα"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1401
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1648
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:63
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:355
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:378
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:413
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:446
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:512
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:450
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:545
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:53
 #: modules/luci-base/luasrc/view/cbi/network_netlist.htm:38
 msgid "unspecified"
@@ -6207,7 +6386,7 @@ msgstr "μη-καθορισμένο"
 msgid "unspecified -or- create:"
 msgstr "μη-καθορισμένο -ή- δημιουργείστε:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:366
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:344
 msgid "untagged"
 msgstr ""
 
@@ -6288,8 +6467,8 @@ msgstr ""
 msgid "valid address:port"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:523
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:527
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:529
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:533
 msgid "valid date (YYYY-MM-DD)"
 msgstr ""
 
@@ -6326,7 +6505,7 @@ msgstr ""
 msgid "valid network in address/netmask notation"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:498
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:504
 msgid "valid phone digit (0-9, \"*\", \"#\", \"!\" or \".\")"
 msgstr ""
 
@@ -6339,11 +6518,11 @@ msgstr ""
 msgid "valid port value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:503
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:509
 msgid "valid time (HH:MM:SS)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:425
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:431
 msgid "value between %d and %d characters"
 msgstr ""
 
@@ -6359,14 +6538,23 @@ msgstr ""
 msgid "value smaller or equal to %f"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:430
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:425
+msgid "value with %d characters"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:436
 msgid "value with at least %d characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:435
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:441
 msgid "value with at most %d characters"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1169
+msgid "weak security"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:221
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:232
@@ -6377,6 +6565,120 @@ msgstr "ναι"
 msgid "« Back"
 msgstr "« Πίσω"
 
+#, fuzzy
+#~ msgid "Specifies the listening port of this <em>Dropbear</em> instance"
+#~ msgstr ""
+#~ "Προσδιορίζει την θύρα ακρόασης αυτού του στιγμιοτύπου <em>Dropbear</em>"
+
+#~ msgid "Antenna 1"
+#~ msgstr "Κεραία 1"
+
+#~ msgid "Antenna 2"
+#~ msgstr "Κεραία 2"
+
+#~ msgid "Back to overview"
+#~ msgstr "Πίσω προς επισκόπηση"
+
+#~ msgid "Back to scan results"
+#~ msgstr "Πίσω στα αποτελέσματα σάρωσης"
+
+#~ msgid "Common Configuration"
+#~ msgstr "Κοινή Παραμετροποίηση"
+
+#~ msgid "Connect"
+#~ msgstr "Σύνδεση"
+
+#~ msgid "Connection Limit"
+#~ msgstr "Όριο Συνδέσεων"
+
+#~ msgid "Cover the following interface"
+#~ msgstr "Κάλυψη της ακόλουθης διεπαφής"
+
+#~ msgid "Cover the following interfaces"
+#~ msgstr "Κάλυψη των ακόλουθων διεπαφών"
+
+#~ msgid "Create Interface"
+#~ msgstr "Δημιουργία Διεπαφής"
+
+#~ msgid "Diversity"
+#~ msgstr "Διαφορική Λήψη"
+
+#~ msgid "Edit this interface"
+#~ msgstr "Επεξεργασία αυτής της διεπαφής"
+
+#~ msgid "Frame Bursting"
+#~ msgstr "Bursting Πλαισίων"
+
+#~ msgid "Install package %q"
+#~ msgstr "Εγκατάσταση πακέτου %q"
+
+#~ msgid "Interface Overview"
+#~ msgstr "Επισκόπηση Διεπαφής"
+
+#~ msgid "Name of the new interface"
+#~ msgstr "Όνομα νέας διεπαφής"
+
+#~ msgid "No network configured on this device"
+#~ msgstr "Δεν υπάρχει παραμετροποιημένο δίκτυο σε αυτή τη συσκευή"
+
+#~ msgid "No network name specified"
+#~ msgstr "Δεν έχει οριστεί όνομα δικτύου"
+
+#~ msgid ""
+#~ "On this page you can configure the network interfaces. You can bridge "
+#~ "several interfaces by ticking the \"bridge interfaces\" field and enter "
+#~ "the names of several network interfaces separated by spaces. You can also "
+#~ "use <abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
+#~ "<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
+#~ "<samp>eth0.1</samp>)."
+#~ msgstr ""
+#~ "Σε αυτή τη σελίδα μπορείτε να ρυθμίσετε τις διεπαφές δικτύου. Μπορείτε να "
+#~ "γεφυρώσετε πολλαπλές διεπαφές τικάροντας το πεδίο \"γεφύρωμα διεπαφών\" "
+#~ "και εισάγοντας τα ονόματα των διεπαφών δικτύου χωρισμένα με κενά. "
+#~ "Μπορείτε επίσης να χρησιμοποιήσετε παράσταση τύπου <abbr title=\"Virtual "
+#~ "Local Area Network\">VLAN</abbr> <samp>INTERFACE.VLANNR</samp> (<abbr "
+#~ "title=\"παραδείγματος χάριν\">π.χ.</abbr>: <samp>eth0.1</samp>)."
+
+#~ msgid "Package libiwinfo required!"
+#~ msgstr "Απαιτείται το πακέτο libiwinfo!"
+
+#~ msgid "Protocol of the new interface"
+#~ msgstr "Πρωτόκολλο νέας διεπαφής"
+
+#~ msgid "Protocol support is not installed"
+#~ msgstr "Η υποστήριξη πρωτοκόλλου δεν έχει εκγατασταθεί"
+
+#~ msgid "Receiver Antenna"
+#~ msgstr "Κεραία Λήψης"
+
+#~ msgid "Repeat scan"
+#~ msgstr "Επανάληψη σάρωσης"
+
+#~ msgid "Replace entry"
+#~ msgstr "Αντικατάσταση καταχώρησης"
+
+#, fuzzy
+#~ msgid "Separate Clients"
+#~ msgstr "Απομόνωση Πελατών"
+
+#~ msgid "The given network name is not unique"
+#~ msgstr "Το παρεχόμενο όνομα δικτύου δεν είναι μοναδικό"
+
+#~ msgid "Transmission Rate"
+#~ msgstr "Ρυθμός Εκπομπής"
+
+#~ msgid "Transmit Power"
+#~ msgstr "Ισχύς Εκπομπής"
+
+#~ msgid "Transmitter Antenna"
+#~ msgstr "Κεραία Εκπομπής"
+
+#~ msgid "Uploaded File"
+#~ msgstr "Το Αρχείο Ανέβηκε"
+
+#~ msgid "Wireless is restarting..."
+#~ msgstr "Το ασύρματο δίκτυο επανεκκινείται..."
+
 #~ msgid "Back"
 #~ msgstr "Πίσω"
 
@@ -6473,9 +6775,6 @@ msgstr "« Πίσω"
 #~ msgid "Activate this network"
 #~ msgstr "Ενεργοποίηση αυτού του δικτύου"
 
-#~ msgid "Interface is shutting down..."
-#~ msgstr "Η διεπαφή απενεργοποιείται..."
-
 #~ msgid "Interface reconnected"
 #~ msgstr "Η διεπαφή επανασυνδέθηκε"
 
diff --git a/modules/luci-base/po/en/base.po b/modules/luci-base/po/en/base.po
index 73f3074fc..609f2862a 100644
--- a/modules/luci-base/po/en/base.po
+++ b/modules/luci-base/po/en/base.po
@@ -13,19 +13,20 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.4\n"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:133
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:857
 msgid "%.1f dB"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:109
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:122
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 msgid "%d Bit"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1641
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2194
 msgid "%d invalid field(s)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:281
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:31
 msgid "%s is untagged in multiple VLANs!"
 msgstr ""
 
@@ -63,19 +64,19 @@ msgid "-- Additional Field --"
 msgstr "-- Additional Field --"
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:258
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1401
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1533
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:250
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:350
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1114
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1648
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1780
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:314
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:414
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1178
 #: modules/luci-base/luasrc/view/cbi/header.htm:5
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:26
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:88
 msgid "-- Please choose --"
 msgstr "-- Please choose --"
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:259
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:351
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1115
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:415
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1179
 #: modules/luci-base/luasrc/view/cbi/header.htm:6
 msgid "-- custom --"
 msgstr "-- custom --"
@@ -98,7 +99,7 @@ msgstr ""
 msgid "-- please select --"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:382
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:814
 msgid "0 = not using RSSI threshold, 1 = do not change driver default"
 msgstr ""
 
@@ -110,10 +111,11 @@ msgstr "1 Minute Load:"
 msgid "15 Minute Load:"
 msgstr "15 Minute Load:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:924
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1337
 msgid "4-character hexadecimal ID"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:11
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:18
 msgid "464XLAT (CLAT)"
 msgstr ""
@@ -122,47 +124,47 @@ msgstr ""
 msgid "5 Minute Load:"
 msgstr "5 Minute Load:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:960
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1366
 msgid "6-octet identifier as a hex string - no colons"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:891
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1310
 msgid "802.11r Fast Transition"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1157
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1567
 msgid "802.11w Association SA Query maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1574
 msgid "802.11w Association SA Query retry timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1133
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1533
 msgid "802.11w Management Frame Protection"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1156
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1567
 msgid "802.11w maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1165
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1574
 msgid "802.11w retry timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:399
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:831
 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:224
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:225
 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:215
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:216
 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:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
 msgid ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
 "order of the resolvfile"
@@ -170,11 +172,11 @@ msgstr ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
 "order of the resolvfile"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:388
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:820
 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:351
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:373
 #: 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"
@@ -184,8 +186,8 @@ msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
 msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:555
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:35
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:506
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 
@@ -201,29 +203,29 @@ 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:378
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:402
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:58
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:35
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:33
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:67
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:51
 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:328
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:329
 #: 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:372
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:233
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:234
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> leases"
@@ -231,7 +233,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:242
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> packet size"
@@ -239,65 +241,69 @@ 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:251
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:252
 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
 msgstr "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:10
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:42
 msgid ""
 "<br/>Note: you need to manually restart the cron service if the crontab file "
 "was empty before editing."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:817
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1605
+msgid "A directory with the same name already exists."
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:863
 msgid "A new login is required since the authentication session expired."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:114
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:837
 msgid "A43C + J43 + A43"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:838
 msgid "A43C + J43 + A43 + V43"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:850
 msgid "ADSL"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:826
 msgid "ANSI T1.413"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:33
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:47
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:23
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:94
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:86
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:67
 msgid "APN"
 msgstr "APN"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:56
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:175
 msgid "ARP retry threshold"
 msgstr "ARP retry threshold"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:122
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:845
 msgid "ATM (Asynchronous Transfer Mode)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:144
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:866
 msgid "ATM Bridges"
 msgstr "ATM Bridges"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:178
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:21
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:898
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:66
 msgid "ATM Virtual Channel Identifier (VCI)"
 msgstr "ATM Virtual Channel Identifier (VCI)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:179
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:26
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:899
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:70
 msgid "ATM Virtual Path Identifier (VPI)"
 msgstr "ATM Virtual Path Identifier (VPI)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:866
 msgid ""
 "ATM bridges expose encapsulated ethernet in AAL5 connections as virtual "
 "Linux network interfaces which can be used in conjunction with DHCP or PPP "
@@ -307,8 +313,8 @@ msgstr ""
 "Linux network interfaces which can be used in conjunction with DHCP or PPP "
 "to dial into the provider network."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:184
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:905
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:62
 msgid "ATM device number"
 msgstr "ATM device number"
 
@@ -317,17 +323,17 @@ msgid "ATU-C System Vendor ID"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:251
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:495
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:499
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:528
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:532
 msgid "Absent Interface"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:19
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
 msgid "Access Concentrator"
 msgstr "Access Concentrator"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:368
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:470
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:802
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
 msgid "Access Point"
 msgstr "Access Point"
 
@@ -350,7 +356,7 @@ msgid "Active Connections"
 msgstr "Active Connections"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:68
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:30
 msgid "Active DHCP Leases"
 msgstr ""
 
@@ -358,55 +364,75 @@ msgstr ""
 msgid "Active DHCPv6 Leases"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1951
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:370
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:12
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2190
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:804
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:23
 msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:650
-#: modules/luci-base/htdocs/luci-static/resources/form.js:651
-#: modules/luci-base/htdocs/luci-static/resources/form.js:666
-#: modules/luci-base/htdocs/luci-static/resources/form.js:667
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1290
+#: modules/luci-base/htdocs/luci-static/resources/form.js:902
+#: modules/luci-base/htdocs/luci-static/resources/form.js:904
+#: modules/luci-base/htdocs/luci-static/resources/form.js:917
+#: modules/luci-base/htdocs/luci-static/resources/form.js:918
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1539
 #: modules/luci-base/luasrc/view/cbi/nsection.htm:25
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:189
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:197
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:39
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:47
 #: modules/luci-base/luasrc/view/cbi/ucisection.htm:54
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:703
 msgid "Add"
 msgstr "Add"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:60
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:870
+msgid "Add ATM Bridge"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:92
 msgid "Add IPv4 address…"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:129
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:204
 msgid "Add IPv6 address…"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:143
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:149
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:38
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:47
+msgid "Add LED action"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:215
+msgid "Add VLAN"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:14
+msgid "Add instance"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:153
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:159
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:250
 msgid "Add key"
 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:155
 msgid "Add local domain suffix to names served from hosts files"
 msgstr "Add local domain suffix to names served from hosts files"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:705
 msgid "Add new interface..."
 msgstr "Add new interface..."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:104
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:99
+msgid "Add peer"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:105
 msgid "Additional Hosts files"
 msgstr "Additional Hosts files"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:161
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
 msgid "Additional servers file"
 msgstr ""
 
@@ -433,7 +459,7 @@ msgstr ""
 msgid "Address"
 msgstr "Address"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:12
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:151
 msgid "Address to access local relay bridge"
 msgstr "Address to access local relay bridge"
 
@@ -442,13 +468,13 @@ msgstr "Address to access local relay bridge"
 msgid "Administration"
 msgstr "Administration"
 
-#: 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:70
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:505
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:896
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:24
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:189
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:463
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:176
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:143
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:364
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:742
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:799
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:50
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:34
 msgid "Advanced Settings"
@@ -458,166 +484,166 @@ msgstr "Advanced Settings"
 msgid "Aggregate Transmit Power(ACTATP)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:175
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:166
 msgid "Alert"
 msgstr "Alert"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1628
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1834
 #: modules/luci-base/luasrc/model/network.lua:1416
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:54
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:78
 msgid "Alias Interface"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:138
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:66
 msgid "Alias of \"%s\""
 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:170
 msgid "All Servers"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:114
 msgid ""
 "Allocate IP addresses sequentially, starting from the lowest available "
 "address"
 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:113
 msgid "Allocate IP sequentially"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:24
 msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
 msgstr "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:545
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:987
 msgid "Allow AP mode to disconnect STAs based on low ACK condition"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:462
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:589
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:891
 msgid "Allow all except listed"
 msgstr "Allow all except listed"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:236
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:767
 msgid "Allow legacy 802.11b rates"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:461
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:588
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:890
 msgid "Allow listed only"
 msgstr "Allow listed only"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:198
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:199
 msgid "Allow localhost"
 msgstr "Allow localhost"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:47
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:35
 msgid "Allow remote hosts to connect to local SSH forwarded ports"
 msgstr "Allow remote hosts to connect to local SSH forwarded ports"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:38
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:30
 msgid "Allow root logins with password"
 msgstr "Allow root logins with password"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:39
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:30
 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:199
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:200
 msgid ""
 "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
 msgstr ""
 "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:135
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:122
 msgid "Allowed IPs"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:549
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:602
 msgid "Always announce default router"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:259
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:782
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
 "option does not comply with IEEE 802.11n-2009!"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:95
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:818
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:119
 msgid "Annex"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:96
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:819
 msgid "Annex A + L + M (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:827
 msgid "Annex A G.992.1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:828
 msgid "Annex A G.992.2"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:829
 msgid "Annex A G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:830
 msgid "Annex A G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:97
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:820
 msgid "Annex B (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:823
 msgid "Annex B G.992.1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:824
 msgid "Annex B G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:102
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:825
 msgid "Annex B G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:98
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:821
 msgid "Annex J (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:831
 msgid "Annex L G.992.3 POTS 1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:99
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:822
 msgid "Annex M (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:109
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:832
 msgid "Annex M G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:833
 msgid "Annex M G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:550
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:602
 msgid "Announce as default router even if no public prefix is available."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:555
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:607
 msgid "Announced DNS domains"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:554
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:606
 msgid "Announced DNS servers"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1093
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1496
 msgid "Anonymous Identity"
 msgstr ""
 
@@ -629,20 +655,6 @@ msgstr ""
 msgid "Anonymous Swap"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:322
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:329
-msgid "Antenna 1"
-msgstr "Antenna 1"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:323
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:330
-msgid "Antenna 2"
-msgstr "Antenna 2"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:246
-msgid "Antenna Configuration"
-msgstr ""
-
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:71
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:160
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:181
@@ -650,11 +662,11 @@ msgstr ""
 msgid "Any zone"
 msgstr "Any zone"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1981
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2522
 msgid "Apply request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1867
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2409
 msgid "Apply unchecked"
 msgstr ""
 
@@ -662,8 +674,8 @@ msgstr ""
 msgid "Architecture"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:19
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:184
+#: 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 ""
@@ -672,13 +684,13 @@ msgstr ""
 msgid "Assign interfaces..."
 msgstr "Assign interfaces..."
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:124
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:24
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:189
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:31
 msgid ""
 "Assign prefix parts using this hexadecimal subprefix ID for this interface."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:148
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1967
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:22
 msgid "Associated Stations"
 msgstr "Associated Stations"
@@ -687,20 +699,20 @@ msgstr "Associated Stations"
 msgid "Associations"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:39
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:37
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:101
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:64
 msgid "Auth Group"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1027
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1421
 msgid "Authentication"
 msgstr "Authentication"
 
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:29
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:70
 msgid "Authentication Type"
 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:78
 msgid "Authoritative"
 msgstr "Authoritative"
 
@@ -718,17 +730,19 @@ msgstr "Authorization Required"
 msgid "Auto Refresh"
 msgstr "Auto Refresh"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:53
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:7
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:17
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:67
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:24
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:36
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:42
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:36
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:106
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:24
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:98
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:50
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:94
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:81
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:55
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:68
 msgid "Automatic"
 msgstr ""
 
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:7
 #: protocols/luci-proto-hnet/luasrc/model/network/proto_hnet.lua:7
 msgid "Automatic Homenet (HNCP)"
 msgstr ""
@@ -771,21 +785,21 @@ msgstr "Available"
 msgid "Average:"
 msgstr "Average:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:116
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:839
 msgid "B43 + B43C"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:840
 msgid "B43 + B43C + V43"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:48
 msgid "BR / DMR / AFTR"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:43
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:75
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1620
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:176
 msgid "BSSID"
 msgstr "BSSID"
@@ -799,19 +813,11 @@ msgstr "Back to Overview"
 msgid "Back to configuration"
 msgstr "Back to configuration"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:48
-msgid "Back to overview"
-msgstr "Back to overview"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:20
-msgid "Back to scan results"
-msgstr "Back to scan results"
-
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:17
 msgid "Backup"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:38
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:36
 msgid "Backup / Flash Firmware"
 msgstr "Backup / Flash Firmware"
 
@@ -824,11 +830,11 @@ msgid "Bad address specified!"
 msgstr "Bad address specified!"
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:158
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:288
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:368
 msgid "Band"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:261
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:785
 msgid "Beacon Interval"
 msgstr ""
 
@@ -842,79 +848,85 @@ 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:293
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:294
 msgid ""
 "Bind dynamically to interfaces rather than wildcard address (recommended as "
 "linux default)"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:16
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:48
 msgid "Bind interface"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:16
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:48
 msgid "Bind the tunnel to this interface (optional)."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:49
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:134
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:187
 msgid "Bitrate"
 msgstr "Bitrate"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:172
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
 msgid "Bogus NX Domain Override"
 msgstr "Bogus NX Domain Override"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1634
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1840
 #: modules/luci-base/luasrc/model/network.lua:1420
 msgid "Bridge"
 msgstr "Bridge"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:264
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:368
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:678
 msgid "Bridge interfaces"
 msgstr "Bridge interfaces"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:906
 msgid "Bridge unit number"
 msgstr "Bridge unit number"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:250
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:364
 msgid "Bring up on boot"
 msgstr "Bring up on boot"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:35
-msgid "Broadcom 802.11%s Wireless Controller"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:45
-msgid "Broadcom BCM%04x 802.11 Wireless Controller"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1697
+msgid "Browse…"
 msgstr ""
 
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:18
 msgid "Buffered"
 msgstr "Buffered"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:75
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:134
 msgid "CA certificate; if empty it will be saved after the first connection."
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:7
+msgid "CLAT configuration failed"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:13
 msgid "CPU usage (%)"
 msgstr "CPU usage (%)"
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:21
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:53
 msgid "Call failed"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1789
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:14
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:52
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:711
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:948
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1839
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:191
 #: modules/luci-mod-system/luasrc/view/admin_system/upgrade.htm:60
 msgid "Cancel"
 msgstr "Cancel"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:6
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:17
 msgid "Category"
 msgstr ""
 
@@ -932,13 +944,7 @@ msgstr ""
 msgid "Chain"
 msgstr "Chain"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:9
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:14
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:24
-msgid "Change login password"
-msgstr ""
-
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1744
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 msgid "Changes"
 msgstr "Changes"
 
@@ -946,33 +952,23 @@ msgstr "Changes"
 msgid "Changes applied."
 msgstr "Changes applied."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2004
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2545
 msgid "Changes have been reverted."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:43
 msgid "Changes the administrator password for accessing the device"
 msgstr "Changes the administrator password for accessing the device"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:10
-msgid "Changing password…"
-msgstr ""
-
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:162
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:45
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:87
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:174
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:376
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1618
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:186
 msgid "Channel"
 msgstr "Channel"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:119
-msgid ""
-"Channel %d is not available in the %s regulatory domain and has been auto-"
-"adjusted to %d."
-msgstr ""
-
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:229
 msgid "Check"
 msgstr "Check"
@@ -981,7 +977,7 @@ msgstr "Check"
 msgid "Check filesystems before mount"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1806
 msgid "Check this option to delete the existing networks from this radio."
 msgstr ""
 
@@ -993,8 +989,8 @@ msgstr "Checksum"
 msgid "Choose mtdblock"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:358
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:443
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1829
 msgid ""
 "Choose the firewall zone you want to assign to this interface. Select "
 "<em>unspecified</em> to remove the interface from the associated zone or "
@@ -1006,17 +1002,17 @@ msgstr ""
 "fill out the <em>create</em> field to define a new zone and attach the "
 "interface to it."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:834
 msgid ""
 "Choose the network(s) you want to attach to this wireless interface or fill "
 "out the <em>create</em> field to define a new network."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:614
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1023
 msgid "Cipher"
 msgstr "Cipher"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:61
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:91
 msgid "Cisco UDP encapsulation"
 msgstr ""
 
@@ -1034,28 +1030,28 @@ msgid ""
 "FEATURE IS FOR PROFESSIONALS! )"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1950
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:369
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:471
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2189
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:803
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:908
 msgid "Client"
 msgstr "Client"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:55
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:52
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:47
 msgid "Client ID to send when requesting DHCP"
 msgstr "Client ID to send when requesting DHCP"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:145
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:151
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:155
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:161
 msgid "Close"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:146
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:119
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:125
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:127
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:98
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:119
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:157
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:141
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:115
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:138
 msgid ""
 "Close inactive connection after the given amount of seconds, use 0 to "
 "persist connection"
@@ -1070,12 +1066,9 @@ msgstr "Close list..."
 #: modules/luci-base/luasrc/view/lease_status.htm:77
 #: modules/luci-base/luasrc/view/lease_status.htm:98
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:118
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:37
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:24
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1965
 #: modules/luci-mod-network/luasrc/view/admin_network/iface_status.htm:6
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:40
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:30
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:8
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:398
 #: modules/luci-mod-status/luasrc/view/admin_status/index/30-network.htm:11
 #: modules/luci-mod-status/luasrc/view/admin_status/index/50-dsl.htm:17
@@ -1089,15 +1082,19 @@ msgstr "Collecting data..."
 msgid "Command"
 msgstr "Command"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:193
+msgid "Command OK"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:41
+msgid "Command failed"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:64
 msgid "Comment"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:185
-msgid "Common Configuration"
-msgstr "Common Configuration"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
 msgid ""
 "Complicates key reinstallation attacks on the client side by disabling "
 "retransmission of EAPOL-Key frames that are used to install keys. This "
@@ -1105,13 +1102,14 @@ msgid ""
 "negotiation especially in environments with heavy traffic load."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1744
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 #: modules/luci-base/luasrc/controller/admin/uci.lua:11
 #: modules/luci-mod-system/luasrc/view/admin_system/backupfiles.htm:9
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:13
 msgid "Configuration"
 msgstr "Configuration"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:21
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:63
 msgid "Configuration failed"
 msgstr ""
@@ -1120,89 +1118,89 @@ msgstr ""
 msgid "Configuration files will be kept"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1915
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2456
 msgid "Configuration has been applied."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1848
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2395
 msgid "Configuration has been rolled back!"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:43
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:942
+msgid "Confirm disconnect"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:50
 msgid "Confirmation"
 msgstr "Confirmation"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:32
-msgid "Connect"
-msgstr "Connect"
-
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:72
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:105
 msgid "Connected"
 msgstr "Connected"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:338
-msgid "Connection Limit"
-msgstr "Connection Limit"
-
 #: modules/luci-base/htdocs/luci-static/resources/network.js:7
 #: modules/luci-base/luasrc/model/network.lua:27
 msgid "Connection attempt failed"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:203
+msgid "Connection lost"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/controller/admin/status.lua:32
 msgid "Connections"
 msgstr "Connections"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1890
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:66
+msgid "Contents have been saved."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:618
+msgid "Continue"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2431
 msgid ""
 "Could not regain access to the device after applying the configuration "
 "changes. You might need to reconnect if you modified network related "
 "settings such as the IP address or wireless security credentials."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:135
 msgid "Country"
 msgstr "Country"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:227
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:233
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:337
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:764
 msgid "Country Code"
 msgstr "Country Code"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:36
-msgid "Cover the following interface"
-msgstr "Cover the following interface"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:43
-msgid "Cover the following interfaces"
-msgstr "Cover the following interfaces"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:357
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:86
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:443
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1829
 msgid "Create / Assign firewall-zone"
 msgstr "Create / Assign firewall-zone"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:9
-msgid "Create Interface"
-msgstr "Create Interface"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:33
-msgid "Create a bridge over multiple interfaces"
-msgstr "Create a bridge over multiple interfaces"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:735
+msgid "Create interface"
+msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:174
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:165
 msgid "Critical"
 msgstr "Critical"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:178
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:169
 msgid "Cron Log Level"
 msgstr "Cron Log Level"
 
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:519
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:521
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:447
+msgid "Current power"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:552
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:554
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:51
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:53
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:82
@@ -1210,7 +1208,7 @@ msgstr "Cron Log Level"
 msgid "Custom Interface"
 msgstr "Custom Interface"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:36
 msgid "Custom delegated IPv6-prefix"
 msgstr ""
 
@@ -1220,7 +1218,7 @@ msgid ""
 "this, perform a factory-reset first."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:59
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:41
 msgid ""
 "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
 "\">LED</abbr>s if possible."
@@ -1228,46 +1226,47 @@ msgstr ""
 "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
 "\">LED</abbr>s if possible."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:799
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1223
 msgid "DAE-Client"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:807
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1231
 msgid "DAE-Port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:815
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1239
 msgid "DAE-Secret"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:448
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:459
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:279
 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:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:61
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:62
 msgid "DHCP and DNS"
 msgstr "DHCP and DNS"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1195
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1385
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:16
 #: modules/luci-base/luasrc/model/network.lua:968
 msgid "DHCP client"
 msgstr "DHCP client"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:571
 msgid "DHCP-Options"
 msgstr "DHCP-Options"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_dhcpv6.lua:7
 msgid "DHCPv6 client"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:540
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:594
 msgid "DHCPv6-Mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:529
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:583
 msgid "DHCPv6-Service"
 msgstr ""
 
@@ -1284,31 +1283,31 @@ msgstr ""
 msgid "DNS"
 msgstr "DNS"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:183
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
 msgid "DNS forwardings"
 msgstr "DNS forwardings"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:30
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:37
 msgid "DNS-Label / FQDN"
 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:136
 msgid "DNSSEC"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:139
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
 msgid "DNSSEC check unsigned"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:73
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:99
 msgid "DPD Idle Timeout"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:14
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:41
 msgid "DS-Lite AFTR address"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:92
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:815
 #: modules/luci-mod-status/luasrc/view/admin_status/index/50-dsl.htm:14
 msgid "DSL"
 msgstr ""
@@ -1317,11 +1316,11 @@ msgstr ""
 msgid "DSL Status"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:125
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:848
 msgid "DSL line mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:519
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:963
 msgid "DTIM Interval"
 msgstr ""
 
@@ -1333,42 +1332,45 @@ msgstr ""
 msgid "Data Rate"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:169
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:180
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:160
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:171
 msgid "Debug"
 msgstr "Debug"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:759
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:783
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:807
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1183
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1207
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1231
 msgid "Default %d"
 msgstr "Default %d"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:82
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:107
 msgid "Default Route"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:17
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:81
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:51
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:32
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:48
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:85
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:65
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:80
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:108
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:146
 msgid "Default gateway"
 msgstr "Default gateway"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:541
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:594
 msgid "Default is stateless + stateful"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:70
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:54
 msgid "Default state"
 msgstr "Default state"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:503
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:553
 msgid "Define a name for this network."
 msgstr "Define a name for this network."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:514
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:571
 msgid ""
 "Define additional DHCP options, for example "
 "\"<code>6,192.168.2.1,192.168.2.2</code>\" which advertises different DNS "
@@ -1378,35 +1380,47 @@ msgstr ""
 "\"<code>6,192.168.2.1,192.168.2.2</code>\" which advertises different DNS "
 "servers to clients."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:705
-#: modules/luci-base/htdocs/luci-static/resources/form.js:958
-#: modules/luci-base/htdocs/luci-static/resources/form.js:959
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1271
+#: modules/luci-base/htdocs/luci-static/resources/form.js:966
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1210
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1216
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1524
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1758
 #: modules/luci-base/luasrc/view/cbi/nsection.htm:11
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:162
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:16
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:41
 msgid "Delete"
 msgstr "Delete"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:178
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:187
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:193
 msgid "Delete key"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:45
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1654
+msgid "Delete permission denied"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1656
+msgid "Delete request failed: %d %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:723
 msgid "Delete this network"
 msgstr "Delete this network"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:519
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:963
 msgid "Delivery Traffic Indication Message Interval"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:102
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:108
 msgid "Description"
 msgstr "Description"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:224
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1754
+msgid "Deselect"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:215
 msgid "Design"
 msgstr "Design"
 
@@ -1424,10 +1438,12 @@ msgstr ""
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:177
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:43
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:13
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:38
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:73
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:33
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:52
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:85
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:86
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:72
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:154
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:253
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:86
@@ -1435,15 +1451,24 @@ msgstr ""
 msgid "Device"
 msgstr "Device"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:138
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:737
 msgid "Device Configuration"
 msgstr "Device Configuration"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:81
+msgid "Device is not active"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/reboot.htm:23
 msgid "Device is rebooting..."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1889
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:167
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:513
+msgid "Device is restarting…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2430
 msgid "Device unreachable!"
 msgstr ""
 
@@ -1451,96 +1476,91 @@ msgstr ""
 msgid "Device unreachable! Still waiting for device..."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:123
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:78
 #: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:61
 msgid "Diagnostics"
 msgstr "Diagnostics"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:45
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:60
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:101
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:93
 msgid "Dial number"
 msgstr ""
 
-#: modules/luci-base/luasrc/view/cbi/filebrowser.htm:99
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1554
 msgid "Directory"
 msgstr "Directory"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:131
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:715
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:754
 msgid "Disable"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:472
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:531
 msgid ""
 "Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for "
 "this interface."
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:64
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:93
 msgid "Disable Encryption"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:530
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:973
 msgid "Disable Inactivity Polling"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:713
 msgid "Disable this network"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:44
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:54
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:68
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:37
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:43
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:37
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1534
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:76
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:107
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:99
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:51
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:95
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:82
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:69
 msgid "Disabled"
 msgstr "Disabled"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1139
-msgid "Disabled (default)"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:544
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:987
 msgid "Disassociate On Low Acknowledgement"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:193
 msgid "Discard upstream RFC1918 responses"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:92
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:114
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:956
 msgid "Disconnect"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:22
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:64
 msgid "Disconnection attempt failed"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1121
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1762
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1855
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:17
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1375
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1995
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2314
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2401
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1634
 msgid "Dismiss"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:240
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:334
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:770
 msgid "Distance Optimization"
 msgstr "Distance Optimization"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:241
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:770
 msgid "Distance to farthest network member in meters."
 msgstr "Distance to farthest network member in meters."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:347
-msgid "Diversity"
-msgstr "Diversity"
-
-#: 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:61
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
@@ -1552,35 +1572,43 @@ msgstr ""
 "Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> "
 "firewalls"
 
-#: 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:159
 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:123
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:124
 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:118
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
 msgid "Do not forward reverse lookups for local networks"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:173
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1639
+msgid "Do you really want to delete \"%s\" ?"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:188
 msgid "Do you really want to delete the following SSH key?"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1637
+msgid "Do you really want to recursively delete the directory \"%s\" ?"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:74
 msgid "Domain required"
 msgstr "Domain required"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:205
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:206
 msgid "Domain whitelist"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:34
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:67
 msgid "Don't Fragment"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:74
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:75
 msgid ""
 "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
 "<abbr title=\"Domain Name System\">DNS</abbr>-Name"
@@ -1600,19 +1628,19 @@ msgstr ""
 msgid "Download mtdblock"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:853
 msgid "Downstream SNR offset"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:914
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1169
 msgid "Drag to reorder"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:9
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:11
 msgid "Dropbear Instance"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:6
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 msgid ""
 "Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access "
 "and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
@@ -1620,40 +1648,41 @@ msgstr ""
 "Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access "
 "and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:11
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:14
 msgid "Dual-Stack Lite (RFC6333)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:493
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:547
 msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 msgstr ""
 "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:60
 msgid "Dynamic tunnel"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:494
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:547
 msgid ""
 "Dynamically allocate DHCP addresses for clients. If disabled, only clients "
 "having static leases will be served."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:67
 msgid "EA-bits length"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:990
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1386
 msgid "EAP-Method"
 msgstr "EAP-Method"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:934
-#: modules/luci-base/htdocs/luci-static/resources/form.js:935
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1199
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1188
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1191
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1450
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:154
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:160
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:38
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:291
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:720
 msgid "Edit"
 msgstr "Edit"
 
@@ -1663,90 +1692,91 @@ msgid ""
 "reload the page."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:38
-msgid "Edit this interface"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:718
+msgid "Edit this network"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:42
-msgid "Edit this network"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:669
+msgid "Edit wireless network"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:176
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:167
 msgid "Emergency"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:127
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:715
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:754
 msgid "Enable"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:414
 msgid ""
 "Enable <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> "
 "snooping"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:271
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:412
 msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 msgstr "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:41
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:60
 msgid "Enable HE.net dynamic endpoint update"
 msgstr ""
 
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:51
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:89
 msgid "Enable IPv6 negotiation"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:23
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:35
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:41
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:35
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:37
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:49
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:80
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:54
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:67
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:93
 msgid "Enable IPv6 negotiation on the PPP link"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:143
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:188
 msgid "Enable Jumbo Frame passthrough"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:244
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:235
 msgid "Enable NTP client"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:69
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:96
 msgid "Enable Single DES"
 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:267
 msgid "Enable TFTP server"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:134
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:180
 msgid "Enable VLAN functionality"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1595
 msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1175
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
 msgid "Enable key reinstallation (KRACK) countermeasures"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:138
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:183
 msgid "Enable learning and aging"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:194
 msgid "Enable mirroring of incoming packets"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:151
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:195
 msgid "Enable mirroring of outgoing packets"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:34
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:67
 msgid "Enable the DF (Don't Fragment) flag of the encapsulating packets."
 msgstr ""
 
@@ -1754,7 +1784,7 @@ msgstr ""
 msgid "Enable this mount"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:713
 msgid "Enable this network"
 msgstr ""
 
@@ -1762,48 +1792,52 @@ msgstr ""
 msgid "Enable this swap"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:37
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:88
 msgid "Enable/Disable"
 msgstr "Enable/Disable"
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:76
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:152
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:251
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:41
 msgid "Enabled"
 msgstr "Enabled"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:277
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:414
 msgid "Enables IGMP snooping on this bridge"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:892
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1310
 msgid ""
 "Enables fast roaming among access points that belong to the same Mobility "
 "Domain"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:272
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:412
 msgid "Enables the Spanning Tree Protocol on this bridge"
 msgstr "Enables the Spanning Tree Protocol on this bridge"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:120
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:180
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:59
+msgid "Encapsulation limit"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:843
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:901
 msgid "Encapsulation mode"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:76
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:603
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:129
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:992
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1621
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:177
 msgid "Encryption"
 msgstr "Encryption"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:155
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:128
 msgid "Endpoint Host"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:165
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:132
 msgid "Endpoint Port"
 msgstr ""
 
@@ -1815,16 +1849,21 @@ msgstr ""
 msgid "Enter custom values"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:273
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:271
 msgid "Erasing..."
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:95
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:96
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:97
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:98
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:99
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:106
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:107
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:108
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:109
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:110
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:173
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:164
 msgid "Error"
 msgstr "Error"
 
@@ -1832,24 +1871,28 @@ msgstr "Error"
 msgid "Errored seconds (ES)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1646
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1852
 #: modules/luci-base/luasrc/model/network.lua:1432
 msgid "Ethernet Adapter"
 msgstr "Ethernet Adapter"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1637
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1843
 #: modules/luci-base/luasrc/model/network.lua:1422
 msgid "Ethernet Switch"
 msgstr "Ethernet Switch"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:303
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
 msgid "Exclude interfaces"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:153
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
 msgid "Expand hosts"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:195
+msgid "Expecting an hexadecimal assignment hint"
+msgstr ""
+
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:59
 msgid "Expecting: %s"
 msgstr ""
@@ -1858,60 +1901,76 @@ msgstr ""
 msgid "Expires"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:488
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:543
 msgid ""
 "Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:8
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:19
 msgid "External"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:971
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1377
 msgid "External R0 Key Holder List"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:980
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1381
 msgid "External R1 Key Holder List"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:150
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:141
 msgid "External system log server"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:155
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:146
 msgid "External system log server port"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:160
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:151
 msgid "External system log server protocol"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:18
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:79
 msgid "Extra SSH command options"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:940
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1351
 msgid "FT over DS"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:941
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1352
 msgid "FT over the Air"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:938
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1349
 msgid "FT protocol"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1842
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:82
+msgid "Failed to change the system password."
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2389
 msgid "Failed to confirm apply within %ds, waiting for rollback…"
 msgstr ""
 
-#: modules/luci-base/luasrc/view/cbi/filebrowser.htm:106
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:45
+msgid "Failed to execute \"/etc/init.d/%s %s\" action: %s"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1561
 msgid "File"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:279
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1514
+msgid "File not accessible"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1698
+msgid "Filename"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:280
 msgid "Filename of the boot image advertised to clients"
 msgstr ""
 
@@ -1921,14 +1980,15 @@ msgstr ""
 msgid "Filesystem"
 msgstr "Filesystem"
 
-#: 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:118
 msgid "Filter private"
 msgstr "Filter private"
 
-#: 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:123
 msgid "Filter useless"
 msgstr "Filter useless"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:23
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:65
 msgid "Finalizing failed"
 msgstr ""
@@ -1939,7 +1999,7 @@ msgid ""
 "with defaults based on what was detected"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:696
 msgid "Find and join network"
 msgstr ""
 
@@ -1951,11 +2011,11 @@ msgstr ""
 msgid "Firewall"
 msgstr "Firewall"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:77
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:76
 msgid "Firewall Mark"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:193
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:278
 msgid "Firewall Settings"
 msgstr "Firewall Settings"
 
@@ -1963,7 +2023,7 @@ msgstr "Firewall Settings"
 msgid "Firewall Status"
 msgstr "Firewall Status"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:137
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:860
 msgid "Firmware File"
 msgstr ""
 
@@ -1971,7 +2031,7 @@ msgstr ""
 msgid "Firmware Version"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:225
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:226
 msgid "Fixed source port for outbound DNS queries"
 msgstr ""
 
@@ -1991,35 +2051,35 @@ msgstr ""
 msgid "Flash operations"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:194
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:192
 msgid "Flashing..."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:498
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:550
 msgid "Force"
 msgstr "Force"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:258
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:782
 msgid "Force 40MHz mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:622
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1031
 msgid "Force CCMP (AES)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:499
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:550
 msgid "Force DHCP on this network even if another server is detected."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:623
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1032
 msgid "Force TKIP"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:624
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1033
 msgid "Force TKIP and CCMP (AES)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:795
 msgid "Force link"
 msgstr ""
 
@@ -2027,7 +2087,7 @@ msgstr ""
 msgid "Force upgrade"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:60
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:90
 msgid "Force use of NAT-T"
 msgstr ""
 
@@ -2035,7 +2095,7 @@ msgstr ""
 msgid "Form token mismatch"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:34
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:164
 msgid "Forward DHCP traffic"
 msgstr ""
 
@@ -2043,46 +2103,41 @@ msgstr ""
 msgid "Forward Error Correction Seconds (FECS)"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:28
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:161
 msgid "Forward broadcast traffic"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:375
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:809
 msgid "Forward mesh peer traffic"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:186
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:908
 msgid "Forwarding mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:255
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:596
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:774
 msgid "Fragmentation Threshold"
 msgstr "Fragmentation Threshold"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:332
-msgid "Frame Bursting"
-msgstr "Frame Bursting"
-
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:17
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:28
 msgid "Free"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:91
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:89
 msgid ""
-"Further information about WireGuard interfaces and peers at <a href=\"http://"
-"wireguard.com\">wireguard.com</a>."
+"Further information about WireGuard interfaces and peers at <a href='http://"
+"wireguard.com'>wireguard.com</a>."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:45
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:130
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:186
 msgid "GHz"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:29
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:36
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:91
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:77
 msgid "GPRS only"
 msgstr ""
 
@@ -2091,28 +2146,28 @@ msgstr ""
 msgid "Gateway"
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:35
+msgid "Gateway Ports"
+msgstr ""
+
 #: modules/luci-base/htdocs/luci-static/resources/network.js:9
 #: modules/luci-base/luasrc/model/network.lua:29
 msgid "Gateway address is invalid"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:46
-msgid "Gateway ports"
-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:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:275
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:23
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:112
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:103
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:49
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:33
 msgid "General Settings"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:188
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:462
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:175
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:141
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:361
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:504
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:895
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:741
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:796
 msgid "General Setup"
 msgstr "General Setup"
 
@@ -2120,7 +2175,7 @@ msgstr "General Setup"
 msgid "Generate Config"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:945
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1355
 msgid "Generate PMK locally"
 msgstr ""
 
@@ -2128,11 +2183,7 @@ msgstr ""
 msgid "Generate archive"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:63
-msgid "Generic 802.11%s Wireless Controller"
-msgstr ""
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:26
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:74
 msgid "Given password confirmation did not match, password not changed!"
 msgstr ""
 
@@ -2140,7 +2191,7 @@ msgstr ""
 msgid "Global Settings"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:806
 msgid "Global network options"
 msgstr ""
 
@@ -2151,33 +2202,29 @@ msgstr ""
 msgid "Go to password configuration..."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:857
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1369
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1112
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1616
 #: modules/luci-base/luasrc/view/cbi/full_valueheader.htm:4
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:58
 msgid "Go to relevant configuration page"
 msgstr "Go to relevant configuration page"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:38
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:66
 msgid "Group Password"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:11
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:22
 msgid "Guest"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:73
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:81
 msgid "HE.net password"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:60
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:73
 msgid "HE.net username"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:310
-msgid "HT mode (802.11n)"
-msgstr ""
-
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:16
 msgid "Hang Up"
 msgstr "Hang Up"
@@ -2186,7 +2233,7 @@ msgstr "Hang Up"
 msgid "Header Error Code Errors (HEC)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:103
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 msgid ""
 "Here you can configure the basic aspects of your device like its hostname or "
 "the timezone."
@@ -2194,9 +2241,7 @@ msgstr ""
 "Here you can configure the basic aspects of your device like its hostname or "
 "the timezone."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:499
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:556
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:579
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:941
 msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 
@@ -2207,14 +2252,15 @@ msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:92
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1959
 msgid "Host"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:20
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:21
 msgid "Host entries"
 msgstr "Host entries"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:48
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:171
 msgid "Host expiry timeout"
 msgstr ""
 
@@ -2222,45 +2268,45 @@ msgstr ""
 msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
 msgstr "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:118
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:102
 msgid "Host-Uniq tag content"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:71
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:31
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:316
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:25
+#: 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:317
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:26
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:17
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:125
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:116
 msgid "Hostname"
 msgstr "Hostname"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:12
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:22
 msgid "Hostname to send when requesting DHCP"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:18
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:19
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:67
 msgid "Hostnames"
 msgstr "Hostnames"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:13
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:24
 msgid "Hybrid"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:45
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:75
 msgid "IKE DH Group"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:41
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:59
 msgid "IP Addresses"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:40
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:80
 msgid "IP Protocol"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:29
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:30
 msgid "IP address"
 msgstr "IP address"
 
@@ -2279,6 +2325,11 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:20
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:21
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:22
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:79
+#: 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/network.js:89
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:90
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:91
@@ -2286,7 +2337,7 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:93
 #: 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/luasrc/model/cbi/admin_network/proto_ncm.lua:42
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:82
 msgid "IPv4"
 msgstr ""
 
@@ -2298,24 +2349,23 @@ msgstr ""
 msgid "IPv4 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:57
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:178
 msgid "IPv4 address"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:26
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:33
 msgid "IPv4 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:104
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:181
 msgid "IPv4 broadcast"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:100
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:180
 msgid "IPv4 gateway"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:92
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:179
 msgid "IPv4 netmask"
 msgstr ""
 
@@ -2323,24 +2373,25 @@ msgstr ""
 msgid "IPv4 network in address/netmask notation"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:25
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:52
 msgid "IPv4 prefix"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:42
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:30
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:55
 msgid "IPv4 prefix length"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:43
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:83
 msgid "IPv4+IPv6"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:72
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:34
 msgid "IPv4-Address"
 msgstr ""
 
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:10
 #: protocols/luci-proto-ipip/luasrc/model/network/proto_ipip.lua:9
 msgid "IPv4-in-IPv4 (RFC2003)"
 msgstr ""
@@ -2355,6 +2406,16 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:30
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:31
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:32
+#: 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/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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:89
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:90
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:91
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:92
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:95
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:96
@@ -2367,7 +2428,7 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:103
 #: 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/luasrc/model/cbi/admin_network/proto_ncm.lua:44
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:84
 msgid "IPv6"
 msgstr "IPv6"
 
@@ -2379,11 +2440,11 @@ msgstr ""
 msgid "IPv6 Neighbours"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:464
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:506
 msgid "IPv6 Settings"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:195
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:810
 msgid "IPv6 ULA-Prefix"
 msgstr ""
 
@@ -2391,21 +2452,21 @@ msgstr ""
 msgid "IPv6 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:202
 msgid "IPv6 address"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:23
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:189
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:31
 msgid "IPv6 assignment hint"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:18
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:184
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:27
 msgid "IPv6 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:207
 msgid "IPv6 gateway"
 msgstr ""
 
@@ -2413,22 +2474,22 @@ msgstr ""
 msgid "IPv6 network in address/netmask notation"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:37
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:59
 msgid "IPv6 prefix"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:34
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:45
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:63
 msgid "IPv6 prefix length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:33
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:211
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:57
 msgid "IPv6 routed prefix"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:143
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:215
 msgid "IPv6 suffix"
 msgstr ""
 
@@ -2438,31 +2499,35 @@ msgid "IPv6-Address"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:93
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:104
 msgid "IPv6-PD"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:10
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:13
 msgid "IPv6-in-IPv4 (RFC4213)"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:17
 msgid "IPv6-over-IPv4 (6rd)"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:15
 msgid "IPv6-over-IPv4 (6to4)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1075
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1478
 msgid "Identity"
 msgstr "Identity"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:70
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:96
 msgid "If checked, 1DES is enabled"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:65
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:93
 msgid "If checked, encryption is disabled"
 msgstr ""
 
@@ -2479,36 +2544,36 @@ msgid ""
 "device node"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:27
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:71
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:18
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:82
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:52
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:17
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:29
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:33
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:68
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:85
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:32
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:45
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:45
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:24
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:44
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:116
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:48
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:85
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:65
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:33
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:80
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:108
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:146
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:74
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:97
 msgid "If unchecked, no default route is configured"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:34
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:86
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:35
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:99
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:47
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:60
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:60
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:39
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:59
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:124
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:39
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:116
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:59
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:103
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:64
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:77
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:100
 msgid "If unchecked, the advertised DNS server addresses are ignored"
 msgstr ""
 
@@ -2526,15 +2591,15 @@ 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:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:102
 msgid "Ignore <code>/etc/hosts</code>"
 msgstr "Ignore <code>/etc/hosts</code>"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:471
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:531
 msgid "Ignore interface"
 msgstr "Ignore interface"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:90
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:91
 msgid "Ignore resolve file"
 msgstr "Ignore resolve file"
 
@@ -2552,12 +2617,12 @@ msgid ""
 "blocked. Click \"Continue »\" below to return to the previous page."
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:145
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:118
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:124
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:126
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:97
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:118
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:157
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:141
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:115
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:138
 msgid "Inactivity timeout"
 msgstr ""
 
@@ -2565,23 +2630,25 @@ msgstr ""
 msgid "Inbound:"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:170
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:161
 msgid "Info"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:105
 msgid "Information"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:25
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:67
 msgid "Initialization failure"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:34
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:87
 msgid "Initscript"
 msgstr "Initscript"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:26
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:122
 msgid "Initscripts"
 msgstr "Initscripts"
 
@@ -2589,55 +2656,74 @@ msgstr "Initscripts"
 msgid "Install iputils-traceroute6 for IPv6 traceroute"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:223
-msgid "Install package %q"
-msgstr ""
-
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:220
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:120
 msgid "Install protocol extensions..."
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:416
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:423
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:683
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:687
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:26
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:284
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:342
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:47
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:134
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:14
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:16
 msgid "Interface"
 msgstr "Interface"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:58
 msgid "Interface %q device auto-migrated from %q to %q."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:356
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:792
 msgid "Interface Configuration"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:51
-msgid "Interface Overview"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:99
+msgid "Interface has %d pending changes"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:57
+msgid "Interface is marked for deletion"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:162
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:3
 msgid "Interface is reconnecting..."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:162
+msgid "Interface is shutting down..."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:205
+msgid "Interface is starting..."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:208
+msgid "Interface is stopping..."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:954
 msgid "Interface name"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:34
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:224
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:131
 msgid "Interface not present or not connected yet."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:88
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:16
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:11
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:287
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:54
 msgid "Interfaces"
 msgstr "Interfaces"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:9
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:20
 msgid "Internal"
 msgstr ""
 
@@ -2650,19 +2736,35 @@ msgstr ""
 msgid "Invalid"
 msgstr "Invalid input value"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:311
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:10
+msgid "Invalid Base64 key string"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:281
 msgid "Invalid VLAN ID given! Only IDs between %d and %d are allowed."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:307
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:290
 msgid "Invalid VLAN ID given! Only unique IDs are allowed"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:195
+msgid "Invalid argument"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:194
+msgid "Invalid command"
+msgstr ""
+
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:80
+msgid "Invalid hexadecimal value"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/sysauth.htm:12
 msgid "Invalid username and/or password! Please try again."
 msgstr "Invalid username and/or password! Please try again."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:508
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:950
 msgid "Isolate Clients"
 msgstr ""
 
@@ -2682,15 +2784,15 @@ msgstr ""
 msgid "JavaScript required!"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:52
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1691
 msgid "Join Network"
 msgstr "Join Network"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:22
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1628
 msgid "Join Network: Wireless Scan"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:19
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1833
 msgid "Joining Network: %q"
 msgstr ""
 
@@ -2707,15 +2809,15 @@ msgstr "Kernel Log"
 msgid "Kernel Version"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:823
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1248
 msgid "Key"
 msgstr "Key"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:851
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:852
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:853
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:854
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:870
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1277
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1278
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1279
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1291
 msgid "Key #%d"
 msgstr ""
 
@@ -2723,33 +2825,34 @@ msgstr ""
 msgid "Kill"
 msgstr "Kill"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:10
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:21
 msgid "L2TP"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:10
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:40
 msgid "L2TP Server"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:100
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:74
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:80
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:74
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:53
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:73
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:131
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:102
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:89
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:112
 msgid "LCP echo failure threshold"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:118
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:89
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:95
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:89
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:68
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:91
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:144
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:102
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:125
 msgid "LCP echo interval"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:181
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:902
 msgid "LLC"
 msgstr ""
 
@@ -2758,11 +2861,11 @@ msgstr ""
 msgid "Label"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:213
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:204
 msgid "Language"
 msgstr "Language"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:115
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:106
 msgid "Language and Style"
 msgstr ""
 
@@ -2770,51 +2873,51 @@ msgstr ""
 msgid "Latency"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:10
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:21
 msgid "Leaf"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:369
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:487
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:393
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:543
 msgid "Lease time"
 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:87
 msgid "Leasefile"
 msgstr "Leasefile"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:74
 #: modules/luci-base/luasrc/view/lease_status.htm:95
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:34
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
 msgid "Leasetime remaining"
 msgstr "Leasetime remaining"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:9
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:20
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:27
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:50
 msgid "Leave empty to autodetect"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:21
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:45
 msgid "Leave empty to use the current WAN address"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1746
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2299
 msgid "Legend:"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:481
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:538
 msgid "Limit"
 msgstr "Limit"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:287
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:288
 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:299
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:300
 msgid "Limit listening to these interfaces, and loopback."
 msgstr ""
 
@@ -2834,17 +2937,17 @@ msgstr ""
 msgid "Line Uptime"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:101
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:88
 msgid "Link On"
 msgstr "Link On"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:185
 msgid ""
 "List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
 "requests to"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:972
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1377
 msgid ""
 "List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-"
 "Identifier,128-bit key as hex string. <br />This list is used to map R0KH-ID "
@@ -2853,7 +2956,7 @@ msgid ""
 "Association."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:981
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1381
 msgid ""
 "List of R1KHs in the same Mobility Domain. <br />Format: MAC-address,R1KH-ID "
 "as 6 octets with colons,128-bit key as hex string. <br />This list is used "
@@ -2862,31 +2965,31 @@ msgid ""
 "PMK-R1 keys."
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:21
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:82
 msgid "List of SSH key files for auth"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:206
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:207
 msgid "List of domains to allow RFC1918 responses for"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:174
 msgid "List of hosts that supply bogus NX domain results"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:298
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:299
 msgid "Listen Interfaces"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:30
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:54
 msgid "Listen Port"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:15
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:16
 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:216
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:217
 msgid "Listening port for inbound DNS queries"
 msgstr ""
 
@@ -2905,11 +3008,11 @@ msgstr ""
 msgid "Loading"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:35
-msgid "Loading SSH keys…"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1819
+msgid "Loading directory contents…"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1204
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1296
 #: modules/luci-base/luasrc/view/view.htm:4
 msgid "Loading view…"
 msgstr ""
@@ -2919,77 +3022,73 @@ msgstr ""
 msgid "Local IP address is invalid"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:25
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:86
 msgid "Local IP address to assign"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:10
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:11
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:44
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:39
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:151
 msgid "Local IPv4 address"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:20
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:54
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:45
 msgid "Local IPv6 address"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:286
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:287
 msgid "Local Service Only"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:81
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:126
 msgid "Local Startup"
 msgstr ""
 
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:25
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:121
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:112
 msgid "Local Time"
 msgstr "Local Time"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:149
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
 msgid "Local domain"
 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:147
 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:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:151
 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:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
 msgid "Local server"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:129
 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:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:128
 msgid "Localise queries"
 msgstr "Localise queries"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:175
-msgid "Locked to channel %s used by: %s"
-msgstr ""
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:168
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:159
 msgid "Log output level"
 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:181
 msgid "Log queries"
 msgstr "Log queries"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:113
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:104
 msgid "Logging"
 msgstr ""
 
@@ -2997,7 +3096,7 @@ msgstr ""
 msgid "Login"
 msgstr "Login"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:95
+#: modules/luci-base/luasrc/controller/admin/index.lua:103
 msgid "Logout"
 msgstr "Logout"
 
@@ -3005,11 +3104,13 @@ msgstr "Logout"
 msgid "Loss of Signal Seconds (LOSS)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:476
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:533
 msgid "Lowest leased address as offset from the network address."
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:40
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:75
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:35
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:86
 msgid "MAC"
@@ -3017,32 +3118,32 @@ msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:73
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:109
-#: 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:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1958
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:86
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:133
 msgid "MAC-Address"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:457
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:586
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:886
 msgid "MAC-Address Filter"
 msgstr "MAC-Address Filter"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:142
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:363
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:798
 msgid "MAC-Filter"
 msgstr "MAC-Filter"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:464
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:590
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:893
 msgid "MAC-List"
 msgstr "MAC-List"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:13
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:16
 msgid "MAP / LW4over6"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:62
 msgid "MAP rule is invalid"
 msgstr ""
@@ -3060,8 +3161,8 @@ msgid "MHz"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:53
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:29
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:66
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:53
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:71
 msgid "MTU"
 msgstr ""
 
@@ -3071,16 +3172,17 @@ msgid ""
 "below:"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:55
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:69
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:26
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:38
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:38
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:108
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:52
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:96
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:83
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:57
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:70
 msgid "Manual"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1949
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2188
 msgid "Master"
 msgstr ""
 
@@ -3088,48 +3190,46 @@ msgstr ""
 msgid "Max. Attainable Data Rate (ATTNDR)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:539
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:982
 msgid "Maximum allowed Listen Interval"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:234
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
 msgid "Maximum allowed number of active DHCP leases"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:252
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:253
 msgid "Maximum allowed number of concurrent DNS queries"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:244
 msgid "Maximum allowed size of EDNS.0 UDP packets"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:63
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:77
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:57
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:112
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:104
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:93
 msgid "Maximum amount of seconds to wait for the modem to become ready"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:27
-msgid ""
-"Maximum length of the name is 15 characters including the automatic protocol/"
-"bridge prefix (br-, 6in4-, pppoe- etc.)"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:538
+msgid "Maximum number of leased addresses."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:482
-msgid "Maximum number of leased addresses."
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:761
+msgid "Maximum transmit power"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:21
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:49
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:134
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:187
 #: modules/luci-mod-status/luasrc/view/admin_status/bandwidth.htm:79
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:284
 msgid "Mbit/s"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:18
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:32
 msgid "Medium"
 msgstr ""
 
@@ -3141,42 +3241,43 @@ msgstr "Memory"
 msgid "Memory usage (%)"
 msgstr "Memory usage (%)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1952
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2191
 msgid "Mesh"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:372
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:806
 msgid "Mesh Id"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:196
+msgid "Method not found"
+msgstr ""
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:45
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:76
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:104
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:54
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:66
 msgid "Metric"
 msgstr "Metric"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:154
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:198
 msgid "Mirror monitor port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:153
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:197
 msgid "Mirror source port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:408
-msgid "Missing protocol extension for proto %q"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:923
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1337
 msgid "Mobility Domain"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:154
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:41
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:74
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:366
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:31
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:360
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:801
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1619
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:175
 msgid "Mode"
 msgstr "Mode"
@@ -3185,39 +3286,38 @@ msgstr "Mode"
 msgid "Model"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:31
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:72
 msgid "Modem default"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:11
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:19
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:11
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:10
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:73
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:73
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:57
 msgid "Modem device"
 msgstr "Modem device"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:24
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:66
 msgid "Modem information query failed"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:62
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:76
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:56
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:112
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:104
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:93
 msgid "Modem init timeout"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1953
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:452
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:554
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:577
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2192
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:880
 msgid "Monitor"
 msgstr "Monitor"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:14
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
 msgid "More Characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:802
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1057
 msgid "More…"
 msgstr ""
 
@@ -3230,7 +3330,7 @@ msgstr ""
 msgid "Mount Point"
 msgstr "Mount Point"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:26
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:36
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:137
 msgid "Mount Points"
@@ -3280,46 +3380,44 @@ msgstr ""
 msgid "Move up"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:912
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
 msgid "NAS ID"
 msgstr "NAS ID"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:57
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:87
 msgid "NAT-T Mode"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:9
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 msgid "NAT64 Prefix"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:31
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:26
 msgid "NCM"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:535
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:589
 msgid "NDP-Proxy"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:43
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:72
 msgid "NT Domain"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:273
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:264
 msgid "NTP server candidates"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:837
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1092
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:27
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:502
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:65
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:553
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:658
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:49
 msgid "Name"
 msgstr "Name"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:17
-msgid "Name of the new interface"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1808
 msgid "Name of the new network"
 msgstr "Name of the new network"
 
@@ -3327,9 +3425,10 @@ msgstr "Name of the new network"
 msgid "Navigation"
 msgstr "Navigation"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:62
+#: modules/luci-base/luasrc/controller/admin/index.lua:69
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:108
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:402
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:834
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1957
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:389
 #: modules/luci-mod-status/luasrc/view/admin_status/index/30-network.htm:8
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:73
@@ -3341,7 +3440,7 @@ msgstr "Network"
 msgid "Network Utilities"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:278
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:279
 msgid "Network boot image"
 msgstr ""
 
@@ -3354,53 +3453,59 @@ msgstr ""
 msgid "Network without interfaces."
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:661
+msgid "New interface name…"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:11
 msgid "Next »"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1507
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1754
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:108
 msgid "No"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:453
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:514
 msgid "No DHCP Server configured for this interface"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1162
+msgid "No Encryption"
+msgstr ""
+
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:89
 msgid "No NAT-T"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:198
+msgid "No data received"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1764
+msgid "No entries in this directory"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/backupfiles.lua:82
 msgid "No files found"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:550
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:191
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:180
 msgid "No information available"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:8
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:63
 msgid "No matching prefix delegation"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:157
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
 msgid "No negative cache"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:53
-msgid "No network configured on this device"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:65
-msgid "No network name specified"
-msgstr ""
-
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:147
-msgid "No networks in range"
-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
@@ -3408,7 +3513,12 @@ msgstr ""
 msgid "No password set!"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:116
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:104
+msgid "No peers defined yet"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:129
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:271
 msgid "No public keys present yet."
 msgstr ""
 
@@ -3416,19 +3526,19 @@ msgstr ""
 msgid "No rules in this chain."
 msgstr "No rules in this chain."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:150
-msgid "No scan results available yet..."
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:53
+msgid "No signal"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:7
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:756
 msgid "No zone assigned"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:111
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:35
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:48
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:133
 msgid "Noise"
 msgstr "Noise"
 
@@ -3444,16 +3554,16 @@ msgstr ""
 msgid "Non Pre-emtive CRC errors (CRC_P)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:292
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:293
 msgid "Non-wildcard"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:129
 msgid "None"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:181
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:172
 msgid "Normal"
 msgstr ""
 
@@ -3461,25 +3571,29 @@ msgstr ""
 msgid "Not Found"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:27
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:5
-msgid "Not associated"
-msgstr ""
-
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:87
 msgid "Not connected"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:38
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:139
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:232
+msgid "Not present"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:105
 msgid "Not started on boot"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:26
-msgid "Note: interface name length"
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:201
+msgid "Not supported"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:171
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:162
 msgid "Notice"
 msgstr ""
 
@@ -3487,63 +3601,50 @@ msgstr ""
 msgid "Nslookup"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:261
 msgid "Number of cached DNS entries (max is 10000, 0 is no caching)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:203
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:194
 msgid "Number of parallel threads used for compression"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:40
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:69
 msgid "Obfuscated Group Password"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:35
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:61
 msgid "Obfuscated Password"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:22
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:34
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:40
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:105
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:97
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:49
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:80
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:54
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:67
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:93
 msgid "Obtain IPv6-Address"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:83
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:68
 msgid "Off-State Delay"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:16
-msgid ""
-"On this page you can configure the network interfaces. You can bridge "
-"several interfaces by ticking the \"bridge interfaces\" field and enter the "
-"names of several network interfaces separated by spaces. You can also use "
-"<abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
-"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
-"<samp>eth0.1</samp>)."
-msgstr ""
-"On this page you can configure the network interfaces. You can bridge "
-"several interfaces by ticking the \"bridge interfaces\" field and enter the "
-"names of several network interfaces separated by spaces. You can also use "
-"<abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
-"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
-"<samp>eth0.1</samp>)."
-
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:95
 msgid "On-Link route"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:80
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:64
 msgid "On-State Delay"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:360
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:382
 msgid "One of hostname or mac address must be specified!"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:456
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:462
 msgid "One of the following: %s"
 msgstr ""
 
@@ -3565,34 +3666,35 @@ msgstr ""
 msgid "Open list..."
 msgstr ""
 
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:61
 #: protocols/luci-proto-openconnect/luasrc/model/network/proto_openconnect.lua:9
 msgid "OpenConnect (CISCO AnyConnect)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:757
 msgid "Operating frequency"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1753
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2306
 msgid "Option changed"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1755
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2308
 msgid "Option removed"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1140
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:55
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1535
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:66
 msgid "Optional"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:78
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:76
 msgid ""
 "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, "
 "starting with <code>0x</code>."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:144
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:215
 msgid ""
 "Optional. Allowed values: 'eui64', 'random', fixed value like '::1' or "
 "'::1:2'. When IPv6 prefix (like 'a:b:c:d::') is received from a delegating "
@@ -3600,41 +3702,41 @@ msgid ""
 "for the interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:123
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:117
 msgid ""
 "Optional. Base64-encoded preshared key. Adds in an additional layer of "
 "symmetric-key cryptography for post-quantum resistance."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:148
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:126
 msgid "Optional. Create routes for Allowed IPs for this peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:103
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:108
 msgid "Optional. Description of peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:156
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:128
 msgid ""
 "Optional. Host of peer. Names are resolved prior to bringing up the "
 "interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:67
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:71
 msgid "Optional. Maximum Transmission Unit of tunnel interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:166
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:132
 msgid "Optional. Port of peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:175
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:136
 msgid ""
 "Optional. Seconds between keep alive messages. Default is 0 (disabled). "
 "Recommended value if this device is behind a NAT is 25."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:31
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:54
 msgid "Optional. UDP port used for outgoing and incoming packets."
 msgstr ""
 
@@ -3655,7 +3757,7 @@ msgstr "Out"
 msgid "Outbound:"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:26
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:50
 msgid "Output Interface"
 msgstr ""
 
@@ -3664,51 +3766,51 @@ msgstr ""
 msgid "Output zone"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:63
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:155
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:33
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:54
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:54
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:219
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:50
 msgid "Override MAC address"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:66
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:35
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:56
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:88
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:125
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:131
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:133
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:104
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:61
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:58
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:223
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:44
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:54
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:154
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:71
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:145
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:132
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:110
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:119
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:97
 msgid "Override MTU"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:30
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:63
 msgid "Override TOS"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:25
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:58
 msgid "Override TTL"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:954
 msgid "Override default interface name"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:41
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:167
 msgid "Override the gateway in DHCP responses"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:507
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:555
 msgid ""
 "Override the netmask sent to clients. Normally it is calculated from the "
 "subnet that is served."
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:65
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:179
 msgid "Override the table used for internal routes"
 msgstr ""
 
@@ -3716,29 +3818,33 @@ msgstr ""
 msgid "Overview"
 msgstr "Overview"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1606
+msgid "Overwrite existing file \"%s\" ?"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:11
 msgid "Owner"
 msgstr "Owner"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:42
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:56
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:17
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:28
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:34
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:14
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:18
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:43
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:98
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:45
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:44
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:63
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:82
 msgid "PAP/CHAP password"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:39
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:53
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:14
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:11
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:15
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:96
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:88
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:43
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:74
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:42
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:61
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:77
 msgid "PAP/CHAP username"
 msgstr ""
 
@@ -3746,9 +3852,9 @@ msgstr ""
 msgid "PID"
 msgstr "PID"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:36
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:50
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:26
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:95
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:87
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:68
 msgid "PIN"
 msgstr ""
 
@@ -3757,114 +3863,116 @@ msgstr ""
 msgid "PIN code rejected"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:966
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1372
 msgid "PMK R1 Push"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:43
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:13
 msgid "PPP"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:11
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:58
 msgid "PPPoA Encapsulation"
 msgstr "PPPoA Encapsulation"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:19
 msgid "PPPoATM"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:17
 msgid "PPPoE"
 msgstr ""
 
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:28
 #: protocols/luci-proto-pppossh/luasrc/model/network/proto_pppossh.lua:9
 msgid "PPPoSSH"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:15
 msgid "PPtP"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:59
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:73
 msgid "PSID offset"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:56
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:70
 msgid "PSID-bits length"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:123
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:846
 msgid "PTM/EFM (Packet Transfer Mode)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:78
-msgid "Package libiwinfo required!"
-msgstr ""
-
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:45
 msgid "Packets"
 msgstr "Packets"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:7
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:756
 msgid "Part of zone %q"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/sysauth.htm:29
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1111
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:35
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:42
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1514
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:46
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:104
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:58
 msgid "Password"
 msgstr "Password"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:29
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:24
 msgid "Password authentication"
 msgstr "Password authentication"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1019
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1414
 msgid "Password of Private Key"
 msgstr "Password of Private Key"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1067
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1471
 msgid "Password of inner Private Key"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:14
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:16
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:18
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:20
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:32
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:34
 msgid "Password strength"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:44
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:107
 msgid "Password2"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:37
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:244
 msgid "Paste or drag SSH key file…"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1000
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1396
 msgid "Path to CA-Certificate"
 msgstr "Path to CA-Certificate"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1007
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1402
 msgid "Path to Client-Certificate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1013
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1408
 msgid "Path to Private Key"
 msgstr "Path to Private Key"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1049
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1453
 msgid "Path to inner CA-Certificate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1055
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1459
 msgid "Path to inner Client-Certificate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1061
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1465
 msgid "Path to inner Private Key"
 msgstr ""
 
@@ -3882,7 +3990,7 @@ msgstr ""
 msgid "Peak:"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:28
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:89
 msgid "Peer IP address to assign"
 msgstr ""
 
@@ -3891,11 +3999,11 @@ msgstr ""
 msgid "Peer address is missing"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:90
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:89
 msgid "Peers"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:50
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:80
 msgid "Perfect Forward Secrecy"
 msgstr ""
 
@@ -3907,7 +4015,11 @@ msgstr "Perform reboot"
 msgid "Perform reset"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:174
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:199
+msgid "Permission denied"
+msgstr ""
+
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:136
 msgid "Persistent Keep Alive"
 msgstr ""
 
@@ -3915,7 +4027,7 @@ msgstr ""
 msgid "Phy Rate:"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:190
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:277
 msgid "Physical Settings"
 msgstr "Physical Settings"
 
@@ -3926,6 +4038,10 @@ msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:16
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:17
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:41
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:77
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:87
@@ -3943,15 +4059,19 @@ msgstr "Please enter your username and password."
 msgid "Policy"
 msgstr "Policy"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:22
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:20
 msgid "Port"
 msgstr "Port"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:18
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:133
+msgid "Port %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:274
 msgid "Port status:"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:482
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:488
 msgid "Potential negation of: %s"
 msgstr ""
 
@@ -3963,11 +4083,11 @@ msgstr ""
 msgid "Pre-emtive CRC errors (CRCP_P)"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:32
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:73
 msgid "Prefer LTE"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:33
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:74
 msgid "Prefer UMTS"
 msgstr ""
 
@@ -3975,31 +4095,30 @@ msgstr ""
 msgid "Prefix Delegated"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:122
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:117
 msgid "Preshared Key"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:101
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:75
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:81
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:75
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:54
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:74
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:131
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:102
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:89
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:112
 msgid ""
 "Presume peer to be dead after given amount of LCP echo failures, use 0 to "
 "ignore failures"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:305
 msgid "Prevent listening on these interfaces."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:509
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:562
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:950
 msgid "Prevents client-to-client communication"
 msgstr "Prevents client-to-client communication"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:18
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:49
 msgid "Private Key"
 msgstr ""
 
@@ -4020,39 +4139,33 @@ msgstr ""
 msgid "Prot."
 msgstr "Prot."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:72
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:349
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:675
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:84
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:216
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:87
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:390
 msgid "Protocol"
 msgstr "Protocol"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:31
-msgid "Protocol of the new interface"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:222
-msgid "Protocol support is not installed"
-msgstr ""
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:269
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:260
 msgid "Provide NTP server"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:701
 msgid "Provide new network"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:451
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:879
 msgid "Pseudo Ad-Hoc (ahdemo)"
 msgstr "Pseudo Ad-Hoc (ahdemo)"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:112
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:113
 msgid "Public Key"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:278
 msgid ""
 "Public keys allow for the passwordless SSH logins with a higher security "
 "compared to the use of plain passwords. In order to upload a new key to the "
@@ -4060,47 +4173,48 @@ msgid ""
 "code> file into the input field."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:139
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:211
 msgid "Public prefix routed to this device for distribution to clients."
 msgstr ""
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:27
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:9
 msgid "QMI Cellular"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:173
 msgid "Quality"
 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:171
 msgid ""
 "Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> "
 "servers"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:952
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1360
 msgid "R0 Key Lifetime"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:959
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1366
 msgid "R1 Key Holder"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:58
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:88
 msgid "RFC3947 NAT-T mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:381
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:814
 msgid "RSSI threshold for joining"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:256
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:597
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:778
 msgid "RTS/CTS Threshold"
 msgstr "RTS/CTS Threshold"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:41
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:76
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:87
 msgid "RX"
@@ -4110,35 +4224,39 @@ msgstr "RX"
 msgid "RX Rate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:783
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1961
+msgid "RX Rate / TX Rate"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1207
 msgid "Radius-Accounting-Port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:791
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1215
 msgid "Radius-Accounting-Secret"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:775
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1199
 msgid "Radius-Accounting-Server"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:759
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1183
 msgid "Radius-Authentication-Port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:767
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1191
 msgid "Radius-Authentication-Secret"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:751
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1175
 msgid "Radius-Authentication-Server"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:119
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:102
 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:83
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:84
 msgid ""
 "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-Server"
@@ -4152,17 +4270,11 @@ msgid ""
 "access to this device if you are connected via this interface"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2
-msgid ""
-"Really delete this wireless network? The deletion cannot be undone! You "
-"might lose access to this device if you are connected via this network."
-msgstr ""
-
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:40
 msgid "Really reset all changes?"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:237
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:354
 msgid "Really switch protocol?"
 msgstr ""
 
@@ -4186,15 +4298,15 @@ msgstr ""
 msgid "Realtime Wireless"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:931
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1343
 msgid "Reassociation Deadline"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:191
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
 msgid "Rebind protection"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:48
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:46
 #: modules/luci-mod-system/luasrc/view/admin_system/reboot.htm:9
 msgid "Reboot"
 msgstr "Reboot"
@@ -4208,21 +4320,15 @@ msgstr ""
 msgid "Reboots the operating system of your device"
 msgstr "Reboots the operating system of your device"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:103
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:90
 msgid "Receive"
 msgstr "Receive"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:325
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:350
-msgid "Receiver Antenna"
-msgstr "Receiver Antenna"
-
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:42
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:59
 msgid "Recommended. IP addresses of the WireGuard interface."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:28
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:300
 msgid "Reconnect this interface"
 msgstr ""
 
@@ -4230,92 +4336,134 @@ msgstr ""
 msgid "References"
 msgstr "References"
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:39
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:153
 msgid "Relay"
 msgstr ""
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:36
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:157
 msgid "Relay Bridge"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:17
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:154
 msgid "Relay between networks"
 msgstr ""
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:64
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:12
 msgid "Relay bridge"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:18
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:50
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:49
 msgid "Remote IPv4 address"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:8
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:40
 msgid "Remote IPv4 address or FQDN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:45
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:725
 msgid "Remove"
 msgstr "Remove"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:53
-msgid "Repeat scan"
-msgstr "Repeat scan"
-
-#: modules/luci-base/luasrc/view/cbi/upload.htm:11
-msgid "Replace entry"
-msgstr "Replace entry"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:46
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:51
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1806
 msgid "Replace wireless configuration"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:8
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:17
 msgid "Request IPv6-address"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:16
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:23
 msgid "Request IPv6-prefix of length"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1141
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:200
+msgid "Request timeout"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1536
 msgid "Required"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:20
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:31
 msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:19
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:49
 msgid "Required. Base64-encoded private key for this interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:113
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:113
 msgid "Required. Base64-encoded public key of peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:136
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:122
 msgid ""
 "Required. IP addresses and prefixes that this peer is allowed to use inside "
 "the tunnel. Usually the peer's tunnel IP addresses and the networks the peer "
 "routes through the tunnel."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1134
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1095
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1096
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1097
+msgid "Requires hostapd"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1101
+msgid "Requires hostapd with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1102
+msgid "Requires hostapd with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1098
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1099
+msgid "Requires hostapd with SAE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1533
 msgid ""
 "Requires the 'full' version of wpad/hostapd and support from the wifi driver "
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:141
 msgid ""
 "Requires upstream supports DNSSEC; verify unsigned domain responses really "
 "come from unsigned domains"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1268
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1109
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1119
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1120
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1121
+msgid "Requires wpa-supplicant"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1113
+msgid "Requires wpa-supplicant with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1114
+msgid "Requires wpa-supplicant with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1111
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1124
+msgid "Requires wpa-supplicant with SAE support"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1355
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:17
 #: modules/luci-base/luasrc/view/cbi/footer.htm:30
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:66
@@ -4331,17 +4479,22 @@ msgstr "Reset Counters"
 msgid "Reset to defaults"
 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:68
 msgid "Resolv and Hosts Files"
 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:94
 msgid "Resolve file"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:28
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:14
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:71
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:197
+msgid "Resource not found"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:302
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:693
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:90
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:112
 msgid "Restart"
 msgstr "Restart"
 
@@ -4349,7 +4502,7 @@ msgstr "Restart"
 msgid "Restart Firewall"
 msgstr "Restart Firewall"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:14
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:691
 msgid "Restart radio interface"
 msgstr ""
 
@@ -4361,26 +4514,24 @@ msgstr ""
 msgid "Restore backup"
 msgstr "Restore backup"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:113
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:114
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:38
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:46
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:119
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:120
 msgid "Reveal/hide password"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1774
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2322
 msgid "Revert"
 msgstr "Revert"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1861
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2405
 msgid "Revert changes"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2013
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2554
 msgid "Revert request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1993
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2534
 msgid "Reverting configuration…"
 msgstr ""
 
@@ -4388,7 +4539,7 @@ msgstr ""
 msgid "Root"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:271
 msgid "Root directory for files served via TFTP"
 msgstr ""
 
@@ -4396,7 +4547,7 @@ msgstr ""
 msgid "Root preparation"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:147
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:126
 msgid "Route Allowed IPs"
 msgstr ""
 
@@ -4408,12 +4559,12 @@ msgstr ""
 msgid "Route type"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:523
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:577
 msgid "Router Advertisement-Service"
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:43
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:15
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:27
 msgid "Router Password"
 msgstr ""
 
@@ -4443,7 +4594,7 @@ msgstr ""
 msgid "Run filesystem check"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:651
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:669
 msgid "Runtime error"
 msgstr ""
 
@@ -4455,31 +4606,31 @@ msgstr ""
 msgid "SNR"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:5
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:18
 msgid "SSH Access"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:10
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:70
 msgid "SSH server address"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:13
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:74
 msgid "SSH server port"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:8
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:58
 msgid "SSH username"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:27
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:277
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
 msgid "SSH-Keys"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:42
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:73
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:29
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1617
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:174
 msgid "SSID"
 msgstr "SSID"
@@ -4488,17 +4639,17 @@ msgstr "SSID"
 msgid "SWAP"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1127
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1262
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1379
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1351
 #: modules/luci-base/luasrc/view/cbi/error.htm:17
 #: modules/luci-base/luasrc/view/cbi/footer.htm:26
 #: modules/luci-base/luasrc/view/cbi/header.htm:17
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:54
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:133
 msgid "Save"
 msgstr "Save"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1256
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1768
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1347
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2318
 #: modules/luci-base/luasrc/view/cbi/footer.htm:22
 msgid "Save & Apply"
 msgstr "Save & Apply"
@@ -4511,28 +4662,20 @@ msgstr ""
 msgid "Save mtdblock contents"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
-msgid "Saving keys…"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:698
 msgid "Scan"
 msgstr "Scan"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:109
-msgid "Scan request failed"
-msgstr ""
-
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:8
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:39
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:23
 msgid "Scheduled Tasks"
 msgstr "Scheduled Tasks"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1749
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2302
 msgid "Section added"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1751
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2304
 msgid "Section removed"
 msgstr ""
 
@@ -4547,61 +4690,66 @@ msgid ""
 "your device!"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:119
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:90
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:96
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:90
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:69
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:92
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1516
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1646
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1809
+msgid "Select file…"
+msgstr ""
+
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:144
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:102
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:125
 msgid ""
 "Send LCP echo requests at the given interval in seconds, only effective in "
 "conjunction with failure threshold"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:561
-msgid "Separate Clients"
-msgstr "Separate Clients"
-
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:62
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:63
 msgid "Server Settings"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:26
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:50
 msgid "Service Name"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:25
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:30
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:87
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:71
 msgid "Service Type"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:55
+#: modules/luci-base/luasrc/controller/admin/index.lua:62
 msgid "Services"
 msgstr "Services"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:815
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:861
 msgid "Session expired"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:83
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:107
 msgid "Set VPN as Default Route"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:258
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:795
 msgid ""
 "Set interface properties regardless of the link carrier (If set, carrier "
 "sense events do not invoke hotplug handlers)."
 msgstr ""
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:23
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:55
 msgid "Setting PLMN failed"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:26
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:68
 msgid "Setting operation mode failed"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:454
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:517
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:527
 msgid "Setup DHCP Server"
 msgstr ""
 
@@ -4613,7 +4761,7 @@ msgstr ""
 msgid "Short GI"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:516
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:960
 msgid "Short Preamble"
 msgstr ""
 
@@ -4625,21 +4773,23 @@ msgstr ""
 msgid "Show empty chains"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:306
 msgid "Shutdown this interface"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:111
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:34
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:47
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:132
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1616
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:173
 msgid "Signal"
 msgstr "Signal"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1960
+msgid "Signal / Noise"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:125
 msgid "Signal Attenuation (SATN)"
 msgstr ""
@@ -4652,11 +4802,11 @@ msgstr ""
 msgid "Size"
 msgstr "Size"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:259
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:260
 msgid "Size of DNS query cache"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:191
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
 msgid "Size of the ZRam device in megabytes"
 msgstr ""
 
@@ -4673,11 +4823,7 @@ msgstr "Skip to content"
 msgid "Skip to navigation"
 msgstr "Skip to navigation"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:335
-msgid "Slot time"
-msgstr "Slot time"
-
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1640
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1846
 #: modules/luci-base/luasrc/model/network.lua:1427
 msgid "Software VLAN"
 msgstr ""
@@ -4715,61 +4861,65 @@ msgstr ""
 msgid "Specifies the directory the device is attached to"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:23
-msgid "Specifies the listening port of this <em>Dropbear</em> instance"
-msgstr ""
-
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:57
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:175
 msgid ""
 "Specifies the maximum amount of failed ARP requests until hosts are presumed "
 "to be dead"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:49
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:171
 msgid ""
 "Specifies the maximum amount of seconds after which hosts are presumed to be "
 "dead"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:761
+msgid ""
+"Specifies the maximum transmit power the wireless radio may use. Depending "
+"on regulatory requirements and wireless usage, the actual transmit power may "
+"be reduced by the driver."
+msgstr ""
+
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:63
 msgid "Specify a TOS (Type of Service)."
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:25
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:58
 msgid ""
 "Specify a TTL (Time to Live) for the encapsulating packet other than the "
 "default (64)."
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:53
 msgid ""
 "Specify an MTU (Maximum Transmission Unit) other than the default (1280 "
 "bytes)."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:60
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "Specify the secret encryption key here."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:475
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:64
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:533
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:89
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:111
 msgid "Start"
 msgstr "Start"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:33
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:86
 msgid "Start priority"
 msgstr "Start priority"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1958
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2499
 msgid "Starting configuration apply…"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1626
 msgid "Starting wireless scan..."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:24
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:120
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
 msgid "Startup"
 msgstr ""
 
@@ -4781,59 +4931,62 @@ msgstr "Static IPv4 Routes"
 msgid "Static IPv6 Routes"
 msgstr "Static IPv6 Routes"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:70
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:71
 msgid "Static Leases"
 msgstr "Static Leases"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:118
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:73
 msgid "Static Routes"
 msgstr "Static Routes"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1194
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1384
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:172
 #: modules/luci-base/luasrc/model/network.lua:966
 msgid "Static address"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:308
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:309
 msgid ""
 "Static leases are used to assign fixed IP addresses and symbolic hostnames "
 "to DHCP clients. They are also required for non-dynamic interface "
 "configurations where only hosts with a corresponding lease are served."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:534
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:977
 msgid "Station inactivity limit"
 msgstr ""
 
 #: modules/luci-base/luasrc/controller/admin/index.lua:40
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:197
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:337
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:746
 #: modules/luci-mod-status/luasrc/view/admin_status/index.htm:128
 msgid "Status"
 msgstr "Status"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:35
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:75
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:308
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:91
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:113
 msgid "Stop"
 msgstr "Stop"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:165
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Strict order"
 msgstr "Strict order"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:16
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:30
 msgid "Strong"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1843
 msgid "Submit"
 msgstr "Submit"
 
-#: 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:108
 msgid "Suppress logging"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:109
 msgid "Suppress logging of the routine operation of these protocols"
 msgstr ""
 
@@ -4845,42 +4998,44 @@ msgstr ""
 msgid "Swap Entry"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:23
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:5
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:135
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:21
 msgid "Switch"
 msgstr "Switch"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:129
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:168
 msgid "Switch %q"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:128
-msgid "Switch %q (%s)"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:66
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:146
 msgid ""
 "Switch %q has an unknown topology - the VLAN settings might not be accurate."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:146
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:142
 msgid "Switch Port Mask"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1640
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1846
 #: modules/luci-base/luasrc/model/network.lua:1425
 msgid "Switch VLAN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:238
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:355
 msgid "Switch protocol"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:103
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:104
 #: modules/luci-base/luasrc/view/cbi/ipaddr.htm:26
 msgid "Switch to CIDR list notation"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:77
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1547
+msgid "Symbolic link"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:71
 msgid "Sync with NTP-Server"
 msgstr ""
 
@@ -4890,7 +5045,7 @@ msgstr ""
 
 #: modules/luci-base/luasrc/controller/admin/index.lua:47
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:14
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:102
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:94
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
 #: modules/luci-mod-system/luasrc/view/admin_system/applyreboot.htm:39
 msgid "System"
@@ -4901,11 +5056,11 @@ msgstr "System"
 msgid "System Log"
 msgstr "System Log"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:108
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:99
 msgid "System Properties"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:145
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:136
 msgid "System log buffer size"
 msgstr ""
 
@@ -4913,15 +5068,17 @@ msgstr ""
 msgid "TCP:"
 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:69
 msgid "TFTP Settings"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:269
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
 msgid "TFTP server root"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:17
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:77
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:88
 msgid "TX"
@@ -4944,7 +5101,7 @@ msgstr "Table"
 msgid "Target"
 msgstr "Target"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:77
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:103
 msgid "Target network"
 msgstr ""
 
@@ -4952,40 +5109,24 @@ msgstr ""
 msgid "Terminate"
 msgstr "Terminate"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:27
-msgid ""
-"The <em>Device Configuration</em> section covers physical settings of the "
-"radio hardware such as channel, transmit power or antenna selection which "
-"are shared among all defined wireless networks (if the radio hardware is "
-"multi-SSID capable). Per network settings like encryption or operation mode "
-"are grouped in the <em>Interface Configuration</em>."
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:79
-msgid ""
-"The <em>libiwinfo-lua</em> package is not installed. You must install this "
-"component for working wireless configuration!"
-msgstr ""
-
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:66
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:77
 msgid ""
 "The HE.net endpoint update configuration changed, you must now use the plain "
 "username instead of the user ID!"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:8
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:40
 msgid ""
 "The IPv4 address or the fully-qualified domain name of the remote tunnel end."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:27
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:38
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:59
 msgid ""
 "The IPv6 prefix assigned to the provider, usually ends with <code>::</code>"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:18
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1808
 msgid ""
 "The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
 "code> and <code>_</code>"
@@ -4999,7 +5140,7 @@ msgstr ""
 msgid "The configuration file could not be loaded due to the following error:"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1849
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2396
 msgid ""
 "The device could not be reached within %d seconds after applying the pending "
 "changes, which caused the configuration to be rolled back for safety "
@@ -5019,6 +5160,12 @@ msgstr ""
 "The device file of the memory or partition (<abbr title=\"for example\">e.g."
 "</abbr> <code>/dev/sda1</code>)"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:612
+msgid ""
+"The existing wireless configuration needs to be changed for LuCI to function "
+"properly."
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:127
 msgid ""
 "The filesystem that was used to format the memory (<abbr title=\"for example"
@@ -5040,43 +5187,49 @@ msgstr ""
 msgid "The following rules are currently active on this system."
 msgstr "The following rules are currently active on this system."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:144
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:154
+msgid "The gateway address must not be a local IP address"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:154
 msgid "The given SSH public key has already been added."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:150
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:160
 msgid ""
 "The given SSH public key is invalid. Please supply proper public RSA or "
 "ECDSA keys."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:67
-msgid "The given network name is not unique"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:664
+msgid "The interface name is already used"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:52
-msgid ""
-"The hardware is not multi-SSID capable and the existing configuration will "
-"be replaced if you proceed."
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:670
+msgid "The interface name is too long"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:43
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:31
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:55
 msgid ""
 "The length of the IPv4 prefix in bits, the remainder is used in the IPv6 "
 "addresses."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:35
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:46
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:63
 msgid "The length of the IPv6 prefix in bits"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:12
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:44
 msgid "The local IPv4 address over which the tunnel is created (optional)."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:5
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1814
+msgid "The network name is already used"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:135
 msgid ""
 "The network ports on this device can be combined to several <abbr title="
 "\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
@@ -5086,22 +5239,21 @@ msgid ""
 "next greater network like the internet and other ports for a local network."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:77
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:395
-msgid "The selected protocol needs a device assigned"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1149
+msgid "The selected %s mode is incompatible with %s encryption"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/csrftoken.htm:11
 msgid "The submitted security token is invalid or already expired!"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:274
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:272
 msgid ""
 "The system is erasing the configuration partition now and will reboot itself "
 "when finished."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:195
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:193
 #, fuzzy
 msgid ""
 "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
@@ -5114,7 +5266,7 @@ msgstr ""
 "address of your computer to reach the device again, depending on your "
 "settings."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:15
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:80
 msgid "The system password has been successfully changed."
 msgstr ""
 
@@ -5126,7 +5278,7 @@ 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:403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:427
 msgid "There are no active leases"
 msgstr ""
 
@@ -5135,16 +5287,10 @@ msgstr ""
 msgid "There are no active leases."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1973
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2514
 msgid "There are no changes to apply"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:204
-msgid ""
-"There is no device assigned yet, please attach a network device in the "
-"\"Physical Settings\" tab"
-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
@@ -5154,11 +5300,19 @@ msgid ""
 "protect the web interface and enable SSH."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:19
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:49
 msgid "This IPv4 address of the relay"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1448
+msgid "This authentication type is not applicable to the selected EAP method."
+msgstr ""
+
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:54
+msgid "This does not look like a valid PEM file"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
 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 "
@@ -5172,25 +5326,25 @@ msgid ""
 "configurations are automatically preserved."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:74
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:81
 msgid ""
 "This is either the \"Update Key\" configured for the tunnel or the account "
 "password if no update key has been configured"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:82
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:127
 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 ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:27
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:54
 msgid ""
 "This is the local endpoint address assigned by the tunnel broker, it usually "
 "ends with <code>...:2/64</code>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:79
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> in the local network"
@@ -5198,20 +5352,20 @@ msgstr ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> in the local network"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:73
 msgid "This is the plain username for logging into the account"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:34
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:57
 msgid ""
 "This is the prefix routed to you by the tunnel broker for use by clients"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:9
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:41
 msgid "This is the system crontab in which scheduled tasks can be defined."
 msgstr "This is the system crontab in which scheduled tasks can be defined."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:19
+#: 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 ""
@@ -5228,26 +5382,26 @@ msgstr ""
 msgid "This page gives an overview over currently active network connections."
 msgstr "This page gives an overview over currently active network connections."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:726
-#: modules/luci-base/htdocs/luci-static/resources/form.js:809
+#: modules/luci-base/htdocs/luci-static/resources/form.js:936
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1064
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:172
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:32
 msgid "This section contains no values yet"
 msgstr "This section contains no values yet"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:114
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:105
 msgid "Time Synchronization"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:525
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:968
 msgid "Time interval for rekeying GTK"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:128
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:119
 msgid "Timezone"
 msgstr "Timezone"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:825
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:871
 msgid "To login…"
 msgstr ""
 
@@ -5261,7 +5415,7 @@ msgstr ""
 "archive here. To reset the firmware to its initial state, click \"Perform "
 "reset\" (only possible with squashfs images)."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:835
 msgid "Tone"
 msgstr ""
 
@@ -5285,55 +5439,41 @@ msgstr "Traffic"
 msgid "Transfer"
 msgstr "Transfer"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:595
-msgid "Transmission Rate"
-msgstr "Transmission Rate"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:102
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:89
 msgid "Transmit"
 msgstr "Transmit"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:211
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:273
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:345
-msgid "Transmit Power"
-msgstr "Transmit Power"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:318
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:349
-msgid "Transmitter Antenna"
-msgstr "Transmitter Antenna"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:73
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:57
 msgid "Trigger"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:98
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:84
 msgid "Trigger Mode"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:54
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:69
 msgid "Tunnel ID"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1643
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1849
 #: modules/luci-base/luasrc/model/network.lua:1430
 msgid "Tunnel Interface"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:44
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:55
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:76
 msgid "Tunnel Link"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:46
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:131
 msgid "Tx-Power"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:32
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:185
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:11
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:43
 msgid "Type"
 msgstr "Type"
 
@@ -5341,19 +5481,20 @@ msgstr "Type"
 msgid "UDP:"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:28
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:90
 msgid "UMTS only"
 msgstr ""
 
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:43
 #: protocols/luci-proto-3g/luasrc/model/network/proto_3g.lua:10
 msgid "UMTS/GPRS/EV-DO"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:106
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:93
 msgid "USB Device"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:122
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:110
 msgid "USB Ports"
 msgstr ""
 
@@ -5383,10 +5524,12 @@ msgstr ""
 msgid "Unable to dispatch"
 msgstr ""
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:22
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:54
 msgid "Unable to obtain client ID"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:61
 msgid "Unable to resolve AFTR host name"
 msgstr ""
@@ -5396,21 +5539,31 @@ msgstr ""
 msgid "Unable to resolve peer host name"
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:33
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:68
+msgid "Unable to save contents: %s"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:132
 msgid "Unavailable Seconds (UAS)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1196
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1386
 #: modules/luci-base/luasrc/model/network.lua:970
 msgid "Unknown"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1349
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1539
 #: modules/luci-base/luasrc/model/network.lua:1137
 msgid "Unknown error (%s)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1193
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:204
+msgid "Unknown error code"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1383
+#: modules/luci-base/htdocs/luci-static/resources/protocol/none.js:6
 #: modules/luci-base/luasrc/model/network.lua:964
 msgid "Unmanaged"
 msgstr ""
@@ -5420,22 +5573,30 @@ msgstr ""
 msgid "Unmount"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:107
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:262
 msgid "Unnamed key"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1708
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2261
 msgid "Unsaved Changes"
 msgstr "Unsaved Changes"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:202
+msgid "Unspecified error"
+msgstr ""
+
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:64
 msgid "Unsupported MAP type"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:27
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:69
 msgid "Unsupported modem"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:219
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:119
 msgid "Unsupported protocol type."
 msgstr ""
@@ -5455,56 +5616,70 @@ msgstr ""
 msgid "Upload archive..."
 msgstr ""
 
-#: modules/luci-base/luasrc/view/cbi/upload.htm:8
-msgid "Uploaded File"
-msgstr "Uploaded File"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1703
+msgid "Upload file"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1678
+msgid "Upload file…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1623
+msgid "Upload request failed: %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:613
+msgid ""
+"Upon pressing \"Continue\", anonymous \"wifi-iface\" sections will be "
+"assigned with a name in the form <em>wifinet#</em> and the network will be "
+"restarted to apply the updated configuration."
+msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:14
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:74
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:85
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:26
 msgid "Uptime"
 msgstr "Uptime"
 
-#: 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:83
 msgid "Use <code>/etc/ethers</code>"
 msgstr "Use <code>/etc/ethers</code>"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:40
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:167
 msgid "Use DHCP gateway"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:33
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:85
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:34
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:98
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:46
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:65
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:38
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:58
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:124
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:39
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:116
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:59
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:103
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:64
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:77
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:100
 msgid "Use DNS servers advertised by peer"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:227
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:233
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:479
 msgid "Use ISO/IEC 3166 alpha2 country codes."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:31
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:100
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:70
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:35
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:51
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:86
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:56
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:97
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:77
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:75
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:92
 msgid "Use MTU on tunnel interface"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:95
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:65
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:30
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:46
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:81
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:93
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:73
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:88
 msgid "Use TTL on tunnel interface"
 msgstr ""
 
@@ -5516,68 +5691,65 @@ msgstr ""
 msgid "Use as root filesystem (/)"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:19
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:31
 msgid "Use broadcast flag"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:253
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:791
 msgid "Use builtin IPv6-management"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:40
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:109
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:92
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:45
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:105
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:53
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:72
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:45
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:65
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:40
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:182
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:127
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:42
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:119
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:62
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:67
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:80
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:103
 msgid "Use custom DNS servers"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:26
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:70
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:16
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:28
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:84
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:24
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:50
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:23
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:43
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:116
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:33
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:74
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:97
 msgid "Use default gateway"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:48
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:164
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:77
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:24
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:88
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:58
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:23
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:39
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:74
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:90
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:38
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:57
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:30
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:50
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:45
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:227
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:119
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:51
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:88
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:68
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:52
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:70
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:83
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:111
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:149
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:67
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:111
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:98
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:72
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:85
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:108
 msgid "Use gateway metric"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:64
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:179
 msgid "Use routing table"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:309
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:310
 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 "
@@ -5590,77 +5762,78 @@ msgstr ""
 msgid "Used"
 msgstr "Used"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:848
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1273
 msgid "Used Key Slot"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:913
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
 msgid ""
 "Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not "
 "needed with normal WPA(2)-PSK."
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:48
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:110
 msgid "User certificate (PEM encoded)"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:61
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:122
 msgid "User key (PEM encoded)"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/sysauth.htm:23
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:41
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:32
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:102
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:56
 msgid "Username"
 msgstr "Username"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:182
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:903
 msgid "VC-Mux"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:851
 msgid "VDSL"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:172
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:169
 msgid "VLANs on %q"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:171
-msgid "VLANs on %q (%s)"
+#: modules/luci-base/luasrc/controller/admin/index.lua:55
+msgid "VPN"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:18
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:42
 msgid "VPN Local address"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:22
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:46
 msgid "VPN Local port"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:15
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:11
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:15
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:58
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:39
 msgid "VPN Server"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:18
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:96
 msgid "VPN Server port"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:37
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:100
 msgid "VPN Server's certificate SHA1 hash"
 msgstr ""
 
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:9
 #: protocols/luci-proto-vpnc/luasrc/model/network/proto_vpnc.lua:9
 msgid "VPNC (CISCO 3000 (and others) VPN)"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:44
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:73
 msgid "Vendor"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:60
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:52
 msgid "Vendor Class to send when requesting DHCP"
 msgstr ""
 
@@ -5668,41 +5841,37 @@ msgstr ""
 msgid "Verify"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:52
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:76
 msgid "Virtual dynamic interface"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:470
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:471
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:553
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:576
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:908
 msgid "WDS"
 msgstr "WDS"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:667
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1160
 msgid "WEP Open System"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:668
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1161
 msgid "WEP Shared Key"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "WEP passphrase"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:503
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:566
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:945
 msgid "WMM Mode"
 msgstr "WMM Mode"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "WPA passphrase"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:716
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:735
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:740
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1074
 msgid ""
 "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
 "and ad-hoc mode) to be installed."
@@ -5718,7 +5887,7 @@ msgstr ""
 msgid "Waiting for command to complete..."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1940
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2481
 msgid "Waiting for configuration to get applied… %ds"
 msgstr ""
 
@@ -5726,8 +5895,8 @@ msgstr ""
 msgid "Waiting for device..."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:172
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:163
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:173
 msgid "Warning"
 msgstr ""
 
@@ -5735,11 +5904,11 @@ msgstr ""
 msgid "Warning: There are unsaved changes that will get lost on reboot!"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:20
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:34
 msgid "Weak"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:946
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1355
 msgid ""
 "When using a PSK, the PMK can be automatically generated. When enabled, the "
 "R0/R1 key options below are not applied. Disable this to use the R0 and R1 "
@@ -5747,78 +5916,85 @@ msgid ""
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:383
 msgid "Width"
 msgstr ""
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:17
 #: protocols/luci-proto-wireguard/luasrc/model/network/proto_wireguard.lua:9
 msgid "WireGuard VPN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:58
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:40
 #: modules/luci-mod-status/luasrc/controller/admin/status.lua:28
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:14
 msgid "Wireless"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1631
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1837
 #: modules/luci-base/luasrc/model/network.lua:1418
 msgid "Wireless Adapter"
 msgstr "Wireless Adapter"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1617
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2052
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1823
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2288
 #: modules/luci-base/luasrc/model/network.lua:1404
 #: modules/luci-base/luasrc/model/network.lua:1865
 msgid "Wireless Network"
 msgstr "Wireless Network"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:629
 msgid "Wireless Overview"
 msgstr "Wireless Overview"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:362
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:797
 msgid "Wireless Security"
 msgstr "Wireless Security"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:54
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:611
+msgid "Wireless configuration migration"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:139
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:179
 msgid "Wireless is disabled"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:54
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:139
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:179
 msgid "Wireless is not associated"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:15
-msgid "Wireless is restarting..."
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:752
 msgid "Wireless network is disabled"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:752
 msgid "Wireless network is enabled"
 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:182
 msgid "Write received DNS requests to syslog"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:164
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:155
 msgid "Write system log to file"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1507
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:85
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1754
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:109
 msgid "Yes"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:26
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:943
+msgid ""
+"You appear to be currently connected to the device via the \"%h\" interface. "
+"Do you really want to shut down the interface?"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:123
 msgid ""
 "You can enable or disable installed init scripts here. Changes will applied "
 "after a device reboot.<br /><strong>Warning: If you disable essential init "
@@ -5836,38 +6012,34 @@ msgid ""
 "You must enable JavaScript in your browser or LuCI will not work properly."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:196
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:187
 msgid "ZRam Compression Algorithm"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:203
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:194
 msgid "ZRam Compression Streams"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:189
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:180
 msgid "ZRam Settings"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:191
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
 msgid "ZRam Size"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:229
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:230
 msgid "any"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:113
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:121
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:126
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:218
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:282
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:321
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:328
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:621
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:37
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:22
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:29
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:121
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:836
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:844
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:849
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1030
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:78
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:48
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:51
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:103
 msgid "auto"
 msgstr "auto"
 
@@ -5875,11 +6047,11 @@ msgstr "auto"
 msgid "automatic"
 msgstr "automatic"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:45
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:78
 msgid "baseT"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:909
 msgid "bridged"
 msgstr ""
 
@@ -5895,22 +6067,21 @@ msgstr ""
 msgid "create:"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:264
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:368
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:678
 msgid "creates a bridge over specified interface(s)"
 msgstr "creates a bridge over specified interface(s)"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:277
 msgid "dB"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:34
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:35
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:46
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:47
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:48
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:131
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:132
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:133
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:277
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:279
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:331
@@ -5922,26 +6093,30 @@ msgstr ""
 msgid "dBm"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:460
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:587
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:889
 msgid "disable"
 msgstr "disable"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:119
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:524
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:530
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:536
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:18
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:578
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:584
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:590
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:25
 msgid "disabled"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:433
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:467
+msgid "driver default"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/lease_status.htm:17
 #: modules/luci-base/luasrc/view/lease_status.htm:46
-#: 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:416
 msgid "expired"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:88
 msgid ""
 "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr>-leases will be stored"
@@ -5955,25 +6130,21 @@ msgstr ""
 msgid "forward"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:80
 msgid "full-duplex"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:80
 msgid "half-duplex"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:559
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:565
 msgid "hexadecimal encoded value"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:138
-msgid "hidden"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:527
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:533
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:538
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:581
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:587
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:592
 msgid "hybrid mode"
 msgstr ""
 
@@ -5981,6 +6152,10 @@ msgstr ""
 msgid "if target is a network"
 msgstr "if target is a network"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:63
+msgid "ignore"
+msgstr ""
+
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:177
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
@@ -6015,25 +6190,26 @@ msgstr ""
 msgid "key with either 5 or 13 characters"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:94
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:95
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:952
-msgid "minutes"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1168
+msgid "medium security"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:43
-msgid "mixed WPA/WPA2"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1360
+msgid "minutes"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:225
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:232
 msgid "no"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:54
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:72
 msgid "no link"
 msgstr ""
 
@@ -6041,7 +6217,7 @@ msgstr ""
 msgid "non-empty value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1195
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1446
 msgid "none"
 msgstr "none"
 
@@ -6051,7 +6227,9 @@ msgstr "none"
 msgid "not present"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:363
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:341
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:776
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:780
 #: 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
@@ -6066,8 +6244,8 @@ msgstr ""
 msgid "on"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
-msgid "open"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1169
+msgid "open network"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
@@ -6087,73 +6265,77 @@ msgstr ""
 msgid "positive integer value"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:34
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:56
 msgid "random"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:526
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:532
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:537
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:580
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:586
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:591
 msgid "relay mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:910
 msgid "routed"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:525
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:534
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:968
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:977
 msgid "sec"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:525
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:531
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:579
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:585
 msgid "server mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:544
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:597
 msgid "stateful-only"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:542
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:595
 msgid "stateless"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:543
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:596
 msgid "stateless + stateful"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:369
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1167
+msgid "strong security"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:346
 msgid "tagged"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:932
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1343
 msgid "time units (TUs / 1.024 ms) [1000-65535]"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:549
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:555
 msgid "unique value"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:448
 msgid "unknown"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:15
 #: modules/luci-base/luasrc/view/lease_status.htm:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:238
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:390
+#: 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:414
 msgid "unlimited"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1401
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1648
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:63
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:355
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:378
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:413
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:446
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:512
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:450
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:545
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:53
 #: modules/luci-base/luasrc/view/cbi/network_netlist.htm:38
 msgid "unspecified"
@@ -6163,7 +6345,7 @@ msgstr ""
 msgid "unspecified -or- create:"
 msgstr "unspecified -or- create:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:366
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:344
 msgid "untagged"
 msgstr ""
 
@@ -6244,8 +6426,8 @@ msgstr ""
 msgid "valid address:port"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:523
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:527
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:529
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:533
 msgid "valid date (YYYY-MM-DD)"
 msgstr ""
 
@@ -6282,7 +6464,7 @@ msgstr ""
 msgid "valid network in address/netmask notation"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:498
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:504
 msgid "valid phone digit (0-9, \"*\", \"#\", \"!\" or \".\")"
 msgstr ""
 
@@ -6295,11 +6477,11 @@ msgstr ""
 msgid "valid port value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:503
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:509
 msgid "valid time (HH:MM:SS)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:425
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:431
 msgid "value between %d and %d characters"
 msgstr ""
 
@@ -6315,14 +6497,23 @@ msgstr ""
 msgid "value smaller or equal to %f"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:430
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:425
+msgid "value with %d characters"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:436
 msgid "value with at least %d characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:435
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:441
 msgid "value with at most %d characters"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1169
+msgid "weak security"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:221
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:232
@@ -6333,6 +6524,87 @@ msgstr ""
 msgid "« Back"
 msgstr "« Back"
 
+#~ msgid "Antenna 1"
+#~ msgstr "Antenna 1"
+
+#~ msgid "Antenna 2"
+#~ msgstr "Antenna 2"
+
+#~ msgid "Back to overview"
+#~ msgstr "Back to overview"
+
+#~ msgid "Back to scan results"
+#~ msgstr "Back to scan results"
+
+#~ msgid "Common Configuration"
+#~ msgstr "Common Configuration"
+
+#~ msgid "Connect"
+#~ msgstr "Connect"
+
+#~ msgid "Connection Limit"
+#~ msgstr "Connection Limit"
+
+#~ msgid "Cover the following interface"
+#~ msgstr "Cover the following interface"
+
+#~ msgid "Cover the following interfaces"
+#~ msgstr "Cover the following interfaces"
+
+#~ msgid "Create Interface"
+#~ msgstr "Create Interface"
+
+#~ msgid "Create a bridge over multiple interfaces"
+#~ msgstr "Create a bridge over multiple interfaces"
+
+#~ msgid "Diversity"
+#~ msgstr "Diversity"
+
+#~ msgid "Frame Bursting"
+#~ msgstr "Frame Bursting"
+
+#~ msgid ""
+#~ "On this page you can configure the network interfaces. You can bridge "
+#~ "several interfaces by ticking the \"bridge interfaces\" field and enter "
+#~ "the names of several network interfaces separated by spaces. You can also "
+#~ "use <abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
+#~ "<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
+#~ "<samp>eth0.1</samp>)."
+#~ msgstr ""
+#~ "On this page you can configure the network interfaces. You can bridge "
+#~ "several interfaces by ticking the \"bridge interfaces\" field and enter "
+#~ "the names of several network interfaces separated by spaces. You can also "
+#~ "use <abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
+#~ "<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
+#~ "<samp>eth0.1</samp>)."
+
+#~ msgid "Receiver Antenna"
+#~ msgstr "Receiver Antenna"
+
+#~ msgid "Repeat scan"
+#~ msgstr "Repeat scan"
+
+#~ msgid "Replace entry"
+#~ msgstr "Replace entry"
+
+#~ msgid "Separate Clients"
+#~ msgstr "Separate Clients"
+
+#~ msgid "Slot time"
+#~ msgstr "Slot time"
+
+#~ msgid "Transmission Rate"
+#~ msgstr "Transmission Rate"
+
+#~ msgid "Transmit Power"
+#~ msgstr "Transmit Power"
+
+#~ msgid "Transmitter Antenna"
+#~ msgstr "Transmitter Antenna"
+
+#~ msgid "Uploaded File"
+#~ msgstr "Uploaded File"
+
 #~ msgid "Back"
 #~ msgstr "Back"
 
diff --git a/modules/luci-base/po/es/base.po b/modules/luci-base/po/es/base.po
index 923f8f74d..2e80f338d 100644
--- a/modules/luci-base/po/es/base.po
+++ b/modules/luci-base/po/es/base.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-06-10 03:41+0200\n"
-"PO-Revision-Date: 2019-07-27 20:50-0300\n"
+"PO-Revision-Date: 2019-09-21 14:29-0300\n"
 "Last-Translator: Franco Castillo <castillofrancodamian@gmail.com>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
@@ -13,19 +13,20 @@ msgstr ""
 "X-Generator: Poedit 2.2.3\n"
 "Language-Team: \n"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:133
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:857
 msgid "%.1f dB"
 msgstr "%.1f dB"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:109
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:122
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 msgid "%d Bit"
 msgstr "%d Bit"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1641
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2194
 msgid "%d invalid field(s)"
 msgstr "%d campo(s) inválido(s)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:281
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:31
 msgid "%s is untagged in multiple VLANs!"
 msgstr "¡%s no está etiquetado en varias VLAN!"
 
@@ -63,19 +64,19 @@ msgid "-- Additional Field --"
 msgstr "-- Campo adicional --"
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:258
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1401
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1533
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:250
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:350
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1114
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1648
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1780
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:314
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:414
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1178
 #: modules/luci-base/luasrc/view/cbi/header.htm:5
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:26
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:88
 msgid "-- Please choose --"
 msgstr "-- Por favor elija --"
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:259
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:351
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1115
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:415
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1179
 #: modules/luci-base/luasrc/view/cbi/header.htm:6
 msgid "-- custom --"
 msgstr "-- Personalizado --"
@@ -98,7 +99,7 @@ msgstr "-- Emparejar por uuid --"
 msgid "-- please select --"
 msgstr "-- Por favor seleccione --"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:382
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:814
 msgid "0 = not using RSSI threshold, 1 = do not change driver default"
 msgstr ""
 "0 = Sin utilizar el umbral RSSI, 1 = No cambiar el valor predeterminado del "
@@ -112,10 +113,11 @@ msgstr "Carga a 1 minuto:"
 msgid "15 Minute Load:"
 msgstr "Carga a 15 minutos:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:924
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1337
 msgid "4-character hexadecimal ID"
 msgstr "ID hexadecimal de 4 caracteres"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:11
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:18
 msgid "464XLAT (CLAT)"
 msgstr "464XLAT (CLAT)"
@@ -124,47 +126,47 @@ msgstr "464XLAT (CLAT)"
 msgid "5 Minute Load:"
 msgstr "Carga a 5 minutos:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:960
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1366
 msgid "6-octet identifier as a hex string - no colons"
 msgstr "Identificador de 6 octetos como una cadena hexadecimal, sin dos puntos"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:891
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1310
 msgid "802.11r Fast Transition"
 msgstr "Habilitar 802.11r (FT)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1157
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1567
 msgid "802.11w Association SA Query maximum timeout"
 msgstr "Consulta tiempo de espera máximo de Asociación SA de 802.11w"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1574
 msgid "802.11w Association SA Query retry timeout"
 msgstr "Consulta tiempo de espera de reintento de Asociación SA de 802.11w"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1133
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1533
 msgid "802.11w Management Frame Protection"
 msgstr "Protección de marco de gestión de 802.11w"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1156
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1567
 msgid "802.11w maximum timeout"
 msgstr "Tiempo de espera máximo de 802.11w"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1165
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1574
 msgid "802.11w retry timeout"
 msgstr "Tiempo de espera de reintento de 802.11w"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:399
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:831
 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:224
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:225
 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:215
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:216
 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:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
 msgid ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
 "order of the resolvfile"
@@ -172,11 +174,11 @@ msgstr ""
 "Los servidores de <abbr title=\"Domain Name System\">DNS</abbr> se consultan "
 "en el orden en que aparecen en el archivo resolv"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:388
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:820
 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:351
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:373
 #: 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>"
@@ -187,8 +189,8 @@ msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
 msgstr ""
 "Puerta de enlace <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:555
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:35
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:506
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr "Máscara de red <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
 
@@ -204,29 +206,29 @@ 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:378
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:402
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
 msgstr "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:58
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:35
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:33
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "Configuración de <abbr title=\"Light Emitting Diode\">LEDs</abbr>"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:67
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:51
 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:328
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:329
 #: 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:372
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 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:233
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:234
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> leases"
@@ -234,19 +236,19 @@ msgstr ""
 "Máximas conexiones <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:242
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> packet size"
 msgstr ""
-"<abbr title=\"maximal\">Máx. tamaño del paquete</abbr> <abbr title="
+"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:251
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:252
 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
-msgstr "<abbr title=\"maximal\">Máx.</abbr> consultas simultáneas"
+msgstr "Máx. consultas simultáneas"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:10
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:42
 msgid ""
 "<br/>Note: you need to manually restart the cron service if the crontab file "
 "was empty before editing."
@@ -254,57 +256,61 @@ msgstr ""
 "<br/>Nota: debe reiniciar manualmente el servicio cron si el archivo crontab "
 "estaba vacío antes de editar."
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:817
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1605
+msgid "A directory with the same name already exists."
+msgstr "Ya existe un directorio con el mismo nombre."
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:863
 msgid "A new login is required since the authentication session expired."
 msgstr ""
 "Se requiere un nuevo inicio de sesión ya que la sesión de autenticación "
 "expiró."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:114
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:837
 msgid "A43C + J43 + A43"
 msgstr "A43C + J43 + A43"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:838
 msgid "A43C + J43 + A43 + V43"
 msgstr "A43C + J43 + A43 + V43"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:850
 msgid "ADSL"
 msgstr "ADSL"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:826
 msgid "ANSI T1.413"
 msgstr "ANSI T1.413"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:33
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:47
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:23
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:94
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:86
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:67
 msgid "APN"
 msgstr "APN"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:56
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:175
 msgid "ARP retry threshold"
 msgstr "Umbral de reintento ARP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:122
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:845
 msgid "ATM (Asynchronous Transfer Mode)"
 msgstr "ATM (Modo de transferencia asíncrono)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:144
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:866
 msgid "ATM Bridges"
 msgstr "Puente ATM"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:178
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:21
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:898
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:66
 msgid "ATM Virtual Channel Identifier (VCI)"
 msgstr "Identificador de canal virtual ATM (VCI)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:179
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:26
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:899
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:70
 msgid "ATM Virtual Path Identifier (VPI)"
 msgstr "Identificador de camino virtual ATM (VPI)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:866
 msgid ""
 "ATM bridges expose encapsulated ethernet in AAL5 connections as virtual "
 "Linux network interfaces which can be used in conjunction with DHCP or PPP "
@@ -314,8 +320,8 @@ msgstr ""
 "interfaces de red Linux que se pueden usar junto a DHCP o PPP para conectar "
 "a la red del proveedor."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:184
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:905
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:62
 msgid "ATM device number"
 msgstr "Número de dispositivo ATM"
 
@@ -324,17 +330,17 @@ msgid "ATU-C System Vendor ID"
 msgstr "ID del proveedor del sistema ATU-C"
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:251
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:495
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:499
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:528
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:532
 msgid "Absent Interface"
 msgstr "Interfaz ausente"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:19
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
 msgid "Access Concentrator"
 msgstr "Concentrador de acceso"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:368
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:470
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:802
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
 msgid "Access Point"
 msgstr "AP"
 
@@ -357,7 +363,7 @@ msgid "Active Connections"
 msgstr "Conexiones activas"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:68
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:30
 msgid "Active DHCP Leases"
 msgstr "Clientes DHCP activos"
 
@@ -365,57 +371,77 @@ msgstr "Clientes DHCP activos"
 msgid "Active DHCPv6 Leases"
 msgstr "Clientes DHCPv6 activos"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1951
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:370
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:12
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2190
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:804
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:23
 msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:650
-#: modules/luci-base/htdocs/luci-static/resources/form.js:651
-#: modules/luci-base/htdocs/luci-static/resources/form.js:666
-#: modules/luci-base/htdocs/luci-static/resources/form.js:667
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1290
+#: modules/luci-base/htdocs/luci-static/resources/form.js:902
+#: modules/luci-base/htdocs/luci-static/resources/form.js:904
+#: modules/luci-base/htdocs/luci-static/resources/form.js:917
+#: modules/luci-base/htdocs/luci-static/resources/form.js:918
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1539
 #: modules/luci-base/luasrc/view/cbi/nsection.htm:25
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:189
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:197
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:39
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:47
 #: modules/luci-base/luasrc/view/cbi/ucisection.htm:54
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:703
 msgid "Add"
 msgstr "Añadir"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:60
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:870
+msgid "Add ATM Bridge"
+msgstr "Agregar puente ATM"
+
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:92
 msgid "Add IPv4 address…"
 msgstr "Añadir dirección IPv4..."
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:129
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:204
 msgid "Add IPv6 address…"
 msgstr "Añadir dirección IPv6..."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:143
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:149
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:38
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:47
+msgid "Add LED action"
+msgstr "Agregar acción LED"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:215
+msgid "Add VLAN"
+msgstr "Añadir VLAN"
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:14
+msgid "Add instance"
+msgstr "Añadir instancia"
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:153
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:159
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:250
 msgid "Add key"
 msgstr "Añadir clave"
 
-#: 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:155
 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 "
 "hosts"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:705
 msgid "Add new interface..."
 msgstr "Añadir nueva interfaz..."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:104
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:99
+msgid "Add peer"
+msgstr "Añadir par"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:105
 msgid "Additional Hosts files"
 msgstr "Archivos de hosts adicionales"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:161
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
 msgid "Additional servers file"
 msgstr "Archivo de servidores adicionales"
 
@@ -442,7 +468,7 @@ msgstr "Archivo de servidores adicionales"
 msgid "Address"
 msgstr "Dirección"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:12
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:151
 msgid "Address to access local relay bridge"
 msgstr "Dirección del puente relé local"
 
@@ -451,13 +477,13 @@ msgstr "Dirección del puente relé local"
 msgid "Administration"
 msgstr "Administración"
 
-#: 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:70
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:505
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:896
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:24
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:189
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:463
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:176
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:143
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:364
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:742
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:799
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:50
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:34
 msgid "Advanced Settings"
@@ -467,25 +493,27 @@ msgstr "Configuración avanzada"
 msgid "Aggregate Transmit Power(ACTATP)"
 msgstr "Potencia de transmisión agregada (ACTATP)"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:175
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:166
 msgid "Alert"
 msgstr "Alerta"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1628
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1834
 #: modules/luci-base/luasrc/model/network.lua:1416
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:54
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:78
 msgid "Alias Interface"
 msgstr "Apodo de interfaz"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:138
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:66
 msgid "Alias of \"%s\""
 msgstr "Apodo de \"%s\""
 
-#: 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:170
 msgid "All Servers"
 msgstr "Todos los servidores"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:114
 msgid ""
 "Allocate IP addresses sequentially, starting from the lowest available "
 "address"
@@ -493,68 +521,66 @@ 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:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:113
 msgid "Allocate IP sequentially"
 msgstr "Asignar IPs secuencialmente"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:24
 msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
 msgstr ""
 "Permitir autenticación de contraseña via <abbr title=\"Secure Shell\">SSH</"
 "abbr>"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:545
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:987
 msgid "Allow AP mode to disconnect STAs based on low ACK condition"
 msgstr ""
 "Permitir que el modo AP desconecte los clientes por una condición de ACK bajo"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:462
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:589
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:891
 msgid "Allow all except listed"
 msgstr "Permitir a todos excepto a los de la lista"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:236
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:767
 msgid "Allow legacy 802.11b rates"
 msgstr "Permitir tasas de 802.11b heredadas"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:461
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:588
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:890
 msgid "Allow listed only"
 msgstr "Permitir a los pertenecientes en la lista"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:198
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:199
 msgid "Allow localhost"
 msgstr "Permitir host local"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:47
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:35
 msgid "Allow remote hosts to connect to local SSH forwarded ports"
 msgstr ""
 "Permitir que los hosts remotos se conecten a los puertos reenviados SSH "
 "locales"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:38
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:30
 msgid "Allow root logins with password"
 msgstr "Permitir conexiones a root con contraseña"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:39
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:30
 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:199
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:200
 msgid ""
 "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
 msgstr ""
 "Permitir respuestas en el rango 127.0.0.0/8, por ejemplo para servicios RBL"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:135
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:122
 msgid "Allowed IPs"
 msgstr "IPs permitidas"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:549
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:602
 msgid "Always announce default router"
 msgstr "Siempre anunciar el enrutador predeterminado"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:259
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:782
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
 "option does not comply with IEEE 802.11n-2009!"
@@ -562,82 +588,82 @@ msgstr ""
 "Usará siempre canales de 40MHz incluso si el canal secundario se superpone. "
 "¡El uso de esta opción no cumple con IEEE 802.11n-2009!"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:95
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:818
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:119
 msgid "Annex"
 msgstr "Anexo"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:96
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:819
 msgid "Annex A + L + M (all)"
 msgstr "Anexo A + L + M (todos)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:827
 msgid "Annex A G.992.1"
 msgstr "Anexo A G.992.1"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:828
 msgid "Annex A G.992.2"
 msgstr "Anexo A G.992.2"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:829
 msgid "Annex A G.992.3"
 msgstr "Anexo A G.992.3"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:830
 msgid "Annex A G.992.5"
 msgstr "Anexo A G.992.5"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:97
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:820
 msgid "Annex B (all)"
 msgstr "Anexo B (todos)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:823
 msgid "Annex B G.992.1"
 msgstr "Anexo B G.992.1"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:824
 msgid "Annex B G.992.3"
 msgstr "Anexo B G.992.3"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:102
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:825
 msgid "Annex B G.992.5"
 msgstr "Anexo B G.992.5"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:98
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:821
 msgid "Annex J (all)"
 msgstr "Anexo J (todos)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:831
 msgid "Annex L G.992.3 POTS 1"
 msgstr "Anexo L G.992.3 POTS 1"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:99
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:822
 msgid "Annex M (all)"
 msgstr "Anexo M (todos)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:109
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:832
 msgid "Annex M G.992.3"
 msgstr "Anexo M G.992.3"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:833
 msgid "Annex M G.992.5"
 msgstr "Anexo M G.992.5"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:550
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:602
 msgid "Announce as default router even if no public prefix is available."
 msgstr ""
 "Anuncie como enrutador predeterminado incluso si no hay un prefijo público "
 "disponible."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:555
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:607
 msgid "Announced DNS domains"
 msgstr "Dominios DNS anunciados"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:554
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:606
 msgid "Announced DNS servers"
 msgstr "Servidores DNS anunciados"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1093
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1496
 msgid "Anonymous Identity"
 msgstr "Identidad anónima"
 
@@ -649,20 +675,6 @@ msgstr "Monte anónimo"
 msgid "Anonymous Swap"
 msgstr "Swap anónimo"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:322
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:329
-msgid "Antenna 1"
-msgstr "Antena 1"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:323
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:330
-msgid "Antenna 2"
-msgstr "Antena 2"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:246
-msgid "Antenna Configuration"
-msgstr "Configuración de la antena"
-
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:71
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:160
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:181
@@ -670,11 +682,11 @@ msgstr "Configuración de la antena"
 msgid "Any zone"
 msgstr "Cualquier zona"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1981
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2522
 msgid "Apply request failed with status <code>%h</code>"
 msgstr "Solicitud de aplicar fallida con estado <code>%h</code>"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1867
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2409
 msgid "Apply unchecked"
 msgstr "Aplicar sin restricción"
 
@@ -682,8 +694,8 @@ msgstr "Aplicar sin restricción"
 msgid "Architecture"
 msgstr "Arquitectura"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:19
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:184
+#: 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 ""
@@ -694,15 +706,15 @@ msgstr ""
 msgid "Assign interfaces..."
 msgstr "Asignar interfaces..."
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:124
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:24
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:189
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:31
 msgid ""
 "Assign prefix parts using this hexadecimal subprefix ID for this interface."
 msgstr ""
 "Asigna partes de prefijo utilizando este ID de subprefijo hexadecimal para "
 "esta interfaz."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:148
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1967
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:22
 msgid "Associated Stations"
 msgstr "Dispositivos conectados"
@@ -711,20 +723,20 @@ msgstr "Dispositivos conectados"
 msgid "Associations"
 msgstr "Dispositivos"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:39
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:37
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:101
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:64
 msgid "Auth Group"
 msgstr "Grupo de autenticaciones"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1027
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1421
 msgid "Authentication"
 msgstr "Autenticación"
 
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:29
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:70
 msgid "Authentication Type"
 msgstr "Tipo de autenticación"
 
-#: 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:78
 msgid "Authoritative"
 msgstr "Autorizar"
 
@@ -742,17 +754,19 @@ msgstr "Autorización requerida"
 msgid "Auto Refresh"
 msgstr "Autorefrescar"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:53
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:7
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:17
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:67
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:24
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:36
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:42
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:36
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:106
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:24
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:98
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:50
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:94
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:81
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:55
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:68
 msgid "Automatic"
 msgstr "Automático"
 
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:7
 #: protocols/luci-proto-hnet/luasrc/model/network/proto_hnet.lua:7
 msgid "Automatic Homenet (HNCP)"
 msgstr "Homenet automático (HNCP)"
@@ -797,21 +811,21 @@ msgstr "Disponible"
 msgid "Average:"
 msgstr "Media:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:116
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:839
 msgid "B43 + B43C"
 msgstr "B43 + B43C"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:840
 msgid "B43 + B43C + V43"
 msgstr "B43 + B43C + V43"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:48
 msgid "BR / DMR / AFTR"
 msgstr "BR / DMR / AFTR"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:43
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:75
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1620
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:176
 msgid "BSSID"
 msgstr "BSSID"
@@ -825,19 +839,11 @@ msgstr "Volver al resumen"
 msgid "Back to configuration"
 msgstr "Volver a la configuración"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:48
-msgid "Back to overview"
-msgstr "Volver al resumen"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:20
-msgid "Back to scan results"
-msgstr "Volver a resultados de la exploración"
-
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:17
 msgid "Backup"
 msgstr "Copia de seguridad"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:38
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:36
 msgid "Backup / Flash Firmware"
 msgstr "Copia de seguridad / Grabar firmware"
 
@@ -850,11 +856,11 @@ msgid "Bad address specified!"
 msgstr "¡Dirección no válida!"
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:158
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:288
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:368
 msgid "Band"
 msgstr "Banda"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:261
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:785
 msgid "Beacon Interval"
 msgstr "Intervalo de baliza"
 
@@ -869,7 +875,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:293
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:294
 msgid ""
 "Bind dynamically to interfaces rather than wildcard address (recommended as "
 "linux default)"
@@ -877,74 +883,80 @@ msgstr ""
 "Enlace dinámico a las interfaces en lugar de la dirección del comodín "
 "(recomendado como linux predeterminado)"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:16
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:48
 msgid "Bind interface"
 msgstr "Interfaz de enlace"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:16
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:48
 msgid "Bind the tunnel to this interface (optional)."
 msgstr "Enlazar el túnel a esta interfaz (opcional)."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:49
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:134
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:187
 msgid "Bitrate"
 msgstr "Bitrate"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:172
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
 msgid "Bogus NX Domain Override"
 msgstr "Ignorar dominio falso NX"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1634
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1840
 #: modules/luci-base/luasrc/model/network.lua:1420
 msgid "Bridge"
 msgstr "Puente"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:264
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:368
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:678
 msgid "Bridge interfaces"
 msgstr "Puentear interfaces"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:906
 msgid "Bridge unit number"
 msgstr "Número de unidad del puente"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:250
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:364
 msgid "Bring up on boot"
 msgstr "Iniciar en el arranque"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:35
-msgid "Broadcom 802.11%s Wireless Controller"
-msgstr "Controlador WiFi 802.11%s Broadcom"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:45
-msgid "Broadcom BCM%04x 802.11 Wireless Controller"
-msgstr "Controlador WiFi 802.11 BCM%04x"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1697
+msgid "Browse…"
+msgstr "Explorar..."
 
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:18
 msgid "Buffered"
 msgstr "En búfer"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:75
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:134
 msgid "CA certificate; if empty it will be saved after the first connection."
 msgstr ""
 "Certificado de CA; Si está vacío se guardará después de la primera conexión."
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:7
+msgid "CLAT configuration failed"
+msgstr "Configuración CLAT fallida"
+
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:13
 msgid "CPU usage (%)"
 msgstr "Uso de CPU (%)"
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:21
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:53
 msgid "Call failed"
 msgstr "Llamada fallida"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1789
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:14
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:52
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:711
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:948
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1839
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:191
 #: modules/luci-mod-system/luasrc/view/admin_system/upgrade.htm:60
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:6
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:17
 msgid "Category"
 msgstr "Categoría"
 
@@ -962,13 +974,7 @@ msgstr "Precaución: la actualización del sistema será forzada"
 msgid "Chain"
 msgstr "Cadena"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:9
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:14
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:24
-msgid "Change login password"
-msgstr "Cambiar contraseña de inicio de sesión"
-
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1744
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 msgid "Changes"
 msgstr "Cambios"
 
@@ -976,35 +982,23 @@ msgstr "Cambios"
 msgid "Changes applied."
 msgstr "Cambios aplicados."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2004
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2545
 msgid "Changes have been reverted."
 msgstr "Se revirtieron los cambios."
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:43
 msgid "Changes the administrator password for accessing the device"
 msgstr "Cambie la contraseña del administrador para acceder al dispositivo"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:10
-msgid "Changing password…"
-msgstr "Cambiando contraseña..."
-
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:162
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:45
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:87
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:174
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:376
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1618
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:186
 msgid "Channel"
 msgstr "Canal"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:119
-msgid ""
-"Channel %d is not available in the %s regulatory domain and has been auto-"
-"adjusted to %d."
-msgstr ""
-"El canal %d no está disponible en el dominio regulatorio %s y se ha ajustado "
-"automáticamente a %d."
-
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:229
 msgid "Check"
 msgstr "Comprobar"
@@ -1013,7 +1007,7 @@ msgstr "Comprobar"
 msgid "Check filesystems before mount"
 msgstr "Comprobar los sistemas de archivos antes de montar"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1806
 msgid "Check this option to delete the existing networks from this radio."
 msgstr "Marque esta opción para eliminar las redes existentes de esta radio."
 
@@ -1025,8 +1019,8 @@ msgstr "Comprobación"
 msgid "Choose mtdblock"
 msgstr "Elegir mtdblock"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:358
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:443
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1829
 msgid ""
 "Choose the firewall zone you want to assign to this interface. Select "
 "<em>unspecified</em> to remove the interface from the associated zone or "
@@ -1038,7 +1032,7 @@ msgstr ""
 "rellene el campo <em>crear</em> para definir una zona nueva a la que "
 "asignarla."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:834
 msgid ""
 "Choose the network(s) you want to attach to this wireless interface or fill "
 "out the <em>create</em> field to define a new network."
@@ -1046,11 +1040,11 @@ msgstr ""
 "Elija la red o redes a las que quiere unir esta interfaz WiFi o rellene el "
 "campo <em>crear</em> para definir una red nueva."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:614
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1023
 msgid "Cipher"
 msgstr "Cifrado"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:61
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:91
 msgid "Cisco UDP encapsulation"
 msgstr "Encapsulación UDP de Cisco"
 
@@ -1070,28 +1064,28 @@ msgstr ""
 "Haga clic en \"Guardar mtdblock\" para descargar el archivo mtdblock "
 "especificado. (NOTA: ¡ESTA FUNCIÓN ES PARA PROFESIONALES!)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1950
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:369
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:471
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2189
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:803
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:908
 msgid "Client"
 msgstr "Cliente"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:55
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:52
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:47
 msgid "Client ID to send when requesting DHCP"
 msgstr "ID de cliente que se enviará al solicitar DHCP"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:145
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:151
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:155
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:161
 msgid "Close"
 msgstr "Cerrar"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:146
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:119
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:125
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:127
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:98
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:119
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:157
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:141
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:115
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:138
 msgid ""
 "Close inactive connection after the given amount of seconds, use 0 to "
 "persist connection"
@@ -1106,12 +1100,9 @@ msgstr "Cerrar lista..."
 #: modules/luci-base/luasrc/view/lease_status.htm:77
 #: modules/luci-base/luasrc/view/lease_status.htm:98
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:118
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:37
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:24
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1965
 #: modules/luci-mod-network/luasrc/view/admin_network/iface_status.htm:6
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:40
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:30
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:8
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:398
 #: modules/luci-mod-status/luasrc/view/admin_status/index/30-network.htm:11
 #: modules/luci-mod-status/luasrc/view/admin_status/index/50-dsl.htm:17
@@ -1125,15 +1116,19 @@ msgstr "Recolectando datos..."
 msgid "Command"
 msgstr "Comando"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:193
+msgid "Command OK"
+msgstr "Comando OK"
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:41
+msgid "Command failed"
+msgstr "Comando fallido"
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:64
 msgid "Comment"
 msgstr "Comentario"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:185
-msgid "Common Configuration"
-msgstr "Configuración común"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
 msgid ""
 "Complicates key reinstallation attacks on the client side by disabling "
 "retransmission of EAPOL-Key frames that are used to install keys. This "
@@ -1146,13 +1141,14 @@ msgstr ""
 "interoperabilidad y reducir la robustez de la negociación de claves, "
 "especialmente en entornos con una gran carga de tráfico."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1744
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 #: modules/luci-base/luasrc/controller/admin/uci.lua:11
 #: modules/luci-mod-system/luasrc/view/admin_system/backupfiles.htm:9
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:13
 msgid "Configuration"
 msgstr "Configuración"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:21
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:63
 msgid "Configuration failed"
 msgstr "Configuración fallida"
@@ -1161,42 +1157,52 @@ msgstr "Configuración fallida"
 msgid "Configuration files will be kept"
 msgstr "Los archivos de configuración se mantendrán"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1915
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2456
 msgid "Configuration has been applied."
 msgstr "Se ha aplicado la configuración."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1848
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2395
 msgid "Configuration has been rolled back!"
 msgstr "¡La configuración ha sido revertida!"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:43
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:942
+msgid "Confirm disconnect"
+msgstr "Confirmar desconexión"
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:50
 msgid "Confirmation"
 msgstr "Confirmación"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:32
-msgid "Connect"
-msgstr "Conectar"
-
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:72
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:105
 msgid "Connected"
 msgstr "Conectado"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:338
-msgid "Connection Limit"
-msgstr "Límite de conexión"
-
 #: modules/luci-base/htdocs/luci-static/resources/network.js:7
 #: modules/luci-base/luasrc/model/network.lua:27
 msgid "Connection attempt failed"
 msgstr "Intento de conexión fallido"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:203
+msgid "Connection lost"
+msgstr "Conexión perdida"
+
 #: modules/luci-mod-status/luasrc/controller/admin/status.lua:32
 msgid "Connections"
 msgstr "Conexiones"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1890
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:66
+msgid "Contents have been saved."
+msgstr "Los contenidos han sido guardados."
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:618
+msgid "Continue"
+msgstr "Continuar"
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2431
 msgid ""
 "Could not regain access to the device after applying the configuration "
 "changes. You might need to reconnect if you modified network related "
@@ -1207,47 +1213,37 @@ msgstr ""
 "configuración relacionada con la red, como la dirección IP o las "
 "credenciales de seguridad WiFi."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:135
 msgid "Country"
 msgstr "País"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:227
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:233
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:337
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:764
 msgid "Country Code"
 msgstr "Código de país"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:36
-msgid "Cover the following interface"
-msgstr "Cubrir interfaz"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:43
-msgid "Cover the following interfaces"
-msgstr "Cubre los siguientes interfaces"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:357
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:86
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:443
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1829
 msgid "Create / Assign firewall-zone"
 msgstr "Crear / Asignar zona de firewall"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:9
-msgid "Create Interface"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:735
+msgid "Create interface"
 msgstr "Crear interfaz"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:33
-msgid "Create a bridge over multiple interfaces"
-msgstr "Crear un puente sobre múltiples interfaces"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:174
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:165
 msgid "Critical"
 msgstr "Crítico"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:178
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:169
 msgid "Cron Log Level"
 msgstr "Nivel de registro de cron"
 
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:519
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:521
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:447
+msgid "Current power"
+msgstr "Potencia actual"
+
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:552
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:554
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:51
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:53
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:82
@@ -1255,7 +1251,7 @@ msgstr "Nivel de registro de cron"
 msgid "Custom Interface"
 msgstr "Interfaz personalizada"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:36
 msgid "Custom delegated IPv6-prefix"
 msgstr "Delegado personalizado IPv6-prefix"
 
@@ -1267,7 +1263,7 @@ msgstr ""
 "Los archivos personalizados (certificados, scripts) pueden permanecer en el "
 "sistema. Para evitar esto, primero realice un restablecimiento de fábrica."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:59
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:41
 msgid ""
 "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
 "\">LED</abbr>s if possible."
@@ -1275,46 +1271,47 @@ msgstr ""
 "Personaliza el comportamiento de los <abbr title=\"Light Emitting Diode"
 "\">LED</abbr>s del dispositivo, si es posible."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:799
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1223
 msgid "DAE-Client"
 msgstr "Cliente DAE"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:807
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1231
 msgid "DAE-Port"
 msgstr "Puerto DAE"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:815
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1239
 msgid "DAE-Secret"
 msgstr "Secreto DAE"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:448
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:459
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:279
 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:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:61
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:62
 msgid "DHCP and DNS"
 msgstr "DHCP y DNS"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1195
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1385
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:16
 #: modules/luci-base/luasrc/model/network.lua:968
 msgid "DHCP client"
 msgstr "Cliente DHCP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:571
 msgid "DHCP-Options"
 msgstr "Opciones de DHCP"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_dhcpv6.lua:7
 msgid "DHCPv6 client"
 msgstr "Cliente DHCPv6"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:540
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:594
 msgid "DHCPv6-Mode"
 msgstr "Modo DHCPv6"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:529
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:583
 msgid "DHCPv6-Service"
 msgstr "Servicio DHCPv6"
 
@@ -1331,31 +1328,31 @@ msgstr "Servicio DHCPv6"
 msgid "DNS"
 msgstr "DNS"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:183
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
 msgid "DNS forwardings"
 msgstr "Reenvíos DNS"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:30
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:37
 msgid "DNS-Label / FQDN"
 msgstr "Etiqueta DNS / FQDN"
 
-#: 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:136
 msgid "DNSSEC"
 msgstr "DNSSEC"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:139
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
 msgid "DNSSEC check unsigned"
 msgstr "Comprobación DNSSEC sin firmar"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:73
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:99
 msgid "DPD Idle Timeout"
 msgstr "Tiempo de espera de inactividad de DPD"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:14
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:41
 msgid "DS-Lite AFTR address"
 msgstr "Dirección DS-Lite AFTR"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:92
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:815
 #: modules/luci-mod-status/luasrc/view/admin_status/index/50-dsl.htm:14
 msgid "DSL"
 msgstr "DSL"
@@ -1364,11 +1361,11 @@ msgstr "DSL"
 msgid "DSL Status"
 msgstr "Estado DSL"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:125
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:848
 msgid "DSL line mode"
 msgstr "Modo de línea DSL"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:519
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:963
 msgid "DTIM Interval"
 msgstr "Intervalo DTIM"
 
@@ -1380,42 +1377,45 @@ msgstr "DUID"
 msgid "Data Rate"
 msgstr "Velocidad de datos"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:169
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:180
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:160
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:171
 msgid "Debug"
 msgstr "Depuración"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:759
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:783
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:807
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1183
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1207
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1231
 msgid "Default %d"
 msgstr "%d por defecto"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:82
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:107
 msgid "Default Route"
 msgstr "Ruta predeterminada"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:17
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:81
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:51
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:32
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:48
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:85
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:65
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:80
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:108
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:146
 msgid "Default gateway"
 msgstr "Puerta de enlace predeterminada"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:541
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:594
 msgid "Default is stateless + stateful"
 msgstr "El valor predeterminado es Sin estado + Con estado"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:70
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:54
 msgid "Default state"
-msgstr "Estado por defecto"
+msgstr "Estado predeterminado"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:503
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:553
 msgid "Define a name for this network."
 msgstr "Definir un nombre para esta red."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:514
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:571
 msgid ""
 "Define additional DHCP options, for example "
 "\"<code>6,192.168.2.1,192.168.2.2</code>\" which advertises different DNS "
@@ -1425,35 +1425,47 @@ msgstr ""
 "\"<code>6,192.168.2.1,192.168.2.2</code>\" que publica diferentes servidores "
 "DNS a los clientes."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:705
-#: modules/luci-base/htdocs/luci-static/resources/form.js:958
-#: modules/luci-base/htdocs/luci-static/resources/form.js:959
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1271
+#: modules/luci-base/htdocs/luci-static/resources/form.js:966
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1210
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1216
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1524
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1758
 #: modules/luci-base/luasrc/view/cbi/nsection.htm:11
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:162
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:16
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:41
 msgid "Delete"
 msgstr "Eliminar"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:178
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:187
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:193
 msgid "Delete key"
 msgstr "Eliminar clave"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:45
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1654
+msgid "Delete permission denied"
+msgstr "Eliminar permiso denegado"
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1656
+msgid "Delete request failed: %d %s"
+msgstr "Error al eliminar la solicitud: %d %s"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:723
 msgid "Delete this network"
 msgstr "Eliminar esta red"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:519
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:963
 msgid "Delivery Traffic Indication Message Interval"
 msgstr "Intervalo de mensaje de indicación de tráfico de entrega"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:102
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:108
 msgid "Description"
 msgstr "Descripción"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:224
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1754
+msgid "Deselect"
+msgstr "Deseleccionar"
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:215
 msgid "Design"
 msgstr "Diseño"
 
@@ -1471,10 +1483,12 @@ msgstr "Zona de destino"
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:177
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:43
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:13
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:38
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:73
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:33
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:52
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:85
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:86
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:72
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:154
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:253
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:86
@@ -1482,15 +1496,24 @@ msgstr "Zona de destino"
 msgid "Device"
 msgstr "Dispositivo"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:138
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:737
 msgid "Device Configuration"
 msgstr "Configuración del dispositivo"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:81
+msgid "Device is not active"
+msgstr "El dispositivo no está activo"
+
 #: modules/luci-mod-system/luasrc/view/admin_system/reboot.htm:23
 msgid "Device is rebooting..."
 msgstr "El dispositivo se está reiniciando..."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1889
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:167
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:513
+msgid "Device is restarting…"
+msgstr "El dispositivo se está reiniciando"
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2430
 msgid "Device unreachable!"
 msgstr "Dispositivo inalcanzable!"
 
@@ -1498,26 +1521,26 @@ 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:123
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:78
 #: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:61
 msgid "Diagnostics"
 msgstr "Diagnósticos"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:45
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:60
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:101
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:93
 msgid "Dial number"
 msgstr "Marcar el número"
 
-#: modules/luci-base/luasrc/view/cbi/filebrowser.htm:99
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1554
 msgid "Directory"
 msgstr "Directorio"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:131
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:715
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:754
 msgid "Disable"
 msgstr "Deshabilitar"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:472
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:531
 msgid ""
 "Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for "
 "this interface."
@@ -1525,71 +1548,66 @@ msgstr ""
 "Deshabilitar <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> "
 "para esta interfaz."
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:64
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:93
 msgid "Disable Encryption"
 msgstr "Deshabilitar encriptación"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:530
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:973
 msgid "Disable Inactivity Polling"
 msgstr "Deshabilitar el sondeo de inactividad"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:713
 msgid "Disable this network"
 msgstr "Deshabilitar esta red"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:44
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:54
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:68
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:37
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:43
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:37
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1534
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:76
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:107
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:99
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:51
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:95
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:82
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:69
 msgid "Disabled"
 msgstr "Deshabilitado"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1139
-msgid "Disabled (default)"
-msgstr "Deshabilitado (predeterminado)"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:544
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:987
 msgid "Disassociate On Low Acknowledgement"
 msgstr "Desasociarse en un reconocimiento bajo"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:193
 msgid "Discard upstream RFC1918 responses"
 msgstr "Descartar respuestas RFC1918 salientes"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:92
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:114
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:956
 msgid "Disconnect"
 msgstr "Desconectar"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:22
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:64
 msgid "Disconnection attempt failed"
 msgstr "Intento de desconexión fallido"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1121
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1762
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1855
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:17
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1375
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1995
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2314
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2401
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1634
 msgid "Dismiss"
 msgstr "Descartar"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:240
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:334
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:770
 msgid "Distance Optimization"
 msgstr "Optimización de distancia"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:241
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:770
 msgid "Distance to farthest network member in meters."
-msgstr "Distancia al miembro de la red mas lejana en metros."
+msgstr "Distancia en metros al miembro mas lejano de la red."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:347
-msgid "Diversity"
-msgstr "Diversidad"
-
-#: 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:61
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
@@ -1601,37 +1619,45 @@ 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:158
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:159
 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:123
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:124
 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:118
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
 msgid "Do not forward reverse lookups for local networks"
 msgstr "No reenviar búsquedas inversas para redes locales"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:173
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1639
+msgid "Do you really want to delete \"%s\" ?"
+msgstr "¿Realmente quieres eliminar \"%s\" ?"
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:188
 msgid "Do you really want to delete the following SSH key?"
 msgstr "¿Realmente quiere eliminar la siguiente clave SSH?"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1637
+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:74
 msgid "Domain required"
 msgstr "Requerir dominio"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:205
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:206
 msgid "Domain whitelist"
 msgstr "Lista blanca de dominios"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:34
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:67
 msgid "Don't Fragment"
 msgstr "No fragmentar"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:74
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:75
 msgid ""
 "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
 "<abbr title=\"Domain Name System\">DNS</abbr>-Name"
@@ -1651,19 +1677,19 @@ msgstr "Descargar copia de seguridad"
 msgid "Download mtdblock"
 msgstr "Descargar mtdblock"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:853
 msgid "Downstream SNR offset"
 msgstr "Desplazamiento SNR en sentido descendente"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:914
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1169
 msgid "Drag to reorder"
 msgstr "Arrastrar para reordenar"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:9
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:11
 msgid "Dropbear Instance"
 msgstr "Instancia Dropbear"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:6
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 msgid ""
 "Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access "
 "and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
@@ -1671,20 +1697,21 @@ msgstr ""
 "Dropbear ofrece acceso <abbr title=\"Secure Shell\">SSH</abbr> y un servidor "
 "<abbr title=\"Secure Copy\">SCP</abbr>"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:11
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:14
 msgid "Dual-Stack Lite (RFC6333)"
 msgstr "Dual-Stack Lite (RFC6333)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:493
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:547
 msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 msgstr ""
 "<abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> dinámico"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:60
 msgid "Dynamic tunnel"
 msgstr "Túnel dinámico"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:494
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:547
 msgid ""
 "Dynamically allocate DHCP addresses for clients. If disabled, only clients "
 "having static leases will be served."
@@ -1692,21 +1719,21 @@ msgstr ""
 "Reparte direcciones DHCP dinámicamente a los clientes. Si se deshabilita, "
 "sólo se dará a clientes con direcciones estáticas."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:67
 msgid "EA-bits length"
 msgstr "Longitud de bits EA"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:990
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1386
 msgid "EAP-Method"
 msgstr "Método EAP"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:934
-#: modules/luci-base/htdocs/luci-static/resources/form.js:935
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1199
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1188
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1191
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1450
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:154
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:160
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:38
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:291
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:720
 msgid "Edit"
 msgstr "Editar"
 
@@ -1718,24 +1745,24 @@ msgstr ""
 "Edite los datos de configuración sin procesar anteriores para corregir "
 "cualquier error y presione \"Guardar\" para volver a cargar la página."
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:38
-msgid "Edit this interface"
-msgstr "Editar esta interfaz"
-
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:718
 msgid "Edit this network"
 msgstr "Editar esta red"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:669
+msgid "Edit wireless network"
+msgstr "Editar red WiFi"
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:167
 msgid "Emergency"
 msgstr "Emergencia"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:127
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:715
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:754
 msgid "Enable"
 msgstr "Habilitar"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:414
 msgid ""
 "Enable <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> "
 "snooping"
@@ -1743,67 +1770,68 @@ msgstr ""
 "Habilitar <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> "
 "Snooping"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:271
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:412
 msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 msgstr "Habilitar <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:41
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:60
 msgid "Enable HE.net dynamic endpoint update"
 msgstr "Habilitar actualización dinámica de punto final HE.net"
 
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:51
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:89
 msgid "Enable IPv6 negotiation"
 msgstr "Habilitar negociación IPv6"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:23
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:35
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:41
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:35
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:37
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:49
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:80
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:54
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:67
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:93
 msgid "Enable IPv6 negotiation on the PPP link"
 msgstr "Habilitar negociación IPv6 en el enlace PPP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:143
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:188
 msgid "Enable Jumbo Frame passthrough"
 msgstr "Habilitar paso de tramas jumbo"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:244
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:235
 msgid "Enable NTP client"
 msgstr "Habilitar cliente NTP"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:69
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:96
 msgid "Enable Single DES"
 msgstr "Habilitar solo DES"
 
-#: 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:267
 msgid "Enable TFTP server"
 msgstr "Habilitar servidor TFTP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:134
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:180
 msgid "Enable VLAN functionality"
 msgstr "Habilitar funcionalidad VLAN"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1595
 msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
 msgstr "Habilitar botón WPS, requiere WPA(2)-PSK"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1175
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
 msgid "Enable key reinstallation (KRACK) countermeasures"
 msgstr "Habilitar las medidas correctivas de reinstalación de claves (KRACK)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:138
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:183
 msgid "Enable learning and aging"
 msgstr "Habilitar aprendizaje y envejecimiento"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:194
 msgid "Enable mirroring of incoming packets"
 msgstr "Habilitar la duplicación de paquetes entrantes"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:151
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:195
 msgid "Enable mirroring of outgoing packets"
 msgstr "Habilitar la duplicación de paquetes salientes"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:34
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:67
 msgid "Enable the DF (Don't Fragment) flag of the encapsulating packets."
 msgstr ""
 "Habilita el indicador DF (No fragmentar) de los paquetes de encapsulación."
@@ -1812,7 +1840,7 @@ msgstr ""
 msgid "Enable this mount"
 msgstr "Habilitar este punto de montaje"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:713
 msgid "Enable this network"
 msgstr "Habilitar esta red"
 
@@ -1820,21 +1848,21 @@ msgstr "Habilitar esta red"
 msgid "Enable this swap"
 msgstr "Habilitar este swap"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:37
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:88
 msgid "Enable/Disable"
 msgstr "Habilitar/Deshabilitar"
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:76
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:152
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:251
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:41
 msgid "Enabled"
 msgstr "Habilitado"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:277
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:414
 msgid "Enables IGMP snooping on this bridge"
 msgstr "Habilita el protocolo IGMP Snooping en este puente"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:892
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1310
 msgid ""
 "Enables fast roaming among access points that belong to the same Mobility "
 "Domain"
@@ -1842,28 +1870,32 @@ msgstr ""
 "Habilita la itinerancia rápida entre los APs que pertenecen al mismo dominio "
 "de movilidad"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:272
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:412
 msgid "Enables the Spanning Tree Protocol on this bridge"
 msgstr "Habilita el protocolo STP en este puente"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:120
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:180
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:59
+msgid "Encapsulation limit"
+msgstr "Límite de encapsulación"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:843
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:901
 msgid "Encapsulation mode"
 msgstr "Modo de encapsulado"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:76
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:603
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:129
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:992
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1621
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:177
 msgid "Encryption"
 msgstr "Encriptación"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:155
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:128
 msgid "Endpoint Host"
 msgstr "Punto final de Host"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:165
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:132
 msgid "Endpoint Port"
 msgstr "Punto final del puerto"
 
@@ -1875,16 +1907,21 @@ msgstr "Ingrese valor personalizado"
 msgid "Enter custom values"
 msgstr "Ingrese valores personalizados"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:273
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:271
 msgid "Erasing..."
 msgstr "Borrando..."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:95
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:96
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:97
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:98
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:99
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:106
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:107
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:108
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:109
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:110
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:173
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:164
 msgid "Error"
 msgstr "Error"
 
@@ -1892,24 +1929,28 @@ msgstr "Error"
 msgid "Errored seconds (ES)"
 msgstr "Segundos errados (ES)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1646
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1852
 #: modules/luci-base/luasrc/model/network.lua:1432
 msgid "Ethernet Adapter"
 msgstr "Adaptador ethernet"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1637
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1843
 #: modules/luci-base/luasrc/model/network.lua:1422
 msgid "Ethernet Switch"
 msgstr "Switch ethernet"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:303
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
 msgid "Exclude interfaces"
 msgstr "Excluir interfaces"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:153
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
 msgid "Expand hosts"
 msgstr "Expandir hosts"
 
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:195
+msgid "Expecting an hexadecimal assignment hint"
+msgstr "Esperando una pista de asignación hexadecimal"
+
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:59
 msgid "Expecting: %s"
 msgstr "Esperando: %s"
@@ -1918,64 +1959,80 @@ msgstr "Esperando: %s"
 msgid "Expires"
 msgstr "Expira"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:488
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:543
 msgid ""
 "Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
 msgstr ""
 "Tiempo de expiración de direcciones dadas, con un mínimo de dos minutos "
 "(<code>2m</code>)."
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:8
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:19
 msgid "External"
 msgstr "Externo"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:971
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1377
 msgid "External R0 Key Holder List"
 msgstr "Lista de soporte de clave externa R0"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:980
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1381
 msgid "External R1 Key Holder List"
 msgstr "Lista de soporte de clave externa R1"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:150
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:141
 msgid "External system log server"
 msgstr "Servidor externo de registro del sistema"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:155
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:146
 msgid "External system log server port"
 msgstr "Puerto del servidor externo de registro del sistema"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:160
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:151
 msgid "External system log server protocol"
 msgstr "Protocolo de servidor de registro de sistema externo"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:18
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:79
 msgid "Extra SSH command options"
 msgstr "Opciones de comando SSH adicionales"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:940
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1351
 msgid "FT over DS"
 msgstr "FT sobre DS"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:941
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1352
 msgid "FT over the Air"
 msgstr "FT sobre The Air"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:938
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1349
 msgid "FT protocol"
 msgstr "Protocolo FT"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1842
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:82
+msgid "Failed to change the system password."
+msgstr "Error al cambiar la contraseña del sistema."
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2389
 msgid "Failed to confirm apply within %ds, waiting for rollback…"
 msgstr ""
 "Error al confirmar aplicar dentro de %ds. Esperando a que se reviertan los "
 "cambios..."
 
-#: modules/luci-base/luasrc/view/cbi/filebrowser.htm:106
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:45
+msgid "Failed to execute \"/etc/init.d/%s %s\" action: %s"
+msgstr "Error al ejecutar la acción \"/etc/init.d/%s%s\": %s"
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1561
 msgid "File"
 msgstr "Archivo"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:279
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1514
+msgid "File not accessible"
+msgstr "Archivo no accesible"
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1698
+msgid "Filename"
+msgstr "Nombre de archivo"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:280
 msgid "Filename of the boot image advertised to clients"
 msgstr "Nombre del archivo de imagen de arranque mostrado a los clientes"
 
@@ -1985,14 +2042,15 @@ 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:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:118
 msgid "Filter private"
 msgstr "Filtro privado"
 
-#: 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:123
 msgid "Filter useless"
 msgstr "Filtro inútil"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:23
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:65
 msgid "Finalizing failed"
 msgstr "La finalización falló"
@@ -2006,7 +2064,7 @@ msgstr ""
 "intercambie y reemplace la configuración con los valores predeterminados "
 "según lo que se detectó"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:696
 msgid "Find and join network"
 msgstr "Encontrar y unirse a red"
 
@@ -2018,11 +2076,11 @@ msgstr "Terminar"
 msgid "Firewall"
 msgstr "Firewall"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:77
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:76
 msgid "Firewall Mark"
 msgstr "Marca de Firewall"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:193
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:278
 msgid "Firewall Settings"
 msgstr "Configuración del Firewall"
 
@@ -2030,7 +2088,7 @@ msgstr "Configuración del Firewall"
 msgid "Firewall Status"
 msgstr "Estado del Firewall"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:137
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:860
 msgid "Firmware File"
 msgstr "Archivo de firmware"
 
@@ -2038,7 +2096,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:225
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:226
 msgid "Fixed source port for outbound DNS queries"
 msgstr "Puerto origen fijo para peticiones de DNS salientes"
 
@@ -2058,35 +2116,35 @@ msgstr "Grabar nueva imagen de firmware"
 msgid "Flash operations"
 msgstr "Operaciones de grabado"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:194
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:192
 msgid "Flashing..."
 msgstr "Grabando..."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:498
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:550
 msgid "Force"
 msgstr "Forzar"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:258
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:782
 msgid "Force 40MHz mode"
 msgstr "Forzar modo 40MHz"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:622
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1031
 msgid "Force CCMP (AES)"
 msgstr "Forzar CCMP (AES)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:499
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:550
 msgid "Force DHCP on this network even if another server is detected."
 msgstr "Forzar DHCP en esta red aunque se detecte otro servidor."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:623
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1032
 msgid "Force TKIP"
 msgstr "Forzar TKIP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:624
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1033
 msgid "Force TKIP and CCMP (AES)"
 msgstr "Forzar TKIP y CCMP (AES)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:795
 msgid "Force link"
 msgstr "Forzar enlace"
 
@@ -2094,7 +2152,7 @@ msgstr "Forzar enlace"
 msgid "Force upgrade"
 msgstr "Forzar actualización"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:60
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:90
 msgid "Force use of NAT-T"
 msgstr "Forzar uso de NAT-T"
 
@@ -2102,7 +2160,7 @@ msgstr "Forzar uso de NAT-T"
 msgid "Form token mismatch"
 msgstr "No coincide el token del formulario"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:34
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:164
 msgid "Forward DHCP traffic"
 msgstr "Reenviar tráfico DHCP"
 
@@ -2110,49 +2168,43 @@ msgstr "Reenviar tráfico DHCP"
 msgid "Forward Error Correction Seconds (FECS)"
 msgstr "Segundos de corrección de errores de reenvío (FECS)"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:28
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:161
 msgid "Forward broadcast traffic"
 msgstr "Reenviar tráfico de difusión"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:375
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:809
 msgid "Forward mesh peer traffic"
 msgstr "Reenviar tráfico de pares de malla"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:186
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:908
 msgid "Forwarding mode"
 msgstr "Modo de reenvío"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:255
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:596
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:774
 msgid "Fragmentation Threshold"
 msgstr "Umbral de fragmentación"
 
-# It should be "Frame Bursting" at once!
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:332
-msgid "Frame Bursting"
-msgstr "Estallido del marco"
-
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:17
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:28
 msgid "Free"
 msgstr "Libre"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:91
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:89
 msgid ""
-"Further information about WireGuard interfaces and peers at <a href=\"http://"
-"wireguard.com\">wireguard.com</a>."
+"Further information about WireGuard interfaces and peers at <a href='http://"
+"wireguard.com'>wireguard.com</a>."
 msgstr ""
-"Más información sobre las interfaces y los pares de WireGuard en <a href="
-"\"http://wireguard.com\">wireguard.com</a>."
+"Para más información sobre las interfaces y pares de WireGuard ingrese a <a "
+"href='http://wireguard.com'>wireguard.com</a>."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:45
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:130
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:186
 msgid "GHz"
 msgstr "GHz"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:29
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:36
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:91
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:77
 msgid "GPRS only"
 msgstr "Sólo GPRS"
 
@@ -2161,28 +2213,28 @@ msgstr "Sólo GPRS"
 msgid "Gateway"
 msgstr "Puerta de enlace"
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:35
+msgid "Gateway Ports"
+msgstr "Puertos del gateway"
+
 #: modules/luci-base/htdocs/luci-static/resources/network.js:9
 #: modules/luci-base/luasrc/model/network.lua:29
 msgid "Gateway address is invalid"
 msgstr "La dirección de la puerta de enlace es inválida"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:46
-msgid "Gateway ports"
-msgstr "Puertos del gateway"
-
-#: 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:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:275
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:23
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:112
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:103
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:49
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:33
 msgid "General Settings"
 msgstr "Configuración general"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:188
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:462
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:175
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:141
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:361
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:504
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:895
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:741
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:796
 msgid "General Setup"
 msgstr "Configuración general"
 
@@ -2190,7 +2242,7 @@ msgstr "Configuración general"
 msgid "Generate Config"
 msgstr "Generar Config"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:945
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1355
 msgid "Generate PMK locally"
 msgstr "Generar PMK localmente"
 
@@ -2198,11 +2250,7 @@ msgstr "Generar PMK localmente"
 msgid "Generate archive"
 msgstr "Generar archivo"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:63
-msgid "Generic 802.11%s Wireless Controller"
-msgstr "Controlador WiFi 802.11%s genérico"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:26
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:74
 msgid "Given password confirmation did not match, password not changed!"
 msgstr ""
 "La confirmación y la contraseña no coinciden. ¡No se ha cambiado la "
@@ -2212,7 +2260,7 @@ msgstr ""
 msgid "Global Settings"
 msgstr "Configuración global"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:806
 msgid "Global network options"
 msgstr "Opciones globales de red"
 
@@ -2221,35 +2269,31 @@ msgstr "Opciones globales de red"
 #: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:241
 #: themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm:284
 msgid "Go to password configuration..."
-msgstr "Ir a configuración de contraseña..."
+msgstr "Ir a la configuración de la contraseña..."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:857
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1369
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1112
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1616
 #: modules/luci-base/luasrc/view/cbi/full_valueheader.htm:4
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:58
 msgid "Go to relevant configuration page"
 msgstr "Ir a la página principal de configuración"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:38
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:66
 msgid "Group Password"
 msgstr "Grupo de contraseña"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:11
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:22
 msgid "Guest"
 msgstr "Invitado"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:73
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:81
 msgid "HE.net password"
 msgstr "Contraseña HE.net"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:60
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:73
 msgid "HE.net username"
 msgstr "Nombre de usuario HE.net"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:310
-msgid "HT mode (802.11n)"
-msgstr "Modo HT (802.11n)"
-
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:16
 msgid "Hang Up"
 msgstr "Suspender"
@@ -2258,7 +2302,7 @@ msgstr "Suspender"
 msgid "Header Error Code Errors (HEC)"
 msgstr "Errores de código de error de encabezado (HEC)"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:103
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 msgid ""
 "Here you can configure the basic aspects of your device like its hostname or "
 "the timezone."
@@ -2266,9 +2310,7 @@ msgstr ""
 "Aquí puede configurar los aspectos básicos de su dispositivo, como el nombre "
 "del host o la zona horaria."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:499
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:556
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:579
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:941
 msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "Ocultar <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 
@@ -2279,14 +2321,15 @@ msgstr "Ocultar cadenas vacias"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:92
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1959
 msgid "Host"
 msgstr "Host"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:20
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:21
 msgid "Host entries"
 msgstr "Entradas de hosts"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:48
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:171
 msgid "Host expiry timeout"
 msgstr "Tiempo de espera de expiración del host"
 
@@ -2294,45 +2337,45 @@ msgstr "Tiempo de espera de expiración del host"
 msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
 msgstr "Dirección <abbr title=\"Internet Protocol Address\">IP</abbr> o red"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:118
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:102
 msgid "Host-Uniq tag content"
 msgstr "Contenido de la etiqueta Host-Uniq"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:71
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:31
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:316
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:25
+#: 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:317
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:26
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:17
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:125
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:116
 msgid "Hostname"
 msgstr "Nombre del host"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:12
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:22
 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:18
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:19
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:67
 msgid "Hostnames"
 msgstr "Nombres de hosts"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:13
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:24
 msgid "Hybrid"
 msgstr "Híbrido"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:45
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:75
 msgid "IKE DH Group"
 msgstr "Grupo IKE DH"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:41
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:59
 msgid "IP Addresses"
 msgstr "Direcciones IP"
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:40
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:80
 msgid "IP Protocol"
 msgstr "Protocolo IP"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:29
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:30
 msgid "IP address"
 msgstr "Dirección IP"
 
@@ -2351,6 +2394,11 @@ msgstr "Falta la dirección IP"
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:20
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:21
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:22
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:79
+#: 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/network.js:89
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:90
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:91
@@ -2358,7 +2406,7 @@ msgstr "Falta la dirección IP"
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:93
 #: 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/luasrc/model/cbi/admin_network/proto_ncm.lua:42
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:82
 msgid "IPv4"
 msgstr "IPv4"
 
@@ -2370,24 +2418,23 @@ msgstr "Firewall IPv4"
 msgid "IPv4 Upstream"
 msgstr "Conexión IPv4"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:57
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:178
 msgid "IPv4 address"
 msgstr "Dirección IPv4"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:26
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:33
 msgid "IPv4 assignment length"
 msgstr "Longitud de asignación de IPv4"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:104
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:181
 msgid "IPv4 broadcast"
 msgstr "Difusión IPv4"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:100
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:180
 msgid "IPv4 gateway"
 msgstr "Puerta de enlace IPv4"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:92
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:179
 msgid "IPv4 netmask"
 msgstr "Máscara de red IPv4"
 
@@ -2395,24 +2442,25 @@ msgstr "Máscara de red IPv4"
 msgid "IPv4 network in address/netmask notation"
 msgstr "Red IPv4 en notación de dirección / máscara de red"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:25
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:52
 msgid "IPv4 prefix"
 msgstr "Prefijo IPv4"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:42
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:30
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:55
 msgid "IPv4 prefix length"
 msgstr "Longitud de prefijo IPv4"
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:43
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:83
 msgid "IPv4+IPv6"
 msgstr "IPv4+IPv6"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:72
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:34
 msgid "IPv4-Address"
 msgstr "Dirección IPv4"
 
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:10
 #: protocols/luci-proto-ipip/luasrc/model/network/proto_ipip.lua:9
 msgid "IPv4-in-IPv4 (RFC2003)"
 msgstr "IPv4 en IPv4 (RFC2003)"
@@ -2427,6 +2475,16 @@ msgstr "IPv4 en IPv4 (RFC2003)"
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:30
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:31
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:32
+#: 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/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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:89
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:90
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:91
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:92
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:95
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:96
@@ -2439,7 +2497,7 @@ msgstr "IPv4 en IPv4 (RFC2003)"
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:103
 #: 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/luasrc/model/cbi/admin_network/proto_ncm.lua:44
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:84
 msgid "IPv6"
 msgstr "IPv6"
 
@@ -2451,11 +2509,11 @@ msgstr "Firewall IPv6"
 msgid "IPv6 Neighbours"
 msgstr "Vecinos de IPv6"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:464
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:506
 msgid "IPv6 Settings"
 msgstr "Configuraciones de IPv6"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:195
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:810
 msgid "IPv6 ULA-Prefix"
 msgstr "IPv6 ULA-Prefix"
 
@@ -2463,21 +2521,21 @@ msgstr "IPv6 ULA-Prefix"
 msgid "IPv6 Upstream"
 msgstr "Conexión IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:202
 msgid "IPv6 address"
 msgstr "Dirección IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:23
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:189
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:31
 msgid "IPv6 assignment hint"
 msgstr "Sugerencia de asignación de IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:18
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:184
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:27
 msgid "IPv6 assignment length"
 msgstr "Longitud de asignación de IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:207
 msgid "IPv6 gateway"
 msgstr "Puerta de enlace IPv6"
 
@@ -2485,22 +2543,22 @@ msgstr "Puerta de enlace IPv6"
 msgid "IPv6 network in address/netmask notation"
 msgstr "Red IPv6 en notación de dirección / máscara de red"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:37
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:59
 msgid "IPv6 prefix"
 msgstr "Prefijo IPv6"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:34
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:45
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:63
 msgid "IPv6 prefix length"
 msgstr "Longitud de prefijo IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:33
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:211
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:57
 msgid "IPv6 routed prefix"
 msgstr "Prefijo IPv6 enrutado"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:143
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:215
 msgid "IPv6 suffix"
 msgstr "Sufijo IPv6"
 
@@ -2510,31 +2568,35 @@ msgid "IPv6-Address"
 msgstr "Dirección IPv6"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:93
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:104
 msgid "IPv6-PD"
 msgstr "IPv6-PD"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:10
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:13
 msgid "IPv6-in-IPv4 (RFC4213)"
 msgstr "IPv6-en-IPv4 (RFC4213)"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:17
 msgid "IPv6-over-IPv4 (6rd)"
 msgstr "IPv6-sobre-IPv4 (6rd)"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:15
 msgid "IPv6-over-IPv4 (6to4)"
 msgstr "IPv6-sobre-IPv4 (6to4)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1075
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1478
 msgid "Identity"
 msgstr "Identidad"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:70
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:96
 msgid "If checked, 1DES is enabled"
 msgstr "Si está comprobado, 1DES está habilitado"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:65
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:93
 msgid "If checked, encryption is disabled"
 msgstr "Si está marcado, el encriptado estará deshabilitado"
 
@@ -2555,39 +2617,39 @@ msgstr ""
 "Montar el dispositivo por la etiqueta de la partición en vez de por el nodo "
 "fijo de dispositivo si se especifica"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:27
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:71
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:18
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:82
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:52
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:17
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:29
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:33
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:68
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:85
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:32
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:45
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:45
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:24
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:44
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:116
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:48
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:85
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:65
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:33
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:80
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:108
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:146
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:74
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:97
 msgid "If unchecked, no default route is configured"
 msgstr "Si está desmarcado no se configurará una ruta por defecto"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:34
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:86
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:35
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:99
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:47
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:60
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:60
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:39
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:59
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:124
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:39
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:116
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:59
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:103
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:64
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:77
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:100
 msgid "If unchecked, the advertised DNS server addresses are ignored"
 msgstr ""
-"Si está desmarcado las direcciones de servidores DNS ingresadas se ignorarán"
+"Si está desmarcado, se usarán las direcciones de servidores DNS ingresadas."
 
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:236
 msgid ""
@@ -2604,15 +2666,15 @@ 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:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:102
 msgid "Ignore <code>/etc/hosts</code>"
 msgstr "Ignorar <code>/etc/hosts</code>"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:471
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:531
 msgid "Ignore interface"
 msgstr "Deshabilitar DHCP"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:90
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:91
 msgid "Ignore resolve file"
 msgstr "Ignorar el archivo resolve"
 
@@ -2633,12 +2695,12 @@ msgstr ""
 "bloqueada. Haga clic en \"Continuar» a continuación para volver a la página "
 "anterior."
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:145
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:118
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:124
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:126
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:97
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:118
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:157
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:141
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:115
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:138
 msgid "Inactivity timeout"
 msgstr "Espera de inactividad"
 
@@ -2646,23 +2708,25 @@ msgstr "Espera de inactividad"
 msgid "Inbound:"
 msgstr "Entrante:"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:170
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:161
 msgid "Info"
 msgstr "Información"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:105
 msgid "Information"
 msgstr "Información"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:25
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:67
 msgid "Initialization failure"
 msgstr "Fallo de inicialización"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:34
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:87
 msgid "Initscript"
 msgstr "Nombre del script de inicio"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:26
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:122
 msgid "Initscripts"
 msgstr "Scripts de inicio"
 
@@ -2670,55 +2734,74 @@ msgstr "Scripts de inicio"
 msgid "Install iputils-traceroute6 for IPv6 traceroute"
 msgstr "Instale \"iputils-traceroute6\" para Traceroute IPv6"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:223
-msgid "Install package %q"
-msgstr "Instalar paquete %q"
-
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:220
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:120
 msgid "Install protocol extensions..."
 msgstr "Instalar extensiones de protocolo..."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:416
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:423
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:683
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:687
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:26
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:284
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:342
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:47
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:134
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:14
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:16
 msgid "Interface"
 msgstr "Interfaz"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:58
 msgid "Interface %q device auto-migrated from %q to %q."
 msgstr "La interfaz %q del dispositivo migra automáticamente de %q a %q."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:356
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:792
 msgid "Interface Configuration"
 msgstr "Configuración de la interfaz"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:51
-msgid "Interface Overview"
-msgstr "Resumen de interfaces"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:99
+msgid "Interface has %d pending changes"
+msgstr "La interfaz tiene %d cambios pendientes"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:57
+msgid "Interface is marked for deletion"
+msgstr "La interfaz está marcada para su eliminación."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:162
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:3
 msgid "Interface is reconnecting..."
 msgstr "Reconectando interfaz..."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:162
+msgid "Interface is shutting down..."
+msgstr "Parando interfaz..."
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:205
+msgid "Interface is starting..."
+msgstr "La interfaz se está iniciando..."
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:208
+msgid "Interface is stopping..."
+msgstr "La interfaz se está deteniendo..."
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:954
 msgid "Interface name"
 msgstr "Nombre de interfaz"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:34
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:224
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:131
 msgid "Interface not present or not connected yet."
 msgstr "La interfaz no existe o no está aún conectado."
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:88
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:16
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:11
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:287
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:54
 msgid "Interfaces"
 msgstr "Interfaces"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:9
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:20
 msgid "Internal"
 msgstr "Interno"
 
@@ -2731,19 +2814,35 @@ msgstr "Error interno del servidor"
 msgid "Invalid"
 msgstr "Inválido"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:311
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:10
+msgid "Invalid Base64 key string"
+msgstr "Cadena de clave Base64 inválida"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:281
 msgid "Invalid VLAN ID given! Only IDs between %d and %d are allowed."
 msgstr "¡ID VLAN no válido! Sólo se permiten IDs entre %d y %d."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:307
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:290
 msgid "Invalid VLAN ID given! Only unique IDs are allowed"
 msgstr "¡ID VLAN no válido! Sólo se permiten IDs únicos"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:195
+msgid "Invalid argument"
+msgstr "Argumento inválido"
+
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:194
+msgid "Invalid command"
+msgstr "Comando inválido"
+
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:80
+msgid "Invalid hexadecimal value"
+msgstr "Valor hexadecimal inválido"
+
 #: modules/luci-base/luasrc/view/sysauth.htm:12
 msgid "Invalid username and/or password! Please try again."
 msgstr "¡Nombre de usuario y/o contraseña no válido/s!. Por favor reintente."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:508
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:950
 msgid "Isolate Clients"
 msgstr "Aislar clientes"
 
@@ -2762,15 +2861,15 @@ msgstr ""
 msgid "JavaScript required!"
 msgstr "¡Se necesita JavaScript!"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:52
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1691
 msgid "Join Network"
 msgstr "Conectar"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:22
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1628
 msgid "Join Network: Wireless Scan"
 msgstr "Conectarse a una red: Búsqueda de redes WiFi"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:19
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1833
 msgid "Joining Network: %q"
 msgstr "Conectarse a: %q"
 
@@ -2787,15 +2886,15 @@ msgstr "Registro del Kernel"
 msgid "Kernel Version"
 msgstr "Versión del Kernel"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:823
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1248
 msgid "Key"
 msgstr "Clave"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:851
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:852
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:853
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:854
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:870
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1277
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1278
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1279
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1291
 msgid "Key #%d"
 msgstr "Clave #%d"
 
@@ -2803,33 +2902,34 @@ msgstr "Clave #%d"
 msgid "Kill"
 msgstr "Matar"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:10
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:21
 msgid "L2TP"
 msgstr "L2TP"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:10
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:40
 msgid "L2TP Server"
 msgstr "Servidor L2TP"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:100
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:74
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:80
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:74
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:53
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:73
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:131
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:102
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:89
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:112
 msgid "LCP echo failure threshold"
 msgstr "Umbral de fracaso en eco LCP"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:118
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:89
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:95
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:89
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:68
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:91
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:144
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:102
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:125
 msgid "LCP echo interval"
 msgstr "Intervalo de eco LCP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:181
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:902
 msgid "LLC"
 msgstr "LLC"
 
@@ -2838,11 +2938,11 @@ msgstr "LLC"
 msgid "Label"
 msgstr "Etiqueta"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:213
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:204
 msgid "Language"
 msgstr "Idioma"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:115
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:106
 msgid "Language and Style"
 msgstr "Idioma y Estilo"
 
@@ -2850,53 +2950,53 @@ msgstr "Idioma y Estilo"
 msgid "Latency"
 msgstr "Latencia"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:10
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:21
 msgid "Leaf"
 msgstr "Hoja"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:369
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:487
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:393
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:543
 msgid "Lease time"
 msgstr "Tiempo de expiració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:87
 msgid "Leasefile"
 msgstr "Archivo de conexiones"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:74
 #: modules/luci-base/luasrc/view/lease_status.htm:95
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:34
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
 msgid "Leasetime remaining"
 msgstr "Tiempo de conexión restante"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:9
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:20
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:27
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:50
 msgid "Leave empty to autodetect"
 msgstr "Deje vacío para autodetectar"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:21
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:45
 msgid "Leave empty to use the current WAN address"
 msgstr "Deje vacío para usar la dirección WAN actual"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1746
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2299
 msgid "Legend:"
 msgstr "Registro de cambios:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:481
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:538
 msgid "Limit"
 msgstr "Límite de IPs"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:287
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:288
 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:299
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:300
 msgid "Limit listening to these interfaces, and loopback."
 msgstr "Limita la escucha de estas interfaces, y el bucle de retorno."
 
@@ -2916,11 +3016,11 @@ msgstr "Estado de línea"
 msgid "Line Uptime"
 msgstr "Tiempo de actividad de línea"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:101
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:88
 msgid "Link On"
-msgstr "Enlace activado"
+msgstr "Enlace conectado"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:185
 msgid ""
 "List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
 "requests to"
@@ -2928,7 +3028,7 @@ msgstr ""
 "Lista de servidores <abbr title=\"Domain Name System\">DNS</abbr> a los que "
 "enviar solicitudes"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:972
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1377
 msgid ""
 "List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-"
 "Identifier,128-bit key as hex string. <br />This list is used to map R0KH-ID "
@@ -2942,7 +3042,7 @@ msgstr ""
 "dirección MAC de destino cuando se solicita la clave PMK-R1 del R0KH que el "
 "STA usó durante la Asociación de dominio de movilidad inicial."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:981
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1381
 msgid ""
 "List of R1KHs in the same Mobility Domain. <br />Format: MAC-address,R1KH-ID "
 "as 6 octets with colons,128-bit key as hex string. <br />This list is used "
@@ -2957,31 +3057,31 @@ msgstr ""
 "también la lista de R1KH autorizados en el MD que pueden solicitar claves "
 "PMK-R1."
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:21
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:82
 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:206
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:207
 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:173
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:174
 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:298
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:299
 msgid "Listen Interfaces"
 msgstr "Interfaces de escucha"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:30
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:54
 msgid "Listen Port"
 msgstr "Puerto"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:15
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:16
 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:216
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:217
 msgid "Listening port for inbound DNS queries"
 msgstr "Puerto de escucha para consultas DNS entrantes"
 
@@ -3000,11 +3100,11 @@ msgstr "Carga media"
 msgid "Loading"
 msgstr "Cargando"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:35
-msgid "Loading SSH keys…"
-msgstr "Cargando claves SSH..."
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1819
+msgid "Loading directory contents…"
+msgstr "Cargando el contenido del directorio..."
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1204
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1296
 #: modules/luci-base/luasrc/view/view.htm:4
 msgid "Loading view…"
 msgstr "Cargando vista..."
@@ -3014,41 +3114,41 @@ msgstr "Cargando vista..."
 msgid "Local IP address is invalid"
 msgstr "Dirección IP local inválida"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:25
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:86
 msgid "Local IP address to assign"
 msgstr "Dirección IP local para asignar"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:10
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:11
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:44
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:39
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:151
 msgid "Local IPv4 address"
 msgstr "Dirección local IPv4"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:20
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:54
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:45
 msgid "Local IPv6 address"
 msgstr "Dirección local IPv6"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:286
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:287
 msgid "Local Service Only"
 msgstr "Solo servicio local"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:81
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:126
 msgid "Local Startup"
 msgstr "Arranque local"
 
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:25
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:121
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:112
 msgid "Local Time"
 msgstr "Hora local"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:149
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
 msgid "Local domain"
 msgstr "Dominio 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:147
 msgid ""
 "Local domain specification. Names matching this domain are never forwarded "
 "and are resolved from DHCP or hosts files only"
@@ -3056,17 +3156,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:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:151
 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:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
 msgid "Local server"
 msgstr "Servidor local"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:129
 msgid ""
 "Localise hostname depending on the requesting subnet if multiple IPs are "
 "available"
@@ -3074,23 +3174,19 @@ 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:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:128
 msgid "Localise queries"
 msgstr "Localizar consultas"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:175
-msgid "Locked to channel %s used by: %s"
-msgstr "Bloqueado en el canal %s utilizado por: %s"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:168
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:159
 msgid "Log output level"
 msgstr "Nivel de registro"
 
-#: 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:181
 msgid "Log queries"
 msgstr "Registrar consultas"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:113
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:104
 msgid "Logging"
 msgstr "Registro"
 
@@ -3098,7 +3194,7 @@ msgstr "Registro"
 msgid "Login"
 msgstr "Iniciar sesión"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:95
+#: modules/luci-base/luasrc/controller/admin/index.lua:103
 msgid "Logout"
 msgstr "Cerrar sesión"
 
@@ -3106,11 +3202,13 @@ msgstr "Cerrar sesión"
 msgid "Loss of Signal Seconds (LOSS)"
 msgstr "Pérdida de segundos de señal (LOSS)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:476
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:533
 msgid "Lowest leased address as offset from the network address."
 msgstr "Dirección inicial más baja como diferencia de la dirección de red."
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:40
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:75
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:35
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:86
 msgid "MAC"
@@ -3118,32 +3216,32 @@ msgstr "MAC"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:73
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:109
-#: 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:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1958
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:86
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:133
 msgid "MAC-Address"
 msgstr "Dirección MAC"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:457
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:586
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:886
 msgid "MAC-Address Filter"
 msgstr "Filtro por dirección MAC"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:142
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:363
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:798
 msgid "MAC-Filter"
 msgstr "Filtro por dirección MAC"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:464
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:590
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:893
 msgid "MAC-List"
 msgstr "Lista de direcciones MAC"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:13
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:16
 msgid "MAP / LW4over6"
 msgstr "MAP / LW4over6"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:62
 msgid "MAP rule is invalid"
 msgstr "La regla MAP no es válida"
@@ -3161,8 +3259,8 @@ msgid "MHz"
 msgstr "MHz"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:53
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:29
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:66
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:53
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:71
 msgid "MTU"
 msgstr "MTU"
 
@@ -3174,16 +3272,17 @@ msgstr ""
 "Asegúrate de clonar el sistema de archivos raíz usando algo como los "
 "siguientes comandos:"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:55
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:69
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:26
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:38
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:38
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:108
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:52
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:96
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:83
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:57
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:70
 msgid "Manual"
 msgstr "Manual"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1949
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2188
 msgid "Master"
 msgstr "AP"
 
@@ -3191,50 +3290,46 @@ msgstr "AP"
 msgid "Max. Attainable Data Rate (ATTNDR)"
 msgstr "Max. velocidad de datos alcanzable (ATTNDR)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:539
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:982
 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:234
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
 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:252
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:253
 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:243
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:244
 msgid "Maximum allowed size of EDNS.0 UDP packets"
 msgstr "Tamaño máximo de paquetes EDNS.0 paquetes UDP"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:63
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:77
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:57
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:112
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:104
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:93
 msgid "Maximum amount of seconds to wait for the modem to become ready"
 msgstr "Segundos máximos de espera a que el módem esté activo"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:27
-msgid ""
-"Maximum length of the name is 15 characters including the automatic protocol/"
-"bridge prefix (br-, 6in4-, pppoe- etc.)"
-msgstr ""
-"La longitud máxima del nombre es de 15 caracteres, incluido el prefijo de "
-"protocolo/puente automático (br-, 6in4-, pppoe-, etc.)"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:482
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:538
 msgid "Maximum number of leased addresses."
 msgstr "Máximo de conexiones activas."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:761
+msgid "Maximum transmit power"
+msgstr "Máxima potencia de transmisión"
+
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:21
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:49
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:134
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:187
 #: modules/luci-mod-status/luasrc/view/admin_status/bandwidth.htm:79
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:284
 msgid "Mbit/s"
 msgstr "Mbit/s"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:18
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:32
 msgid "Medium"
 msgstr "Medio"
 
@@ -3246,42 +3341,43 @@ msgstr "Memoria"
 msgid "Memory usage (%)"
 msgstr "Uso de RAM (%)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1952
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2191
 msgid "Mesh"
 msgstr "Malla"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:372
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:806
 msgid "Mesh Id"
 msgstr "ID de malla"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:196
+msgid "Method not found"
+msgstr "Método no encontrado"
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:45
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:76
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:104
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:54
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:66
 msgid "Metric"
 msgstr "Métrica"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:154
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:198
 msgid "Mirror monitor port"
 msgstr "Puerto monitor de espejo"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:153
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:197
 msgid "Mirror source port"
 msgstr "Puerto fuente de espejo"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:408
-msgid "Missing protocol extension for proto %q"
-msgstr "Extensión de protocolo faltante para %q"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:923
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1337
 msgid "Mobility Domain"
 msgstr "Dominio de movilidad"
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:154
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:41
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:74
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:366
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:31
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:360
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:801
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1619
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:175
 msgid "Mode"
 msgstr "Modo"
@@ -3290,39 +3386,38 @@ msgstr "Modo"
 msgid "Model"
 msgstr "Modelo"
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:31
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:72
 msgid "Modem default"
 msgstr "Modem predeterminado"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:11
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:19
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:11
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:10
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:73
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:73
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:57
 msgid "Modem device"
 msgstr "Dispositivo de módem"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:24
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:66
 msgid "Modem information query failed"
 msgstr "Error en la consulta de información del módem"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:62
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:76
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:56
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:112
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:104
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:93
 msgid "Modem init timeout"
 msgstr "Espera de inicialización del modem"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1953
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:452
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:554
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:577
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2192
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:880
 msgid "Monitor"
 msgstr "Monitor"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:14
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
 msgid "More Characters"
 msgstr "Más caracteres"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:802
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1057
 msgid "More…"
 msgstr "Más…"
 
@@ -3335,7 +3430,7 @@ msgstr "Entrada de montaje"
 msgid "Mount Point"
 msgstr "Punto de montaje"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:26
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:36
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:137
 msgid "Mount Points"
@@ -3385,46 +3480,44 @@ msgstr "Bajar"
 msgid "Move up"
 msgstr "Subir"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:912
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
 msgid "NAS ID"
 msgstr "NAS ID"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:57
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:87
 msgid "NAT-T Mode"
 msgstr "Modo NAT-T"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:9
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 msgid "NAT64 Prefix"
 msgstr "Prefijo NAT64"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:31
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:26
 msgid "NCM"
 msgstr "NCM"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:535
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:589
 msgid "NDP-Proxy"
 msgstr "NDP-Proxy"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:43
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:72
 msgid "NT Domain"
 msgstr "Dominio NT"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:273
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:264
 msgid "NTP server candidates"
 msgstr "Servidores NTP a consultar"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:837
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1092
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:27
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:502
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:65
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:553
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:658
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:49
 msgid "Name"
 msgstr "Nombre"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:17
-msgid "Name of the new interface"
-msgstr "Nombre de la nueva interfaz"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1808
 msgid "Name of the new network"
 msgstr "Nombre de la nueva red"
 
@@ -3432,9 +3525,10 @@ msgstr "Nombre de la nueva red"
 msgid "Navigation"
 msgstr "Navegación"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:62
+#: modules/luci-base/luasrc/controller/admin/index.lua:69
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:108
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:402
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:834
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1957
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:389
 #: modules/luci-mod-status/luasrc/view/admin_status/index/30-network.htm:8
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:73
@@ -3446,7 +3540,7 @@ msgstr "Red"
 msgid "Network Utilities"
 msgstr "Utilidades de red"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:278
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:279
 msgid "Network boot image"
 msgstr "Imagen de arranque en red"
 
@@ -3459,53 +3553,59 @@ msgstr "El dispositivo de red no está presente"
 msgid "Network without interfaces."
 msgstr "Red sin interfaces."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:661
+msgid "New interface name…"
+msgstr "Nuevo nombre de interfaz..."
+
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:11
 msgid "Next »"
 msgstr "Siguiente »"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1507
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1754
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:108
 msgid "No"
 msgstr "No"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:453
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:514
 msgid "No DHCP Server configured for this interface"
 msgstr "No se ha configurado un servidor DHCP para esta interfaz"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1162
+msgid "No Encryption"
+msgstr "Sin encriptación"
+
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:89
 msgid "No NAT-T"
 msgstr "Sin NAT-T"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:198
+msgid "No data received"
+msgstr "Sin datos recibidos"
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1764
+msgid "No entries in this directory"
+msgstr "No hay entradas en este directorio"
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/backupfiles.lua:82
 msgid "No files found"
 msgstr "No se han encontrado archivos"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:550
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:191
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:180
 msgid "No information available"
 msgstr "No hay información disponible"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:8
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:63
 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:157
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
 msgid "No negative cache"
 msgstr "Sin caché negativa"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:53
-msgid "No network configured on this device"
-msgstr "No hay red configurada para este dispositivo"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:65
-msgid "No network name specified"
-msgstr "No se ha especificado un nombre de red"
-
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:147
-msgid "No networks in range"
-msgstr "No hay redes en rango"
-
 #: 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
@@ -3513,7 +3613,12 @@ msgstr "No hay redes en rango"
 msgid "No password set!"
 msgstr "¡Sin contraseña!"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:116
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:104
+msgid "No peers defined yet"
+msgstr "Sin pares definidos"
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:129
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:271
 msgid "No public keys present yet."
 msgstr "No hay claves públicas presentes todavía."
 
@@ -3521,19 +3626,19 @@ msgstr "No hay claves públicas presentes todavía."
 msgid "No rules in this chain."
 msgstr "No hay reglas en esta cadena."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:150
-msgid "No scan results available yet..."
-msgstr "Aún no hay resultados de escaneo disponibles ..."
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:53
+msgid "No signal"
+msgstr "Sin señal"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:7
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:756
 msgid "No zone assigned"
 msgstr "Sin zona asignada"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:111
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:35
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:48
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:133
 msgid "Noise"
 msgstr "Ruido"
 
@@ -3549,16 +3654,16 @@ msgstr "Ruido:"
 msgid "Non Pre-emtive CRC errors (CRC_P)"
 msgstr "Errores de CRC no preventivos (CRC P)"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:292
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:293
 msgid "Non-wildcard"
 msgstr "Sin comodín"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:129
 msgid "None"
 msgstr "Ninguno"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:181
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:172
 msgid "Normal"
 msgstr "Normal"
 
@@ -3566,25 +3671,29 @@ msgstr "Normal"
 msgid "Not Found"
 msgstr "No encontrado"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:27
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:5
-msgid "Not associated"
-msgstr "No asociado"
-
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:87
 msgid "Not connected"
 msgstr "No conectado"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:38
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:139
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:232
+msgid "Not present"
+msgstr "No presente"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:105
 msgid "Not started on boot"
 msgstr "No se inició en el arranque"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:26
-msgid "Note: interface name length"
-msgstr "Nota: longitud del nombre de la interfaz"
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:201
+msgid "Not supported"
+msgstr "No soportado"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:171
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:162
 msgid "Notice"
 msgstr "Aviso"
 
@@ -3592,66 +3701,54 @@ msgstr "Aviso"
 msgid "Nslookup"
 msgstr "NSLookup"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:261
 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 "
 "almacenamiento en caché)"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:203
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:194
 msgid "Number of parallel threads used for compression"
 msgstr "Número de hilos paralelos utilizados para la compresión"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:40
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:69
 msgid "Obfuscated Group Password"
 msgstr "Contraseña de grupo confusa"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:35
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:61
 msgid "Obfuscated Password"
 msgstr "Contraseña confusa"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:22
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:34
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:40
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:105
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:97
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:49
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:80
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:54
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:67
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:93
 msgid "Obtain IPv6-Address"
 msgstr "Obtener dirección IPv6"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:83
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:68
 msgid "Off-State Delay"
 msgstr "Retraso de desconexión"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:16
-msgid ""
-"On this page you can configure the network interfaces. You can bridge "
-"several interfaces by ticking the \"bridge interfaces\" field and enter the "
-"names of several network interfaces separated by spaces. You can also use "
-"<abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
-"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
-"<samp>eth0.1</samp>)."
-msgstr ""
-"Configure las interfaces de red. Puede hacer puentes con diferentes "
-"interfaces, marcando el campo \"Puentear interfaces\" e introduciendo el "
-"nombre de las mismas separadas por espacios. También puede usar la notación "
-"<abbr title=\"Virtual Local Area Network\">VLAN</abbr>, <samp>INTERFACE."
-"VLANNR</samp> (<abbr title=\"por ejemplo\">Ej.</abbr>: <samp>eth0.1</samp>)."
-
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:95
 msgid "On-Link route"
 msgstr "Ruta en enlace"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:80
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:64
 msgid "On-State Delay"
 msgstr "Retraso de activación"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:360
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:382
 msgid "One of hostname or mac address must be specified!"
 msgstr "¡Debe especificar al menos un nombre de host o dirección MAC!"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:456
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:462
 msgid "One of the following: %s"
-msgstr "Uno de los siguientes: %s"
+msgstr "uno de los siguientes: %s"
 
 #: modules/luci-base/luasrc/view/cbi/nullsection.htm:17
 #: modules/luci-base/luasrc/view/cbi/ucisection.htm:22
@@ -3671,28 +3768,29 @@ msgstr "¡Campos vacíos!"
 msgid "Open list..."
 msgstr "Abrir lista..."
 
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:61
 #: protocols/luci-proto-openconnect/luasrc/model/network/proto_openconnect.lua:9
 msgid "OpenConnect (CISCO AnyConnect)"
 msgstr "OpenConnect (CISCO AnyConnect)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:757
 msgid "Operating frequency"
 msgstr "Frecuencia de operación"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1753
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2306
 msgid "Option changed"
 msgstr "Opción cambiada"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1755
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2308
 msgid "Option removed"
 msgstr "Opción removida"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1140
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:55
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1535
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:66
 msgid "Optional"
 msgstr "Opcional"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:78
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:76
 msgid ""
 "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, "
 "starting with <code>0x</code>."
@@ -3700,7 +3798,7 @@ msgstr ""
 "Opcional. Marca de 32 bits para los paquetes cifrados salientes. Ingrese el "
 "valor en hexadecimal, comenzando con <code>0x</code>."
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:144
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:215
 msgid ""
 "Optional. Allowed values: 'eui64', 'random', fixed value like '::1' or "
 "'::1:2'. When IPv6 prefix (like 'a:b:c:d::') is received from a delegating "
@@ -3712,7 +3810,7 @@ msgstr ""
 "servidor delegante, use el sufijo (como '::1') para formar la dirección IPv6 "
 "('a:b:c:d::1') para la interfaz."
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:123
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:117
 msgid ""
 "Optional. Base64-encoded preshared key. Adds in an additional layer of "
 "symmetric-key cryptography for post-quantum resistance."
@@ -3721,30 +3819,30 @@ msgstr ""
 "adicional de criptografía de clave simétrica para la resistencia post-"
 "cuántica."
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:148
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:126
 msgid "Optional. Create routes for Allowed IPs for this peer."
 msgstr "Opcional. Crear rutas para IPs permitidas para este par."
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:103
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:108
 msgid "Optional. Description of peer."
 msgstr "Opcional. Descripción del par."
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:156
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:128
 msgid ""
 "Optional. Host of peer. Names are resolved prior to bringing up the "
 "interface."
 msgstr ""
 "Opcional. Host de pares. Los nombres se resuelven antes de abrir la interfaz."
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:67
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:71
 msgid "Optional. Maximum Transmission Unit of tunnel interface."
 msgstr "Opcional. Unidad máxima de transmisión de la interfaz del túnel."
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:166
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:132
 msgid "Optional. Port of peer."
 msgstr "Opcional. Puerto de pares."
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:175
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:136
 msgid ""
 "Optional. Seconds between keep alive messages. Default is 0 (disabled). "
 "Recommended value if this device is behind a NAT is 25."
@@ -3753,7 +3851,7 @@ msgstr ""
 "0 (deshabilitado). El valor recomendado si este dispositivo está detrás de "
 "un NAT es 25."
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:31
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:54
 msgid "Optional. UDP port used for outgoing and incoming packets."
 msgstr "Opcional. Puerto UDP utilizado para paquetes salientes y entrantes."
 
@@ -3774,7 +3872,7 @@ msgstr "Salida"
 msgid "Outbound:"
 msgstr "Saliente:"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:26
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:50
 msgid "Output Interface"
 msgstr "Interfaz de salida"
 
@@ -3783,45 +3881,45 @@ msgstr "Interfaz de salida"
 msgid "Output zone"
 msgstr "Zona de salida"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:63
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:155
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:33
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:54
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:54
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:219
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:50
 msgid "Override MAC address"
 msgstr "Reemplazar dirección MAC"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:66
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:35
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:56
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:88
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:125
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:131
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:133
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:104
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:61
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:58
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:223
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:44
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:54
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:154
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:71
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:145
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:132
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:110
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:119
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:97
 msgid "Override MTU"
 msgstr "Reemplazar MTU"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:30
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:63
 msgid "Override TOS"
 msgstr "Reemplazar TOS"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:25
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:58
 msgid "Override TTL"
 msgstr "Reemplazar TTL"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:954
 msgid "Override default interface name"
 msgstr "Reemplaza el nombre de interfaz predeterminado"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:41
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:167
 msgid "Override the gateway in DHCP responses"
 msgstr "Reemplazar puerta de enlace en las respuestas DHCP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:507
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:555
 msgid ""
 "Override the netmask sent to clients. Normally it is calculated from the "
 "subnet that is served."
@@ -3829,7 +3927,7 @@ msgstr ""
 "Anula la máscara de red enviada a los clientes. Normalmente se calcula a "
 "partir de la subred que se sirve."
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:65
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:179
 msgid "Override the table used for internal routes"
 msgstr "Anular la tabla utilizada para rutas internas"
 
@@ -3837,29 +3935,33 @@ msgstr "Anular la tabla utilizada para rutas internas"
 msgid "Overview"
 msgstr "Descripción general"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1606
+msgid "Overwrite existing file \"%s\" ?"
+msgstr "Sobrescribir archivo \"%s\" existente?"
+
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:11
 msgid "Owner"
 msgstr "Propietario"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:42
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:56
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:17
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:28
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:34
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:14
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:18
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:43
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:98
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:45
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:44
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:63
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:82
 msgid "PAP/CHAP password"
 msgstr "Contraseña PAP/CHAP"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:39
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:53
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:14
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:11
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:15
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:96
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:88
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:43
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:74
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:42
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:61
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:77
 msgid "PAP/CHAP username"
 msgstr "Nombre de usuario PAP/CHAP"
 
@@ -3867,9 +3969,9 @@ msgstr "Nombre de usuario PAP/CHAP"
 msgid "PID"
 msgstr "PID"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:36
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:50
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:26
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:95
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:87
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:68
 msgid "PIN"
 msgstr "PIN"
 
@@ -3878,114 +3980,116 @@ msgstr "PIN"
 msgid "PIN code rejected"
 msgstr "Código PIN rechazado"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:966
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1372
 msgid "PMK R1 Push"
 msgstr "PMK R1 Push"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:43
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:13
 msgid "PPP"
 msgstr "PPP"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:11
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:58
 msgid "PPPoA Encapsulation"
 msgstr "Encapsulación PPPoA"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:19
 msgid "PPPoATM"
 msgstr "PPPoATM"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:17
 msgid "PPPoE"
 msgstr "PPPoE"
 
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:28
 #: protocols/luci-proto-pppossh/luasrc/model/network/proto_pppossh.lua:9
 msgid "PPPoSSH"
 msgstr "PPPoSSH"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:15
 msgid "PPtP"
 msgstr "PPtP"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:59
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:73
 msgid "PSID offset"
 msgstr "Desplazamiento PSID"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:56
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:70
 msgid "PSID-bits length"
 msgstr "Longitud de PSID-bits"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:123
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:846
 msgid "PTM/EFM (Packet Transfer Mode)"
 msgstr "PTM/EFM (Modo de transferencia de paquetes)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:78
-msgid "Package libiwinfo required!"
-msgstr "¡Se necesita el paquete libiwinfo!"
-
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:45
 msgid "Packets"
 msgstr "Paquetes"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:7
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:756
 msgid "Part of zone %q"
 msgstr "Parte de zona %q"
 
 #: modules/luci-base/luasrc/view/sysauth.htm:29
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1111
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:35
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:42
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1514
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:46
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:104
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:58
 msgid "Password"
 msgstr "Contraseña"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:29
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:24
 msgid "Password authentication"
 msgstr "Autentificación de contraseña"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1019
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1414
 msgid "Password of Private Key"
 msgstr "Contraseña de la Clave Privada"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1067
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1471
 msgid "Password of inner Private Key"
 msgstr "Contraseña de clave privada interna"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:14
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:16
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:18
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:20
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:32
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:34
 msgid "Password strength"
 msgstr "Seguridad de la contraseña"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:44
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:107
 msgid "Password2"
 msgstr "Contraseña2"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:37
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:244
 msgid "Paste or drag SSH key file…"
 msgstr "Pegar o arrastrar archivo de clave SSH..."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1000
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1396
 msgid "Path to CA-Certificate"
 msgstr "Ruta al Certificado CA"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1007
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1402
 msgid "Path to Client-Certificate"
 msgstr "Camino al certificado de cliente"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1013
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1408
 msgid "Path to Private Key"
 msgstr "Ruta a la Clave Privada"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1049
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1453
 msgid "Path to inner CA-Certificate"
 msgstr "Ruta al certificado interno de CA"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1055
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1459
 msgid "Path to inner Client-Certificate"
 msgstr "Ruta al certificado del cliente interno"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1061
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1465
 msgid "Path to inner Private Key"
 msgstr "Ruta a la clave privada interna"
 
@@ -4003,7 +4107,7 @@ msgstr "Ruta a la clave privada interna"
 msgid "Peak:"
 msgstr "Pico:"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:28
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:89
 msgid "Peer IP address to assign"
 msgstr "Dirección IP del par para asignar"
 
@@ -4012,11 +4116,11 @@ msgstr "Dirección IP del par para asignar"
 msgid "Peer address is missing"
 msgstr "Falta la dirección del compañero"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:90
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:89
 msgid "Peers"
 msgstr "Pares"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:50
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:80
 msgid "Perfect Forward Secrecy"
 msgstr "Reenvío secreto perfecto"
 
@@ -4028,7 +4132,11 @@ msgstr "Reiniciar"
 msgid "Perform reset"
 msgstr "Realizar restablecimiento"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:174
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:199
+msgid "Permission denied"
+msgstr "Permiso denegado"
+
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:136
 msgid "Persistent Keep Alive"
 msgstr "Mantener vivo persistente"
 
@@ -4036,7 +4144,7 @@ msgstr "Mantener vivo persistente"
 msgid "Phy Rate:"
 msgstr "Ratio Phy:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:190
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:277
 msgid "Physical Settings"
 msgstr "Configuración física"
 
@@ -4047,6 +4155,10 @@ msgstr "Ping"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:16
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:17
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:41
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:77
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:87
@@ -4064,15 +4176,19 @@ msgstr "Por favor, introduzca su nombre de usuario y contraseña."
 msgid "Policy"
 msgstr "Política"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:22
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:20
 msgid "Port"
 msgstr "Puerto"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:18
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:133
+msgid "Port %s"
+msgstr "Puerto %s"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:274
 msgid "Port status:"
 msgstr "Estado del puerto:"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:482
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:488
 msgid "Potential negation of: %s"
 msgstr "negación potencial de: %s"
 
@@ -4084,11 +4200,11 @@ msgstr "Modo de administración de energía"
 msgid "Pre-emtive CRC errors (CRCP_P)"
 msgstr "Errores preventivos de CRC (CRC P)"
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:32
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:73
 msgid "Prefer LTE"
 msgstr "Preferir LTE"
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:33
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:74
 msgid "Prefer UMTS"
 msgstr "Preferir UMTS"
 
@@ -4096,16 +4212,16 @@ msgstr "Preferir UMTS"
 msgid "Prefix Delegated"
 msgstr "Prefijo delegado"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:122
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:117
 msgid "Preshared Key"
 msgstr "Clave precompartida"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:101
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:75
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:81
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:75
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:54
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:74
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:131
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:102
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:89
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:112
 msgid ""
 "Presume peer to be dead after given amount of LCP echo failures, use 0 to "
 "ignore failures"
@@ -4113,16 +4229,15 @@ 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:304
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:305
 msgid "Prevent listening on these interfaces."
 msgstr "Evita escuchar en estas interfaces."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:509
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:562
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:950
 msgid "Prevents client-to-client communication"
 msgstr "Impide la comunicación entre los clientes"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:18
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:49
 msgid "Private Key"
 msgstr "Clave privada"
 
@@ -4143,39 +4258,33 @@ msgstr "Prefil"
 msgid "Prot."
 msgstr "Prot."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:72
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:349
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:675
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:84
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:216
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:87
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:390
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:31
-msgid "Protocol of the new interface"
-msgstr "Protocolo de la nueva interfaz"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:222
-msgid "Protocol support is not installed"
-msgstr "No está instalado el paquete necesario para utilizar el protocolo"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:269
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:260
 msgid "Provide NTP server"
 msgstr "Dar servicio NTP"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:701
 msgid "Provide new network"
 msgstr "Introduzca una nueva red"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:451
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:879
 msgid "Pseudo Ad-Hoc (ahdemo)"
 msgstr "Pseudo Ad-Hoc (ahdemo)"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:112
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:113
 msgid "Public Key"
 msgstr "Clave pública"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:278
 msgid ""
 "Public keys allow for the passwordless SSH logins with a higher security "
 "compared to the use of plain passwords. In order to upload a new key to the "
@@ -4188,22 +4297,22 @@ msgstr ""
 "compatible con OpenSSH o arrastre un archivo <code>.pub</code> al campo de "
 "entrada."
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:139
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:211
 msgid "Public prefix routed to this device for distribution to clients."
 msgstr ""
 "Prefijo público enrutado a este dispositivo para su distribución a los "
 "clientes."
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:27
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:9
 msgid "QMI Cellular"
 msgstr "QMI Celular"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:173
 msgid "Quality"
 msgstr "Calidad"
 
-#: 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:171
 msgid ""
 "Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> "
 "servers"
@@ -4211,28 +4320,29 @@ msgstr ""
 "Consulta todos los servidores <abbr title=\"Domain Name System\">DNS</abbr> "
 "disponibles en el enlace"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:952
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1360
 msgid "R0 Key Lifetime"
 msgstr "Tiempo de vida de la clave R0"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:959
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1366
 msgid "R1 Key Holder"
 msgstr "Llavero R1"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:58
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:88
 msgid "RFC3947 NAT-T mode"
 msgstr "RFC3947 modo NAT-T"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:381
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:814
 msgid "RSSI threshold for joining"
 msgstr "Umbral RSSI para unirse"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:256
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:597
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:778
 msgid "RTS/CTS Threshold"
 msgstr "Umbral RTS/CTS"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:41
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:76
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:87
 msgid "RX"
@@ -4242,37 +4352,41 @@ msgstr "RX"
 msgid "RX Rate"
 msgstr "Tasa RX"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:783
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1961
+msgid "RX Rate / TX Rate"
+msgstr "Tasa RX / Tasa TX"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1207
 msgid "Radius-Accounting-Port"
 msgstr "Puerto de contabilidad Radius"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:791
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1215
 msgid "Radius-Accounting-Secret"
 msgstr "Secreto de contabilidad Radius"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:775
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1199
 msgid "Radius-Accounting-Server"
 msgstr "Servidor de contabilidad Radius"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:759
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1183
 msgid "Radius-Authentication-Port"
 msgstr "Puerto de autentificación Radius"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:767
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1191
 msgid "Radius-Authentication-Secret"
 msgstr "Secreto de autentificación Radius"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:751
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1175
 msgid "Radius-Authentication-Server"
 msgstr "Servidor de autentificación Radius"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:119
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:102
 msgid "Raw hex-encoded bytes. Leave empty unless your ISP require this"
 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:83
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:84
 msgid ""
 "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-Server"
@@ -4289,20 +4403,11 @@ msgstr ""
 "deshacer! Es posible que pierda el acceso a este dispositivo si está "
 "conectado a través de esta interfaz"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2
-msgid ""
-"Really delete this wireless network? The deletion cannot be undone! You "
-"might lose access to this device if you are connected via this network."
-msgstr ""
-"¿Realmente quiere eliminar esta red WiFi? La eliminación no se puede "
-"deshacer! Es posible que pierda el acceso a este dispositivo si está "
-"conectado a través de esta red."
-
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:40
 msgid "Really reset all changes?"
 msgstr "¿Está seguro de restablecer todos los cambios?"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:237
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:354
 msgid "Really switch protocol?"
 msgstr "¿Está seguro de querer cambiar el protocolo?"
 
@@ -4326,15 +4431,15 @@ msgstr "Tráfico en tiempo real"
 msgid "Realtime Wireless"
 msgstr "Red WiFi en tiempo real"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:931
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1343
 msgid "Reassociation Deadline"
 msgstr "Fecha límite de reasociación"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:191
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
 msgid "Rebind protection"
 msgstr "Protección contra reasociación"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:48
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:46
 #: modules/luci-mod-system/luasrc/view/admin_system/reboot.htm:9
 msgid "Reboot"
 msgstr "Reiniciar"
@@ -4348,21 +4453,15 @@ msgstr "Reiniciando..."
 msgid "Reboots the operating system of your device"
 msgstr "Reiniciar el sistema operativo de su dispositivo"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:103
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:90
 msgid "Receive"
 msgstr "Recibir"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:325
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:350
-msgid "Receiver Antenna"
-msgstr "Antena Receptora"
-
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:42
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:59
 msgid "Recommended. IP addresses of the WireGuard interface."
 msgstr "Recomendado. Direcciones IP de la interfaz de WireGuard."
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:28
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:300
 msgid "Reconnect this interface"
 msgstr "Reconectar esta interfaz"
 
@@ -4370,73 +4469,71 @@ msgstr "Reconectar esta interfaz"
 msgid "References"
 msgstr "Referencias"
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:39
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:153
 msgid "Relay"
 msgstr "Relé (relayd)"
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:36
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:157
 msgid "Relay Bridge"
 msgstr "Puente relé (relayd)"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:17
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:154
 msgid "Relay between networks"
 msgstr "Relé entre redes"
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:64
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:12
 msgid "Relay bridge"
 msgstr "Puente relé (relayd)"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:18
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:50
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:49
 msgid "Remote IPv4 address"
 msgstr "Dirección IPv4 remota"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:8
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:40
 msgid "Remote IPv4 address or FQDN"
 msgstr "Dirección IPv4 remota o FQDN"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:45
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:725
 msgid "Remove"
 msgstr "Remover"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:53
-msgid "Repeat scan"
-msgstr "Repetir exploración"
-
-#: modules/luci-base/luasrc/view/cbi/upload.htm:11
-msgid "Replace entry"
-msgstr "Reemplazar entrada"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:46
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:51
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1806
 msgid "Replace wireless configuration"
 msgstr "Cambiar la configuración WiFi"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:8
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:17
 msgid "Request IPv6-address"
 msgstr "Solicitar dirección IPv6"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:16
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:23
 msgid "Request IPv6-prefix of length"
 msgstr "Solicitud IPv6-prefijo de longitud"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1141
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:200
+msgid "Request timeout"
+msgstr "Tiempo de espera de solicitud terminada"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1536
 msgid "Required"
 msgstr "Requerido"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:20
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:31
 msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3"
 msgstr "Requerido para ciertos ISPs, por ejemplo Charter con DOCSIS 3"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:19
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:49
 msgid "Required. Base64-encoded private key for this interface."
 msgstr "Requerido. Clave privada codificada en base64 para esta interfaz."
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:113
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:113
 msgid "Required. Base64-encoded public key of peer."
 msgstr "Requerido. Base64 codificada clave pública de igual."
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:136
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:122
 msgid ""
 "Required. IP addresses and prefixes that this peer is allowed to use inside "
 "the tunnel. Usually the peer's tunnel IP addresses and the networks the peer "
@@ -4446,7 +4543,27 @@ msgstr ""
 "túnel. Por lo general, las direcciones IP del túnel del par y las redes que "
 "el mismo enruta a través del túnel."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1134
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1095
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1096
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1097
+msgid "Requires hostapd"
+msgstr "Requiere hostapd"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1101
+msgid "Requires hostapd with EAP support"
+msgstr "Requiere hostapd con soporte EAP"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1102
+msgid "Requires hostapd with OWE support"
+msgstr "Requiere hostapd con soporte OWE"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1098
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1099
+msgid "Requires hostapd with SAE support"
+msgstr "Requiere hostapd con soporte SAE"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1533
 msgid ""
 "Requires the 'full' version of wpad/hostapd and support from the wifi driver "
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
@@ -4454,7 +4571,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:140
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:141
 msgid ""
 "Requires upstream supports DNSSEC; verify unsigned domain responses really "
 "come from unsigned domains"
@@ -4462,7 +4579,31 @@ msgstr ""
 "Requiere upstream soporta DNSSEC; Verifique que las respuestas de los "
 "dominios no firmados realmente provengan de dominios no firmados"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1268
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1109
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1119
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1120
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1121
+msgid "Requires wpa-supplicant"
+msgstr "Requiere wpa-supplicant"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1113
+msgid "Requires wpa-supplicant with EAP support"
+msgstr "Requiere wpa-supplicant con soporte EAP"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1114
+msgid "Requires wpa-supplicant with OWE support"
+msgstr "Requiere wpa-supplicant con soporte OWE"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1111
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1124
+msgid "Requires wpa-supplicant with SAE support"
+msgstr "Requiere wpa-supplicant con soporte SAE"
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1355
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:17
 #: modules/luci-base/luasrc/view/cbi/footer.htm:30
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:66
@@ -4478,17 +4619,22 @@ msgstr "Reiniciar contadores"
 msgid "Reset to defaults"
 msgstr "Reiniciar a configuraciones predeterminadas"
 
-#: 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:68
 msgid "Resolv and Hosts Files"
 msgstr "Archivos Resolv y Hosts"
 
-#: 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:94
 msgid "Resolve file"
 msgstr "Archivo de resolución"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:28
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:14
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:71
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:197
+msgid "Resource not found"
+msgstr "Recurso no encontrado"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:302
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:693
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:90
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:112
 msgid "Restart"
 msgstr "Reiniciar"
 
@@ -4496,7 +4642,7 @@ msgstr "Reiniciar"
 msgid "Restart Firewall"
 msgstr "Reiniciar Firewall"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:14
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:691
 msgid "Restart radio interface"
 msgstr "Reiniciar la interfaz de radio"
 
@@ -4508,26 +4654,24 @@ msgstr "Restaurar"
 msgid "Restore backup"
 msgstr "Restaurar copia de seguridad"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:113
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:114
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:38
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:46
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:119
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:120
 msgid "Reveal/hide password"
 msgstr "Mostrar/ocultar contraseña"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1774
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2322
 msgid "Revert"
 msgstr "Revertir"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1861
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2405
 msgid "Revert changes"
 msgstr "Revertir cambios"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2013
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2554
 msgid "Revert request failed with status <code>%h</code>"
 msgstr "Error al revertir la solicitud con el estado <code>%h</code>"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1993
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2534
 msgid "Reverting configuration…"
 msgstr "Revirtiendo configuración..."
 
@@ -4535,7 +4679,7 @@ msgstr "Revirtiendo configuración..."
 msgid "Root"
 msgstr "Raíz"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:271
 msgid "Root directory for files served via TFTP"
 msgstr "Directorio raíz para los archivos servidos por TFTP"
 
@@ -4543,7 +4687,7 @@ msgstr "Directorio raíz para los archivos servidos por TFTP"
 msgid "Root preparation"
 msgstr "Preparación de la raíz"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:147
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:126
 msgid "Route Allowed IPs"
 msgstr "Ruta permitida IPs"
 
@@ -4555,12 +4699,12 @@ msgstr "Tabla de ruta"
 msgid "Route type"
 msgstr "Tipo de ruta"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:523
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:577
 msgid "Router Advertisement-Service"
 msgstr "Servicio de anuncio de enrutador"
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:43
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:15
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:27
 msgid "Router Password"
 msgstr "Contraseña del router"
 
@@ -4590,7 +4734,7 @@ msgstr "Comprobar el sistema de archivos antes de montar el dispositivo"
 msgid "Run filesystem check"
 msgstr "Comprobar el sistema de archivos"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:651
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:669
 msgid "Runtime error"
 msgstr "Error de tiempo de ejecución"
 
@@ -4602,31 +4746,31 @@ msgstr "SHA256"
 msgid "SNR"
 msgstr "SNR"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:5
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:18
 msgid "SSH Access"
 msgstr "Acceso SSH"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:10
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:70
 msgid "SSH server address"
 msgstr "Dirección del servidor SSH"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:13
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:74
 msgid "SSH server port"
 msgstr "Puerto del servidor SSH"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:8
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:58
 msgid "SSH username"
 msgstr "Nombre de usuario SSH"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:27
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:277
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
 msgid "SSH-Keys"
 msgstr "Claves SSH"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:42
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:73
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:29
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1617
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:174
 msgid "SSID"
 msgstr "SSID"
@@ -4635,17 +4779,17 @@ msgstr "SSID"
 msgid "SWAP"
 msgstr "SWAP"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1127
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1262
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1379
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1351
 #: modules/luci-base/luasrc/view/cbi/error.htm:17
 #: modules/luci-base/luasrc/view/cbi/footer.htm:26
 #: modules/luci-base/luasrc/view/cbi/header.htm:17
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:54
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:133
 msgid "Save"
 msgstr "Guardar"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1256
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1768
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1347
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2318
 #: modules/luci-base/luasrc/view/cbi/footer.htm:22
 msgid "Save & Apply"
 msgstr "Guardar y aplicar"
@@ -4658,28 +4802,20 @@ msgstr "Guardar mtdblock"
 msgid "Save mtdblock contents"
 msgstr "Guardar contenidos mtdblock"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
-msgid "Saving keys…"
-msgstr "Guardando llaves..."
-
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:698
 msgid "Scan"
 msgstr "Escanear"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:109
-msgid "Scan request failed"
-msgstr "Error en la solicitud de escaneo"
-
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:8
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:39
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:23
 msgid "Scheduled Tasks"
 msgstr "Tareas programadas"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1749
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2302
 msgid "Section added"
 msgstr "Sección añadida"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1751
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2304
 msgid "Section removed"
 msgstr "Sección removida"
 
@@ -4697,12 +4833,18 @@ msgstr ""
 "la verificación del formato de la imagen. ¡Úselo solo si está seguro de que "
 "el firmware es correcto y está diseñado para su dispositivo!"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:119
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:90
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:96
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:90
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:69
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:92
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1516
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1646
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1809
+msgid "Select file…"
+msgstr "Seleccionar archivo..."
+
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:144
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:102
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:125
 msgid ""
 "Send LCP echo requests at the given interval in seconds, only effective in "
 "conjunction with failure threshold"
@@ -4710,36 +4852,32 @@ msgstr ""
 "Enviar peticiones de echo LCP cada intervalo de segundos dado, solo efectivo "
 "usado conjuntamente con el umbral de fallo"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:561
-msgid "Separate Clients"
-msgstr "Aislar clientes"
-
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:62
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:63
 msgid "Server Settings"
 msgstr "Configuración del servidor"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:26
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:50
 msgid "Service Name"
 msgstr "Nombre de servicio"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:25
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:30
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:87
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:71
 msgid "Service Type"
 msgstr "Tipo de servicio"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:55
+#: modules/luci-base/luasrc/controller/admin/index.lua:62
 msgid "Services"
 msgstr "Aplicaciones"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:815
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:861
 msgid "Session expired"
 msgstr "Sesión expirada"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:83
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:107
 msgid "Set VPN as Default Route"
 msgstr "Establecer VPN como ruta predeterminada"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:258
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:795
 msgid ""
 "Set interface properties regardless of the link carrier (If set, carrier "
 "sense events do not invoke hotplug handlers)."
@@ -4748,15 +4886,18 @@ msgstr ""
 "enlace (si está configurado, los eventos de detección de operador no invocan "
 "los controladores de conexión en caliente)."
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:23
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:55
 msgid "Setting PLMN failed"
 msgstr "La configuración de la PLMN falló"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:26
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:68
 msgid "Setting operation mode failed"
 msgstr "El modo de operación de ajuste falló"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:454
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:517
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:527
 msgid "Setup DHCP Server"
 msgstr "Configuración del servidor DHCP"
 
@@ -4768,7 +4909,7 @@ msgstr "Segundos con errores graves (SES)"
 msgid "Short GI"
 msgstr "GI corto"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:516
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:960
 msgid "Short Preamble"
 msgstr "Preámbulo corto"
 
@@ -4780,21 +4921,23 @@ msgstr "Mostrar lista de archivos a resguardar"
 msgid "Show empty chains"
 msgstr "Mostrar cadenas vacias"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:306
 msgid "Shutdown this interface"
 msgstr "Apagar esta interfaz"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:111
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:34
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:47
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:132
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1616
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:173
 msgid "Signal"
 msgstr "Señal"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1960
+msgid "Signal / Noise"
+msgstr "Señal / Ruido"
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:125
 msgid "Signal Attenuation (SATN)"
 msgstr "Atenuación de señal (SATN)"
@@ -4807,11 +4950,11 @@ msgstr "Señal:"
 msgid "Size"
 msgstr "Tamaño"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:259
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:260
 msgid "Size of DNS query cache"
 msgstr "Tamaño de la caché de consultas DNS"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:191
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
 msgid "Size of the ZRam device in megabytes"
 msgstr "Tamaño del dispositivo ZRam en megabytes"
 
@@ -4828,11 +4971,7 @@ msgstr "Saltar al contenido"
 msgid "Skip to navigation"
 msgstr "Saltar a navegación"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:335
-msgid "Slot time"
-msgstr "Tiempo asignado"
-
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1640
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1846
 #: modules/luci-base/luasrc/model/network.lua:1427
 msgid "Software VLAN"
 msgstr "Software VLAN"
@@ -4873,12 +5012,7 @@ msgstr "Dirección de la fuente"
 msgid "Specifies the directory the device is attached to"
 msgstr "Especifica el directorio al que está enlazado el dispositivo"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:23
-msgid "Specifies the listening port of this <em>Dropbear</em> instance"
-msgstr ""
-"Especifica los puertos de escucha de esta instancia de <em>Dropbear</em>"
-
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:57
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:175
 msgid ""
 "Specifies the maximum amount of failed ARP requests until hosts are presumed "
 "to be dead"
@@ -4886,7 +5020,7 @@ msgstr ""
 "Especifica la cantidad de peticiones ARP fallidas hasta suponer muerto un "
 "dispositivo"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:49
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:171
 msgid ""
 "Specifies the maximum amount of seconds after which hosts are presumed to be "
 "dead"
@@ -4894,11 +5028,21 @@ msgstr ""
 "Especifica la cantidad de segundos a transcurrir hasta suponer muerto un "
 "dispositivo"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:761
+msgid ""
+"Specifies the maximum transmit power the wireless radio may use. Depending "
+"on regulatory requirements and wireless usage, the actual transmit power may "
+"be reduced by the driver."
+msgstr ""
+"Especifique la potencia de transmisión máxima que puede usar la radio "
+"inalámbrica. Dependiendo de los requisitos reglamentarios y el uso "
+"inalámbrico, el controlador puede reducir la potencia de transmisión real."
+
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:63
 msgid "Specify a TOS (Type of Service)."
 msgstr "Especifique un TOS (Tipo de Servicio)."
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:25
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:58
 msgid ""
 "Specify a TTL (Time to Live) for the encapsulating packet other than the "
 "default (64)."
@@ -4906,7 +5050,7 @@ msgstr ""
 "Especifique un TTL (Tiempo de vida) para el paquete de encapsulación que no "
 "sea el predeterminado (64)."
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:53
 msgid ""
 "Specify an MTU (Maximum Transmission Unit) other than the default (1280 "
 "bytes)."
@@ -4914,29 +5058,30 @@ msgstr ""
 "Especifique una MTU (Unidad de transmisión máxima) distinta de la "
 "predeterminada (1280 bytes)."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:60
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "Specify the secret encryption key here."
 msgstr "Especifique la clave de encriptación."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:475
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:64
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:533
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:89
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:111
 msgid "Start"
 msgstr "Iniciar"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:33
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:86
 msgid "Start priority"
 msgstr "Prioridad de inicio"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1958
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2499
 msgid "Starting configuration apply…"
 msgstr "Iniciando aplicar configuración..."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1626
 msgid "Starting wireless scan..."
 msgstr "Iniciando escaneo de WiFi..."
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:24
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:120
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
 msgid "Startup"
 msgstr "Arranque"
 
@@ -4948,20 +5093,21 @@ 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:70
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:71
 msgid "Static Leases"
 msgstr "Direcciones estáticas"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:118
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:73
 msgid "Static Routes"
 msgstr "Rutas estáticas"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1194
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1384
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:172
 #: modules/luci-base/luasrc/model/network.lua:966
 msgid "Static address"
 msgstr "Dirección estática"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:308
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:309
 msgid ""
 "Static leases are used to assign fixed IP addresses and symbolic hostnames "
 "to DHCP clients. They are also required for non-dynamic interface "
@@ -4972,39 +5118,41 @@ msgstr ""
 "necesarias para configuraciones de interfaces no dinámicas en las que a cada "
 "dispositivo siempre se le quiere dar la misma dirección IP."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:534
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:977
 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/luasrc/model/cbi/admin_network/ifaces.lua:197
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:337
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:746
 #: modules/luci-mod-status/luasrc/view/admin_status/index.htm:128
 msgid "Status"
 msgstr "Estado"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:35
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:75
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:308
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:91
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:113
 msgid "Stop"
 msgstr "Detener"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:165
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Strict order"
 msgstr "Orden estricto"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:16
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:30
 msgid "Strong"
 msgstr "Fuerte"
 
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1843
 msgid "Submit"
 msgstr "Enviar"
 
-#: 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:108
 msgid "Suppress logging"
 msgstr "Suprimir el registro"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:109
 msgid "Suppress logging of the routine operation of these protocols"
 msgstr "Suprimir el registro de la operación rutinaria de estos protocolos"
 
@@ -5016,44 +5164,46 @@ msgstr "Swap"
 msgid "Swap Entry"
 msgstr "Entrada de Swap"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:23
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:5
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:135
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:21
 msgid "Switch"
 msgstr "Switch"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:129
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:168
 msgid "Switch %q"
 msgstr "Switch %q"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:128
-msgid "Switch %q (%s)"
-msgstr "Switch %q (%s)"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:66
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:146
 msgid ""
 "Switch %q has an unknown topology - the VLAN settings might not be accurate."
 msgstr ""
 "El Switch %q tiene una topología desconocida: la configuración de VLAN puede "
 "no ser precisa."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:146
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:142
 msgid "Switch Port Mask"
 msgstr "Máscara de puerto de Switch"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1640
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1846
 #: modules/luci-base/luasrc/model/network.lua:1425
 msgid "Switch VLAN"
 msgstr "Switch VLAN"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:238
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:355
 msgid "Switch protocol"
 msgstr "Intercambiar protocolo"
 
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:103
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:104
 #: modules/luci-base/luasrc/view/cbi/ipaddr.htm:26
 msgid "Switch to CIDR list notation"
 msgstr "Cambiar a la notación de lista CIDR"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:77
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1547
+msgid "Symbolic link"
+msgstr "Enlace simbólico"
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:71
 msgid "Sync with NTP-Server"
 msgstr "Sincronizar con el servidor NTP"
 
@@ -5063,7 +5213,7 @@ msgstr "Sincronizar con el navegador"
 
 #: modules/luci-base/luasrc/controller/admin/index.lua:47
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:14
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:102
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:94
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
 #: modules/luci-mod-system/luasrc/view/admin_system/applyreboot.htm:39
 msgid "System"
@@ -5074,11 +5224,11 @@ msgstr "Sistema"
 msgid "System Log"
 msgstr "Registro del sistema"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:108
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:99
 msgid "System Properties"
 msgstr "Propiedades del sistema"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:145
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:136
 msgid "System log buffer size"
 msgstr "Tamaño del buffer de registro del sistema"
 
@@ -5086,15 +5236,17 @@ 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:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:69
 msgid "TFTP Settings"
 msgstr "Configuración TFTP"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:269
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
 msgid "TFTP server root"
 msgstr "Raíz del servidor TFTP"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:17
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:77
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:88
 msgid "TX"
@@ -5118,7 +5270,7 @@ msgstr "Tabla"
 msgid "Target"
 msgstr "Destino"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:77
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:103
 msgid "Target network"
 msgstr "Red de destino"
 
@@ -5126,30 +5278,7 @@ msgstr "Red de destino"
 msgid "Terminate"
 msgstr "Terminar"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:27
-msgid ""
-"The <em>Device Configuration</em> section covers physical settings of the "
-"radio hardware such as channel, transmit power or antenna selection which "
-"are shared among all defined wireless networks (if the radio hardware is "
-"multi-SSID capable). Per network settings like encryption or operation mode "
-"are grouped in the <em>Interface Configuration</em>."
-msgstr ""
-"La sección de <em>Configuración del dispositivo</em> ocupa la configuración "
-"física del hardware de radio como el canal, la potencia de transmisión o la "
-"selección de antena que se comparte entre todas las redes WiFi definidas (si "
-"el hardware de radio es capaz de ser multi-SSID). Configuración por red como "
-"encriptado o modo de operación se agrupan en <em>Configuración de la "
-"interfaz</em>."
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:79
-msgid ""
-"The <em>libiwinfo-lua</em> package is not installed. You must install this "
-"component for working wireless configuration!"
-msgstr ""
-"El paquete <em>libiwinfo-lua</em> no está instalado. ¡Debe instalarlo para "
-"poder configurar la conectividad WiFi!"
-
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:66
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:77
 msgid ""
 "The HE.net endpoint update configuration changed, you must now use the plain "
 "username instead of the user ID!"
@@ -5157,22 +5286,21 @@ msgstr ""
 "La configuración de actualización de punto final de HE.net cambió, ¡ahora "
 "debe usar el nombre de usuario simple en lugar de la ID de usuario!"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:8
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:40
 msgid ""
 "The IPv4 address or the fully-qualified domain name of the remote tunnel end."
 msgstr ""
 "La dirección IPv4 o el nombre de dominio completo del extremo del túnel "
 "remoto."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:27
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:38
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:59
 msgid ""
 "The IPv6 prefix assigned to the provider, usually ends with <code>::</code>"
 msgstr ""
 "El prefijo IPv6 asignado por el proveedor, suele termina con <code>::</code>"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:18
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1808
 msgid ""
 "The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
 "code> and <code>_</code>"
@@ -5189,7 +5317,7 @@ msgid "The configuration file could not be loaded due to the following error:"
 msgstr ""
 "El archivo de configuración no se pudo cargar debido al siguiente error:"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1849
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2396
 msgid ""
 "The device could not be reached within %d seconds after applying the pending "
 "changes, which caused the configuration to be rolled back for safety "
@@ -5216,6 +5344,14 @@ msgstr ""
 "El archivo de dispositivo de memoria o partición (<abbr title=\"Por ejemplo"
 "\">e.j.</abbr> <code>/dev/sda1</code>)"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:612
+msgid ""
+"The existing wireless configuration needs to be changed for LuCI to function "
+"properly."
+msgstr ""
+"La configuración inalámbrica existente debe cambiarse para que LuCI funcione "
+"correctamente."
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:127
 msgid ""
 "The filesystem that was used to format the memory (<abbr title=\"for example"
@@ -5240,11 +5376,15 @@ msgstr ""
 msgid "The following rules are currently active on this system."
 msgstr "Las siguientes reglas están actualmente activas en este sistema."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:144
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:154
+msgid "The gateway address must not be a local IP address"
+msgstr "La dirección de la puerta de enlace no debe ser una dirección IP local"
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:154
 msgid "The given SSH public key has already been added."
 msgstr "La clave pública SSH dada ya se ha agregado."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:150
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:160
 msgid ""
 "The given SSH public key is invalid. Please supply proper public RSA or "
 "ECDSA keys."
@@ -5252,36 +5392,36 @@ msgstr ""
 "La clave pública SSH dada no es válida. Por favor, suministre las claves "
 "públicas RSA o ECDSA."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:67
-msgid "The given network name is not unique"
-msgstr "El nombre de red dado no es único"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:664
+msgid "The interface name is already used"
+msgstr "El nombre de la interfaz ya está en uso."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:52
-msgid ""
-"The hardware is not multi-SSID capable and the existing configuration will "
-"be replaced if you proceed."
-msgstr ""
-"El hardware no tiene capacidad de tener varios SSIDs y la configuración "
-"existente será reemplazada si continúa."
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:670
+msgid "The interface name is too long"
+msgstr "El nombre de la interfaz es demasiado largo."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:43
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:31
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:55
 msgid ""
 "The length of the IPv4 prefix in bits, the remainder is used in the IPv6 "
 "addresses."
 msgstr ""
 "Longitud del prefijo IPv4 en bits, el resto se usará en direcciones IPv6."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:35
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:46
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:63
 msgid "The length of the IPv6 prefix in bits"
 msgstr "Longitud del prefijo IPv6 en bits"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:12
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:44
 msgid "The local IPv4 address over which the tunnel is created (optional)."
 msgstr "La dirección IPv4 local sobre la que se crea el túnel (opcional)."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:5
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1814
+msgid "The network name is already used"
+msgstr "El nombre de la red ya está en uso."
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:135
 msgid ""
 "The network ports on this device can be combined to several <abbr title="
 "\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
@@ -5297,24 +5437,23 @@ msgstr ""
 "segmentos de red. Es común que exista un puerto por defecto para subida "
 "hacia una red mayor como internet y el resto se dediquen a la red local."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:77
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:395
-msgid "The selected protocol needs a device assigned"
-msgstr "Este protocolo necesita estar asignado a un dispositivo"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1149
+msgid "The selected %s mode is incompatible with %s encryption"
+msgstr "El modo %s seleccionado es incompatible con el cifrado %s"
 
 #: modules/luci-base/luasrc/view/csrftoken.htm:11
 msgid "The submitted security token is invalid or already expired!"
 msgstr "¡El token de seguridad enviado no es válido o ya está vencido!"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:274
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:272
 msgid ""
 "The system is erasing the configuration partition now and will reboot itself "
 "when finished."
 msgstr ""
-"El sistema está borrando la partición de configuración y rearrancará cuando "
-"termine."
+"El sistema está borrando la partición de configuración y se reiniciará "
+"cuando termine."
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:195
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:193
 msgid ""
 "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
 "few minutes before you try to reconnect. It might be necessary to renew the "
@@ -5325,7 +5464,7 @@ msgstr ""
 "Espere unos minutos antes de reconectar. Es posible que tenga que renovar la "
 "conexión de su ordenador para poder acceder de nuevo al dispositivo."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:15
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:80
 msgid "The system password has been successfully changed."
 msgstr "La contraseña del sistema se ha cambiado correctamente."
 
@@ -5337,7 +5476,7 @@ 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:403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:427
 msgid "There are no active leases"
 msgstr "No hay direcciones activas"
 
@@ -5346,18 +5485,10 @@ msgstr "No hay direcciones activas"
 msgid "There are no active leases."
 msgstr "Sin conexiones activas."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1973
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2514
 msgid "There are no changes to apply"
 msgstr "No hay cambios para aplicar."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:204
-msgid ""
-"There is no device assigned yet, please attach a network device in the "
-"\"Physical Settings\" tab"
-msgstr ""
-"No hay dispositivo asignado aún. Por favor, enlace un dispositivo de red en "
-"la pestaña \"Configuración física\""
-
 #: 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
@@ -5367,13 +5498,21 @@ msgid ""
 "protect the web interface and enable SSH."
 msgstr ""
 "No hay contraseñas en este router. Por favor, configure una contraseña para "
-"proteger el interfaz web y habilitar SSH."
+"proteger la interfaz web y habilitar SSH."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:19
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:49
 msgid "This IPv4 address of the relay"
 msgstr "Dirección IPv4 del relé"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1448
+msgid "This authentication type is not applicable to the selected EAP method."
+msgstr "Este tipo de autenticación no es aplicable al método EAP seleccionado."
+
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:54
+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:163
 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 "
@@ -5393,7 +5532,7 @@ msgstr ""
 "en un sysupgrade. Los archivos modificados en /etc/config/ y ciertas otras "
 "configuraciones se guardarán automáticamente."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:74
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:81
 msgid ""
 "This is either the \"Update Key\" configured for the tunnel or the account "
 "password if no update key has been configured"
@@ -5402,7 +5541,7 @@ msgstr ""
 "contraseña de la cuenta si no se ha configurado ninguna clave de "
 "actualización"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:82
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:127
 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."
@@ -5410,7 +5549,7 @@ msgstr ""
 "Contenido de /etc/rc.local. Ponga sus propios comandos aquí (antes de 'exit "
 "0') para ejecutarlos al final del proceso de inicio."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:27
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:54
 msgid ""
 "This is the local endpoint address assigned by the tunnel broker, it usually "
 "ends with <code>...:2/64</code>"
@@ -5418,7 +5557,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:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:79
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> in the local network"
@@ -5426,22 +5565,22 @@ msgstr ""
 "Este es el único servidor <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr> en la red de área local"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:73
 msgid "This is the plain username for logging into the account"
 msgstr "Este es el nombre de usuario simple para iniciar sesión en la cuenta"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:34
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:57
 msgid ""
 "This is the prefix routed to you by the tunnel broker for use by clients"
 msgstr ""
 "Este es el prefijo que le envía el agente de túneles para que lo utilicen "
 "los clientes"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:9
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:41
 msgid "This is the system crontab in which scheduled tasks can be defined."
 msgstr "Definición de tareas programadas para crontab."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:19
+#: 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 ""
@@ -5458,26 +5597,26 @@ msgstr "Procesos del sistema que se están ejecutando actualmente y su estado."
 msgid "This page gives an overview over currently active network connections."
 msgstr "Conexiones de red activas."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:726
-#: modules/luci-base/htdocs/luci-static/resources/form.js:809
+#: modules/luci-base/htdocs/luci-static/resources/form.js:936
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1064
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:172
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:32
 msgid "This section contains no values yet"
 msgstr "No hay reglas definidas"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:114
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:105
 msgid "Time Synchronization"
 msgstr "Sincronización horaria"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:525
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:968
 msgid "Time interval for rekeying GTK"
 msgstr "Intervalo de tiempo para reprogramar GTK"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:128
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:119
 msgid "Timezone"
 msgstr "Zona horaria"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:825
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:871
 msgid "To login…"
 msgstr "Iniciar sesión…"
 
@@ -5492,7 +5631,7 @@ msgstr ""
 "predeterminadas pulse \"Realizar restablecimiento\" (sólo posible con "
 "imágenes squashfs)."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:835
 msgid "Tone"
 msgstr "Tono"
 
@@ -5516,55 +5655,41 @@ msgstr "Tráfico"
 msgid "Transfer"
 msgstr "Transferencia"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:595
-msgid "Transmission Rate"
-msgstr "Tasa de transmisión"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:102
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:89
 msgid "Transmit"
 msgstr "Transmitir"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:211
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:273
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:345
-msgid "Transmit Power"
-msgstr "Potencia de transmisión"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:318
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:349
-msgid "Transmitter Antenna"
-msgstr "Antena transmisora"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:73
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:57
 msgid "Trigger"
 msgstr "Disparador"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:98
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:84
 msgid "Trigger Mode"
 msgstr "Modo de disparador"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:54
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:69
 msgid "Tunnel ID"
 msgstr "ID de túnel"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1643
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1849
 #: modules/luci-base/luasrc/model/network.lua:1430
 msgid "Tunnel Interface"
 msgstr "Interfaz de túnel"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:44
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:55
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:76
 msgid "Tunnel Link"
 msgstr "Enlace del túnel"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:46
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:131
 msgid "Tx-Power"
 msgstr "Potencia-TX"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:32
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:185
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:11
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:43
 msgid "Type"
 msgstr "Tipo"
 
@@ -5572,19 +5697,20 @@ msgstr "Tipo"
 msgid "UDP:"
 msgstr "UDP:"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:28
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:90
 msgid "UMTS only"
 msgstr "Sólo UMTS"
 
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:43
 #: protocols/luci-proto-3g/luasrc/model/network/proto_3g.lua:10
 msgid "UMTS/GPRS/EV-DO"
 msgstr "UMTS/GPRS/EV-DO"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:106
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:93
 msgid "USB Device"
 msgstr "Dispositivo USB"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:122
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:110
 msgid "USB Ports"
 msgstr "Puertos USB"
 
@@ -5614,10 +5740,12 @@ msgstr "No se puede determinar la interfaz ascendente"
 msgid "Unable to dispatch"
 msgstr "Imposible repartir"
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:22
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:54
 msgid "Unable to obtain client ID"
 msgstr "No se puede obtener la identificación del cliente"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:61
 msgid "Unable to resolve AFTR host name"
 msgstr "No se puede resolver el nombre de host AFTR"
@@ -5627,21 +5755,31 @@ msgstr "No se puede resolver el nombre de host AFTR"
 msgid "Unable to resolve peer host name"
 msgstr "No se puede resolver el nombre de host del par"
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:33
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:68
+msgid "Unable to save contents: %s"
+msgstr "No se puede guardar el contenido: %s"
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:132
 msgid "Unavailable Seconds (UAS)"
 msgstr "Segundos no disponibles (UAS)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1196
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1386
 #: modules/luci-base/luasrc/model/network.lua:970
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1349
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1539
 #: modules/luci-base/luasrc/model/network.lua:1137
 msgid "Unknown error (%s)"
 msgstr "Error desconocido (%s)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1193
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:204
+msgid "Unknown error code"
+msgstr "Código de error desconocido"
+
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1383
+#: modules/luci-base/htdocs/luci-static/resources/protocol/none.js:6
 #: modules/luci-base/luasrc/model/network.lua:964
 msgid "Unmanaged"
 msgstr "No administrado"
@@ -5651,22 +5789,30 @@ msgstr "No administrado"
 msgid "Unmount"
 msgstr "Desmontar"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:107
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:262
 msgid "Unnamed key"
 msgstr "Clave sin nombre"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1708
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2261
 msgid "Unsaved Changes"
 msgstr "Cambios sin aplicar"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:202
+msgid "Unspecified error"
+msgstr "Error no especificado"
+
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:64
 msgid "Unsupported MAP type"
 msgstr "Tipo de MAP no soportado"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:27
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:69
 msgid "Unsupported modem"
 msgstr "Módem no soportado"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:219
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:119
 msgid "Unsupported protocol type."
 msgstr "Tipo de protocolo no soportado."
@@ -5689,56 +5835,73 @@ msgstr ""
 msgid "Upload archive..."
 msgstr "Subir archivo..."
 
-#: modules/luci-base/luasrc/view/cbi/upload.htm:8
-msgid "Uploaded File"
-msgstr "Archivo subido"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1703
+msgid "Upload file"
+msgstr "Subir archivo"
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1678
+msgid "Upload file…"
+msgstr "Subir archivo..."
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1623
+msgid "Upload request failed: %s"
+msgstr "Error al cargar la solicitud: %s"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:613
+msgid ""
+"Upon pressing \"Continue\", anonymous \"wifi-iface\" sections will be "
+"assigned with a name in the form <em>wifinet#</em> and the network will be "
+"restarted to apply the updated configuration."
+msgstr ""
+"Al presionar \"Continuar\", las secciones anónimas de \"wifi-iface\" se "
+"asignarán con un nombre en la forma <em>wifinet#</em> y la red se reiniciará "
+"para aplicar la configuración actualizada."
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:14
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:74
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:85
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:26
 msgid "Uptime"
 msgstr "Tiempo activo"
 
-#: 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:83
 msgid "Use <code>/etc/ethers</code>"
 msgstr "Usar <code>/etc/ethers</code>"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:40
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:167
 msgid "Use DHCP gateway"
 msgstr "Usar puerta de enlace DHCP"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:33
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:85
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:34
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:98
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:46
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:65
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:38
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:58
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:124
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:39
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:116
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:59
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:103
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:64
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:77
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:100
 msgid "Use DNS servers advertised by peer"
-msgstr "Usar otros servidores DNS"
+msgstr "Usar los servidores predeterminados"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:227
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:233
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:479
 msgid "Use ISO/IEC 3166 alpha2 country codes."
 msgstr "Usa códigos de país ISO/IEC 3166 alpha2."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:31
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:100
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:70
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:35
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:51
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:86
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:56
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:97
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:77
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:75
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:92
 msgid "Use MTU on tunnel interface"
 msgstr "MTU a usar en el interfaz de túnel"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:95
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:65
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:30
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:46
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:81
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:93
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:73
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:88
 msgid "Use TTL on tunnel interface"
 msgstr "TTL a usar en el interfaz de túnel"
 
@@ -5750,68 +5913,65 @@ msgstr "Utilizar como superposición externa (/overlay)"
 msgid "Use as root filesystem (/)"
 msgstr "Utilizar como sistema de archivos raíz (/)"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:19
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:31
 msgid "Use broadcast flag"
 msgstr "Usar marca de difusión"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:253
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:791
 msgid "Use builtin IPv6-management"
 msgstr "Utilizar la gestión integrada de IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:40
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:109
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:92
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:45
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:105
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:53
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:72
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:45
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:65
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:40
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:182
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:127
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:42
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:119
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:62
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:67
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:80
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:103
 msgid "Use custom DNS servers"
 msgstr "Usar servidores DNS personalizados"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:26
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:70
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:16
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:28
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:84
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:24
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:50
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:23
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:43
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:116
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:33
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:74
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:97
 msgid "Use default gateway"
 msgstr "Utilizar la puerta de enlace predeterminada"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:48
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:164
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:77
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:24
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:88
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:58
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:23
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:39
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:74
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:90
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:38
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:57
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:30
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:50
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:45
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:227
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:119
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:51
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:88
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:68
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:52
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:70
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:83
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:111
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:149
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:67
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:111
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:98
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:72
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:85
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:108
 msgid "Use gateway metric"
 msgstr "Usar métrica de puerta de enlace"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:64
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:179
 msgid "Use routing table"
 msgstr "Usar tabla de rutas"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:309
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:310
 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 "
@@ -5828,11 +5988,11 @@ msgstr ""
 msgid "Used"
 msgstr "Usado"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:848
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1273
 msgid "Used Key Slot"
 msgstr "Espacio de clave usado"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:913
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
 msgid ""
 "Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not "
 "needed with normal WPA(2)-PSK."
@@ -5840,67 +6000,68 @@ msgstr ""
 "Se utiliza para dos propósitos diferentes: RADIUS NAS ID y 802.11r R0KH-ID. "
 "No es necesario con WPA normal (2)-PSK."
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:48
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:110
 msgid "User certificate (PEM encoded)"
 msgstr "Certificado de usuario (Codificado PEM)"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:61
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:122
 msgid "User key (PEM encoded)"
 msgstr "Clave de usuario (codificada PEM)"
 
 #: modules/luci-base/luasrc/view/sysauth.htm:23
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:41
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:32
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:102
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:56
 msgid "Username"
 msgstr "Nombre de usuario"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:182
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:903
 msgid "VC-Mux"
 msgstr "VC-Mux"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:851
 msgid "VDSL"
 msgstr "VDSL"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:172
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:169
 msgid "VLANs on %q"
 msgstr "VLANs en %q"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:171
-msgid "VLANs on %q (%s)"
-msgstr "VLANs en %q (%s)"
+#: modules/luci-base/luasrc/controller/admin/index.lua:55
+msgid "VPN"
+msgstr "VPN"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:18
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:42
 msgid "VPN Local address"
 msgstr "VPN dirección local"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:22
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:46
 msgid "VPN Local port"
 msgstr "VPN puerto local"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:15
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:11
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:15
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:58
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:39
 msgid "VPN Server"
 msgstr "Servidor VPN"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:18
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:96
 msgid "VPN Server port"
 msgstr "Puerto del servidor VPN"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:37
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:100
 msgid "VPN Server's certificate SHA1 hash"
 msgstr "Hash SHA1 del certificado del servidor VPN"
 
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:9
 #: protocols/luci-proto-vpnc/luasrc/model/network/proto_vpnc.lua:9
 msgid "VPNC (CISCO 3000 (and others) VPN)"
 msgstr "VPNC (CISCO 3000 (y otros) VPN)"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:44
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:73
 msgid "Vendor"
 msgstr "Proveedor"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:60
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:52
 msgid "Vendor Class to send when requesting DHCP"
 msgstr "Clase de vendedor a enviar cuando solicite DHCP"
 
@@ -5908,41 +6069,37 @@ msgstr "Clase de vendedor a enviar cuando solicite DHCP"
 msgid "Verify"
 msgstr "Verificar"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:52
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:76
 msgid "Virtual dynamic interface"
 msgstr "Interfaz dinámica virtual"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:470
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:471
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:553
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:576
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:908
 msgid "WDS"
 msgstr "WDS"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:667
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1160
 msgid "WEP Open System"
 msgstr "Sistema abierto WEP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:668
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1161
 msgid "WEP Shared Key"
 msgstr "Clave compartida WEP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "WEP passphrase"
 msgstr "Contraseña WEP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:503
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:566
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:945
 msgid "WMM Mode"
 msgstr "Habilitar WMM"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "WPA passphrase"
 msgstr "Contraseña WPA"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:716
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:735
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:740
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1074
 msgid ""
 "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
 "and ad-hoc mode) to be installed."
@@ -5958,7 +6115,7 @@ msgstr "Esperando a que se apliquen los cambios..."
 msgid "Waiting for command to complete..."
 msgstr "Esperando a que termine el comando..."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1940
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2481
 msgid "Waiting for configuration to get applied… %ds"
 msgstr "Esperando a que se aplique la configuración… %ds"
 
@@ -5966,8 +6123,8 @@ msgstr "Esperando a que se aplique la configuración… %ds"
 msgid "Waiting for device..."
 msgstr "Esperando al dispositivo..."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:172
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:163
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:173
 msgid "Warning"
 msgstr "Aviso"
 
@@ -5975,11 +6132,11 @@ msgstr "Aviso"
 msgid "Warning: There are unsaved changes that will get lost on reboot!"
 msgstr "Advertencia: ¡Hay cambios no aplicados que se perderán al reiniciar!"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:20
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:34
 msgid "Weak"
 msgstr "Débil"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:946
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1355
 msgid ""
 "When using a PSK, the PMK can be automatically generated. When enabled, the "
 "R0/R1 key options below are not applied. Disable this to use the R0 and R1 "
@@ -5990,78 +6147,87 @@ msgstr ""
 "Deshabilite esto para usar las opciones de teclas R0 y R1."
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:383
 msgid "Width"
 msgstr "Ancho de banda"
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:17
 #: protocols/luci-proto-wireguard/luasrc/model/network/proto_wireguard.lua:9
 msgid "WireGuard VPN"
 msgstr "WireGuard VPN"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:58
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:40
 #: modules/luci-mod-status/luasrc/controller/admin/status.lua:28
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:14
 msgid "Wireless"
 msgstr "WiFi"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1631
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1837
 #: modules/luci-base/luasrc/model/network.lua:1418
 msgid "Wireless Adapter"
 msgstr "Adaptador WiFi"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1617
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2052
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1823
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2288
 #: modules/luci-base/luasrc/model/network.lua:1404
 #: modules/luci-base/luasrc/model/network.lua:1865
 msgid "Wireless Network"
 msgstr "Red WiFi"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:629
 msgid "Wireless Overview"
 msgstr "Visión general de WiFi"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:362
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:797
 msgid "Wireless Security"
 msgstr "Seguridad WiFi"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:54
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:611
+msgid "Wireless configuration migration"
+msgstr "Migración de configuración WiFi"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:139
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:179
 msgid "Wireless is disabled"
 msgstr "Red WiFi deshabilitada"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:54
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:139
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:179
 msgid "Wireless is not associated"
 msgstr "Red WiFi no asociada"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:15
-msgid "Wireless is restarting..."
-msgstr "Reiniciando red WiFi..."
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:752
 msgid "Wireless network is disabled"
 msgstr "Red WiFi deshabilitada"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:752
 msgid "Wireless network is enabled"
 msgstr "Red WiFi habilitada"
 
-#: 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:182
 msgid "Write received DNS requests to syslog"
 msgstr "Escribe las peticiones de DNS recibidas en el registro del sistema"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:164
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:155
 msgid "Write system log to file"
 msgstr "Escribe el registro del sistema al archivo"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1507
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:85
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1754
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:109
 msgid "Yes"
 msgstr "Si"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:26
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:943
+msgid ""
+"You appear to be currently connected to the device via the \"%h\" interface. "
+"Do you really want to shut down the interface?"
+msgstr ""
+"Parece que está conectado actualmente al dispositivo a través de la interfaz "
+"\"%h\" ¿Realmente quieres apagar la interfaz?"
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:123
 msgid ""
 "You can enable or disable installed init scripts here. Changes will applied "
 "after a device reboot.<br /><strong>Warning: If you disable essential init "
@@ -6081,38 +6247,34 @@ msgid ""
 msgstr ""
 "Debe habilitar JavaScript en su navegador o LuCI no funcionará correctamente."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:196
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:187
 msgid "ZRam Compression Algorithm"
 msgstr "Algoritmo de compresión ZRam"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:203
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:194
 msgid "ZRam Compression Streams"
 msgstr "Streams de compresión ZRam"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:189
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:180
 msgid "ZRam Settings"
 msgstr "Configuración de ZRam"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:191
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
 msgid "ZRam Size"
 msgstr "Tamaño de ZRam"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:229
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:230
 msgid "any"
 msgstr "Cualquiera"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:113
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:121
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:126
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:218
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:282
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:321
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:328
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:621
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:37
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:22
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:29
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:121
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:836
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:844
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:849
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1030
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:78
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:48
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:51
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:103
 msgid "auto"
 msgstr "Auto"
 
@@ -6120,11 +6282,11 @@ msgstr "Auto"
 msgid "automatic"
 msgstr "Automático"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:45
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:78
 msgid "baseT"
 msgstr "baseT"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:909
 msgid "bridged"
 msgstr "Puenteado"
 
@@ -6140,22 +6302,21 @@ msgstr "Crear"
 msgid "create:"
 msgstr "Crear:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:264
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:368
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:678
 msgid "creates a bridge over specified interface(s)"
 msgstr "Crea un puente sobre la interfaz o interfaces asociadas"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:277
 msgid "dB"
 msgstr "dB"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:34
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:35
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:46
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:47
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:48
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:131
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:132
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:133
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:277
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:279
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:331
@@ -6167,26 +6328,30 @@ msgstr "dB"
 msgid "dBm"
 msgstr "dBm"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:460
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:587
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:889
 msgid "disable"
 msgstr "Deshabilitar"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:119
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:524
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:530
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:536
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:18
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:578
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:584
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:590
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:25
 msgid "disabled"
 msgstr "Deshabilitado"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:433
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:467
+msgid "driver default"
+msgstr "Predeterminado por el controlador"
+
 #: modules/luci-base/luasrc/view/lease_status.htm:17
 #: modules/luci-base/luasrc/view/lease_status.htm:46
-#: 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:416
 msgid "expired"
 msgstr "Expirado"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:88
 msgid ""
 "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr>-leases will be stored"
@@ -6200,25 +6365,21 @@ msgstr ""
 msgid "forward"
 msgstr "Reenviar"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:80
 msgid "full-duplex"
 msgstr "Full dúplex"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:80
 msgid "half-duplex"
 msgstr "Half dúplex"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:559
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:565
 msgid "hexadecimal encoded value"
 msgstr "valor codificado en hexadecimal"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:138
-msgid "hidden"
-msgstr "Oculto"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:527
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:533
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:538
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:581
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:587
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:592
 msgid "hybrid mode"
 msgstr "Modo híbrido"
 
@@ -6226,6 +6387,10 @@ msgstr "Modo híbrido"
 msgid "if target is a network"
 msgstr "Si el destino es una red"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:63
+msgid "ignore"
+msgstr "ignorar"
+
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:177
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
@@ -6260,25 +6425,26 @@ 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:94
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:95
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr "Archivo <abbr title=\"Domain Name System\">DNS</abbr> local"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:952
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1168
+msgid "medium security"
+msgstr "seguridad media"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1360
 msgid "minutes"
 msgstr "Minutos"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:43
-msgid "mixed WPA/WPA2"
-msgstr "WPA y WPA2"
-
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:225
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:232
 msgid "no"
 msgstr "No"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:54
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:72
 msgid "no link"
 msgstr "Sin enlace"
 
@@ -6286,7 +6452,7 @@ msgstr "Sin enlace"
 msgid "non-empty value"
 msgstr "valor no vacío"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1195
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1446
 msgid "none"
 msgstr "ninguno"
 
@@ -6296,7 +6462,9 @@ msgstr "ninguno"
 msgid "not present"
 msgstr "No presente"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:363
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:341
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:776
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:780
 #: 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
@@ -6311,9 +6479,9 @@ msgstr "Apagado"
 msgid "on"
 msgstr "Encendido"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
-msgid "open"
-msgstr "Abierto"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1169
+msgid "open network"
+msgstr "red abierta"
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
@@ -6332,73 +6500,77 @@ msgstr "valor decimal positivo"
 msgid "positive integer value"
 msgstr "valor entero positivo"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:34
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:56
 msgid "random"
 msgstr "Aleatorio"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:526
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:532
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:537
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:580
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:586
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:591
 msgid "relay mode"
 msgstr "Modo relé"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:910
 msgid "routed"
 msgstr "Enrutado"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:525
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:534
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:968
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:977
 msgid "sec"
 msgstr "Seg"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:525
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:531
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:579
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:585
 msgid "server mode"
 msgstr "Modo servidor"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:544
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:597
 msgid "stateful-only"
 msgstr "Con estado solamente"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:542
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:595
 msgid "stateless"
 msgstr "Sin estado"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:543
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:596
 msgid "stateless + stateful"
 msgstr "Sin estado + Con estado"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:369
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1167
+msgid "strong security"
+msgstr "seguridad fuerte"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:346
 msgid "tagged"
 msgstr "Etiquetado"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:932
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1343
 msgid "time units (TUs / 1.024 ms) [1000-65535]"
 msgstr "Unidades de tiempo (TUs / 1.024 ms) [1000-65535]"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:549
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:555
 msgid "unique value"
 msgstr "valor único"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:448
 msgid "unknown"
 msgstr "Desconocido"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:15
 #: modules/luci-base/luasrc/view/lease_status.htm:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:238
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:390
+#: 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:414
 msgid "unlimited"
 msgstr "Ilimitado"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1401
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1648
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:63
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:355
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:378
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:413
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:446
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:512
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:450
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:545
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:53
 #: modules/luci-base/luasrc/view/cbi/network_netlist.htm:38
 msgid "unspecified"
@@ -6408,7 +6580,7 @@ msgstr "No especificado"
 msgid "unspecified -or- create:"
 msgstr "No especificado -o- crear:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:366
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:344
 msgid "untagged"
 msgstr "Desetiquetado"
 
@@ -6489,8 +6661,8 @@ msgstr "identificador UCI válido, nombre del host o dirección IP"
 msgid "valid address:port"
 msgstr "dirección válida: puerto"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:523
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:527
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:529
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:533
 msgid "valid date (YYYY-MM-DD)"
 msgstr "fecha válida (AAAA-MM-DD)"
 
@@ -6527,7 +6699,7 @@ msgstr "valor entero valido"
 msgid "valid network in address/netmask notation"
 msgstr "red válida en notación de dirección/máscara de red"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:498
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:504
 msgid "valid phone digit (0-9, \"*\", \"#\", \"!\" or \".\")"
 msgstr "dígito de teléfono válido (0-9, \"*\", \"#\", \"!\" o \".\")"
 
@@ -6540,11 +6712,11 @@ msgstr "puerto válido o rango de puertos (port1-port2)"
 msgid "valid port value"
 msgstr "valor de puerto válido"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:503
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:509
 msgid "valid time (HH:MM:SS)"
 msgstr "tiempo válido (HH:MM:SS)"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:425
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:431
 msgid "value between %d and %d characters"
 msgstr "valor entre %d y %d caracteres"
 
@@ -6560,14 +6732,23 @@ msgstr "valor mayor o igual a %f"
 msgid "value smaller or equal to %f"
 msgstr "valor menor o igual a %f"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:430
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:425
+msgid "value with %d characters"
+msgstr "valor con %d caracteres"
+
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:436
 msgid "value with at least %d characters"
 msgstr "valor con al menos %d caracteres"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:435
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:441
 msgid "value with at most %d characters"
 msgstr "valor con un máximo de %d caracteres"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1169
+msgid "weak security"
+msgstr "seguridad débil"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:221
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:232
@@ -6578,6 +6759,258 @@ msgstr "Si"
 msgid "« Back"
 msgstr "« Volver"
 
+#~ msgid "Change login password"
+#~ msgstr "Cambiar contraseña de inicio de sesión"
+
+#~ msgid "Changing password…"
+#~ msgstr "Cambiando contraseña..."
+
+#~ msgid "Disabled (default)"
+#~ msgstr "Deshabilitado (predeterminado)"
+
+#~ msgid "Loading SSH keys…"
+#~ msgstr "Cargando claves SSH..."
+
+#~ msgid "Saving keys…"
+#~ msgstr "Guardando llaves..."
+
+#~ msgid "Specifies the listening port of this <em>Dropbear</em> instance"
+#~ msgstr ""
+#~ "Especifica los puertos de escucha de esta instancia de <em>Dropbear</em>"
+
+#~ msgid "Switch %q (%s)"
+#~ msgstr "Switch %q (%s)"
+
+#~ msgid "VLANs on %q (%s)"
+#~ msgstr "VLANs en %q (%s)"
+
+#~ msgid "Antenna 1"
+#~ msgstr "Antena 1"
+
+#~ msgid "Antenna 2"
+#~ msgstr "Antena 2"
+
+#~ msgid "Antenna Configuration"
+#~ msgstr "Configuración de la antena"
+
+#~ msgid "Back to overview"
+#~ msgstr "Volver al resumen"
+
+#~ msgid "Back to scan results"
+#~ msgstr "Volver a resultados de la exploración"
+
+#~ msgid "Broadcom 802.11%s Wireless Controller"
+#~ msgstr "Controlador WiFi 802.11%s Broadcom"
+
+#~ msgid "Broadcom BCM%04x 802.11 Wireless Controller"
+#~ msgstr "Controlador WiFi 802.11 BCM%04x"
+
+#~ msgid ""
+#~ "Channel %d is not available in the %s regulatory domain and has been auto-"
+#~ "adjusted to %d."
+#~ msgstr ""
+#~ "El canal %d no está disponible en el dominio regulatorio %s y se ha "
+#~ "ajustado automáticamente a %d."
+
+#~ msgid "Common Configuration"
+#~ msgstr "Configuración común"
+
+#~ msgid "Connect"
+#~ msgstr "Conectar"
+
+#~ msgid "Connection Limit"
+#~ msgstr "Límite de conexión"
+
+#~ msgid "Cover the following interface"
+#~ msgstr "Cubrir interfaz"
+
+#~ msgid "Cover the following interfaces"
+#~ msgstr "Cubre los siguientes interfaces"
+
+#~ msgid "Create Interface"
+#~ msgstr "Crear interfaz"
+
+#~ msgid "Create a bridge over multiple interfaces"
+#~ msgstr "Crear un puente sobre múltiples interfaces"
+
+#~ msgid "Diversity"
+#~ msgstr "Diversidad"
+
+#~ msgid "Edit this interface"
+#~ msgstr "Editar esta interfaz"
+
+# It should be "Frame Bursting" at once!
+#~ msgid "Frame Bursting"
+#~ msgstr "Estallido del marco"
+
+#~ msgid ""
+#~ "Further information about WireGuard interfaces and peers at <a href="
+#~ "\"http://wireguard.com\">wireguard.com</a>."
+#~ msgstr ""
+#~ "Más información sobre las interfaces y los pares de WireGuard en <a href="
+#~ "\"http://wireguard.com\">wireguard.com</a>."
+
+#~ msgid "Generic 802.11%s Wireless Controller"
+#~ msgstr "Controlador WiFi 802.11%s genérico"
+
+#~ msgid "HT mode (802.11n)"
+#~ msgstr "Modo HT (802.11n)"
+
+#~ msgid "Install package %q"
+#~ msgstr "Instalar paquete %q"
+
+#~ msgid "Interface Overview"
+#~ msgstr "Resumen de interfaces"
+
+#~ msgid "Locked to channel %s used by: %s"
+#~ msgstr "Bloqueado en el canal %s utilizado por: %s"
+
+#~ msgid ""
+#~ "Maximum length of the name is 15 characters including the automatic "
+#~ "protocol/bridge prefix (br-, 6in4-, pppoe- etc.)"
+#~ msgstr ""
+#~ "La longitud máxima del nombre es de 15 caracteres, incluido el prefijo de "
+#~ "protocolo/puente automático (br-, 6in4-, pppoe-, etc.)"
+
+#~ msgid "Missing protocol extension for proto %q"
+#~ msgstr "Extensión de protocolo faltante para %q"
+
+#~ msgid "Name of the new interface"
+#~ msgstr "Nombre de la nueva interfaz"
+
+#~ msgid "No network configured on this device"
+#~ msgstr "No hay red configurada para este dispositivo"
+
+#~ msgid "No network name specified"
+#~ msgstr "No se ha especificado un nombre de red"
+
+#~ msgid "No networks in range"
+#~ msgstr "No hay redes en rango"
+
+#~ msgid "No scan results available yet..."
+#~ msgstr "Aún no hay resultados de escaneo disponibles ..."
+
+#~ msgid "Not associated"
+#~ msgstr "No asociado"
+
+#~ msgid "Note: interface name length"
+#~ msgstr "Nota: longitud del nombre de la interfaz"
+
+#~ msgid ""
+#~ "On this page you can configure the network interfaces. You can bridge "
+#~ "several interfaces by ticking the \"bridge interfaces\" field and enter "
+#~ "the names of several network interfaces separated by spaces. You can also "
+#~ "use <abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
+#~ "<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
+#~ "<samp>eth0.1</samp>)."
+#~ msgstr ""
+#~ "Configure las interfaces de red. Puede hacer puentes con diferentes "
+#~ "interfaces, marcando el campo \"Puentear interfaces\" e introduciendo el "
+#~ "nombre de las mismas separadas por espacios. También puede usar la "
+#~ "notación <abbr title=\"Virtual Local Area Network\">VLAN</abbr>, "
+#~ "<samp>INTERFACE.VLANNR</samp> (<abbr title=\"por ejemplo\">Ej.</abbr>: "
+#~ "<samp>eth0.1</samp>)."
+
+#~ msgid "Package libiwinfo required!"
+#~ msgstr "¡Se necesita el paquete libiwinfo!"
+
+#~ msgid "Protocol of the new interface"
+#~ msgstr "Protocolo de la nueva interfaz"
+
+#~ msgid "Protocol support is not installed"
+#~ msgstr "No está instalado el paquete necesario para utilizar el protocolo"
+
+#~ msgid ""
+#~ "Really delete this wireless network? The deletion cannot be undone! You "
+#~ "might lose access to this device if you are connected via this network."
+#~ msgstr ""
+#~ "¿Realmente quiere eliminar esta red WiFi? La eliminación no se puede "
+#~ "deshacer! Es posible que pierda el acceso a este dispositivo si está "
+#~ "conectado a través de esta red."
+
+#~ msgid "Receiver Antenna"
+#~ msgstr "Antena Receptora"
+
+#~ msgid "Repeat scan"
+#~ msgstr "Repetir exploración"
+
+#~ msgid "Replace entry"
+#~ msgstr "Reemplazar entrada"
+
+#~ msgid "Scan request failed"
+#~ msgstr "Error en la solicitud de escaneo"
+
+#~ msgid "Separate Clients"
+#~ msgstr "Aislar clientes"
+
+#~ msgid "Slot time"
+#~ msgstr "Tiempo asignado"
+
+#~ msgid ""
+#~ "The <em>Device Configuration</em> section covers physical settings of the "
+#~ "radio hardware such as channel, transmit power or antenna selection which "
+#~ "are shared among all defined wireless networks (if the radio hardware is "
+#~ "multi-SSID capable). Per network settings like encryption or operation "
+#~ "mode are grouped in the <em>Interface Configuration</em>."
+#~ msgstr ""
+#~ "La sección de <em>Configuración del dispositivo</em> ocupa la "
+#~ "configuración física del hardware de radio como el canal, la potencia de "
+#~ "transmisión o la selección de antena que se comparte entre todas las "
+#~ "redes WiFi definidas (si el hardware de radio es capaz de ser multi-"
+#~ "SSID). Configuración por red como encriptado o modo de operación se "
+#~ "agrupan en <em>Configuración de la interfaz</em>."
+
+#~ msgid ""
+#~ "The <em>libiwinfo-lua</em> package is not installed. You must install "
+#~ "this component for working wireless configuration!"
+#~ msgstr ""
+#~ "El paquete <em>libiwinfo-lua</em> no está instalado. ¡Debe instalarlo "
+#~ "para poder configurar la conectividad WiFi!"
+
+#~ msgid "The given network name is not unique"
+#~ msgstr "El nombre de red dado no es único"
+
+#~ msgid ""
+#~ "The hardware is not multi-SSID capable and the existing configuration "
+#~ "will be replaced if you proceed."
+#~ msgstr ""
+#~ "El hardware no tiene capacidad de tener varios SSIDs y la configuración "
+#~ "existente será reemplazada si continúa."
+
+#~ msgid "The selected protocol needs a device assigned"
+#~ msgstr "Este protocolo necesita estar asignado a un dispositivo"
+
+#~ msgid ""
+#~ "There is no device assigned yet, please attach a network device in the "
+#~ "\"Physical Settings\" tab"
+#~ msgstr ""
+#~ "No hay dispositivo asignado aún. Por favor, enlace un dispositivo de red "
+#~ "en la pestaña \"Configuración física\""
+
+#~ msgid "Transmission Rate"
+#~ msgstr "Tasa de transmisión"
+
+#~ msgid "Transmit Power"
+#~ msgstr "Potencia de transmisión"
+
+#~ msgid "Transmitter Antenna"
+#~ msgstr "Antena transmisora"
+
+#~ msgid "Uploaded File"
+#~ msgstr "Archivo subido"
+
+#~ msgid "Wireless is restarting..."
+#~ msgstr "Reiniciando red WiFi..."
+
+#~ msgid "hidden"
+#~ msgstr "Oculto"
+
+#~ msgid "mixed WPA/WPA2"
+#~ msgstr "WPA y WPA2"
+
+#~ msgid "open"
+#~ msgstr "Abierto"
+
 #~ msgid "Advanced"
 #~ msgstr "Avanzado"
 
@@ -6810,9 +7243,6 @@ msgstr "« Volver"
 #~ msgid "Hermes 802.11b Wireless Controller"
 #~ msgstr "Controlador inalámbrico 802.11b Hermes"
 
-#~ msgid "Interface is shutting down..."
-#~ msgstr "Parando interfaz..."
-
 #~ msgid "Interface reconnected"
 #~ msgstr "Interfaz reconectado"
 
diff --git a/modules/luci-base/po/fr/base.po b/modules/luci-base/po/fr/base.po
index 5f98b3b4d..3e2b9b4ee 100644
--- a/modules/luci-base/po/fr/base.po
+++ b/modules/luci-base/po/fr/base.po
@@ -13,19 +13,20 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Pootle 2.0.6\n"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:133
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:857
 msgid "%.1f dB"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:109
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:122
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 msgid "%d Bit"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1641
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2194
 msgid "%d invalid field(s)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:281
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:31
 msgid "%s is untagged in multiple VLANs!"
 msgstr ""
 
@@ -63,19 +64,19 @@ msgid "-- Additional Field --"
 msgstr "-- Champ Supplémentaire --"
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:258
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1401
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1533
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:250
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:350
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1114
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1648
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1780
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:314
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:414
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1178
 #: modules/luci-base/luasrc/view/cbi/header.htm:5
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:26
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:88
 msgid "-- Please choose --"
 msgstr "-- Choisir --"
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:259
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:351
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1115
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:415
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1179
 #: modules/luci-base/luasrc/view/cbi/header.htm:6
 msgid "-- custom --"
 msgstr "-- autre --"
@@ -98,7 +99,7 @@ msgstr ""
 msgid "-- please select --"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:382
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:814
 msgid "0 = not using RSSI threshold, 1 = do not change driver default"
 msgstr ""
 
@@ -110,10 +111,11 @@ msgstr "Charge sur 1 minute :"
 msgid "15 Minute Load:"
 msgstr "Charge sur 15 minutes :"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:924
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1337
 msgid "4-character hexadecimal ID"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:11
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:18
 msgid "464XLAT (CLAT)"
 msgstr ""
@@ -122,47 +124,47 @@ msgstr ""
 msgid "5 Minute Load:"
 msgstr "Charge sur 5 minutes :"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:960
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1366
 msgid "6-octet identifier as a hex string - no colons"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:891
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1310
 msgid "802.11r Fast Transition"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1157
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1567
 msgid "802.11w Association SA Query maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1574
 msgid "802.11w Association SA Query retry timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1133
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1533
 msgid "802.11w Management Frame Protection"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1156
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1567
 msgid "802.11w maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1165
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1574
 msgid "802.11w retry timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:399
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:831
 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:224
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:225
 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:215
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:216
 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:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
 msgid ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
 "order of the resolvfile"
@@ -170,11 +172,11 @@ msgstr ""
 "Les serveurs <abbr title=\"Domain Name System\">DNS</abbr> seront<br/"
 ">interrogés dans l'ordre du fichier de résolution"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:388
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:820
 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:351
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:373
 #: 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>"
@@ -184,8 +186,8 @@ msgstr "Adresse <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
 msgstr "Passerelle <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:555
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:35
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:506
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr "Masque réseau <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
 
@@ -201,30 +203,30 @@ 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:378
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:402
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:58
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:35
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:33
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr ""
 "Configuration des <abbr title=\"Diode Électro-Luminescente\">DEL</abbr>s"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:67
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:51
 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:328
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:329
 #: 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:372
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:233
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:234
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> leases"
@@ -232,7 +234,7 @@ msgstr ""
 "Nombre de baux <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> maximum"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:242
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> packet size"
@@ -240,69 +242,73 @@ msgstr ""
 "taille maximum des paquets <abbr title=\"Extension Mechanisms for Domain "
 "Name System\">EDNS0</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:251
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:252
 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
 msgstr "Maximum de requêtes concurrentes"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:10
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:42
 msgid ""
 "<br/>Note: you need to manually restart the cron service if the crontab file "
 "was empty before editing."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:817
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1605
+msgid "A directory with the same name already exists."
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:863
 msgid "A new login is required since the authentication session expired."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:114
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:837
 msgid "A43C + J43 + A43"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:838
 msgid "A43C + J43 + A43 + V43"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:850
 msgid "ADSL"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:826
 msgid "ANSI T1.413"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:33
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:47
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:23
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:94
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:86
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:67
 msgid "APN"
 msgstr "APN"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:56
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:175
 msgid "ARP retry threshold"
 msgstr "Niveau de ré-essai ARP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:122
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:845
 msgid "ATM (Asynchronous Transfer Mode)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:144
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:866
 msgid "ATM Bridges"
 msgstr "Ponts ATM"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:178
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:21
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:898
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:66
 msgid "ATM Virtual Channel Identifier (VCI)"
 msgstr ""
 "Identifiant de canal virtuel (<abbr title=\"Virtual Channel Idendifier"
 "\">VCI</abbr>) ATM"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:179
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:26
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:899
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:70
 msgid "ATM Virtual Path Identifier (VPI)"
 msgstr ""
 "Identifiant de chemin virtuel (<abbr title=\"Virtual Path Idendifier\">VPI</"
 "abbr>) ATM"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:866
 msgid ""
 "ATM bridges expose encapsulated ethernet in AAL5 connections as virtual "
 "Linux network interfaces which can be used in conjunction with DHCP or PPP "
@@ -312,8 +318,8 @@ msgstr ""
 "des interfaces réseau virtuelles Linux qui peuvent être utilisées avec DHCP "
 "ou PPP pour se connecter au réseau du fournisseur d'accès."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:184
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:905
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:62
 msgid "ATM device number"
 msgstr "Numéro de périphérique ATM"
 
@@ -322,17 +328,17 @@ msgid "ATU-C System Vendor ID"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:251
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:495
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:499
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:528
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:532
 msgid "Absent Interface"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:19
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
 msgid "Access Concentrator"
 msgstr "Concentrateur d'accès"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:368
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:470
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:802
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
 msgid "Access Point"
 msgstr "Point d'accès"
 
@@ -355,7 +361,7 @@ msgid "Active Connections"
 msgstr "Connexions actives"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:68
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:30
 msgid "Active DHCP Leases"
 msgstr "Bails DHCP actifs"
 
@@ -363,56 +369,76 @@ msgstr "Bails DHCP actifs"
 msgid "Active DHCPv6 Leases"
 msgstr "Bails DHCPv6 actifs"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1951
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:370
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:12
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2190
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:804
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:23
 msgid "Ad-Hoc"
 msgstr "Ad-hoc"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:650
-#: modules/luci-base/htdocs/luci-static/resources/form.js:651
-#: modules/luci-base/htdocs/luci-static/resources/form.js:666
-#: modules/luci-base/htdocs/luci-static/resources/form.js:667
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1290
+#: modules/luci-base/htdocs/luci-static/resources/form.js:902
+#: modules/luci-base/htdocs/luci-static/resources/form.js:904
+#: modules/luci-base/htdocs/luci-static/resources/form.js:917
+#: modules/luci-base/htdocs/luci-static/resources/form.js:918
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1539
 #: modules/luci-base/luasrc/view/cbi/nsection.htm:25
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:189
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:197
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:39
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:47
 #: modules/luci-base/luasrc/view/cbi/ucisection.htm:54
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:703
 msgid "Add"
 msgstr "Ajouter"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:60
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:870
+msgid "Add ATM Bridge"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:92
 msgid "Add IPv4 address…"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:129
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:204
 msgid "Add IPv6 address…"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:143
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:149
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:38
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:47
+msgid "Add LED action"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:215
+msgid "Add VLAN"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:14
+msgid "Add instance"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:153
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:159
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:250
 msgid "Add key"
 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:155
 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"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:705
 msgid "Add new interface..."
 msgstr "Ajout d'une nouvelle interface..."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:104
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:99
+msgid "Add peer"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:105
 msgid "Additional Hosts files"
 msgstr "Fichiers hosts supplémetaires"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:161
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
 msgid "Additional servers file"
 msgstr ""
 
@@ -439,7 +465,7 @@ msgstr ""
 msgid "Address"
 msgstr "Adresse"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:12
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:151
 msgid "Address to access local relay bridge"
 msgstr "Adresse pour accéder au pont-relais local"
 
@@ -448,13 +474,13 @@ msgstr "Adresse pour accéder au pont-relais local"
 msgid "Administration"
 msgstr "Administration"
 
-#: 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:70
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:505
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:896
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:24
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:189
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:463
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:176
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:143
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:364
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:742
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:799
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:50
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:34
 msgid "Advanced Settings"
@@ -464,172 +490,172 @@ msgstr "Paramètres avancés"
 msgid "Aggregate Transmit Power(ACTATP)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:175
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:166
 msgid "Alert"
 msgstr "Alerte"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1628
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1834
 #: modules/luci-base/luasrc/model/network.lua:1416
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:54
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:78
 msgid "Alias Interface"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:138
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:66
 msgid "Alias of \"%s\""
 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:170
 msgid "All Servers"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:114
 msgid ""
 "Allocate IP addresses sequentially, starting from the lowest available "
 "address"
 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:113
 msgid "Allocate IP sequentially"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:24
 msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
 msgstr ""
 "Autoriser l'authentification <abbr title=\"Secure Shell\">SSH</abbr> par mot "
 "de passe"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:545
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:987
 msgid "Allow AP mode to disconnect STAs based on low ACK condition"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:462
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:589
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:891
 msgid "Allow all except listed"
 msgstr "Autoriser tout sauf ce qui est listé"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:236
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:767
 msgid "Allow legacy 802.11b rates"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:461
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:588
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:890
 msgid "Allow listed only"
 msgstr "Autoriser seulement ce qui est listé"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:198
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:199
 msgid "Allow localhost"
 msgstr "Autoriser l'hôte local"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:47
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:35
 msgid "Allow remote hosts to connect to local SSH forwarded ports"
 msgstr ""
 "Permettre à des hôtes distants de se conecter à des ports SSH locaux "
 "correspondants (« forwarded »)"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:38
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:30
 msgid "Allow root logins with password"
 msgstr "Autoriser les connexions administrateur avec mot de passe"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:39
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:30
 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:199
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:200
 msgid ""
 "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
 msgstr ""
 "Autorise les réponses de l'amont dans la plage 127.0.0.0/8, par ex. pour les "
 "services RBL"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:135
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:122
 msgid "Allowed IPs"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:549
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:602
 msgid "Always announce default router"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:259
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:782
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
 "option does not comply with IEEE 802.11n-2009!"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:95
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:818
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:119
 msgid "Annex"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:96
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:819
 msgid "Annex A + L + M (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:827
 msgid "Annex A G.992.1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:828
 msgid "Annex A G.992.2"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:829
 msgid "Annex A G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:830
 msgid "Annex A G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:97
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:820
 msgid "Annex B (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:823
 msgid "Annex B G.992.1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:824
 msgid "Annex B G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:102
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:825
 msgid "Annex B G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:98
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:821
 msgid "Annex J (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:831
 msgid "Annex L G.992.3 POTS 1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:99
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:822
 msgid "Annex M (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:109
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:832
 msgid "Annex M G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:833
 msgid "Annex M G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:550
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:602
 msgid "Announce as default router even if no public prefix is available."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:555
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:607
 msgid "Announced DNS domains"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:554
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:606
 msgid "Announced DNS servers"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1093
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1496
 msgid "Anonymous Identity"
 msgstr ""
 
@@ -641,20 +667,6 @@ msgstr ""
 msgid "Anonymous Swap"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:322
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:329
-msgid "Antenna 1"
-msgstr "Antenne 1"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:323
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:330
-msgid "Antenna 2"
-msgstr "Antenne 2"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:246
-msgid "Antenna Configuration"
-msgstr "Configuration de l'antenne"
-
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:71
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:160
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:181
@@ -662,11 +674,11 @@ msgstr "Configuration de l'antenne"
 msgid "Any zone"
 msgstr "N'importe quelle zone"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1981
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2522
 msgid "Apply request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1867
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2409
 msgid "Apply unchecked"
 msgstr ""
 
@@ -674,8 +686,8 @@ msgstr ""
 msgid "Architecture"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:19
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:184
+#: 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 ""
@@ -684,13 +696,13 @@ msgstr ""
 msgid "Assign interfaces..."
 msgstr "Affecte les interfaces…"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:124
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:24
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:189
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:31
 msgid ""
 "Assign prefix parts using this hexadecimal subprefix ID for this interface."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:148
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1967
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:22
 msgid "Associated Stations"
 msgstr "Équipements associés"
@@ -699,20 +711,20 @@ msgstr "Équipements associés"
 msgid "Associations"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:39
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:37
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:101
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:64
 msgid "Auth Group"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1027
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1421
 msgid "Authentication"
 msgstr "Authentification"
 
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:29
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:70
 msgid "Authentication Type"
 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:78
 msgid "Authoritative"
 msgstr "Autoritaire"
 
@@ -730,17 +742,19 @@ msgstr "Autorisation requise"
 msgid "Auto Refresh"
 msgstr "Rafraîchissement automatique"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:53
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:7
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:17
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:67
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:24
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:36
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:42
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:36
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:106
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:24
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:98
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:50
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:94
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:81
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:55
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:68
 msgid "Automatic"
 msgstr ""
 
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:7
 #: protocols/luci-proto-hnet/luasrc/model/network/proto_hnet.lua:7
 msgid "Automatic Homenet (HNCP)"
 msgstr ""
@@ -783,21 +797,21 @@ msgstr "Disponible"
 msgid "Average:"
 msgstr "Moyenne :"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:116
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:839
 msgid "B43 + B43C"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:840
 msgid "B43 + B43C + V43"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:48
 msgid "BR / DMR / AFTR"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:43
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:75
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1620
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:176
 msgid "BSSID"
 msgstr "BSSID"
@@ -811,19 +825,11 @@ msgstr "Retour à la vue générale"
 msgid "Back to configuration"
 msgstr "Retour à la configuration"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:48
-msgid "Back to overview"
-msgstr "Retour à la vue générale"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:20
-msgid "Back to scan results"
-msgstr "Retour aux résultats de la recherche"
-
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:17
 msgid "Backup"
 msgstr "Sauvegarder"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:38
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:36
 msgid "Backup / Flash Firmware"
 msgstr "Sauvegarde / Mise à jour du micrologiciel"
 
@@ -836,11 +842,11 @@ msgid "Bad address specified!"
 msgstr "Adresse spécifiée incorrecte!"
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:158
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:288
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:368
 msgid "Band"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:261
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:785
 msgid "Beacon Interval"
 msgstr ""
 
@@ -854,79 +860,85 @@ 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:293
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:294
 msgid ""
 "Bind dynamically to interfaces rather than wildcard address (recommended as "
 "linux default)"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:16
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:48
 msgid "Bind interface"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:16
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:48
 msgid "Bind the tunnel to this interface (optional)."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:49
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:134
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:187
 msgid "Bitrate"
 msgstr "Débit"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:172
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
 msgid "Bogus NX Domain Override"
 msgstr "Contourne les «  NX Domain » bogués"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1634
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1840
 #: modules/luci-base/luasrc/model/network.lua:1420
 msgid "Bridge"
 msgstr "Pont"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:264
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:368
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:678
 msgid "Bridge interfaces"
 msgstr "Interfaces en pont"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:906
 msgid "Bridge unit number"
 msgstr "Numéro d'unité du pont"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:250
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:364
 msgid "Bring up on boot"
 msgstr "L'activer au démarrage"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:35
-msgid "Broadcom 802.11%s Wireless Controller"
-msgstr "Contrôleur sans fil Broadcom 802.11%s"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:45
-msgid "Broadcom BCM%04x 802.11 Wireless Controller"
-msgstr "Contrôleur sans fil Broadcom BCM%04x 802.11"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1697
+msgid "Browse…"
+msgstr ""
 
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:18
 msgid "Buffered"
 msgstr "Temporisé"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:75
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:134
 msgid "CA certificate; if empty it will be saved after the first connection."
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:7
+msgid "CLAT configuration failed"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:13
 msgid "CPU usage (%)"
 msgstr "Utilisation CPU (%)"
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:21
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:53
 msgid "Call failed"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1789
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:14
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:52
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:711
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:948
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1839
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:191
 #: modules/luci-mod-system/luasrc/view/admin_system/upgrade.htm:60
 msgid "Cancel"
 msgstr "Annuler"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:6
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:17
 msgid "Category"
 msgstr ""
 
@@ -944,13 +956,7 @@ msgstr ""
 msgid "Chain"
 msgstr "Chaîne"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:9
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:14
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:24
-msgid "Change login password"
-msgstr ""
-
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1744
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 msgid "Changes"
 msgstr "Changements"
 
@@ -958,33 +964,23 @@ msgstr "Changements"
 msgid "Changes applied."
 msgstr "Changements appliqués."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2004
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2545
 msgid "Changes have been reverted."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:43
 msgid "Changes the administrator password for accessing the device"
 msgstr "Change le mot de passe administrateur pour accéder à l'équipement"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:10
-msgid "Changing password…"
-msgstr ""
-
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:162
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:45
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:87
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:174
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:376
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1618
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:186
 msgid "Channel"
 msgstr "Canal"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:119
-msgid ""
-"Channel %d is not available in the %s regulatory domain and has been auto-"
-"adjusted to %d."
-msgstr ""
-
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:229
 msgid "Check"
 msgstr "Vérification"
@@ -993,7 +989,7 @@ msgstr "Vérification"
 msgid "Check filesystems before mount"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1806
 msgid "Check this option to delete the existing networks from this radio."
 msgstr ""
 
@@ -1005,8 +1001,8 @@ msgstr "Somme de contrôle"
 msgid "Choose mtdblock"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:358
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:443
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1829
 msgid ""
 "Choose the firewall zone you want to assign to this interface. Select "
 "<em>unspecified</em> to remove the interface from the associated zone or "
@@ -1018,7 +1014,7 @@ msgstr ""
 "zone associée, ou remplissez le champ <em>créer</em> pour définir une "
 "nouvelle zone et y inclure cette interface."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:834
 msgid ""
 "Choose the network(s) you want to attach to this wireless interface or fill "
 "out the <em>create</em> field to define a new network."
@@ -1027,11 +1023,11 @@ msgstr ""
 "sans-fil ou remplissez le <em>créer</em>  champ pour définir un nouveau "
 "réseau. "
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:614
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1023
 msgid "Cipher"
 msgstr "Code de chiffrement"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:61
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:91
 msgid "Cisco UDP encapsulation"
 msgstr ""
 
@@ -1049,28 +1045,28 @@ msgid ""
 "FEATURE IS FOR PROFESSIONALS! )"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1950
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:369
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:471
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2189
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:803
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:908
 msgid "Client"
 msgstr "Client"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:55
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:52
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:47
 msgid "Client ID to send when requesting DHCP"
 msgstr "Identifiant client à envoyer dans les requêtes DHCP"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:145
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:151
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:155
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:161
 msgid "Close"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:146
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:119
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:125
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:127
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:98
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:119
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:157
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:141
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:115
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:138
 msgid ""
 "Close inactive connection after the given amount of seconds, use 0 to "
 "persist connection"
@@ -1085,12 +1081,9 @@ msgstr "Fermer la liste…"
 #: modules/luci-base/luasrc/view/lease_status.htm:77
 #: modules/luci-base/luasrc/view/lease_status.htm:98
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:118
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:37
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:24
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1965
 #: modules/luci-mod-network/luasrc/view/admin_network/iface_status.htm:6
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:40
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:30
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:8
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:398
 #: modules/luci-mod-status/luasrc/view/admin_status/index/30-network.htm:11
 #: modules/luci-mod-status/luasrc/view/admin_status/index/50-dsl.htm:17
@@ -1104,15 +1097,19 @@ msgstr "Récupération de données..."
 msgid "Command"
 msgstr "Commande"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:193
+msgid "Command OK"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:41
+msgid "Command failed"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:64
 msgid "Comment"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:185
-msgid "Common Configuration"
-msgstr "Configuration commune"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
 msgid ""
 "Complicates key reinstallation attacks on the client side by disabling "
 "retransmission of EAPOL-Key frames that are used to install keys. This "
@@ -1120,13 +1117,14 @@ msgid ""
 "negotiation especially in environments with heavy traffic load."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1744
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 #: modules/luci-base/luasrc/controller/admin/uci.lua:11
 #: modules/luci-mod-system/luasrc/view/admin_system/backupfiles.htm:9
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:13
 msgid "Configuration"
 msgstr "Configuration"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:21
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:63
 msgid "Configuration failed"
 msgstr ""
@@ -1135,89 +1133,89 @@ msgstr ""
 msgid "Configuration files will be kept"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1915
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2456
 msgid "Configuration has been applied."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1848
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2395
 msgid "Configuration has been rolled back!"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:43
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:942
+msgid "Confirm disconnect"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:50
 msgid "Confirmation"
 msgstr "Confirmation"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:32
-msgid "Connect"
-msgstr "Se connecter"
-
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:72
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:105
 msgid "Connected"
 msgstr "Connecté"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:338
-msgid "Connection Limit"
-msgstr "Limite de connexion"
-
 #: modules/luci-base/htdocs/luci-static/resources/network.js:7
 #: modules/luci-base/luasrc/model/network.lua:27
 msgid "Connection attempt failed"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:203
+msgid "Connection lost"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/controller/admin/status.lua:32
 msgid "Connections"
 msgstr "Connexions"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1890
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:66
+msgid "Contents have been saved."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:618
+msgid "Continue"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2431
 msgid ""
 "Could not regain access to the device after applying the configuration "
 "changes. You might need to reconnect if you modified network related "
 "settings such as the IP address or wireless security credentials."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:135
 msgid "Country"
 msgstr "Pays"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:227
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:233
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:337
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:764
 msgid "Country Code"
 msgstr "Code pays"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:36
-msgid "Cover the following interface"
-msgstr "Couvre l'interface suivante"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:43
-msgid "Cover the following interfaces"
-msgstr "Couvre les interfaces suivantes"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:357
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:86
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:443
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1829
 msgid "Create / Assign firewall-zone"
 msgstr "Créer / Assigner une zone du pare-feu"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:9
-msgid "Create Interface"
-msgstr "Créer une interface"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:33
-msgid "Create a bridge over multiple interfaces"
-msgstr "Créer un pont par dessus plusieurs interfaces"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:735
+msgid "Create interface"
+msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:174
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:165
 msgid "Critical"
 msgstr "Critique"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:178
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:169
 msgid "Cron Log Level"
 msgstr "Niveau de journalisation de Cron"
 
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:519
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:521
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:447
+msgid "Current power"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:552
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:554
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:51
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:53
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:82
@@ -1225,7 +1223,7 @@ msgstr "Niveau de journalisation de Cron"
 msgid "Custom Interface"
 msgstr "Interface spécifique"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:36
 msgid "Custom delegated IPv6-prefix"
 msgstr ""
 
@@ -1235,7 +1233,7 @@ msgid ""
 "this, perform a factory-reset first."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:59
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:41
 msgid ""
 "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
 "\">LED</abbr>s if possible."
@@ -1243,46 +1241,47 @@ msgstr ""
 "Personnaliser le comportement des <abbr title=\"Diode Électro-Luminescente"
 "\">DEL</abbr>s si possible."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:799
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1223
 msgid "DAE-Client"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:807
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1231
 msgid "DAE-Port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:815
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1239
 msgid "DAE-Secret"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:448
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:459
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:279
 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:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:61
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:62
 msgid "DHCP and DNS"
 msgstr "DHCP et DNS"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1195
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1385
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:16
 #: modules/luci-base/luasrc/model/network.lua:968
 msgid "DHCP client"
 msgstr "client DHCP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:571
 msgid "DHCP-Options"
 msgstr "Options DHCP"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_dhcpv6.lua:7
 msgid "DHCPv6 client"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:540
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:594
 msgid "DHCPv6-Mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:529
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:583
 msgid "DHCPv6-Service"
 msgstr ""
 
@@ -1299,31 +1298,31 @@ msgstr ""
 msgid "DNS"
 msgstr "DNS"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:183
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
 msgid "DNS forwardings"
 msgstr "transmissions DNS"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:30
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:37
 msgid "DNS-Label / FQDN"
 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:136
 msgid "DNSSEC"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:139
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
 msgid "DNSSEC check unsigned"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:73
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:99
 msgid "DPD Idle Timeout"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:14
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:41
 msgid "DS-Lite AFTR address"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:92
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:815
 #: modules/luci-mod-status/luasrc/view/admin_status/index/50-dsl.htm:14
 msgid "DSL"
 msgstr ""
@@ -1332,11 +1331,11 @@ msgstr ""
 msgid "DSL Status"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:125
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:848
 msgid "DSL line mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:519
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:963
 msgid "DTIM Interval"
 msgstr ""
 
@@ -1348,42 +1347,45 @@ msgstr "DUID"
 msgid "Data Rate"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:169
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:180
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:160
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:171
 msgid "Debug"
 msgstr "Deboguage"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:759
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:783
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:807
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1183
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1207
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1231
 msgid "Default %d"
 msgstr "%d par défaut"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:82
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:107
 msgid "Default Route"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:17
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:81
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:51
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:32
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:48
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:85
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:65
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:80
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:108
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:146
 msgid "Default gateway"
 msgstr "Passerelle par défaut"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:541
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:594
 msgid "Default is stateless + stateful"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:70
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:54
 msgid "Default state"
 msgstr "État par défaut"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:503
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:553
 msgid "Define a name for this network."
 msgstr "Donne un nom à ce réseau."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:514
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:571
 msgid ""
 "Define additional DHCP options, for example "
 "\"<code>6,192.168.2.1,192.168.2.2</code>\" which advertises different DNS "
@@ -1393,35 +1395,47 @@ msgstr ""
 "\"<code>6,192.168.2.1,192.168.2.2</code>\" qui publie différents serveurs "
 "DNS à ses clients."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:705
-#: modules/luci-base/htdocs/luci-static/resources/form.js:958
-#: modules/luci-base/htdocs/luci-static/resources/form.js:959
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1271
+#: modules/luci-base/htdocs/luci-static/resources/form.js:966
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1210
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1216
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1524
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1758
 #: modules/luci-base/luasrc/view/cbi/nsection.htm:11
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:162
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:16
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:41
 msgid "Delete"
 msgstr "Effacer"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:178
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:187
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:193
 msgid "Delete key"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:45
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1654
+msgid "Delete permission denied"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1656
+msgid "Delete request failed: %d %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:723
 msgid "Delete this network"
 msgstr "Supprimer ce réseau"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:519
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:963
 msgid "Delivery Traffic Indication Message Interval"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:102
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:108
 msgid "Description"
 msgstr "Description"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:224
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1754
+msgid "Deselect"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:215
 msgid "Design"
 msgstr "Apparence"
 
@@ -1439,10 +1453,12 @@ msgstr ""
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:177
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:43
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:13
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:38
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:73
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:33
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:52
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:85
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:86
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:72
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:154
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:253
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:86
@@ -1450,15 +1466,24 @@ msgstr ""
 msgid "Device"
 msgstr "Équipement"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:138
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:737
 msgid "Device Configuration"
 msgstr "Configuration de l'équipement"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:81
+msgid "Device is not active"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/reboot.htm:23
 msgid "Device is rebooting..."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1889
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:167
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:513
+msgid "Device is restarting…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2430
 msgid "Device unreachable!"
 msgstr ""
 
@@ -1466,26 +1491,26 @@ msgstr ""
 msgid "Device unreachable! Still waiting for device..."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:123
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:78
 #: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:61
 msgid "Diagnostics"
 msgstr "Diagnostics"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:45
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:60
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:101
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:93
 msgid "Dial number"
 msgstr ""
 
-#: modules/luci-base/luasrc/view/cbi/filebrowser.htm:99
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1554
 msgid "Directory"
 msgstr "Répertoire"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:131
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:715
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:754
 msgid "Disable"
 msgstr "Désactiver"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:472
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:531
 msgid ""
 "Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for "
 "this interface."
@@ -1493,71 +1518,66 @@ msgstr ""
 "Désactiver <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> "
 "pour cette interface."
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:64
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:93
 msgid "Disable Encryption"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:530
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:973
 msgid "Disable Inactivity Polling"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:713
 msgid "Disable this network"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:44
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:54
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:68
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:37
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:43
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:37
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1534
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:76
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:107
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:99
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:51
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:95
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:82
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:69
 msgid "Disabled"
 msgstr "Désactivé"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1139
-msgid "Disabled (default)"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:544
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:987
 msgid "Disassociate On Low Acknowledgement"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:193
 msgid "Discard upstream RFC1918 responses"
 msgstr "Jeter les réponses en RFC1918 amont"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:92
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:114
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:956
 msgid "Disconnect"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:22
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:64
 msgid "Disconnection attempt failed"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1121
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1762
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1855
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:17
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1375
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1995
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2314
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2401
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1634
 msgid "Dismiss"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:240
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:334
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:770
 msgid "Distance Optimization"
 msgstr "Optimisation de la distance"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:241
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:770
 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/luasrc/model/cbi/admin_network/wifi.lua:347
-msgid "Diversity"
-msgstr "Diversité"
-
-#: 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:61
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
@@ -1569,40 +1589,48 @@ 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:158
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:159
 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:123
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:124
 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:118
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
 msgid "Do not forward reverse lookups for local networks"
 msgstr ""
 "Ne pas transmettre les requêtes de recherche inverse pour les réseaux locaux"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:173
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1639
+msgid "Do you really want to delete \"%s\" ?"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:188
 msgid "Do you really want to delete the following SSH key?"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1637
+msgid "Do you really want to recursively delete the directory \"%s\" ?"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:74
 msgid "Domain required"
 msgstr "Domaine nécessaire"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:205
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:206
 msgid "Domain whitelist"
 msgstr "Liste blanche de domaines"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:34
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:67
 msgid "Don't Fragment"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:74
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:75
 msgid ""
 "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
 "<abbr title=\"Domain Name System\">DNS</abbr>-Name"
@@ -1622,19 +1650,19 @@ msgstr "Télécharger la sauvegarde"
 msgid "Download mtdblock"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:853
 msgid "Downstream SNR offset"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:914
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1169
 msgid "Drag to reorder"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:9
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:11
 msgid "Dropbear Instance"
 msgstr "Session Dropbear"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:6
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 msgid ""
 "Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access "
 "and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
@@ -1642,20 +1670,21 @@ msgstr ""
 "Dropbear est un serveur <abbr title=\"Secure Shell\">SSH</abbr> et intègre "
 "un serveur <abbr title=\"Secure Copy\">SCP</abbr>"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:11
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:14
 msgid "Dual-Stack Lite (RFC6333)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:493
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:547
 msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 msgstr ""
 "<abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> dynamique"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:60
 msgid "Dynamic tunnel"
 msgstr "Tunnel dynamique"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:494
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:547
 msgid ""
 "Dynamically allocate DHCP addresses for clients. If disabled, only clients "
 "having static leases will be served."
@@ -1663,21 +1692,21 @@ msgstr ""
 "Alloue dynamiquement des adresses pour les clients du DHCP. Si désactivé, "
 "seuls les clients ayant des baux statiques seront gérés."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:67
 msgid "EA-bits length"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:990
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1386
 msgid "EAP-Method"
 msgstr "Méthode EAP"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:934
-#: modules/luci-base/htdocs/luci-static/resources/form.js:935
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1199
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1188
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1191
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1450
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:154
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:160
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:38
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:291
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:720
 msgid "Edit"
 msgstr "Éditer"
 
@@ -1687,90 +1716,91 @@ msgid ""
 "reload the page."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:38
-msgid "Edit this interface"
-msgstr "Éditer cette interface"
-
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:718
 msgid "Edit this network"
 msgstr "Éditer ce réseau"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:669
+msgid "Edit wireless network"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:167
 msgid "Emergency"
 msgstr "Urgence"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:127
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:715
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:754
 msgid "Enable"
 msgstr "Activer"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:414
 msgid ""
 "Enable <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> "
 "snooping"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:271
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:412
 msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 msgstr "Activer le protocole <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:41
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:60
 msgid "Enable HE.net dynamic endpoint update"
 msgstr "Activer la mise à jour dynamique de l'extrémité du tunnel chez HE.net"
 
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:51
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:89
 msgid "Enable IPv6 negotiation"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:23
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:35
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:41
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:35
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:37
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:49
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:80
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:54
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:67
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:93
 msgid "Enable IPv6 negotiation on the PPP link"
 msgstr "Activer la négociation IPv6 sur le lien PPP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:143
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:188
 msgid "Enable Jumbo Frame passthrough"
 msgstr "Activer la circulation de très grandes trames (Jumbo)"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:244
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:235
 msgid "Enable NTP client"
 msgstr "Activer client NTP"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:69
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:96
 msgid "Enable Single DES"
 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:267
 msgid "Enable TFTP server"
 msgstr "Activer le serveur TFTP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:134
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:180
 msgid "Enable VLAN functionality"
 msgstr "Acviter la gestion des VLANs"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1595
 msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1175
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
 msgid "Enable key reinstallation (KRACK) countermeasures"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:138
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:183
 msgid "Enable learning and aging"
 msgstr "Activer l'apprentissage et la péremption"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:194
 msgid "Enable mirroring of incoming packets"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:151
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:195
 msgid "Enable mirroring of outgoing packets"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:34
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:67
 msgid "Enable the DF (Don't Fragment) flag of the encapsulating packets."
 msgstr ""
 
@@ -1778,7 +1808,7 @@ msgstr ""
 msgid "Enable this mount"
 msgstr "Activer ce montage"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:713
 msgid "Enable this network"
 msgstr ""
 
@@ -1786,50 +1816,54 @@ msgstr ""
 msgid "Enable this swap"
 msgstr "Activer cette mémoire d'échange (swap)"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:37
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:88
 msgid "Enable/Disable"
 msgstr "Activer/Désactiver"
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:76
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:152
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:251
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:41
 msgid "Enabled"
 msgstr "Activé"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:277
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:414
 msgid "Enables IGMP snooping on this bridge"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:892
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1310
 msgid ""
 "Enables fast roaming among access points that belong to the same Mobility "
 "Domain"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:272
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:412
 msgid "Enables the Spanning Tree Protocol on this bridge"
 msgstr ""
 "Activer le protocole <abbr title=\"Spanning Tree Protocol\">STP</abbr> sur "
 "ce pont"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:120
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:180
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:59
+msgid "Encapsulation limit"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:843
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:901
 msgid "Encapsulation mode"
 msgstr "Mode encapsulé"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:76
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:603
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:129
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:992
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1621
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:177
 msgid "Encryption"
 msgstr "Chiffrement"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:155
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:128
 msgid "Endpoint Host"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:165
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:132
 msgid "Endpoint Port"
 msgstr ""
 
@@ -1841,16 +1875,21 @@ msgstr ""
 msgid "Enter custom values"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:273
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:271
 msgid "Erasing..."
 msgstr "Effacement…"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:95
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:96
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:97
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:98
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:99
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:106
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:107
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:108
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:109
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:110
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:173
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:164
 msgid "Error"
 msgstr "Erreur"
 
@@ -1858,24 +1897,28 @@ msgstr "Erreur"
 msgid "Errored seconds (ES)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1646
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1852
 #: modules/luci-base/luasrc/model/network.lua:1432
 msgid "Ethernet Adapter"
 msgstr "Module Ethernet"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1637
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1843
 #: modules/luci-base/luasrc/model/network.lua:1422
 msgid "Ethernet Switch"
 msgstr "Commutateur Ethernet"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:303
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
 msgid "Exclude interfaces"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:153
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
 msgid "Expand hosts"
 msgstr "Étendre le nom d'hôte"
 
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:195
+msgid "Expecting an hexadecimal assignment hint"
+msgstr ""
+
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:59
 msgid "Expecting: %s"
 msgstr ""
@@ -1884,7 +1927,7 @@ msgstr ""
 msgid "Expires"
 msgstr "Expire"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:488
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:543
 #, fuzzy
 msgid ""
 "Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
@@ -1892,55 +1935,71 @@ msgstr ""
 "Délai d'expiration des adresses allouées, le minimum est de 2 minutes "
 "(<code>2m</code>)."
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:8
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:19
 msgid "External"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:971
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1377
 msgid "External R0 Key Holder List"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:980
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1381
 msgid "External R1 Key Holder List"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:150
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:141
 msgid "External system log server"
 msgstr "Serveur distant de journaux système"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:155
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:146
 msgid "External system log server port"
 msgstr "Port du serveur distant de journaux système"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:160
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:151
 msgid "External system log server protocol"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:18
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:79
 msgid "Extra SSH command options"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:940
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1351
 msgid "FT over DS"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:941
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1352
 msgid "FT over the Air"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:938
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1349
 msgid "FT protocol"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1842
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:82
+msgid "Failed to change the system password."
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2389
 msgid "Failed to confirm apply within %ds, waiting for rollback…"
 msgstr ""
 
-#: modules/luci-base/luasrc/view/cbi/filebrowser.htm:106
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:45
+msgid "Failed to execute \"/etc/init.d/%s %s\" action: %s"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1561
 msgid "File"
 msgstr "Fichier"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:279
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1514
+msgid "File not accessible"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1698
+msgid "Filename"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:280
 msgid "Filename of the boot image advertised to clients"
 msgstr "Nom de fichier d'une image de démarrage publiée aux clients"
 
@@ -1950,14 +2009,15 @@ 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:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:118
 msgid "Filter private"
 msgstr "Filtrer les requêtes privées"
 
-#: 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:123
 msgid "Filter useless"
 msgstr "Filtrer les requêtes inutiles"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:23
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:65
 msgid "Finalizing failed"
 msgstr ""
@@ -1968,7 +2028,7 @@ msgid ""
 "with defaults based on what was detected"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:696
 msgid "Find and join network"
 msgstr "Cherche et rejoint un réseau"
 
@@ -1980,11 +2040,11 @@ msgstr "Terminer"
 msgid "Firewall"
 msgstr "Pare-feu"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:77
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:76
 msgid "Firewall Mark"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:193
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:278
 msgid "Firewall Settings"
 msgstr "Paramètres du pare-feu"
 
@@ -1992,7 +2052,7 @@ msgstr "Paramètres du pare-feu"
 msgid "Firewall Status"
 msgstr "État du pare-feu"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:137
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:860
 msgid "Firmware File"
 msgstr ""
 
@@ -2000,7 +2060,7 @@ msgstr ""
 msgid "Firmware Version"
 msgstr "Version du micrologiciel"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:225
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:226
 msgid "Fixed source port for outbound DNS queries"
 msgstr "Port source fixe pour les requêtes DNS sortantes"
 
@@ -2020,35 +2080,35 @@ msgstr "Écrire l'image du nouveau micrologiciel"
 msgid "Flash operations"
 msgstr "Opérations d'écriture"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:194
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:192
 msgid "Flashing..."
 msgstr "Écriture…"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:498
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:550
 msgid "Force"
 msgstr "Forcer"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:258
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:782
 msgid "Force 40MHz mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:622
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1031
 msgid "Force CCMP (AES)"
 msgstr "Forcer CCMP (AES)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:499
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:550
 msgid "Force DHCP on this network even if another server is detected."
 msgstr "Force le DHCP sur ce réseau même si un autre serveur est détecté."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:623
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1032
 msgid "Force TKIP"
 msgstr "Forcer TKIP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:624
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1033
 msgid "Force TKIP and CCMP (AES)"
 msgstr "Forcer TKIP et CCMP (AES)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:795
 msgid "Force link"
 msgstr ""
 
@@ -2056,7 +2116,7 @@ msgstr ""
 msgid "Force upgrade"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:60
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:90
 msgid "Force use of NAT-T"
 msgstr ""
 
@@ -2064,7 +2124,7 @@ msgstr ""
 msgid "Form token mismatch"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:34
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:164
 msgid "Forward DHCP traffic"
 msgstr "Transmettre le trafic DHCP"
 
@@ -2072,46 +2132,41 @@ msgstr "Transmettre le trafic DHCP"
 msgid "Forward Error Correction Seconds (FECS)"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:28
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:161
 msgid "Forward broadcast traffic"
 msgstr "Transmettre le trafic de diffusion"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:375
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:809
 msgid "Forward mesh peer traffic"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:186
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:908
 msgid "Forwarding mode"
 msgstr "Mode de transmission"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:255
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:596
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:774
 msgid "Fragmentation Threshold"
 msgstr "Seuil de fragmentation"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:332
-msgid "Frame Bursting"
-msgstr "Rafale de trames"
-
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:17
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:28
 msgid "Free"
 msgstr "Libre"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:91
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:89
 msgid ""
-"Further information about WireGuard interfaces and peers at <a href=\"http://"
-"wireguard.com\">wireguard.com</a>."
+"Further information about WireGuard interfaces and peers at <a href='http://"
+"wireguard.com'>wireguard.com</a>."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:45
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:130
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:186
 msgid "GHz"
 msgstr "Ghz"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:29
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:36
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:91
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:77
 msgid "GPRS only"
 msgstr "seulement GPRS"
 
@@ -2120,28 +2175,28 @@ msgstr "seulement GPRS"
 msgid "Gateway"
 msgstr "Passerelle"
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:35
+msgid "Gateway Ports"
+msgstr "Ports de la passerelle"
+
 #: modules/luci-base/htdocs/luci-static/resources/network.js:9
 #: modules/luci-base/luasrc/model/network.lua:29
 msgid "Gateway address is invalid"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:46
-msgid "Gateway ports"
-msgstr "Ports de la passerelle"
-
-#: 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:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:275
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:23
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:112
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:103
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:49
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:33
 msgid "General Settings"
 msgstr "Paramètres généraux"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:188
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:462
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:175
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:141
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:361
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:504
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:895
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:741
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:796
 msgid "General Setup"
 msgstr "Configuration générale"
 
@@ -2149,7 +2204,7 @@ msgstr "Configuration générale"
 msgid "Generate Config"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:945
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1355
 msgid "Generate PMK locally"
 msgstr ""
 
@@ -2157,11 +2212,7 @@ msgstr ""
 msgid "Generate archive"
 msgstr "Construire l'archive"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:63
-msgid "Generic 802.11%s Wireless Controller"
-msgstr "Contrôleur sans fil générique 802.11%s"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:26
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:74
 msgid "Given password confirmation did not match, password not changed!"
 msgstr ""
 "La confirmation du nouveau mot de passe ne correspond pas, changement "
@@ -2171,7 +2222,7 @@ msgstr ""
 msgid "Global Settings"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:806
 msgid "Global network options"
 msgstr ""
 
@@ -2182,33 +2233,29 @@ msgstr ""
 msgid "Go to password configuration..."
 msgstr "Aller à la configuration du mot de passe…"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:857
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1369
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1112
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1616
 #: modules/luci-base/luasrc/view/cbi/full_valueheader.htm:4
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:58
 msgid "Go to relevant configuration page"
 msgstr "Aller à la page de configuration correspondante"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:38
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:66
 msgid "Group Password"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:11
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:22
 msgid "Guest"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:73
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:81
 msgid "HE.net password"
 msgstr "Mot de passe HE.net"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:60
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:73
 msgid "HE.net username"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:310
-msgid "HT mode (802.11n)"
-msgstr ""
-
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:16
 msgid "Hang Up"
 msgstr "Signal (HUP)"
@@ -2217,7 +2264,7 @@ msgstr "Signal (HUP)"
 msgid "Header Error Code Errors (HEC)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:103
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 msgid ""
 "Here you can configure the basic aspects of your device like its hostname or "
 "the timezone."
@@ -2225,9 +2272,7 @@ msgstr ""
 "Ici, vous pouvez configurer les aspects basiques de votre routeur comme son "
 "nom ou son fuseau horaire."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:499
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:556
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:579
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:941
 msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "Cacher le ESSID"
 
@@ -2238,14 +2283,15 @@ msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:92
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1959
 msgid "Host"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:20
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:21
 msgid "Host entries"
 msgstr "Entrées d'hôtes"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:48
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:171
 msgid "Host expiry timeout"
 msgstr "Délai d'expiration pour les hôtes"
 
@@ -2253,45 +2299,45 @@ msgstr "Délai d'expiration pour les hôtes"
 msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
 msgstr "adresse IP ou réseau"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:118
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:102
 msgid "Host-Uniq tag content"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:71
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:31
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:316
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:25
+#: 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:317
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:26
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:17
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:125
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:116
 msgid "Hostname"
 msgstr "Nom d'hôte"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:12
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:22
 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:18
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:19
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:67
 msgid "Hostnames"
 msgstr "Noms d'hôtes"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:13
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:24
 msgid "Hybrid"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:45
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:75
 msgid "IKE DH Group"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:41
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:59
 msgid "IP Addresses"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:40
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:80
 msgid "IP Protocol"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:29
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:30
 msgid "IP address"
 msgstr "Adresse IP"
 
@@ -2310,6 +2356,11 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:20
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:21
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:22
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:79
+#: 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/network.js:89
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:90
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:91
@@ -2317,7 +2368,7 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:93
 #: 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/luasrc/model/cbi/admin_network/proto_ncm.lua:42
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:82
 msgid "IPv4"
 msgstr "IPv4"
 
@@ -2329,24 +2380,23 @@ msgstr "Pare-feu IPv4"
 msgid "IPv4 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:57
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:178
 msgid "IPv4 address"
 msgstr "Adresse IPv4"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:26
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:33
 msgid "IPv4 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:104
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:181
 msgid "IPv4 broadcast"
 msgstr "Diffusion IPv4"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:100
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:180
 msgid "IPv4 gateway"
 msgstr "Passerelle IPv4"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:92
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:179
 msgid "IPv4 netmask"
 msgstr "Masque-réseau IPv4"
 
@@ -2354,24 +2404,25 @@ msgstr "Masque-réseau IPv4"
 msgid "IPv4 network in address/netmask notation"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:25
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:52
 msgid "IPv4 prefix"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:42
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:30
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:55
 msgid "IPv4 prefix length"
 msgstr "longueur du préfixe IPv4"
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:43
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:83
 msgid "IPv4+IPv6"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:72
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:34
 msgid "IPv4-Address"
 msgstr "Adresse IPv4"
 
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:10
 #: protocols/luci-proto-ipip/luasrc/model/network/proto_ipip.lua:9
 msgid "IPv4-in-IPv4 (RFC2003)"
 msgstr ""
@@ -2386,6 +2437,16 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:30
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:31
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:32
+#: 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/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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:89
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:90
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:91
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:92
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:95
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:96
@@ -2398,7 +2459,7 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:103
 #: 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/luasrc/model/cbi/admin_network/proto_ncm.lua:44
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:84
 msgid "IPv6"
 msgstr "IPv6"
 
@@ -2410,11 +2471,11 @@ msgstr "Pare-feu IPv6"
 msgid "IPv6 Neighbours"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:464
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:506
 msgid "IPv6 Settings"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:195
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:810
 msgid "IPv6 ULA-Prefix"
 msgstr ""
 
@@ -2422,21 +2483,21 @@ msgstr ""
 msgid "IPv6 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:202
 msgid "IPv6 address"
 msgstr "Adresse IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:23
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:189
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:31
 msgid "IPv6 assignment hint"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:18
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:184
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:27
 msgid "IPv6 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:207
 msgid "IPv6 gateway"
 msgstr "Passerelle IPv6"
 
@@ -2444,22 +2505,22 @@ msgstr "Passerelle IPv6"
 msgid "IPv6 network in address/netmask notation"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:37
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:59
 msgid "IPv6 prefix"
 msgstr "Préfixe IPv6"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:34
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:45
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:63
 msgid "IPv6 prefix length"
 msgstr "longueur du préfixe IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:33
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:211
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:57
 msgid "IPv6 routed prefix"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:143
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:215
 msgid "IPv6 suffix"
 msgstr ""
 
@@ -2469,31 +2530,35 @@ msgid "IPv6-Address"
 msgstr "Adresse IPv6"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:93
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:104
 msgid "IPv6-PD"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:10
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:13
 msgid "IPv6-in-IPv4 (RFC4213)"
 msgstr "IPv6 dans IPv4 (RFC 4213)"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:17
 msgid "IPv6-over-IPv4 (6rd)"
 msgstr "IPv6 sur IPv4 (6ème)"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:15
 msgid "IPv6-over-IPv4 (6to4)"
 msgstr "IPv6 sur IPv4 (6 vers 4)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1075
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1478
 msgid "Identity"
 msgstr "Identité"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:70
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:96
 msgid "If checked, 1DES is enabled"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:65
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:93
 msgid "If checked, encryption is disabled"
 msgstr ""
 
@@ -2514,36 +2579,36 @@ msgstr ""
 "Monte le périphérique identifié par cette étiquette au lieu d'un nom de "
 "périphérique fixe"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:27
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:71
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:18
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:82
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:52
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:17
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:29
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:33
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:68
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:85
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:32
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:45
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:45
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:24
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:44
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:116
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:48
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:85
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:65
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:33
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:80
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:108
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:146
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:74
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:97
 msgid "If unchecked, no default route is configured"
 msgstr "Décoché, aucune route par défaut n'est configurée"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:34
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:86
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:35
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:99
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:47
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:60
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:60
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:39
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:59
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:124
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:39
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:116
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:59
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:103
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:64
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:77
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:100
 msgid "If unchecked, the advertised DNS server addresses are ignored"
 msgstr "Décoché, les adresses des serveurs DNS publiés sont ignorées"
 
@@ -2560,15 +2625,15 @@ 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:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:102
 msgid "Ignore <code>/etc/hosts</code>"
 msgstr "Ignorer /etc/hosts"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:471
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:531
 msgid "Ignore interface"
 msgstr "Ignorer l'interface"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:90
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:91
 msgid "Ignore resolve file"
 msgstr "Ignorer le fichier de résolution"
 
@@ -2586,12 +2651,12 @@ msgid ""
 "blocked. Click \"Continue »\" below to return to the previous page."
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:145
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:118
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:124
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:126
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:97
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:118
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:157
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:141
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:115
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:138
 msgid "Inactivity timeout"
 msgstr "Délai d'inactivité"
 
@@ -2599,23 +2664,25 @@ msgstr "Délai d'inactivité"
 msgid "Inbound:"
 msgstr "Intérieur :"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:170
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:161
 msgid "Info"
 msgstr "Info"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:105
 msgid "Information"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:25
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:67
 msgid "Initialization failure"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:34
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:87
 msgid "Initscript"
 msgstr "Script d'initialisation"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:26
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:122
 msgid "Initscripts"
 msgstr "Scripts d'initialisation"
 
@@ -2623,55 +2690,74 @@ msgstr "Scripts d'initialisation"
 msgid "Install iputils-traceroute6 for IPv6 traceroute"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:223
-msgid "Install package %q"
-msgstr "Installer le paquet %q"
-
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:220
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:120
 msgid "Install protocol extensions..."
 msgstr "Installation des extensions de protocole…"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:416
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:423
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:683
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:687
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:26
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:284
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:342
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:47
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:134
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:14
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:16
 msgid "Interface"
 msgstr "Interface"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:58
 msgid "Interface %q device auto-migrated from %q to %q."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:356
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:792
 msgid "Interface Configuration"
 msgstr "Configuration de l'interface"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:51
-msgid "Interface Overview"
-msgstr "Vue d'ensemble de l'interface"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:99
+msgid "Interface has %d pending changes"
+msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:57
+msgid "Interface is marked for deletion"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:162
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:3
 msgid "Interface is reconnecting..."
 msgstr "L'interface se reconnecte…"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:162
+msgid "Interface is shutting down..."
+msgstr "L'interface s'arrête…"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:205
+msgid "Interface is starting..."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:208
+msgid "Interface is stopping..."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:954
 msgid "Interface name"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:34
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:224
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:131
 msgid "Interface not present or not connected yet."
 msgstr "L'interface n'est pas présente ou pas encore connectée."
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:88
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:16
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:11
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:287
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:54
 msgid "Interfaces"
 msgstr "Interfaces"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:9
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:20
 msgid "Internal"
 msgstr ""
 
@@ -2684,22 +2770,38 @@ msgstr "Erreur Serveur Interne"
 msgid "Invalid"
 msgstr "Erreur : donnée entrée invalide"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:311
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:10
+msgid "Invalid Base64 key string"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:281
 msgid "Invalid VLAN ID given! Only IDs between %d and %d are allowed."
 msgstr ""
 "Identifiant VLAN invalide !Seuls les IDs entre %d et %d sont autorisés."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:307
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:290
 msgid "Invalid VLAN ID given! Only unique IDs are allowed"
 msgstr ""
 "Identifiant VLAN donné invalide ! Seuls les identifiants uniques sont "
 "autorisés"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:195
+msgid "Invalid argument"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:194
+msgid "Invalid command"
+msgstr ""
+
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:80
+msgid "Invalid hexadecimal value"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/sysauth.htm:12
 msgid "Invalid username and/or password! Please try again."
 msgstr "Nom d'utilisateur et/ou mot de passe invalides ! Réessayez !"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:508
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:950
 msgid "Isolate Clients"
 msgstr ""
 
@@ -2720,15 +2822,15 @@ msgstr ""
 msgid "JavaScript required!"
 msgstr "Nécessite un Script Java !"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:52
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1691
 msgid "Join Network"
 msgstr "Rejoindre un réseau"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:22
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1628
 msgid "Join Network: Wireless Scan"
 msgstr "Rejoindre un réseau : recherche des réseaux sans-fil"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:19
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1833
 msgid "Joining Network: %q"
 msgstr ""
 
@@ -2745,15 +2847,15 @@ msgstr "Journal du noyau"
 msgid "Kernel Version"
 msgstr "Version du noyau"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:823
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1248
 msgid "Key"
 msgstr "Clé"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:851
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:852
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:853
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:854
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:870
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1277
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1278
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1279
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1291
 msgid "Key #%d"
 msgstr "Clé n° %d"
 
@@ -2761,33 +2863,34 @@ msgstr "Clé n° %d"
 msgid "Kill"
 msgstr "Tuer"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:10
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:21
 msgid "L2TP"
 msgstr "L2TP"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:10
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:40
 msgid "L2TP Server"
 msgstr "Serveur L2TP"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:100
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:74
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:80
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:74
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:53
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:73
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:131
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:102
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:89
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:112
 msgid "LCP echo failure threshold"
 msgstr "Seuil d'erreur des échos LCP"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:118
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:89
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:95
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:89
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:68
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:91
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:144
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:102
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:125
 msgid "LCP echo interval"
 msgstr "Intervalle entre échos LCP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:181
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:902
 msgid "LLC"
 msgstr "LLC"
 
@@ -2796,11 +2899,11 @@ msgstr "LLC"
 msgid "Label"
 msgstr "Étiquette"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:213
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:204
 msgid "Language"
 msgstr "Langue"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:115
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:106
 msgid "Language and Style"
 msgstr "Langue et apparence"
 
@@ -2808,51 +2911,51 @@ msgstr "Langue et apparence"
 msgid "Latency"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:10
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:21
 msgid "Leaf"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:369
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:487
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:393
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:543
 msgid "Lease time"
 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:87
 msgid "Leasefile"
 msgstr "Fichier de baux"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:74
 #: modules/luci-base/luasrc/view/lease_status.htm:95
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:34
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
 msgid "Leasetime remaining"
 msgstr "Durée de validité"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:9
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:20
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:27
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:50
 msgid "Leave empty to autodetect"
 msgstr "Laisser vide pour l'auto-détection"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:21
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:45
 msgid "Leave empty to use the current WAN address"
 msgstr "Laisser vide pour utiliser l'adresse WAN actuelle"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1746
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2299
 msgid "Legend:"
 msgstr "Légende :"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:481
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:538
 msgid "Limit"
 msgstr "Limite"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:287
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:288
 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:299
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:300
 msgid "Limit listening to these interfaces, and loopback."
 msgstr ""
 
@@ -2872,11 +2975,11 @@ msgstr ""
 msgid "Line Uptime"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:101
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:88
 msgid "Link On"
 msgstr "Lien établi"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:185
 msgid ""
 "List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
 "requests to"
@@ -2884,7 +2987,7 @@ msgstr ""
 "Liste des serveurs auquels sont transmis les requêtes <abbr title=\"Domain "
 "Name System\">DNS</abbr>"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:972
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1377
 msgid ""
 "List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-"
 "Identifier,128-bit key as hex string. <br />This list is used to map R0KH-ID "
@@ -2893,7 +2996,7 @@ msgid ""
 "Association."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:981
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1381
 msgid ""
 "List of R1KHs in the same Mobility Domain. <br />Format: MAC-address,R1KH-ID "
 "as 6 octets with colons,128-bit key as hex string. <br />This list is used "
@@ -2902,32 +3005,32 @@ msgid ""
 "PMK-R1 keys."
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:21
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:82
 msgid "List of SSH key files for auth"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:206
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:207
 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:173
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:174
 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:298
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:299
 msgid "Listen Interfaces"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:30
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:54
 msgid "Listen Port"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:15
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:16
 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:216
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:217
 msgid "Listening port for inbound DNS queries"
 msgstr "Port d'écoute des requêtes DNS entrantes"
 
@@ -2946,11 +3049,11 @@ msgstr "Charge moyenne"
 msgid "Loading"
 msgstr "Chargement"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:35
-msgid "Loading SSH keys…"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1819
+msgid "Loading directory contents…"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1204
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1296
 #: modules/luci-base/luasrc/view/view.htm:4
 msgid "Loading view…"
 msgstr ""
@@ -2960,41 +3063,41 @@ msgstr ""
 msgid "Local IP address is invalid"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:25
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:86
 msgid "Local IP address to assign"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:10
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:11
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:44
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:39
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:151
 msgid "Local IPv4 address"
 msgstr "Adresse IPv4 locale"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:20
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:54
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:45
 msgid "Local IPv6 address"
 msgstr "Adresse IPv6 locale"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:286
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:287
 msgid "Local Service Only"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:81
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:126
 msgid "Local Startup"
 msgstr "Démarrage local"
 
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:25
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:121
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:112
 msgid "Local Time"
 msgstr "Heure Locale"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:149
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
 msgid "Local domain"
 msgstr "Domaine 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:147
 #, fuzzy
 msgid ""
 "Local domain specification. Names matching this domain are never forwarded "
@@ -3004,16 +3107,16 @@ msgstr ""
 "jamais transmis, mais résolus seulement depuis le serveur DHCP ou le fichier "
 "Hosts"
 
-#: 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:151
 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:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
 msgid "Local server"
 msgstr "Serveur local"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:129
 msgid ""
 "Localise hostname depending on the requesting subnet if multiple IPs are "
 "available"
@@ -3021,23 +3124,19 @@ 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:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:128
 msgid "Localise queries"
 msgstr "Localiser les requêtes"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:175
-msgid "Locked to channel %s used by: %s"
-msgstr ""
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:168
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:159
 msgid "Log output level"
 msgstr "Niveau de journalisation"
 
-#: 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:181
 msgid "Log queries"
 msgstr "Journaliser les requêtes"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:113
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:104
 msgid "Logging"
 msgstr "Journalisation"
 
@@ -3045,7 +3144,7 @@ msgstr "Journalisation"
 msgid "Login"
 msgstr "Connexion"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:95
+#: modules/luci-base/luasrc/controller/admin/index.lua:103
 msgid "Logout"
 msgstr "Déconnexion"
 
@@ -3053,13 +3152,15 @@ msgstr "Déconnexion"
 msgid "Loss of Signal Seconds (LOSS)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:476
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:533
 msgid "Lowest leased address as offset from the network address."
 msgstr ""
 "Adresse allouée la plus basse, spécifiée par un décalage à partir de "
 "l'adresse réseau."
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:40
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:75
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:35
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:86
 msgid "MAC"
@@ -3067,32 +3168,32 @@ msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:73
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:109
-#: 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:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1958
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:86
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:133
 msgid "MAC-Address"
 msgstr "Adresse MAC"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:457
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:586
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:886
 msgid "MAC-Address Filter"
 msgstr "Filtrage par adresses MAC"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:142
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:363
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:798
 msgid "MAC-Filter"
 msgstr "Filtrage par adresses MAC"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:464
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:590
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:893
 msgid "MAC-List"
 msgstr "Liste des adresses MAC"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:13
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:16
 msgid "MAP / LW4over6"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:62
 msgid "MAP rule is invalid"
 msgstr ""
@@ -3110,8 +3211,8 @@ msgid "MHz"
 msgstr "MHz"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:53
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:29
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:66
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:53
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:71
 msgid "MTU"
 msgstr "MTU"
 
@@ -3121,16 +3222,17 @@ msgid ""
 "below:"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:55
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:69
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:26
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:38
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:38
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:108
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:52
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:96
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:83
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:57
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:70
 msgid "Manual"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1949
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2188
 msgid "Master"
 msgstr ""
 
@@ -3138,48 +3240,46 @@ msgstr ""
 msgid "Max. Attainable Data Rate (ATTNDR)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:539
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:982
 msgid "Maximum allowed Listen Interval"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:234
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
 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:252
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:253
 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:243
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:244
 msgid "Maximum allowed size of EDNS.0 UDP packets"
 msgstr "Taille maximum autorisée des paquets UDP EDNS.0"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:63
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:77
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:57
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:112
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:104
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:93
 msgid "Maximum amount of seconds to wait for the modem to become ready"
 msgstr "Délai d'attente maximum que le modem soit prêt"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:27
-msgid ""
-"Maximum length of the name is 15 characters including the automatic protocol/"
-"bridge prefix (br-, 6in4-, pppoe- etc.)"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:482
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:538
 msgid "Maximum number of leased addresses."
 msgstr "Nombre maximum d'adresses allouées."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:761
+msgid "Maximum transmit power"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:21
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:49
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:134
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:187
 #: modules/luci-mod-status/luasrc/view/admin_status/bandwidth.htm:79
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:284
 msgid "Mbit/s"
 msgstr "Mbit/s"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:18
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:32
 msgid "Medium"
 msgstr ""
 
@@ -3191,42 +3291,43 @@ msgstr "Mémoire"
 msgid "Memory usage (%)"
 msgstr "Utilisation Mémoire (%)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1952
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2191
 msgid "Mesh"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:372
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:806
 msgid "Mesh Id"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:196
+msgid "Method not found"
+msgstr ""
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:45
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:76
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:104
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:54
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:66
 msgid "Metric"
 msgstr "Metrique"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:154
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:198
 msgid "Mirror monitor port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:153
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:197
 msgid "Mirror source port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:408
-msgid "Missing protocol extension for proto %q"
-msgstr "Extention de protocole manquante pour le proto %q"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:923
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1337
 msgid "Mobility Domain"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:154
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:41
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:74
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:366
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:31
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:360
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:801
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1619
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:175
 msgid "Mode"
 msgstr "Mode"
@@ -3235,39 +3336,38 @@ msgstr "Mode"
 msgid "Model"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:31
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:72
 msgid "Modem default"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:11
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:19
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:11
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:10
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:73
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:73
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:57
 msgid "Modem device"
 msgstr "Interface Modem"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:24
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:66
 msgid "Modem information query failed"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:62
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:76
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:56
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:112
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:104
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:93
 msgid "Modem init timeout"
 msgstr "Délai max. d'initialisation du modem"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1953
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:452
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:554
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:577
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2192
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:880
 msgid "Monitor"
 msgstr "Monitor"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:14
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
 msgid "More Characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:802
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1057
 msgid "More…"
 msgstr ""
 
@@ -3280,7 +3380,7 @@ msgstr "Montage"
 msgid "Mount Point"
 msgstr "Point de montage"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:26
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:36
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:137
 msgid "Mount Points"
@@ -3330,46 +3430,44 @@ msgstr "Descendre"
 msgid "Move up"
 msgstr "Monter"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:912
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
 msgid "NAS ID"
 msgstr "NAS ID"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:57
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:87
 msgid "NAT-T Mode"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:9
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 msgid "NAT64 Prefix"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:31
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:26
 msgid "NCM"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:535
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:589
 msgid "NDP-Proxy"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:43
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:72
 msgid "NT Domain"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:273
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:264
 msgid "NTP server candidates"
 msgstr "Serveurs NTP candidats"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:837
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1092
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:27
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:502
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:65
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:553
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:658
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:49
 msgid "Name"
 msgstr "Nom"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:17
-msgid "Name of the new interface"
-msgstr "Nom de la nouvelle interface"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1808
 msgid "Name of the new network"
 msgstr "Nom du nouveau réseau"
 
@@ -3377,9 +3475,10 @@ msgstr "Nom du nouveau réseau"
 msgid "Navigation"
 msgstr "Navigation"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:62
+#: modules/luci-base/luasrc/controller/admin/index.lua:69
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:108
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:402
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:834
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1957
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:389
 #: modules/luci-mod-status/luasrc/view/admin_status/index/30-network.htm:8
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:73
@@ -3391,7 +3490,7 @@ msgstr "Réseau"
 msgid "Network Utilities"
 msgstr "Utilitaires réseau"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:278
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:279
 msgid "Network boot image"
 msgstr "Image de démarrage réseau"
 
@@ -3404,53 +3503,59 @@ msgstr ""
 msgid "Network without interfaces."
 msgstr "Réseau sans interfaces."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:661
+msgid "New interface name…"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:11
 msgid "Next »"
 msgstr "Prochain »"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1507
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1754
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:108
 msgid "No"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:453
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:514
 msgid "No DHCP Server configured for this interface"
 msgstr "Aucun serveur DHCP configuré sur cette interface"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1162
+msgid "No Encryption"
+msgstr ""
+
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:89
 msgid "No NAT-T"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:198
+msgid "No data received"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1764
+msgid "No entries in this directory"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/backupfiles.lua:82
 msgid "No files found"
 msgstr "Aucun fichier trouvé"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:550
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:191
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:180
 msgid "No information available"
 msgstr "Information indisponible"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:8
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:63
 msgid "No matching prefix delegation"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:157
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
 msgid "No negative cache"
 msgstr "Pas de cache négatif"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:53
-msgid "No network configured on this device"
-msgstr "Ce périphérique n'a aucune adresse configurée"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:65
-msgid "No network name specified"
-msgstr "Aucun nom de réseau donné"
-
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:147
-msgid "No networks in range"
-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
@@ -3458,7 +3563,12 @@ msgstr ""
 msgid "No password set!"
 msgstr "Pas de mot de passe positionné !"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:116
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:104
+msgid "No peers defined yet"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:129
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:271
 msgid "No public keys present yet."
 msgstr ""
 
@@ -3466,19 +3576,19 @@ msgstr ""
 msgid "No rules in this chain."
 msgstr "Aucune règle dans cette chaîne"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:150
-msgid "No scan results available yet..."
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:53
+msgid "No signal"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:7
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:756
 msgid "No zone assigned"
 msgstr "Aucune zone attribuée"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:111
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:35
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:48
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:133
 msgid "Noise"
 msgstr "Bruit"
 
@@ -3494,16 +3604,16 @@ msgstr "Bruit :"
 msgid "Non Pre-emtive CRC errors (CRC_P)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:292
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:293
 msgid "Non-wildcard"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:129
 msgid "None"
 msgstr "Vide"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:181
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:172
 msgid "Normal"
 msgstr "Normal"
 
@@ -3511,25 +3621,29 @@ msgstr "Normal"
 msgid "Not Found"
 msgstr "Pas trouvé"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:27
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:5
-msgid "Not associated"
-msgstr "Pas associé"
-
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:87
 msgid "Not connected"
 msgstr "Non connecté"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:38
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:139
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:232
+msgid "Not present"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:105
 msgid "Not started on boot"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:26
-msgid "Note: interface name length"
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:201
+msgid "Not supported"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:171
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:162
 msgid "Notice"
 msgstr "Note"
 
@@ -3537,61 +3651,50 @@ msgstr "Note"
 msgid "Nslookup"
 msgstr "Nslookup"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:261
 msgid "Number of cached DNS entries (max is 10000, 0 is no caching)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:203
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:194
 msgid "Number of parallel threads used for compression"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:40
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:69
 msgid "Obfuscated Group Password"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:35
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:61
 msgid "Obfuscated Password"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:22
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:34
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:40
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:105
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:97
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:49
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:80
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:54
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:67
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:93
 msgid "Obtain IPv6-Address"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:83
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:68
 msgid "Off-State Delay"
 msgstr "Durée éteinte"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:16
-msgid ""
-"On this page you can configure the network interfaces. You can bridge "
-"several interfaces by ticking the \"bridge interfaces\" field and enter the "
-"names of several network interfaces separated by spaces. You can also use "
-"<abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
-"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
-"<samp>eth0.1</samp>)."
-msgstr ""
-"Dans cette page vous pourrez configurer les interfaces réseaux. Vous pouvez "
-"bridger différentes interfaces en cochant le champ \"bridger les interfaces"
-"\" et en saisissant les noms des interfaces réseau séparées par des espaces. "
-"Vous pouvez aussi utiliser la notation VLAN, INTERFACE.VLANNB (ex : eth0.1)."
-
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:95
 msgid "On-Link route"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:80
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:64
 msgid "On-State Delay"
 msgstr "Durée allumée"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:360
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:382
 msgid "One of hostname or mac address must be specified!"
 msgstr "Il faut indiquer un nom d'hôte ou une adresse MAC !"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:456
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:462
 msgid "One of the following: %s"
 msgstr ""
 
@@ -3613,34 +3716,35 @@ msgstr "Un ou plusieurs champs n'ont pas de valeur !"
 msgid "Open list..."
 msgstr "Ouvrir la liste…"
 
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:61
 #: protocols/luci-proto-openconnect/luasrc/model/network/proto_openconnect.lua:9
 msgid "OpenConnect (CISCO AnyConnect)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:757
 msgid "Operating frequency"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1753
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2306
 msgid "Option changed"
 msgstr "Option modifiée"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1755
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2308
 msgid "Option removed"
 msgstr "Option retirée"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1140
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:55
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1535
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:66
 msgid "Optional"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:78
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:76
 msgid ""
 "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, "
 "starting with <code>0x</code>."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:144
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:215
 msgid ""
 "Optional. Allowed values: 'eui64', 'random', fixed value like '::1' or "
 "'::1:2'. When IPv6 prefix (like 'a:b:c:d::') is received from a delegating "
@@ -3648,41 +3752,41 @@ msgid ""
 "for the interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:123
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:117
 msgid ""
 "Optional. Base64-encoded preshared key. Adds in an additional layer of "
 "symmetric-key cryptography for post-quantum resistance."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:148
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:126
 msgid "Optional. Create routes for Allowed IPs for this peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:103
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:108
 msgid "Optional. Description of peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:156
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:128
 msgid ""
 "Optional. Host of peer. Names are resolved prior to bringing up the "
 "interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:67
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:71
 msgid "Optional. Maximum Transmission Unit of tunnel interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:166
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:132
 msgid "Optional. Port of peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:175
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:136
 msgid ""
 "Optional. Seconds between keep alive messages. Default is 0 (disabled). "
 "Recommended value if this device is behind a NAT is 25."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:31
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:54
 msgid "Optional. UDP port used for outgoing and incoming packets."
 msgstr ""
 
@@ -3703,7 +3807,7 @@ msgstr "Sortie"
 msgid "Outbound:"
 msgstr "Extérieur :"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:26
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:50
 msgid "Output Interface"
 msgstr ""
 
@@ -3712,45 +3816,45 @@ msgstr ""
 msgid "Output zone"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:63
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:155
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:33
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:54
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:54
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:219
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:50
 msgid "Override MAC address"
 msgstr "Modifier l'adresse MAC"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:66
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:35
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:56
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:88
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:125
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:131
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:133
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:104
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:61
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:58
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:223
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:44
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:54
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:154
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:71
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:145
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:132
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:110
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:119
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:97
 msgid "Override MTU"
 msgstr "Modifier le MTU"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:30
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:63
 msgid "Override TOS"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:25
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:58
 msgid "Override TTL"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:954
 msgid "Override default interface name"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:41
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:167
 msgid "Override the gateway in DHCP responses"
 msgstr "Modifier la passerelle dans les réponses DHCP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:507
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:555
 msgid ""
 "Override the netmask sent to clients. Normally it is calculated from the "
 "subnet that is served."
@@ -3758,7 +3862,7 @@ msgstr ""
 "Remplacer le masque réseau envoyés aux clients. Il est normalement calculé à "
 "partir du sous-réseau géré."
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:65
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:179
 msgid "Override the table used for internal routes"
 msgstr "Modifier la table utilisée pour les routes internes"
 
@@ -3766,29 +3870,33 @@ msgstr "Modifier la table utilisée pour les routes internes"
 msgid "Overview"
 msgstr "Vue d'ensemble"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1606
+msgid "Overwrite existing file \"%s\" ?"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:11
 msgid "Owner"
 msgstr "Propriétaire"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:42
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:56
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:17
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:28
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:34
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:14
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:18
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:43
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:98
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:45
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:44
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:63
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:82
 msgid "PAP/CHAP password"
 msgstr "Mot de passe PAP/CHAP"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:39
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:53
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:14
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:11
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:15
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:96
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:88
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:43
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:74
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:42
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:61
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:77
 msgid "PAP/CHAP username"
 msgstr "Identifiant PAP/CHAP"
 
@@ -3796,9 +3904,9 @@ msgstr "Identifiant PAP/CHAP"
 msgid "PID"
 msgstr "PID"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:36
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:50
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:26
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:95
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:87
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:68
 msgid "PIN"
 msgstr "code PIN"
 
@@ -3807,114 +3915,116 @@ msgstr "code PIN"
 msgid "PIN code rejected"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:966
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1372
 msgid "PMK R1 Push"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:43
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:13
 msgid "PPP"
 msgstr "PPP"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:11
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:58
 msgid "PPPoA Encapsulation"
 msgstr "PPPoA Encapsulation"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:19
 msgid "PPPoATM"
 msgstr "PPPoATM"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:17
 msgid "PPPoE"
 msgstr "PPPoE"
 
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:28
 #: protocols/luci-proto-pppossh/luasrc/model/network/proto_pppossh.lua:9
 msgid "PPPoSSH"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:15
 msgid "PPtP"
 msgstr "PPtP"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:59
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:73
 msgid "PSID offset"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:56
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:70
 msgid "PSID-bits length"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:123
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:846
 msgid "PTM/EFM (Packet Transfer Mode)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:78
-msgid "Package libiwinfo required!"
-msgstr "Nécessite le paquet libiwinfo !"
-
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:45
 msgid "Packets"
 msgstr "Paquets"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:7
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:756
 msgid "Part of zone %q"
 msgstr "Fait partie de la zone %q"
 
 #: modules/luci-base/luasrc/view/sysauth.htm:29
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1111
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:35
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:42
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1514
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:46
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:104
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:58
 msgid "Password"
 msgstr "Mot de passe"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:29
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:24
 msgid "Password authentication"
 msgstr "Authentification par mot de passe"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1019
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1414
 msgid "Password of Private Key"
 msgstr "Mot de passe de la clé privée"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1067
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1471
 msgid "Password of inner Private Key"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:14
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:16
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:18
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:20
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:32
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:34
 msgid "Password strength"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:44
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:107
 msgid "Password2"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:37
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:244
 msgid "Paste or drag SSH key file…"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1000
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1396
 msgid "Path to CA-Certificate"
 msgstr "Chemin de la CA"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1007
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1402
 msgid "Path to Client-Certificate"
 msgstr "Chemin du certificat-client"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1013
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1408
 msgid "Path to Private Key"
 msgstr "Chemin de la clé privée"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1049
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1453
 msgid "Path to inner CA-Certificate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1055
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1459
 msgid "Path to inner Client-Certificate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1061
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1465
 msgid "Path to inner Private Key"
 msgstr ""
 
@@ -3932,7 +4042,7 @@ msgstr ""
 msgid "Peak:"
 msgstr "Pic :"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:28
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:89
 msgid "Peer IP address to assign"
 msgstr ""
 
@@ -3941,11 +4051,11 @@ msgstr ""
 msgid "Peer address is missing"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:90
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:89
 msgid "Peers"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:50
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:80
 msgid "Perfect Forward Secrecy"
 msgstr ""
 
@@ -3957,7 +4067,11 @@ msgstr "Redémarrer"
 msgid "Perform reset"
 msgstr "Réinitialiser"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:174
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:199
+msgid "Permission denied"
+msgstr ""
+
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:136
 msgid "Persistent Keep Alive"
 msgstr ""
 
@@ -3965,7 +4079,7 @@ msgstr ""
 msgid "Phy Rate:"
 msgstr "Débit de la puce:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:190
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:277
 msgid "Physical Settings"
 msgstr "Paramètres physiques"
 
@@ -3976,6 +4090,10 @@ msgstr "Ping"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:16
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:17
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:41
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:77
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:87
@@ -3993,15 +4111,19 @@ msgstr "Saisissez votre nom d'utilisateur et mot de passe."
 msgid "Policy"
 msgstr "Politique"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:22
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:20
 msgid "Port"
 msgstr "Port"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:18
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:133
+msgid "Port %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:274
 msgid "Port status:"
 msgstr "Statut du port :"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:482
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:488
 msgid "Potential negation of: %s"
 msgstr ""
 
@@ -4013,11 +4135,11 @@ msgstr ""
 msgid "Pre-emtive CRC errors (CRCP_P)"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:32
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:73
 msgid "Prefer LTE"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:33
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:74
 msgid "Prefer UMTS"
 msgstr ""
 
@@ -4025,16 +4147,16 @@ msgstr ""
 msgid "Prefix Delegated"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:122
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:117
 msgid "Preshared Key"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:101
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:75
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:81
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:75
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:54
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:74
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:131
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:102
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:89
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:112
 msgid ""
 "Presume peer to be dead after given amount of LCP echo failures, use 0 to "
 "ignore failures"
@@ -4042,16 +4164,15 @@ 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:304
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:305
 msgid "Prevent listening on these interfaces."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:509
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:562
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:950
 msgid "Prevents client-to-client communication"
 msgstr "Empêche la communication directe entre clients"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:18
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:49
 msgid "Private Key"
 msgstr ""
 
@@ -4072,39 +4193,33 @@ msgstr ""
 msgid "Prot."
 msgstr "Prot."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:72
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:349
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:675
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:84
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:216
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:87
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:390
 msgid "Protocol"
 msgstr "Protocole"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:31
-msgid "Protocol of the new interface"
-msgstr "Protocole de la nouvelle interface"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:222
-msgid "Protocol support is not installed"
-msgstr "La gestion du protocole n'est pas installée"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:269
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:260
 msgid "Provide NTP server"
 msgstr "Fournir serveur NTP"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:701
 msgid "Provide new network"
 msgstr "Donner un nouveau réseau"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:451
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:879
 msgid "Pseudo Ad-Hoc (ahdemo)"
 msgstr "Pseudo Ad-Hoc (ahdemo)"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:112
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:113
 msgid "Public Key"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:278
 msgid ""
 "Public keys allow for the passwordless SSH logins with a higher security "
 "compared to the use of plain passwords. In order to upload a new key to the "
@@ -4112,47 +4227,48 @@ msgid ""
 "code> file into the input field."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:139
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:211
 msgid "Public prefix routed to this device for distribution to clients."
 msgstr ""
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:27
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:9
 msgid "QMI Cellular"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:173
 msgid "Quality"
 msgstr "Qualitée"
 
-#: 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:171
 msgid ""
 "Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> "
 "servers"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:952
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1360
 msgid "R0 Key Lifetime"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:959
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1366
 msgid "R1 Key Holder"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:58
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:88
 msgid "RFC3947 NAT-T mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:381
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:814
 msgid "RSSI threshold for joining"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:256
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:597
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:778
 msgid "RTS/CTS Threshold"
 msgstr "Seuil RTS/CTS"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:41
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:76
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:87
 msgid "RX"
@@ -4162,35 +4278,39 @@ msgstr "Reçu"
 msgid "RX Rate"
 msgstr "Débit en réception"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:783
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1961
+msgid "RX Rate / TX Rate"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1207
 msgid "Radius-Accounting-Port"
 msgstr "Port de la comptabilisation Radius"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:791
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1215
 msgid "Radius-Accounting-Secret"
 msgstr "Secret de la comptabilisation Radius"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:775
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1199
 msgid "Radius-Accounting-Server"
 msgstr "Serveur de la comptabilisation Radius"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:759
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1183
 msgid "Radius-Authentication-Port"
 msgstr "Port de l'authentification Radius"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:767
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1191
 msgid "Radius-Authentication-Secret"
 msgstr "Secret de l'authentification Radius"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:751
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1175
 msgid "Radius-Authentication-Server"
 msgstr "Serveur de l'authentification Radius"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:119
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:102
 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:83
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:84
 msgid ""
 "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-Server"
@@ -4202,21 +4322,11 @@ msgid ""
 "access to this device if you are connected via this interface"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2
-msgid ""
-"Really delete this wireless network? The deletion cannot be undone! You "
-"might lose access to this device if you are connected via this network."
-msgstr ""
-"Voulez-vous vraiment supprimer ce réseau sans-fil? L'effacement ne peut être "
-"annulé!\n"
-"Vous pourriez perdre l'accès à l'équipement si vous y êtes connecté par ce "
-"réseau."
-
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:40
 msgid "Really reset all changes?"
 msgstr "Voulez-vous vraiment ré-initialiser toutes les modifications ?"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:237
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:354
 msgid "Really switch protocol?"
 msgstr "Voulez-vous vraiment changer de protocole ?"
 
@@ -4240,15 +4350,15 @@ msgstr "Trafic temps-réel"
 msgid "Realtime Wireless"
 msgstr "Qualité de réception actuelle"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:931
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1343
 msgid "Reassociation Deadline"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:191
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
 msgid "Rebind protection"
 msgstr "Protection contre l'attaque « rebind »"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:48
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:46
 #: modules/luci-mod-system/luasrc/view/admin_system/reboot.htm:9
 msgid "Reboot"
 msgstr "Redémarrage"
@@ -4262,21 +4372,15 @@ msgstr "Redémarre…"
 msgid "Reboots the operating system of your device"
 msgstr "Redémarrage du système d'exploitation de votre équipement"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:103
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:90
 msgid "Receive"
 msgstr "Reçoit"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:325
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:350
-msgid "Receiver Antenna"
-msgstr "Antenne émettrice"
-
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:42
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:59
 msgid "Recommended. IP addresses of the WireGuard interface."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:28
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:300
 msgid "Reconnect this interface"
 msgstr "Reconnecter cet interface"
 
@@ -4284,92 +4388,134 @@ msgstr "Reconnecter cet interface"
 msgid "References"
 msgstr "Références"
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:39
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:153
 msgid "Relay"
 msgstr "Relais"
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:36
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:157
 msgid "Relay Bridge"
 msgstr "Pont-relais"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:17
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:154
 msgid "Relay between networks"
 msgstr "Relais entre réseaux"
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:64
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:12
 msgid "Relay bridge"
 msgstr "Pont-relais"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:18
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:50
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:49
 msgid "Remote IPv4 address"
 msgstr "Adresse IPv4 distante"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:8
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:40
 msgid "Remote IPv4 address or FQDN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:45
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:725
 msgid "Remove"
 msgstr "Désinstaller"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:53
-msgid "Repeat scan"
-msgstr "Répéter la recherche"
-
-#: modules/luci-base/luasrc/view/cbi/upload.htm:11
-msgid "Replace entry"
-msgstr "Remplacer l'entrée"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:46
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:51
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1806
 msgid "Replace wireless configuration"
 msgstr "Remplacer la configuration sans-fil"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:8
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:17
 msgid "Request IPv6-address"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:16
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:23
 msgid "Request IPv6-prefix of length"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1141
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:200
+msgid "Request timeout"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1536
 msgid "Required"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:20
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:31
 msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3"
 msgstr "Nécessaire avec certains FAIs, par ex. : Charter avec DOCSIS 3"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:19
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:49
 msgid "Required. Base64-encoded private key for this interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:113
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:113
 msgid "Required. Base64-encoded public key of peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:136
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:122
 msgid ""
 "Required. IP addresses and prefixes that this peer is allowed to use inside "
 "the tunnel. Usually the peer's tunnel IP addresses and the networks the peer "
 "routes through the tunnel."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1134
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1095
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1096
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1097
+msgid "Requires hostapd"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1101
+msgid "Requires hostapd with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1102
+msgid "Requires hostapd with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1098
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1099
+msgid "Requires hostapd with SAE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1533
 msgid ""
 "Requires the 'full' version of wpad/hostapd and support from the wifi driver "
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:141
 msgid ""
 "Requires upstream supports DNSSEC; verify unsigned domain responses really "
 "come from unsigned domains"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1268
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1109
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1119
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1120
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1121
+msgid "Requires wpa-supplicant"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1113
+msgid "Requires wpa-supplicant with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1114
+msgid "Requires wpa-supplicant with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1111
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1124
+msgid "Requires wpa-supplicant with SAE support"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1355
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:17
 #: modules/luci-base/luasrc/view/cbi/footer.htm:30
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:66
@@ -4385,17 +4531,22 @@ 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:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:68
 msgid "Resolv and Hosts Files"
 msgstr "Fichiers Resolv et Hosts"
 
-#: 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:94
 msgid "Resolve file"
 msgstr "Fichier de résolution des noms"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:28
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:14
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:71
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:197
+msgid "Resource not found"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:302
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:693
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:90
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:112
 msgid "Restart"
 msgstr "Redémarrer"
 
@@ -4403,7 +4554,7 @@ msgstr "Redémarrer"
 msgid "Restart Firewall"
 msgstr "Redémarrer le pare-feu"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:14
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:691
 msgid "Restart radio interface"
 msgstr ""
 
@@ -4415,26 +4566,24 @@ msgstr "Restaurer"
 msgid "Restore backup"
 msgstr "Restaurer une sauvegarde"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:113
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:114
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:38
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:46
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:119
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:120
 msgid "Reveal/hide password"
 msgstr "Montrer/cacher le mot de passe"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1774
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2322
 msgid "Revert"
 msgstr "Revenir"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1861
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2405
 msgid "Revert changes"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2013
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2554
 msgid "Revert request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1993
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2534
 msgid "Reverting configuration…"
 msgstr ""
 
@@ -4442,7 +4591,7 @@ msgstr ""
 msgid "Root"
 msgstr "Racine"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:271
 msgid "Root directory for files served via TFTP"
 msgstr "Répertoire racine des fichiers fournis par TFTP"
 
@@ -4450,7 +4599,7 @@ msgstr "Répertoire racine des fichiers fournis par TFTP"
 msgid "Root preparation"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:147
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:126
 msgid "Route Allowed IPs"
 msgstr ""
 
@@ -4462,12 +4611,12 @@ msgstr ""
 msgid "Route type"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:523
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:577
 msgid "Router Advertisement-Service"
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:43
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:15
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:27
 msgid "Router Password"
 msgstr "Mot de passe du routeur"
 
@@ -4498,7 +4647,7 @@ msgstr ""
 msgid "Run filesystem check"
 msgstr "Faire une vérification du système de fichiers"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:651
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:669
 msgid "Runtime error"
 msgstr ""
 
@@ -4510,31 +4659,31 @@ msgstr ""
 msgid "SNR"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:5
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:18
 msgid "SSH Access"
 msgstr "Accès SSH"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:10
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:70
 msgid "SSH server address"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:13
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:74
 msgid "SSH server port"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:8
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:58
 msgid "SSH username"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:27
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:277
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
 msgid "SSH-Keys"
 msgstr "Clés SSH"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:42
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:73
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:29
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1617
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:174
 msgid "SSID"
 msgstr "SSID"
@@ -4543,17 +4692,17 @@ msgstr "SSID"
 msgid "SWAP"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1127
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1262
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1379
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1351
 #: modules/luci-base/luasrc/view/cbi/error.htm:17
 #: modules/luci-base/luasrc/view/cbi/footer.htm:26
 #: modules/luci-base/luasrc/view/cbi/header.htm:17
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:54
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:133
 msgid "Save"
 msgstr "Sauvegarder"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1256
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1768
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1347
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2318
 #: modules/luci-base/luasrc/view/cbi/footer.htm:22
 msgid "Save & Apply"
 msgstr "Sauvegarder et Appliquer"
@@ -4566,28 +4715,20 @@ msgstr ""
 msgid "Save mtdblock contents"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
-msgid "Saving keys…"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:698
 msgid "Scan"
 msgstr "Scan"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:109
-msgid "Scan request failed"
-msgstr ""
-
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:8
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:39
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:23
 msgid "Scheduled Tasks"
 msgstr "Tâches Régulières"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1749
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2302
 msgid "Section added"
 msgstr "Section ajoutée"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1751
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2304
 msgid "Section removed"
 msgstr "Section retirée"
 
@@ -4602,12 +4743,18 @@ msgid ""
 "your device!"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:119
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:90
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:96
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:90
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:69
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:92
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1516
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1646
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1809
+msgid "Select file…"
+msgstr ""
+
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:144
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:102
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:125
 msgid ""
 "Send LCP echo requests at the given interval in seconds, only effective in "
 "conjunction with failure threshold"
@@ -4615,50 +4762,49 @@ msgstr ""
 "Envoyer des demandes d'échos LCP à intervalles donnés, en secondes ; utile "
 "uniqument associé à un seuil d'erreurs"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:561
-msgid "Separate Clients"
-msgstr "Isoler les clients"
-
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:62
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:63
 msgid "Server Settings"
 msgstr "Paramètres du serveur"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:26
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:50
 msgid "Service Name"
 msgstr "Nom du service"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:25
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:30
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:87
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:71
 msgid "Service Type"
 msgstr "Type du service"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:55
+#: modules/luci-base/luasrc/controller/admin/index.lua:62
 msgid "Services"
 msgstr "Services"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:815
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:861
 msgid "Session expired"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:83
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:107
 msgid "Set VPN as Default Route"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:258
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:795
 msgid ""
 "Set interface properties regardless of the link carrier (If set, carrier "
 "sense events do not invoke hotplug handlers)."
 msgstr ""
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:23
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:55
 msgid "Setting PLMN failed"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:26
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:68
 msgid "Setting operation mode failed"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:454
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:517
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:527
 msgid "Setup DHCP Server"
 msgstr "Configurer le serveur DHCP"
 
@@ -4670,7 +4816,7 @@ msgstr ""
 msgid "Short GI"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:516
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:960
 msgid "Short Preamble"
 msgstr ""
 
@@ -4682,21 +4828,23 @@ msgstr "Afficher la liste des fichiers de la sauvegarde actuelle"
 msgid "Show empty chains"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:306
 msgid "Shutdown this interface"
 msgstr "Arrêter cet interface"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:111
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:34
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:47
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:132
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1616
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:173
 msgid "Signal"
 msgstr "Signal"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1960
+msgid "Signal / Noise"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:125
 msgid "Signal Attenuation (SATN)"
 msgstr ""
@@ -4709,11 +4857,11 @@ msgstr "Signal :"
 msgid "Size"
 msgstr "Taille"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:259
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:260
 msgid "Size of DNS query cache"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:191
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
 msgid "Size of the ZRam device in megabytes"
 msgstr ""
 
@@ -4730,11 +4878,7 @@ msgstr "Skip to content"
 msgid "Skip to navigation"
 msgstr "Skip to navigation"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:335
-msgid "Slot time"
-msgstr "Tranche de temps"
-
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1640
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1846
 #: modules/luci-base/luasrc/model/network.lua:1427
 msgid "Software VLAN"
 msgstr ""
@@ -4776,11 +4920,7 @@ msgstr ""
 msgid "Specifies the directory the device is attached to"
 msgstr "Indique le répertoire auquel le périphérique est rattaché"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:23
-msgid "Specifies the listening port of this <em>Dropbear</em> instance"
-msgstr "Indique le port d'écoute de cette instance <em>Dropbear</em>"
-
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:57
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:175
 msgid ""
 "Specifies the maximum amount of failed ARP requests until hosts are presumed "
 "to be dead"
@@ -4788,51 +4928,59 @@ msgstr ""
 "Indique le nombre de requêtes ARP ratées au delà duquel les hôtes seront "
 "supposés disparus"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:49
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:171
 msgid ""
 "Specifies the maximum amount of seconds after which hosts are presumed to be "
 "dead"
 msgstr "Indique le délai après quoi les hôtes seront supposés disparus"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:761
+msgid ""
+"Specifies the maximum transmit power the wireless radio may use. Depending "
+"on regulatory requirements and wireless usage, the actual transmit power may "
+"be reduced by the driver."
+msgstr ""
+
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:63
 msgid "Specify a TOS (Type of Service)."
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:25
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:58
 msgid ""
 "Specify a TTL (Time to Live) for the encapsulating packet other than the "
 "default (64)."
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:53
 msgid ""
 "Specify an MTU (Maximum Transmission Unit) other than the default (1280 "
 "bytes)."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:60
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "Specify the secret encryption key here."
 msgstr "Spécifiez ici la clé secrète de chiffrage."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:475
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:64
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:533
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:89
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:111
 msgid "Start"
 msgstr "Démarrer"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:33
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:86
 msgid "Start priority"
 msgstr "Priorité de démarrage"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1958
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2499
 msgid "Starting configuration apply…"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1626
 msgid "Starting wireless scan..."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:24
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:120
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
 msgid "Startup"
 msgstr "Démarrage"
 
@@ -4844,20 +4992,21 @@ msgstr "Routes IPv4 statiques"
 msgid "Static IPv6 Routes"
 msgstr "Routes IPv6 statiques"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:70
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:71
 msgid "Static Leases"
 msgstr "Baux Statiques"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:118
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:73
 msgid "Static Routes"
 msgstr "Routes statiques"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1194
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1384
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:172
 #: modules/luci-base/luasrc/model/network.lua:966
 msgid "Static address"
 msgstr "Adresse statique"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:308
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:309
 msgid ""
 "Static leases are used to assign fixed IP addresses and symbolic hostnames "
 "to DHCP clients. They are also required for non-dynamic interface "
@@ -4868,39 +5017,41 @@ msgstr ""
 "interfaces sans configuration dynamique où l'on fournit un bail aux seuls "
 "hôtes configurés."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:534
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:977
 msgid "Station inactivity limit"
 msgstr ""
 
 #: modules/luci-base/luasrc/controller/admin/index.lua:40
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:197
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:337
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:746
 #: modules/luci-mod-status/luasrc/view/admin_status/index.htm:128
 msgid "Status"
 msgstr "Status"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:35
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:75
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:308
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:91
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:113
 msgid "Stop"
 msgstr "Arrêter"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:165
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Strict order"
 msgstr "Ordre stricte"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:16
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:30
 msgid "Strong"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1843
 msgid "Submit"
 msgstr "Soumettre"
 
-#: 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:108
 msgid "Suppress logging"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:109
 msgid "Suppress logging of the routine operation of these protocols"
 msgstr ""
 
@@ -4912,42 +5063,44 @@ msgstr ""
 msgid "Swap Entry"
 msgstr "Élement de partition d'échange"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:23
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:5
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:135
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:21
 msgid "Switch"
 msgstr "Commutateur"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:129
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:168
 msgid "Switch %q"
 msgstr "Commutateur %q"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:128
-msgid "Switch %q (%s)"
-msgstr "Commutateur %q (%s)"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:66
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:146
 msgid ""
 "Switch %q has an unknown topology - the VLAN settings might not be accurate."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:146
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:142
 msgid "Switch Port Mask"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1640
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1846
 #: modules/luci-base/luasrc/model/network.lua:1425
 msgid "Switch VLAN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:238
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:355
 msgid "Switch protocol"
 msgstr "Protocole du commutateur"
 
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:103
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:104
 #: modules/luci-base/luasrc/view/cbi/ipaddr.htm:26
 msgid "Switch to CIDR list notation"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:77
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1547
+msgid "Symbolic link"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:71
 msgid "Sync with NTP-Server"
 msgstr ""
 
@@ -4957,7 +5110,7 @@ msgstr "Synchro avec le navigateur"
 
 #: modules/luci-base/luasrc/controller/admin/index.lua:47
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:14
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:102
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:94
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
 #: modules/luci-mod-system/luasrc/view/admin_system/applyreboot.htm:39
 msgid "System"
@@ -4968,11 +5121,11 @@ msgstr "Système"
 msgid "System Log"
 msgstr "Journal système"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:108
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:99
 msgid "System Properties"
 msgstr "Propriétés système"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:145
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:136
 msgid "System log buffer size"
 msgstr "Taille du tampon du journal système"
 
@@ -4980,15 +5133,17 @@ msgstr "Taille du tampon du journal système"
 msgid "TCP:"
 msgstr "TCP :"
 
-#: 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:69
 msgid "TFTP Settings"
 msgstr "Paramètres TFTP"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:269
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
 msgid "TFTP server root"
 msgstr "Racine du serveur TFTP"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:17
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:77
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:88
 msgid "TX"
@@ -5011,7 +5166,7 @@ msgstr "Table"
 msgid "Target"
 msgstr "Cible"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:77
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:103
 msgid "Target network"
 msgstr ""
 
@@ -5019,51 +5174,26 @@ msgstr ""
 msgid "Terminate"
 msgstr "Terminer"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:27
-#, fuzzy
-msgid ""
-"The <em>Device Configuration</em> section covers physical settings of the "
-"radio hardware such as channel, transmit power or antenna selection which "
-"are shared among all defined wireless networks (if the radio hardware is "
-"multi-SSID capable). Per network settings like encryption or operation mode "
-"are grouped in the <em>Interface Configuration</em>."
-msgstr ""
-"La section <em>Configuration de l'équipement</em> couvre les paramètres "
-"physiques du matériel radio comme le canal, la puissance d'émission ou la "
-"sélection de l'antenne, qui sont partagés entre tous les réseaux sans-fil "
-"définis (si le matériel radio gère plusieurs réseaux SSID). Les paramètres "
-"dépendant de chaque réseau comme le chiffrage ou le mode de fonctionnement "
-"sont groupés dans <em>Configuration de l'interface</em>."
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:79
-msgid ""
-"The <em>libiwinfo-lua</em> package is not installed. You must install this "
-"component for working wireless configuration!"
-msgstr ""
-"Le paquet <em>libiwinfo-lua</em> n'est pas installé. Vous devez l'installer "
-"pour une configuration sans-fil fonctionnelle !"
-
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:66
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:77
 msgid ""
 "The HE.net endpoint update configuration changed, you must now use the plain "
 "username instead of the user ID!"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:8
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:40
 msgid ""
 "The IPv4 address or the fully-qualified domain name of the remote tunnel end."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:27
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:38
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:59
 msgid ""
 "The IPv6 prefix assigned to the provider, usually ends with <code>::</code>"
 msgstr ""
 "Le préfixe IPv6 attribué par le fournisseur, se termine généralement par "
 "<code>::</code>"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:18
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1808
 msgid ""
 "The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
 "code> and <code>_</code>"
@@ -5079,7 +5209,7 @@ msgstr ""
 msgid "The configuration file could not be loaded due to the following error:"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1849
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2396
 msgid ""
 "The device could not be reached within %d seconds after applying the pending "
 "changes, which caused the configuration to be rolled back for safety "
@@ -5097,6 +5227,12 @@ msgid ""
 "</abbr> <code>/dev/sda1</code>)"
 msgstr "Le périphérique de bloc contenant la partition (ex : /dev/sda1)"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:612
+msgid ""
+"The existing wireless configuration needs to be changed for LuCI to function "
+"properly."
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:127
 msgid ""
 "The filesystem that was used to format the memory (<abbr title=\"for example"
@@ -5121,31 +5257,30 @@ msgstr ""
 msgid "The following rules are currently active on this system."
 msgstr "Les règles suivantes sont actuellement actives sur ce système."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:144
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:154
+msgid "The gateway address must not be a local IP address"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:154
 msgid "The given SSH public key has already been added."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:150
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:160
 msgid ""
 "The given SSH public key is invalid. Please supply proper public RSA or "
 "ECDSA keys."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:67
-msgid "The given network name is not unique"
-msgstr "Le nom de réseau donné n'est pas unique"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:664
+msgid "The interface name is already used"
+msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:52
-#, fuzzy
-msgid ""
-"The hardware is not multi-SSID capable and the existing configuration will "
-"be replaced if you proceed."
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:670
+msgid "The interface name is too long"
 msgstr ""
-"Le matériel ne sait pas gérer plusieurs SSID et la configuration existante "
-"sera remplacée si vous continuez."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:43
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:31
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:55
 msgid ""
 "The length of the IPv4 prefix in bits, the remainder is used in the IPv6 "
 "addresses."
@@ -5153,16 +5288,20 @@ msgstr ""
 "La longueur du préfixe IPv4 en bits, le reste est utilisé dans les adresses "
 "IPv6"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:35
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:46
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:63
 msgid "The length of the IPv6 prefix in bits"
 msgstr "La longueur du préfixe IPv6 en bits"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:12
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:44
 msgid "The local IPv4 address over which the tunnel is created (optional)."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:5
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1814
+msgid "The network name is already used"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:135
 msgid ""
 "The network ports on this device can be combined to several <abbr title="
 "\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
@@ -5179,16 +5318,15 @@ msgstr ""
 "un port d'uplink pour une connexion vers un réseau plus vaste, comme "
 "internet et les autres ports sont réservés au réseau local."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:77
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:395
-msgid "The selected protocol needs a device assigned"
-msgstr "Le protocole sélectionné nécessite l'attribution d'un périphérique"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1149
+msgid "The selected %s mode is incompatible with %s encryption"
+msgstr ""
 
 #: modules/luci-base/luasrc/view/csrftoken.htm:11
 msgid "The submitted security token is invalid or already expired!"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:274
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:272
 msgid ""
 "The system is erasing the configuration partition now and will reboot itself "
 "when finished."
@@ -5196,7 +5334,7 @@ msgstr ""
 "Le système est en train d'effacer la partition de configuration et "
 "redémarrera tout seul une fois cela fini."
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:195
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:193
 #, fuzzy
 msgid ""
 "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
@@ -5209,7 +5347,7 @@ msgstr ""
 "address of your computer to reach the device again, depending on your "
 "settings."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:15
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:80
 msgid "The system password has been successfully changed."
 msgstr ""
 
@@ -5221,7 +5359,7 @@ 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:403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:427
 msgid "There are no active leases"
 msgstr ""
 
@@ -5230,18 +5368,10 @@ msgstr ""
 msgid "There are no active leases."
 msgstr "Il n'y a aucun bail actif."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1973
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2514
 msgid "There are no changes to apply"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:204
-msgid ""
-"There is no device assigned yet, please attach a network device in the "
-"\"Physical Settings\" tab"
-msgstr ""
-"Il n'y a aucun périphérique attribué pour l'instant, liez s.v.p. un "
-"périphérique réseau dans l'onglet \"Paramètres du matériel\""
-
 #: 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
@@ -5254,11 +5384,19 @@ msgstr ""
 "passe pour l'utilisateur root pour protéger l'accès de votre interface web "
 "et activer l'accès par SSH."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:19
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:49
 msgid "This IPv4 address of the relay"
 msgstr "L'adresse IPv4 du relais"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1448
+msgid "This authentication type is not applicable to the selected EAP method."
+msgstr ""
+
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:54
+msgid "This does not look like a valid PEM file"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
 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,13 +5414,13 @@ msgstr ""
 "fichiers modifiés dans /etc/config/ et certains autres sont automatiquement "
 "conservés."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:74
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:81
 msgid ""
 "This is either the \"Update Key\" configured for the tunnel or the account "
 "password if no update key has been configured"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:82
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:127
 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."
@@ -5290,7 +5428,7 @@ msgstr ""
 "Voici le contenu de /etc/rc.local. Placez-y vos propres commandes (avant le "
 "« exit 0 ») pour qu'ils soient exécutés en fin de démarrage."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:27
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:54
 msgid ""
 "This is the local endpoint address assigned by the tunnel broker, it usually "
 "ends with <code>...:2/64</code>"
@@ -5298,27 +5436,27 @@ 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:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:79
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> in the local network"
 msgstr "C'est le seul serveur DHCP sur le réseau local"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:73
 msgid "This is the plain username for logging into the account"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:34
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:57
 msgid ""
 "This is the prefix routed to you by the tunnel broker for use by clients"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:9
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:41
 msgid "This is the system crontab in which scheduled tasks can be defined."
 msgstr ""
 "Ceci est le système crontab avec lequel sont définies les tâches récurrentes."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:19
+#: 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 ""
@@ -5339,26 +5477,26 @@ msgstr ""
 "Cette page donne une vue d'ensemble des connexions réseaux actuellement "
 "actives."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:726
-#: modules/luci-base/htdocs/luci-static/resources/form.js:809
+#: modules/luci-base/htdocs/luci-static/resources/form.js:936
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1064
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:172
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:32
 msgid "This section contains no values yet"
 msgstr "Cette section ne contient pas encore de valeur"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:114
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:105
 msgid "Time Synchronization"
 msgstr "Synchronisation de l'heure"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:525
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:968
 msgid "Time interval for rekeying GTK"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:128
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:119
 msgid "Timezone"
 msgstr "Fuseau horaire"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:825
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:871
 msgid "To login…"
 msgstr ""
 
@@ -5373,7 +5511,7 @@ msgstr ""
 "micrologiciel dans son état initial, cliquer sur \"Réinitialiser\" (possible "
 "seulement avec les images de type squashfs)."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:835
 msgid "Tone"
 msgstr ""
 
@@ -5397,55 +5535,41 @@ msgstr "Trafic"
 msgid "Transfer"
 msgstr "Transfert"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:595
-msgid "Transmission Rate"
-msgstr "Débit d'émission"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:102
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:89
 msgid "Transmit"
 msgstr "Transmet"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:211
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:273
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:345
-msgid "Transmit Power"
-msgstr "Puissance d'émission"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:318
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:349
-msgid "Transmitter Antenna"
-msgstr "Antenne émettrice"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:73
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:57
 msgid "Trigger"
 msgstr "Déclenchement"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:98
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:84
 msgid "Trigger Mode"
 msgstr "Mode de déclenchement"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:54
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:69
 msgid "Tunnel ID"
 msgstr "ID du tunnel"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1643
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1849
 #: modules/luci-base/luasrc/model/network.lua:1430
 msgid "Tunnel Interface"
 msgstr "Interface du tunnel"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:44
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:55
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:76
 msgid "Tunnel Link"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:46
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:131
 msgid "Tx-Power"
 msgstr "Puissance d'émission"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:32
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:185
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:11
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:43
 msgid "Type"
 msgstr "Type"
 
@@ -5453,19 +5577,20 @@ msgstr "Type"
 msgid "UDP:"
 msgstr "UDP :"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:28
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:90
 msgid "UMTS only"
 msgstr "seulement UMTS"
 
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:43
 #: protocols/luci-proto-3g/luasrc/model/network/proto_3g.lua:10
 msgid "UMTS/GPRS/EV-DO"
 msgstr "UMTS/GPRS/EV-DO"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:106
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:93
 msgid "USB Device"
 msgstr "Périphérique USB"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:122
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:110
 msgid "USB Ports"
 msgstr ""
 
@@ -5495,10 +5620,12 @@ msgstr ""
 msgid "Unable to dispatch"
 msgstr "Impossible d'envoyer"
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:22
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:54
 msgid "Unable to obtain client ID"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:61
 msgid "Unable to resolve AFTR host name"
 msgstr ""
@@ -5508,21 +5635,31 @@ msgstr ""
 msgid "Unable to resolve peer host name"
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:33
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:68
+msgid "Unable to save contents: %s"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:132
 msgid "Unavailable Seconds (UAS)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1196
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1386
 #: modules/luci-base/luasrc/model/network.lua:970
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1349
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1539
 #: modules/luci-base/luasrc/model/network.lua:1137
 msgid "Unknown error (%s)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1193
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:204
+msgid "Unknown error code"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1383
+#: modules/luci-base/htdocs/luci-static/resources/protocol/none.js:6
 #: modules/luci-base/luasrc/model/network.lua:964
 msgid "Unmanaged"
 msgstr "non-géré"
@@ -5532,22 +5669,30 @@ msgstr "non-géré"
 msgid "Unmount"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:107
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:262
 msgid "Unnamed key"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1708
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2261
 msgid "Unsaved Changes"
 msgstr "Changements non appliqués"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:202
+msgid "Unspecified error"
+msgstr ""
+
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:64
 msgid "Unsupported MAP type"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:27
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:69
 msgid "Unsupported modem"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:219
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:119
 msgid "Unsupported protocol type."
 msgstr "Type de protocole non pris en charge."
@@ -5571,56 +5716,70 @@ msgstr ""
 msgid "Upload archive..."
 msgstr "Envoi de l'archive…"
 
-#: modules/luci-base/luasrc/view/cbi/upload.htm:8
-msgid "Uploaded File"
-msgstr "Fichier Uploadé"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1703
+msgid "Upload file"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1678
+msgid "Upload file…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1623
+msgid "Upload request failed: %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:613
+msgid ""
+"Upon pressing \"Continue\", anonymous \"wifi-iface\" sections will be "
+"assigned with a name in the form <em>wifinet#</em> and the network will be "
+"restarted to apply the updated configuration."
+msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:14
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:74
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:85
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:26
 msgid "Uptime"
 msgstr "Uptime"
 
-#: 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:83
 msgid "Use <code>/etc/ethers</code>"
 msgstr "Utiliser /etc/ethers"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:40
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:167
 msgid "Use DHCP gateway"
 msgstr "Utiliser la passerelle DHCP"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:33
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:85
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:34
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:98
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:46
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:65
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:38
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:58
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:124
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:39
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:116
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:59
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:103
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:64
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:77
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:100
 msgid "Use DNS servers advertised by peer"
 msgstr "Utiliser les serveurs DNS publiés par le distant"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:227
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:233
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:479
 msgid "Use ISO/IEC 3166 alpha2 country codes."
 msgstr "Utiliser les codes-pays ISO/IEC 3166 alpha2."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:31
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:100
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:70
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:35
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:51
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:86
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:56
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:97
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:77
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:75
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:92
 msgid "Use MTU on tunnel interface"
 msgstr "Utiliser le MTU sur l'interface du tunnel"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:95
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:65
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:30
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:46
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:81
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:93
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:73
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:88
 msgid "Use TTL on tunnel interface"
 msgstr "Utiliser le TTL sur l'interface du tunnel"
 
@@ -5632,68 +5791,65 @@ msgstr ""
 msgid "Use as root filesystem (/)"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:19
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:31
 msgid "Use broadcast flag"
 msgstr "Utiliser une marque de diffusion"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:253
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:791
 msgid "Use builtin IPv6-management"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:40
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:109
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:92
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:45
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:105
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:53
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:72
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:45
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:65
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:40
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:182
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:127
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:42
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:119
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:62
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:67
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:80
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:103
 msgid "Use custom DNS servers"
 msgstr "Utiliser des serveurs DNS spécifiques"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:26
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:70
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:16
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:28
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:84
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:24
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:50
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:23
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:43
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:116
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:33
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:74
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:97
 msgid "Use default gateway"
 msgstr "Utiliser la passerelle par défaut"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:48
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:164
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:77
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:24
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:88
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:58
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:23
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:39
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:74
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:90
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:38
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:57
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:30
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:50
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:45
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:227
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:119
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:51
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:88
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:68
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:52
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:70
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:83
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:111
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:149
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:67
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:111
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:98
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:72
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:85
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:108
 msgid "Use gateway metric"
 msgstr "Utiliser la métrique de la passerelle"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:64
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:179
 msgid "Use routing table"
 msgstr "Utiliser la table de routage"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:309
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:310
 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,77 +5866,78 @@ msgstr ""
 msgid "Used"
 msgstr "Utilisé"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:848
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1273
 msgid "Used Key Slot"
 msgstr "Clé utilisée"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:913
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
 msgid ""
 "Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not "
 "needed with normal WPA(2)-PSK."
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:48
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:110
 msgid "User certificate (PEM encoded)"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:61
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:122
 msgid "User key (PEM encoded)"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/sysauth.htm:23
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:41
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:32
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:102
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:56
 msgid "Username"
 msgstr "Nom d'utilisateur"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:182
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:903
 msgid "VC-Mux"
 msgstr "VC-Mux"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:851
 msgid "VDSL"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:172
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:169
 msgid "VLANs on %q"
 msgstr "VLANs sur %q"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:171
-msgid "VLANs on %q (%s)"
-msgstr "VLANs sur %q (%s)"
+#: modules/luci-base/luasrc/controller/admin/index.lua:55
+msgid "VPN"
+msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:18
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:42
 msgid "VPN Local address"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:22
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:46
 msgid "VPN Local port"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:15
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:11
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:15
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:58
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:39
 msgid "VPN Server"
 msgstr "Serveur VPN"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:18
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:96
 msgid "VPN Server port"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:37
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:100
 msgid "VPN Server's certificate SHA1 hash"
 msgstr ""
 
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:9
 #: protocols/luci-proto-vpnc/luasrc/model/network/proto_vpnc.lua:9
 msgid "VPNC (CISCO 3000 (and others) VPN)"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:44
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:73
 msgid "Vendor"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:60
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:52
 msgid "Vendor Class to send when requesting DHCP"
 msgstr "Classe de fournisseur à envoyer dans les requêtes DHCP"
 
@@ -5788,41 +5945,37 @@ msgstr "Classe de fournisseur à envoyer dans les requêtes DHCP"
 msgid "Verify"
 msgstr "Vérifier"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:52
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:76
 msgid "Virtual dynamic interface"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:470
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:471
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:553
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:576
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:908
 msgid "WDS"
 msgstr "WDS"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:667
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1160
 msgid "WEP Open System"
 msgstr "Système ouvert WEP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:668
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1161
 msgid "WEP Shared Key"
 msgstr "Clé partagée WEP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "WEP passphrase"
 msgstr "Mot de passe WEP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:503
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:566
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:945
 msgid "WMM Mode"
 msgstr "Mode WMM"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "WPA passphrase"
 msgstr "Mot de passe WPA"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:716
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:735
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:740
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1074
 msgid ""
 "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
 "and ad-hoc mode) to be installed."
@@ -5838,7 +5991,7 @@ msgstr "En attente de l'application des changements..."
 msgid "Waiting for command to complete..."
 msgstr "En attente de la fin de la commande..."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1940
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2481
 msgid "Waiting for configuration to get applied… %ds"
 msgstr ""
 
@@ -5846,8 +5999,8 @@ msgstr ""
 msgid "Waiting for device..."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:172
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:163
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:173
 msgid "Warning"
 msgstr "Attention"
 
@@ -5855,11 +6008,11 @@ msgstr "Attention"
 msgid "Warning: There are unsaved changes that will get lost on reboot!"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:20
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:34
 msgid "Weak"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:946
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1355
 msgid ""
 "When using a PSK, the PMK can be automatically generated. When enabled, the "
 "R0/R1 key options below are not applied. Disable this to use the R0 and R1 "
@@ -5867,78 +6020,85 @@ msgid ""
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:383
 msgid "Width"
 msgstr ""
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:17
 #: protocols/luci-proto-wireguard/luasrc/model/network/proto_wireguard.lua:9
 msgid "WireGuard VPN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:58
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:40
 #: modules/luci-mod-status/luasrc/controller/admin/status.lua:28
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:14
 msgid "Wireless"
 msgstr "Sans-fil"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1631
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1837
 #: modules/luci-base/luasrc/model/network.lua:1418
 msgid "Wireless Adapter"
 msgstr "Module Wi-Fi"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1617
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2052
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1823
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2288
 #: modules/luci-base/luasrc/model/network.lua:1404
 #: modules/luci-base/luasrc/model/network.lua:1865
 msgid "Wireless Network"
 msgstr "Réseau sans-fil"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:629
 msgid "Wireless Overview"
 msgstr "Présentation des réseaux sans-fil"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:362
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:797
 msgid "Wireless Security"
 msgstr "Sécurité des réseaux sans-fil"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:54
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:611
+msgid "Wireless configuration migration"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:139
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:179
 msgid "Wireless is disabled"
 msgstr "Le Wi-Fi est désactivé"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:54
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:139
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:179
 msgid "Wireless is not associated"
 msgstr "Le Wi-Fi est non associé"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:15
-msgid "Wireless is restarting..."
-msgstr "Le Wi-Fi est ré-initialisé…"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:752
 msgid "Wireless network is disabled"
 msgstr "Le réseau Wi-Fi est désactivé"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:752
 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:181
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:182
 msgid "Write received DNS requests to syslog"
 msgstr "Écrire les requêtes DNS reçues dans syslog"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:164
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:155
 msgid "Write system log to file"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1507
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:85
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1754
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:109
 msgid "Yes"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:26
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:943
+msgid ""
+"You appear to be currently connected to the device via the \"%h\" interface. "
+"Do you really want to shut down the interface?"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:123
 msgid ""
 "You can enable or disable installed init scripts here. Changes will applied "
 "after a device reboot.<br /><strong>Warning: If you disable essential init "
@@ -5959,38 +6119,34 @@ msgstr ""
 "Vous devez activer JavaScript dans votre navigateur pour que LuCI fonctionne "
 "correctement."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:196
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:187
 msgid "ZRam Compression Algorithm"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:203
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:194
 msgid "ZRam Compression Streams"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:189
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:180
 msgid "ZRam Settings"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:191
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
 msgid "ZRam Size"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:229
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:230
 msgid "any"
 msgstr "n'importe lequel"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:113
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:121
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:126
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:218
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:282
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:321
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:328
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:621
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:37
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:22
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:29
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:121
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:836
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:844
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:849
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1030
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:78
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:48
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:51
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:103
 msgid "auto"
 msgstr "auto"
 
@@ -5999,11 +6155,11 @@ msgstr "auto"
 msgid "automatic"
 msgstr "statique"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:45
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:78
 msgid "baseT"
 msgstr "baseT"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:909
 msgid "bridged"
 msgstr "ponté"
 
@@ -6019,22 +6175,21 @@ msgstr ""
 msgid "create:"
 msgstr "créer:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:264
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:368
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:678
 msgid "creates a bridge over specified interface(s)"
 msgstr "créer un bridge entre plusieurs interfaces"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:277
 msgid "dB"
 msgstr "dB"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:34
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:35
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:46
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:47
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:48
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:131
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:132
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:133
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:277
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:279
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:331
@@ -6046,26 +6201,30 @@ msgstr "dB"
 msgid "dBm"
 msgstr "dBm"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:460
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:587
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:889
 msgid "disable"
 msgstr "désactiver"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:119
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:524
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:530
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:536
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:18
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:578
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:584
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:590
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:25
 msgid "disabled"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:433
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:467
+msgid "driver default"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/lease_status.htm:17
 #: modules/luci-base/luasrc/view/lease_status.htm:46
-#: 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:416
 msgid "expired"
 msgstr "expiré"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:88
 msgid ""
 "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr>-leases will be stored"
@@ -6077,25 +6236,21 @@ msgstr "fichier dans lequel les baux DHCP seront stockés"
 msgid "forward"
 msgstr "transfert"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:80
 msgid "full-duplex"
 msgstr "full-duplex"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:80
 msgid "half-duplex"
 msgstr "half-duplex"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:559
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:565
 msgid "hexadecimal encoded value"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:138
-msgid "hidden"
-msgstr "cacher"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:527
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:533
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:538
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:581
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:587
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:592
 msgid "hybrid mode"
 msgstr ""
 
@@ -6103,6 +6258,10 @@ msgstr ""
 msgid "if target is a network"
 msgstr "si la destination est un réseau"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:63
+msgid "ignore"
+msgstr ""
+
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:177
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
@@ -6137,25 +6296,26 @@ msgstr ""
 msgid "key with either 5 or 13 characters"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:94
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:95
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr "fichier de résolution local"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:952
-msgid "minutes"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1168
+msgid "medium security"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:43
-msgid "mixed WPA/WPA2"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1360
+msgid "minutes"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:225
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:232
 msgid "no"
 msgstr "non"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:54
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:72
 msgid "no link"
 msgstr "pas de lien"
 
@@ -6163,7 +6323,7 @@ msgstr "pas de lien"
 msgid "non-empty value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1195
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1446
 msgid "none"
 msgstr "aucun"
 
@@ -6173,7 +6333,9 @@ msgstr "aucun"
 msgid "not present"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:363
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:341
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:776
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:780
 #: 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
@@ -6188,9 +6350,9 @@ msgstr "Arrêté"
 msgid "on"
 msgstr "Actif"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
-msgid "open"
-msgstr "ouvrir"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1169
+msgid "open network"
+msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
@@ -6209,73 +6371,77 @@ msgstr ""
 msgid "positive integer value"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:34
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:56
 msgid "random"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:526
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:532
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:537
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:580
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:586
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:591
 msgid "relay mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:910
 msgid "routed"
 msgstr "routé"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:525
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:534
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:968
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:977
 msgid "sec"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:525
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:531
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:579
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:585
 msgid "server mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:544
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:597
 msgid "stateful-only"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:542
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:595
 msgid "stateless"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:543
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:596
 msgid "stateless + stateful"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:369
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1167
+msgid "strong security"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:346
 msgid "tagged"
 msgstr "marqué"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:932
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1343
 msgid "time units (TUs / 1.024 ms) [1000-65535]"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:549
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:555
 msgid "unique value"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:448
 msgid "unknown"
 msgstr "inconnu"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:15
 #: modules/luci-base/luasrc/view/lease_status.htm:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:238
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:390
+#: 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:414
 msgid "unlimited"
 msgstr "non limité"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1401
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1648
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:63
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:355
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:378
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:413
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:446
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:512
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:450
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:545
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:53
 #: modules/luci-base/luasrc/view/cbi/network_netlist.htm:38
 msgid "unspecified"
@@ -6285,7 +6451,7 @@ msgstr "non précisé"
 msgid "unspecified -or- create:"
 msgstr "non précisé -ou- créer :"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:366
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:344
 msgid "untagged"
 msgstr "non marqué"
 
@@ -6366,8 +6532,8 @@ msgstr ""
 msgid "valid address:port"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:523
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:527
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:529
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:533
 msgid "valid date (YYYY-MM-DD)"
 msgstr ""
 
@@ -6404,7 +6570,7 @@ msgstr ""
 msgid "valid network in address/netmask notation"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:498
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:504
 msgid "valid phone digit (0-9, \"*\", \"#\", \"!\" or \".\")"
 msgstr ""
 
@@ -6417,11 +6583,11 @@ msgstr ""
 msgid "valid port value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:503
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:509
 msgid "valid time (HH:MM:SS)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:425
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:431
 msgid "value between %d and %d characters"
 msgstr ""
 
@@ -6437,14 +6603,23 @@ msgstr ""
 msgid "value smaller or equal to %f"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:430
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:425
+msgid "value with %d characters"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:436
 msgid "value with at least %d characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:435
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:441
 msgid "value with at most %d characters"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1169
+msgid "weak security"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:221
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:232
@@ -6455,6 +6630,201 @@ msgstr "oui"
 msgid "« Back"
 msgstr "« Retour"
 
+#~ msgid "Specifies the listening port of this <em>Dropbear</em> instance"
+#~ msgstr "Indique le port d'écoute de cette instance <em>Dropbear</em>"
+
+#~ msgid "Switch %q (%s)"
+#~ msgstr "Commutateur %q (%s)"
+
+#~ msgid "VLANs on %q (%s)"
+#~ msgstr "VLANs sur %q (%s)"
+
+#~ msgid "Antenna 1"
+#~ msgstr "Antenne 1"
+
+#~ msgid "Antenna 2"
+#~ msgstr "Antenne 2"
+
+#~ msgid "Antenna Configuration"
+#~ msgstr "Configuration de l'antenne"
+
+#~ msgid "Back to overview"
+#~ msgstr "Retour à la vue générale"
+
+#~ msgid "Back to scan results"
+#~ msgstr "Retour aux résultats de la recherche"
+
+#~ msgid "Broadcom 802.11%s Wireless Controller"
+#~ msgstr "Contrôleur sans fil Broadcom 802.11%s"
+
+#~ msgid "Broadcom BCM%04x 802.11 Wireless Controller"
+#~ msgstr "Contrôleur sans fil Broadcom BCM%04x 802.11"
+
+#~ msgid "Common Configuration"
+#~ msgstr "Configuration commune"
+
+#~ msgid "Connect"
+#~ msgstr "Se connecter"
+
+#~ msgid "Connection Limit"
+#~ msgstr "Limite de connexion"
+
+#~ msgid "Cover the following interface"
+#~ msgstr "Couvre l'interface suivante"
+
+#~ msgid "Cover the following interfaces"
+#~ msgstr "Couvre les interfaces suivantes"
+
+#~ msgid "Create Interface"
+#~ msgstr "Créer une interface"
+
+#~ msgid "Create a bridge over multiple interfaces"
+#~ msgstr "Créer un pont par dessus plusieurs interfaces"
+
+#~ msgid "Diversity"
+#~ msgstr "Diversité"
+
+#~ msgid "Edit this interface"
+#~ msgstr "Éditer cette interface"
+
+#~ msgid "Frame Bursting"
+#~ msgstr "Rafale de trames"
+
+#~ msgid "Generic 802.11%s Wireless Controller"
+#~ msgstr "Contrôleur sans fil générique 802.11%s"
+
+#~ msgid "Install package %q"
+#~ msgstr "Installer le paquet %q"
+
+#~ msgid "Interface Overview"
+#~ msgstr "Vue d'ensemble de l'interface"
+
+#~ msgid "Missing protocol extension for proto %q"
+#~ msgstr "Extention de protocole manquante pour le proto %q"
+
+#~ msgid "Name of the new interface"
+#~ msgstr "Nom de la nouvelle interface"
+
+#~ msgid "No network configured on this device"
+#~ msgstr "Ce périphérique n'a aucune adresse configurée"
+
+#~ msgid "No network name specified"
+#~ msgstr "Aucun nom de réseau donné"
+
+#~ msgid "Not associated"
+#~ msgstr "Pas associé"
+
+#~ msgid ""
+#~ "On this page you can configure the network interfaces. You can bridge "
+#~ "several interfaces by ticking the \"bridge interfaces\" field and enter "
+#~ "the names of several network interfaces separated by spaces. You can also "
+#~ "use <abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
+#~ "<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
+#~ "<samp>eth0.1</samp>)."
+#~ msgstr ""
+#~ "Dans cette page vous pourrez configurer les interfaces réseaux. Vous "
+#~ "pouvez bridger différentes interfaces en cochant le champ \"bridger les "
+#~ "interfaces\" et en saisissant les noms des interfaces réseau séparées par "
+#~ "des espaces. Vous pouvez aussi utiliser la notation VLAN, INTERFACE."
+#~ "VLANNB (ex : eth0.1)."
+
+#~ msgid "Package libiwinfo required!"
+#~ msgstr "Nécessite le paquet libiwinfo !"
+
+#~ msgid "Protocol of the new interface"
+#~ msgstr "Protocole de la nouvelle interface"
+
+#~ msgid "Protocol support is not installed"
+#~ msgstr "La gestion du protocole n'est pas installée"
+
+#~ msgid ""
+#~ "Really delete this wireless network? The deletion cannot be undone! You "
+#~ "might lose access to this device if you are connected via this network."
+#~ msgstr ""
+#~ "Voulez-vous vraiment supprimer ce réseau sans-fil? L'effacement ne peut "
+#~ "être annulé!\n"
+#~ "Vous pourriez perdre l'accès à l'équipement si vous y êtes connecté par "
+#~ "ce réseau."
+
+#~ msgid "Receiver Antenna"
+#~ msgstr "Antenne émettrice"
+
+#~ msgid "Repeat scan"
+#~ msgstr "Répéter la recherche"
+
+#~ msgid "Replace entry"
+#~ msgstr "Remplacer l'entrée"
+
+#~ msgid "Separate Clients"
+#~ msgstr "Isoler les clients"
+
+#~ msgid "Slot time"
+#~ msgstr "Tranche de temps"
+
+#, fuzzy
+#~ msgid ""
+#~ "The <em>Device Configuration</em> section covers physical settings of the "
+#~ "radio hardware such as channel, transmit power or antenna selection which "
+#~ "are shared among all defined wireless networks (if the radio hardware is "
+#~ "multi-SSID capable). Per network settings like encryption or operation "
+#~ "mode are grouped in the <em>Interface Configuration</em>."
+#~ msgstr ""
+#~ "La section <em>Configuration de l'équipement</em> couvre les paramètres "
+#~ "physiques du matériel radio comme le canal, la puissance d'émission ou la "
+#~ "sélection de l'antenne, qui sont partagés entre tous les réseaux sans-fil "
+#~ "définis (si le matériel radio gère plusieurs réseaux SSID). Les "
+#~ "paramètres dépendant de chaque réseau comme le chiffrage ou le mode de "
+#~ "fonctionnement sont groupés dans <em>Configuration de l'interface</em>."
+
+#~ msgid ""
+#~ "The <em>libiwinfo-lua</em> package is not installed. You must install "
+#~ "this component for working wireless configuration!"
+#~ msgstr ""
+#~ "Le paquet <em>libiwinfo-lua</em> n'est pas installé. Vous devez "
+#~ "l'installer pour une configuration sans-fil fonctionnelle !"
+
+#~ msgid "The given network name is not unique"
+#~ msgstr "Le nom de réseau donné n'est pas unique"
+
+#, fuzzy
+#~ msgid ""
+#~ "The hardware is not multi-SSID capable and the existing configuration "
+#~ "will be replaced if you proceed."
+#~ msgstr ""
+#~ "Le matériel ne sait pas gérer plusieurs SSID et la configuration "
+#~ "existante sera remplacée si vous continuez."
+
+#~ msgid "The selected protocol needs a device assigned"
+#~ msgstr "Le protocole sélectionné nécessite l'attribution d'un périphérique"
+
+#~ msgid ""
+#~ "There is no device assigned yet, please attach a network device in the "
+#~ "\"Physical Settings\" tab"
+#~ msgstr ""
+#~ "Il n'y a aucun périphérique attribué pour l'instant, liez s.v.p. un "
+#~ "périphérique réseau dans l'onglet \"Paramètres du matériel\""
+
+#~ msgid "Transmission Rate"
+#~ msgstr "Débit d'émission"
+
+#~ msgid "Transmit Power"
+#~ msgstr "Puissance d'émission"
+
+#~ msgid "Transmitter Antenna"
+#~ msgstr "Antenne émettrice"
+
+#~ msgid "Uploaded File"
+#~ msgstr "Fichier Uploadé"
+
+#~ msgid "Wireless is restarting..."
+#~ msgstr "Le Wi-Fi est ré-initialisé…"
+
+#~ msgid "hidden"
+#~ msgstr "cacher"
+
+#~ msgid "open"
+#~ msgstr "ouvrir"
+
 #~ msgid "Back"
 #~ msgstr "Retour"
 
@@ -6586,9 +6956,6 @@ msgstr "« Retour"
 #~ msgid "Hermes 802.11b Wireless Controller"
 #~ msgstr "Contrôleur sans fil Hermes 802.11b"
 
-#~ msgid "Interface is shutting down..."
-#~ msgstr "L'interface s'arrête…"
-
 #~ msgid "Interface reconnected"
 #~ msgstr "Interface reconnectée"
 
diff --git a/modules/luci-base/po/he/base.po b/modules/luci-base/po/he/base.po
index 7a3f871ac..6c48f3216 100644
--- a/modules/luci-base/po/he/base.po
+++ b/modules/luci-base/po/he/base.po
@@ -11,19 +11,20 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.6\n"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:133
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:857
 msgid "%.1f dB"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:109
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:122
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 msgid "%d Bit"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1641
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2194
 msgid "%d invalid field(s)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:281
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:31
 msgid "%s is untagged in multiple VLANs!"
 msgstr ""
 
@@ -61,19 +62,19 @@ msgid "-- Additional Field --"
 msgstr "-- שדה נוסף --"
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:258
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1401
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1533
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:250
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:350
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1114
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1648
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1780
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:314
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:414
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1178
 #: modules/luci-base/luasrc/view/cbi/header.htm:5
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:26
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:88
 msgid "-- Please choose --"
 msgstr "-- נא לבחור --"
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:259
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:351
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1115
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:415
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1179
 #: modules/luci-base/luasrc/view/cbi/header.htm:6
 msgid "-- custom --"
 msgstr "-- מותאם אישית --"
@@ -96,7 +97,7 @@ msgstr ""
 msgid "-- please select --"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:382
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:814
 msgid "0 = not using RSSI threshold, 1 = do not change driver default"
 msgstr ""
 
@@ -108,10 +109,11 @@ msgstr "עומס במשך דקה:"
 msgid "15 Minute Load:"
 msgstr "עומס במשך רבע שעה:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:924
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1337
 msgid "4-character hexadecimal ID"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:11
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:18
 msgid "464XLAT (CLAT)"
 msgstr ""
@@ -120,57 +122,57 @@ msgstr ""
 msgid "5 Minute Load:"
 msgstr "עומס במשך 5 דקות:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:960
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1366
 msgid "6-octet identifier as a hex string - no colons"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:891
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1310
 msgid "802.11r Fast Transition"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1157
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1567
 msgid "802.11w Association SA Query maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1574
 msgid "802.11w Association SA Query retry timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1133
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1533
 msgid "802.11w Management Frame Protection"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1156
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1567
 msgid "802.11w maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1165
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1574
 msgid "802.11w retry timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:399
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:831
 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:224
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:225
 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:215
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:216
 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:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
 msgid ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
 "order of the resolvfile"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:388
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:820
 msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:351
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:373
 #: 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>"
@@ -180,8 +182,8 @@ msgstr "כתובות <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:555
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:35
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:506
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr ""
 
@@ -196,111 +198,115 @@ msgstr ""
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 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:402
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:58
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:35
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:33
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "הגדרות <abbr title=\"Light Emitting Diode\">LED</abbr>"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:67
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:51
 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:328
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:329
 #: 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:372
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:233
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:234
 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:242
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
 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:251
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:252
 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:10
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:42
 msgid ""
 "<br/>Note: you need to manually restart the cron service if the crontab file "
 "was empty before editing."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:817
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1605
+msgid "A directory with the same name already exists."
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:863
 msgid "A new login is required since the authentication session expired."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:114
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:837
 msgid "A43C + J43 + A43"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:838
 msgid "A43C + J43 + A43 + V43"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:850
 msgid "ADSL"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:826
 msgid "ANSI T1.413"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:33
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:47
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:23
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:94
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:86
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:67
 msgid "APN"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:56
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:175
 #, fuzzy
 msgid "ARP retry threshold"
 msgstr "סף נסיונות של ARP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:122
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:845
 msgid "ATM (Asynchronous Transfer Mode)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:144
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:866
 #, fuzzy
 msgid "ATM Bridges"
 msgstr "גשרי ATM"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:178
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:21
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:898
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:66
 #, fuzzy
 msgid "ATM Virtual Channel Identifier (VCI)"
 msgstr "מזהה ערוצים ווירטואליים של ATM"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:179
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:26
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:899
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:70
 #, fuzzy
 msgid "ATM Virtual Path Identifier (VPI)"
 msgstr "מזהה נתיבים ווירטואליים של ATM  (VPI)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:866
 msgid ""
 "ATM bridges expose encapsulated ethernet in AAL5 connections as virtual "
 "Linux network interfaces which can be used in conjunction with DHCP or PPP "
 "to dial into the provider network."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:184
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:905
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:62
 msgid "ATM device number"
 msgstr "מס' התקן של ATM"
 
@@ -309,18 +315,18 @@ msgid "ATU-C System Vendor ID"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:251
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:495
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:499
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:528
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:532
 msgid "Absent Interface"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:19
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
 #, fuzzy
 msgid "Access Concentrator"
 msgstr "מרכז גישות"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:368
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:470
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:802
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
 msgid "Access Point"
 msgstr "נקודת גישה"
 
@@ -343,7 +349,7 @@ msgid "Active Connections"
 msgstr "חיבורים פעילים"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:68
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:30
 msgid "Active DHCP Leases"
 msgstr "הרשאות DHCP פעילות"
 
@@ -352,57 +358,77 @@ msgid "Active DHCPv6 Leases"
 msgstr "הרשאות DHCPv6 פעילות"
 
 # צריך אימות של מישהו שמבין יותר במושגים האלו אם צריך בכלל לתרגם את זה או להשאיר כמו שזה
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1951
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:370
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:12
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2190
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:804
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:23
 #, fuzzy
 msgid "Ad-Hoc"
 msgstr "אד-הוק"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:650
-#: modules/luci-base/htdocs/luci-static/resources/form.js:651
-#: modules/luci-base/htdocs/luci-static/resources/form.js:666
-#: modules/luci-base/htdocs/luci-static/resources/form.js:667
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1290
+#: modules/luci-base/htdocs/luci-static/resources/form.js:902
+#: modules/luci-base/htdocs/luci-static/resources/form.js:904
+#: modules/luci-base/htdocs/luci-static/resources/form.js:917
+#: modules/luci-base/htdocs/luci-static/resources/form.js:918
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1539
 #: modules/luci-base/luasrc/view/cbi/nsection.htm:25
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:189
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:197
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:39
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:47
 #: modules/luci-base/luasrc/view/cbi/ucisection.htm:54
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:703
 msgid "Add"
 msgstr "הוסף"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:60
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:870
+msgid "Add ATM Bridge"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:92
 msgid "Add IPv4 address…"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:129
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:204
 msgid "Add IPv6 address…"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:143
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:149
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:38
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:47
+msgid "Add LED action"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:215
+msgid "Add VLAN"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:14
+msgid "Add instance"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:153
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:159
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:250
 msgid "Add key"
 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:155
 #, fuzzy
 msgid "Add local domain suffix to names served from hosts files"
 msgstr "הוסף דומיין מקומי לשמות המוגשים מהקבצים של המארח"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:705
 msgid "Add new interface..."
 msgstr "הוסף ממשק חדש..."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:104
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:99
+msgid "Add peer"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:105
 msgid "Additional Hosts files"
 msgstr "קבצי מארח נוספים"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:161
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
 msgid "Additional servers file"
 msgstr ""
 
@@ -429,7 +455,7 @@ msgstr ""
 msgid "Address"
 msgstr "כתובת"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:12
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:151
 msgid "Address to access local relay bridge"
 msgstr ""
 
@@ -439,13 +465,13 @@ msgstr ""
 msgid "Administration"
 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:70
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:505
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:896
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:24
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:189
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:463
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:176
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:143
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:364
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:742
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:799
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:50
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:34
 msgid "Advanced Settings"
@@ -455,168 +481,168 @@ msgstr "הגדרות מתקדמות"
 msgid "Aggregate Transmit Power(ACTATP)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:175
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:166
 #, fuzzy
 msgid "Alert"
 msgstr "אזעקה"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1628
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1834
 #: modules/luci-base/luasrc/model/network.lua:1416
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:54
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:78
 msgid "Alias Interface"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:138
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:66
 msgid "Alias of \"%s\""
 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:170
 msgid "All Servers"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:114
 msgid ""
 "Allocate IP addresses sequentially, starting from the lowest available "
 "address"
 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:113
 msgid "Allocate IP sequentially"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:24
 msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:545
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:987
 msgid "Allow AP mode to disconnect STAs based on low ACK condition"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:462
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:589
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:891
 #, fuzzy
 msgid "Allow all except listed"
 msgstr "אפשר הכל חוץ מהרשומים"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:236
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:767
 msgid "Allow legacy 802.11b rates"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:461
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:588
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:890
 msgid "Allow listed only"
 msgstr "אפשר רשומים בלבד"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:198
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:199
 #, fuzzy
 msgid "Allow localhost"
 msgstr "אפשר localhost"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:47
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:35
 msgid "Allow remote hosts to connect to local SSH forwarded ports"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:38
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:30
 msgid "Allow root logins with password"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:39
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:30
 msgid "Allow the <em>root</em> user to login with password"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:199
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:200
 msgid ""
 "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:135
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:122
 msgid "Allowed IPs"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:549
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:602
 msgid "Always announce default router"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:259
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:782
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
 "option does not comply with IEEE 802.11n-2009!"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:95
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:818
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:119
 msgid "Annex"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:96
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:819
 msgid "Annex A + L + M (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:827
 msgid "Annex A G.992.1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:828
 msgid "Annex A G.992.2"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:829
 msgid "Annex A G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:830
 msgid "Annex A G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:97
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:820
 msgid "Annex B (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:823
 msgid "Annex B G.992.1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:824
 msgid "Annex B G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:102
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:825
 msgid "Annex B G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:98
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:821
 msgid "Annex J (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:831
 msgid "Annex L G.992.3 POTS 1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:99
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:822
 msgid "Annex M (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:109
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:832
 msgid "Annex M G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:833
 msgid "Annex M G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:550
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:602
 msgid "Announce as default router even if no public prefix is available."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:555
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:607
 msgid "Announced DNS domains"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:554
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:606
 msgid "Announced DNS servers"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1093
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1496
 msgid "Anonymous Identity"
 msgstr ""
 
@@ -628,20 +654,6 @@ msgstr ""
 msgid "Anonymous Swap"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:322
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:329
-msgid "Antenna 1"
-msgstr "אנטנה 1"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:323
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:330
-msgid "Antenna 2"
-msgstr "אנטנה 2"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:246
-msgid "Antenna Configuration"
-msgstr "הגדרות אנטנה"
-
 # אזור?
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:71
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:160
@@ -651,11 +663,11 @@ msgstr "הגדרות אנטנה"
 msgid "Any zone"
 msgstr "כל תחום"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1981
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2522
 msgid "Apply request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1867
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2409
 msgid "Apply unchecked"
 msgstr ""
 
@@ -663,8 +675,8 @@ msgstr ""
 msgid "Architecture"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:19
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:184
+#: 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 ""
@@ -673,13 +685,13 @@ msgstr ""
 msgid "Assign interfaces..."
 msgstr "הקצה ממשקים"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:124
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:24
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:189
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:31
 msgid ""
 "Assign prefix parts using this hexadecimal subprefix ID for this interface."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:148
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1967
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:22
 msgid "Associated Stations"
 msgstr "תחנות קשורות"
@@ -688,20 +700,20 @@ msgstr "תחנות קשורות"
 msgid "Associations"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:39
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:37
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:101
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:64
 msgid "Auth Group"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1027
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1421
 msgid "Authentication"
 msgstr "אימות"
 
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:29
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:70
 msgid "Authentication Type"
 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:78
 msgid "Authoritative"
 msgstr "מוסמך"
 
@@ -719,17 +731,19 @@ msgstr "דרוש אימות"
 msgid "Auto Refresh"
 msgstr "רענון אוטומטי"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:53
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:7
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:17
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:67
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:24
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:36
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:42
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:36
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:106
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:24
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:98
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:50
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:94
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:81
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:55
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:68
 msgid "Automatic"
 msgstr ""
 
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:7
 #: protocols/luci-proto-hnet/luasrc/model/network/proto_hnet.lua:7
 msgid "Automatic Homenet (HNCP)"
 msgstr ""
@@ -772,21 +786,21 @@ msgstr "זמין"
 msgid "Average:"
 msgstr "ממוצע:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:116
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:839
 msgid "B43 + B43C"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:840
 msgid "B43 + B43C + V43"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:48
 msgid "BR / DMR / AFTR"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:43
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:75
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1620
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:176
 msgid "BSSID"
 msgstr "BSSID"
@@ -800,19 +814,11 @@ msgstr "חזרה לסקירה"
 msgid "Back to configuration"
 msgstr "חזרה להגדרות"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:48
-msgid "Back to overview"
-msgstr "חזרה לסקירה"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:20
-msgid "Back to scan results"
-msgstr "חזרה לתוצאות סריקה"
-
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:17
 msgid "Backup"
 msgstr "גיבוי"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:38
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:36
 msgid "Backup / Flash Firmware"
 msgstr "גיבוי / קושחת פלאש"
 
@@ -825,11 +831,11 @@ msgid "Bad address specified!"
 msgstr "פורטה כתובת לא תקינה"
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:158
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:288
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:368
 msgid "Band"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:261
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:785
 msgid "Beacon Interval"
 msgstr ""
 
@@ -843,80 +849,86 @@ msgstr ""
 "המסומנים ב opkg ׁOpen PacKaGe Managementׂ, קבצי בסיס חיוניים ותבניות הגיבוי "
 "המוגדרות ע\"י המשתמש."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:293
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:294
 msgid ""
 "Bind dynamically to interfaces rather than wildcard address (recommended as "
 "linux default)"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:16
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:48
 msgid "Bind interface"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:16
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:48
 msgid "Bind the tunnel to this interface (optional)."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:49
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:134
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:187
 msgid "Bitrate"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:172
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
 msgid "Bogus NX Domain Override"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1634
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1840
 #: modules/luci-base/luasrc/model/network.lua:1420
 msgid "Bridge"
 msgstr "גשר"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:264
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:368
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:678
 msgid "Bridge interfaces"
 msgstr "ממשקי גשר"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:906
 msgid "Bridge unit number"
 msgstr "מס' יח' גשר"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:250
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:364
 #, fuzzy
 msgid "Bring up on boot"
 msgstr "הבא באיתחול"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:35
-msgid "Broadcom 802.11%s Wireless Controller"
-msgstr "שלט אלחוטי Broadcom 802.11%s"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:45
-msgid "Broadcom BCM%04x 802.11 Wireless Controller"
-msgstr "שלט אלחוטי Broadcom BCM%04x 802.11"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1697
+msgid "Browse…"
+msgstr ""
 
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:18
 msgid "Buffered"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:75
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:134
 msgid "CA certificate; if empty it will be saved after the first connection."
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:7
+msgid "CLAT configuration failed"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:13
 msgid "CPU usage (%)"
 msgstr "שימוש מעבד (%)"
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:21
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:53
 msgid "Call failed"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1789
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:14
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:52
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:711
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:948
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1839
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:191
 #: modules/luci-mod-system/luasrc/view/admin_system/upgrade.htm:60
 msgid "Cancel"
 msgstr "בטל"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:6
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:17
 msgid "Category"
 msgstr ""
 
@@ -934,13 +946,7 @@ msgstr ""
 msgid "Chain"
 msgstr "שרשרת"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:9
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:14
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:24
-msgid "Change login password"
-msgstr ""
-
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1744
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 msgid "Changes"
 msgstr "שינויים"
 
@@ -948,33 +954,23 @@ msgstr "שינויים"
 msgid "Changes applied."
 msgstr "השינויים הוחלו"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2004
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2545
 msgid "Changes have been reverted."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:43
 msgid "Changes the administrator password for accessing the device"
 msgstr "משנה את סיסמת המנהל לגישה למכשיר"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:10
-msgid "Changing password…"
-msgstr ""
-
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:162
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:45
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:87
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:174
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:376
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1618
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:186
 msgid "Channel"
 msgstr "ערוץ"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:119
-msgid ""
-"Channel %d is not available in the %s regulatory domain and has been auto-"
-"adjusted to %d."
-msgstr ""
-
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:229
 msgid "Check"
 msgstr "לבדוק"
@@ -983,7 +979,7 @@ msgstr "לבדוק"
 msgid "Check filesystems before mount"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1806
 msgid "Check this option to delete the existing networks from this radio."
 msgstr ""
 
@@ -995,8 +991,8 @@ msgstr ""
 msgid "Choose mtdblock"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:358
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:443
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1829
 msgid ""
 "Choose the firewall zone you want to assign to this interface. Select "
 "<em>unspecified</em> to remove the interface from the associated zone or "
@@ -1004,17 +1000,17 @@ msgid ""
 "interface to it."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:834
 msgid ""
 "Choose the network(s) you want to attach to this wireless interface or fill "
 "out the <em>create</em> field to define a new network."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:614
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1023
 msgid "Cipher"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:61
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:91
 msgid "Cisco UDP encapsulation"
 msgstr ""
 
@@ -1030,28 +1026,28 @@ msgid ""
 "FEATURE IS FOR PROFESSIONALS! )"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1950
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:369
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:471
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2189
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:803
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:908
 msgid "Client"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:55
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:52
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:47
 msgid "Client ID to send when requesting DHCP"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:145
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:151
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:155
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:161
 msgid "Close"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:146
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:119
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:125
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:127
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:98
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:119
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:157
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:141
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:115
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:138
 msgid ""
 "Close inactive connection after the given amount of seconds, use 0 to "
 "persist connection"
@@ -1064,12 +1060,9 @@ msgstr "סגור רשימה..."
 #: modules/luci-base/luasrc/view/lease_status.htm:77
 #: modules/luci-base/luasrc/view/lease_status.htm:98
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:118
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:37
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:24
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1965
 #: modules/luci-mod-network/luasrc/view/admin_network/iface_status.htm:6
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:40
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:30
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:8
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:398
 #: modules/luci-mod-status/luasrc/view/admin_status/index/30-network.htm:11
 #: modules/luci-mod-status/luasrc/view/admin_status/index/50-dsl.htm:17
@@ -1083,15 +1076,19 @@ msgstr "אוסף מידע..."
 msgid "Command"
 msgstr "פקודה"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:193
+msgid "Command OK"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:41
+msgid "Command failed"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:64
 msgid "Comment"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:185
-msgid "Common Configuration"
-msgstr "הגדרות נפוצות"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
 msgid ""
 "Complicates key reinstallation attacks on the client side by disabling "
 "retransmission of EAPOL-Key frames that are used to install keys. This "
@@ -1099,13 +1096,14 @@ msgid ""
 "negotiation especially in environments with heavy traffic load."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1744
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 #: modules/luci-base/luasrc/controller/admin/uci.lua:11
 #: modules/luci-mod-system/luasrc/view/admin_system/backupfiles.htm:9
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:13
 msgid "Configuration"
 msgstr "הגדרות"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:21
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:63
 msgid "Configuration failed"
 msgstr ""
@@ -1114,89 +1112,89 @@ msgstr ""
 msgid "Configuration files will be kept"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1915
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2456
 msgid "Configuration has been applied."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1848
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2395
 msgid "Configuration has been rolled back!"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:43
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:942
+msgid "Confirm disconnect"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:50
 msgid "Confirmation"
 msgstr "אישור"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:32
-msgid "Connect"
-msgstr "התחבר"
-
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:72
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:105
 msgid "Connected"
 msgstr "מחובר"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:338
-msgid "Connection Limit"
-msgstr "מגבלת חיבורים"
-
 #: modules/luci-base/htdocs/luci-static/resources/network.js:7
 #: modules/luci-base/luasrc/model/network.lua:27
 msgid "Connection attempt failed"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:203
+msgid "Connection lost"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/controller/admin/status.lua:32
 msgid "Connections"
 msgstr "חיבורים"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1890
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:66
+msgid "Contents have been saved."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:618
+msgid "Continue"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2431
 msgid ""
 "Could not regain access to the device after applying the configuration "
 "changes. You might need to reconnect if you modified network related "
 "settings such as the IP address or wireless security credentials."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:135
 msgid "Country"
 msgstr "מדינה"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:227
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:233
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:337
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:764
 msgid "Country Code"
 msgstr "קוד מדינה"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:36
-msgid "Cover the following interface"
-msgstr "כסה את הממשק הבא"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:43
-msgid "Cover the following interfaces"
-msgstr "כסה את הממשקים הבאים"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:357
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:86
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:443
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1829
 msgid "Create / Assign firewall-zone"
 msgstr "צור / הקצה תחום-חומת אש"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:9
-msgid "Create Interface"
-msgstr "צור ממשק"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:33
-msgid "Create a bridge over multiple interfaces"
-msgstr "צור גשר בין מספר ממשקים"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:735
+msgid "Create interface"
+msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:174
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:165
 msgid "Critical"
 msgstr "קריטי"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:178
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:169
 msgid "Cron Log Level"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:519
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:521
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:447
+msgid "Current power"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:552
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:554
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:51
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:53
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:82
@@ -1204,7 +1202,7 @@ msgstr ""
 msgid "Custom Interface"
 msgstr "ממשק מותאם אישית"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:36
 msgid "Custom delegated IPv6-prefix"
 msgstr ""
 
@@ -1214,7 +1212,7 @@ msgid ""
 "this, perform a factory-reset first."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:59
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:41
 msgid ""
 "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
 "\">LED</abbr>s if possible."
@@ -1222,46 +1220,47 @@ msgstr ""
 "מתאים את הגדרות ה-<abbr title=\"Light Emitting Diode\">LED</abbr>-ים במכשיר "
 "(אם אפשרי)."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:799
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1223
 msgid "DAE-Client"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:807
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1231
 msgid "DAE-Port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:815
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1239
 msgid "DAE-Secret"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:448
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:459
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:279
 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:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:61
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:62
 msgid "DHCP and DNS"
 msgstr "DHCP ו- DNS"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1195
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1385
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:16
 #: modules/luci-base/luasrc/model/network.lua:968
 msgid "DHCP client"
 msgstr "לקוח DHCP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:571
 msgid "DHCP-Options"
 msgstr "אפשרויות-DHCP"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_dhcpv6.lua:7
 msgid "DHCPv6 client"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:540
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:594
 msgid "DHCPv6-Mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:529
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:583
 msgid "DHCPv6-Service"
 msgstr ""
 
@@ -1278,31 +1277,31 @@ msgstr ""
 msgid "DNS"
 msgstr "DNS"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:183
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
 msgid "DNS forwardings"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:30
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:37
 msgid "DNS-Label / FQDN"
 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:136
 msgid "DNSSEC"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:139
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
 msgid "DNSSEC check unsigned"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:73
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:99
 msgid "DPD Idle Timeout"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:14
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:41
 msgid "DS-Lite AFTR address"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:92
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:815
 #: modules/luci-mod-status/luasrc/view/admin_status/index/50-dsl.htm:14
 msgid "DSL"
 msgstr ""
@@ -1311,11 +1310,11 @@ msgstr ""
 msgid "DSL Status"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:125
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:848
 msgid "DSL line mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:519
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:963
 msgid "DTIM Interval"
 msgstr ""
 
@@ -1327,42 +1326,45 @@ msgstr ""
 msgid "Data Rate"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:169
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:180
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:160
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:171
 msgid "Debug"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:759
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:783
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:807
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1183
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1207
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1231
 msgid "Default %d"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:82
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:107
 msgid "Default Route"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:17
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:81
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:51
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:32
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:48
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:85
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:65
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:80
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:108
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:146
 msgid "Default gateway"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:541
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:594
 msgid "Default is stateless + stateful"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:70
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:54
 msgid "Default state"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:503
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:553
 msgid "Define a name for this network."
 msgstr "הגדר שם לרשת זו"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:514
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:571
 msgid ""
 "Define additional DHCP options, for example "
 "\"<code>6,192.168.2.1,192.168.2.2</code>\" which advertises different DNS "
@@ -1371,35 +1373,47 @@ msgstr ""
 "הגדר אפשרויות DHCP נוספות, למשל \"<code>6,192.168.2.1,192.168.2.2</code>\" "
 "אשר מציגות שרתי DNS שונים ללקוח"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:705
-#: modules/luci-base/htdocs/luci-static/resources/form.js:958
-#: modules/luci-base/htdocs/luci-static/resources/form.js:959
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1271
+#: modules/luci-base/htdocs/luci-static/resources/form.js:966
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1210
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1216
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1524
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1758
 #: modules/luci-base/luasrc/view/cbi/nsection.htm:11
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:162
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:16
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:41
 msgid "Delete"
 msgstr "למחוק"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:178
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:187
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:193
 msgid "Delete key"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:45
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1654
+msgid "Delete permission denied"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1656
+msgid "Delete request failed: %d %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:723
 msgid "Delete this network"
 msgstr "מחק רשת זו"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:519
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:963
 msgid "Delivery Traffic Indication Message Interval"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:102
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:108
 msgid "Description"
 msgstr "תיאור"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:224
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1754
+msgid "Deselect"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:215
 msgid "Design"
 msgstr "עיצוב"
 
@@ -1417,10 +1431,12 @@ msgstr ""
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:177
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:43
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:13
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:38
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:73
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:33
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:52
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:85
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:86
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:72
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:154
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:253
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:86
@@ -1428,15 +1444,24 @@ msgstr ""
 msgid "Device"
 msgstr "מכשיר"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:138
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:737
 msgid "Device Configuration"
 msgstr "הגדרות מכשיר"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:81
+msgid "Device is not active"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/reboot.htm:23
 msgid "Device is rebooting..."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1889
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:167
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:513
+msgid "Device is restarting…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2430
 msgid "Device unreachable!"
 msgstr ""
 
@@ -1444,96 +1469,91 @@ msgstr ""
 msgid "Device unreachable! Still waiting for device..."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:123
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:78
 #: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:61
 msgid "Diagnostics"
 msgstr "אבחון"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:45
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:60
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:101
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:93
 msgid "Dial number"
 msgstr ""
 
-#: modules/luci-base/luasrc/view/cbi/filebrowser.htm:99
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1554
 msgid "Directory"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:131
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:715
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:754
 msgid "Disable"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:472
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:531
 msgid ""
 "Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for "
 "this interface."
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:64
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:93
 msgid "Disable Encryption"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:530
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:973
 msgid "Disable Inactivity Polling"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:713
 msgid "Disable this network"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:44
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:54
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:68
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:37
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:43
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:37
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1534
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:76
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:107
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:99
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:51
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:95
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:82
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:69
 msgid "Disabled"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1139
-msgid "Disabled (default)"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:544
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:987
 msgid "Disassociate On Low Acknowledgement"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:193
 msgid "Discard upstream RFC1918 responses"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:92
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:114
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:956
 msgid "Disconnect"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:22
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:64
 msgid "Disconnection attempt failed"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1121
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1762
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1855
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:17
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1375
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1995
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2314
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2401
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1634
 msgid "Dismiss"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:240
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:334
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:770
 msgid "Distance Optimization"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:241
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:770
 msgid "Distance to farthest network member in meters."
 msgstr "מרחק לנק' הרשת הרחוקה ביותר במטרים"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:347
-msgid "Diversity"
-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:61
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
@@ -1541,35 +1561,43 @@ msgid ""
 "firewalls"
 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:159
 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:123
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:124
 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:118
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
 msgid "Do not forward reverse lookups for local networks"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:173
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1639
+msgid "Do you really want to delete \"%s\" ?"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:188
 msgid "Do you really want to delete the following SSH key?"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1637
+msgid "Do you really want to recursively delete the directory \"%s\" ?"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:74
 msgid "Domain required"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:205
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:206
 msgid "Domain whitelist"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:34
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:67
 msgid "Don't Fragment"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:74
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:75
 msgid ""
 "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
 "<abbr title=\"Domain Name System\">DNS</abbr>-Name"
@@ -1587,19 +1615,19 @@ msgstr "הורד גיבוי"
 msgid "Download mtdblock"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:853
 msgid "Downstream SNR offset"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:914
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1169
 msgid "Drag to reorder"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:9
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:11
 msgid "Dropbear Instance"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:6
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 msgid ""
 "Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access "
 "and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
@@ -1607,39 +1635,40 @@ msgstr ""
 "Dropbear מאפשר גישת <abbr title=\"Secure Shell\">SSH</abbr> רשתית ושרת <abbr "
 "title=\"Secure Copy\">SCP</abbr> מובנה"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:11
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:14
 msgid "Dual-Stack Lite (RFC6333)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:493
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:547
 msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 msgstr "<abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> דינאמי"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:60
 msgid "Dynamic tunnel"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:494
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:547
 msgid ""
 "Dynamically allocate DHCP addresses for clients. If disabled, only clients "
 "having static leases will be served."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:67
 msgid "EA-bits length"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:990
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1386
 msgid "EAP-Method"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:934
-#: modules/luci-base/htdocs/luci-static/resources/form.js:935
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1199
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1188
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1191
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1450
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:154
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:160
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:38
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:291
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:720
 msgid "Edit"
 msgstr "ערוך"
 
@@ -1649,90 +1678,91 @@ msgid ""
 "reload the page."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:38
-msgid "Edit this interface"
-msgstr "ערוך ממשק זה"
-
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:718
 msgid "Edit this network"
 msgstr "ערוך רשת זו"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:669
+msgid "Edit wireless network"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:167
 msgid "Emergency"
 msgstr "מצב חרום"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:127
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:715
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:754
 msgid "Enable"
 msgstr "אפשר"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:414
 msgid ""
 "Enable <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> "
 "snooping"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:271
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:412
 msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 msgstr "אפשר <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:41
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:60
 msgid "Enable HE.net dynamic endpoint update"
 msgstr ""
 
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:51
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:89
 msgid "Enable IPv6 negotiation"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:23
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:35
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:41
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:35
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:37
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:49
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:80
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:54
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:67
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:93
 msgid "Enable IPv6 negotiation on the PPP link"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:143
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:188
 msgid "Enable Jumbo Frame passthrough"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:244
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:235
 msgid "Enable NTP client"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:69
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:96
 msgid "Enable Single DES"
 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:267
 msgid "Enable TFTP server"
 msgstr "אפשר שרת TFTP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:134
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:180
 msgid "Enable VLAN functionality"
 msgstr "אפשר תפקוד VLAN"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1595
 msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1175
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
 msgid "Enable key reinstallation (KRACK) countermeasures"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:138
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:183
 msgid "Enable learning and aging"
 msgstr "אפשר למידה והזדקנות"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:194
 msgid "Enable mirroring of incoming packets"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:151
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:195
 msgid "Enable mirroring of outgoing packets"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:34
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:67
 msgid "Enable the DF (Don't Fragment) flag of the encapsulating packets."
 msgstr ""
 
@@ -1740,7 +1770,7 @@ msgstr ""
 msgid "Enable this mount"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:713
 msgid "Enable this network"
 msgstr ""
 
@@ -1748,48 +1778,52 @@ msgstr ""
 msgid "Enable this swap"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:37
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:88
 msgid "Enable/Disable"
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:76
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:152
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:251
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:41
 msgid "Enabled"
 msgstr "אפשר"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:277
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:414
 msgid "Enables IGMP snooping on this bridge"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:892
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1310
 msgid ""
 "Enables fast roaming among access points that belong to the same Mobility "
 "Domain"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:272
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:412
 msgid "Enables the Spanning Tree Protocol on this bridge"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:120
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:180
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:59
+msgid "Encapsulation limit"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:843
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:901
 msgid "Encapsulation mode"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:76
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:603
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:129
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:992
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1621
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:177
 msgid "Encryption"
 msgstr "הצפנה"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:155
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:128
 msgid "Endpoint Host"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:165
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:132
 msgid "Endpoint Port"
 msgstr ""
 
@@ -1801,16 +1835,21 @@ msgstr ""
 msgid "Enter custom values"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:273
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:271
 msgid "Erasing..."
 msgstr "מוחק..."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:95
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:96
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:97
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:98
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:99
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:106
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:107
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:108
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:109
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:110
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:173
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:164
 msgid "Error"
 msgstr "שגיאה"
 
@@ -1818,24 +1857,28 @@ msgstr "שגיאה"
 msgid "Errored seconds (ES)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1646
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1852
 #: modules/luci-base/luasrc/model/network.lua:1432
 msgid "Ethernet Adapter"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1637
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1843
 #: modules/luci-base/luasrc/model/network.lua:1422
 msgid "Ethernet Switch"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:303
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
 msgid "Exclude interfaces"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:153
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
 msgid "Expand hosts"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:195
+msgid "Expecting an hexadecimal assignment hint"
+msgstr ""
+
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:59
 msgid "Expecting: %s"
 msgstr ""
@@ -1844,60 +1887,76 @@ msgstr ""
 msgid "Expires"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:488
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:543
 msgid ""
 "Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:8
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:19
 msgid "External"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:971
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1377
 msgid "External R0 Key Holder List"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:980
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1381
 msgid "External R1 Key Holder List"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:150
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:141
 msgid "External system log server"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:155
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:146
 msgid "External system log server port"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:160
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:151
 msgid "External system log server protocol"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:18
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:79
 msgid "Extra SSH command options"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:940
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1351
 msgid "FT over DS"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:941
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1352
 msgid "FT over the Air"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:938
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1349
 msgid "FT protocol"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1842
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:82
+msgid "Failed to change the system password."
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2389
 msgid "Failed to confirm apply within %ds, waiting for rollback…"
 msgstr ""
 
-#: modules/luci-base/luasrc/view/cbi/filebrowser.htm:106
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:45
+msgid "Failed to execute \"/etc/init.d/%s %s\" action: %s"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1561
 msgid "File"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:279
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1514
+msgid "File not accessible"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1698
+msgid "Filename"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:280
 msgid "Filename of the boot image advertised to clients"
 msgstr ""
 
@@ -1907,14 +1966,15 @@ msgstr ""
 msgid "Filesystem"
 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:118
 msgid "Filter private"
 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:123
 msgid "Filter useless"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:23
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:65
 msgid "Finalizing failed"
 msgstr ""
@@ -1925,7 +1985,7 @@ msgid ""
 "with defaults based on what was detected"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:696
 msgid "Find and join network"
 msgstr ""
 
@@ -1937,11 +1997,11 @@ msgstr ""
 msgid "Firewall"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:77
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:76
 msgid "Firewall Mark"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:193
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:278
 msgid "Firewall Settings"
 msgstr ""
 
@@ -1949,7 +2009,7 @@ msgstr ""
 msgid "Firewall Status"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:137
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:860
 msgid "Firmware File"
 msgstr ""
 
@@ -1957,7 +2017,7 @@ msgstr ""
 msgid "Firmware Version"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:225
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:226
 msgid "Fixed source port for outbound DNS queries"
 msgstr ""
 
@@ -1977,35 +2037,35 @@ msgstr ""
 msgid "Flash operations"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:194
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:192
 msgid "Flashing..."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:498
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:550
 msgid "Force"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:258
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:782
 msgid "Force 40MHz mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:622
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1031
 msgid "Force CCMP (AES)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:499
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:550
 msgid "Force DHCP on this network even if another server is detected."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:623
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1032
 msgid "Force TKIP"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:624
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1033
 msgid "Force TKIP and CCMP (AES)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:795
 msgid "Force link"
 msgstr ""
 
@@ -2013,7 +2073,7 @@ msgstr ""
 msgid "Force upgrade"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:60
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:90
 msgid "Force use of NAT-T"
 msgstr ""
 
@@ -2021,7 +2081,7 @@ msgstr ""
 msgid "Form token mismatch"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:34
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:164
 msgid "Forward DHCP traffic"
 msgstr ""
 
@@ -2029,46 +2089,41 @@ msgstr ""
 msgid "Forward Error Correction Seconds (FECS)"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:28
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:161
 msgid "Forward broadcast traffic"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:375
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:809
 msgid "Forward mesh peer traffic"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:186
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:908
 msgid "Forwarding mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:255
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:596
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:774
 msgid "Fragmentation Threshold"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:332
-msgid "Frame Bursting"
-msgstr ""
-
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:17
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:28
 msgid "Free"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:91
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:89
 msgid ""
-"Further information about WireGuard interfaces and peers at <a href=\"http://"
-"wireguard.com\">wireguard.com</a>."
+"Further information about WireGuard interfaces and peers at <a href='http://"
+"wireguard.com'>wireguard.com</a>."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:45
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:130
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:186
 msgid "GHz"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:29
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:36
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:91
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:77
 msgid "GPRS only"
 msgstr ""
 
@@ -2077,28 +2132,28 @@ msgstr ""
 msgid "Gateway"
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:35
+msgid "Gateway Ports"
+msgstr ""
+
 #: modules/luci-base/htdocs/luci-static/resources/network.js:9
 #: modules/luci-base/luasrc/model/network.lua:29
 msgid "Gateway address is invalid"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:46
-msgid "Gateway ports"
-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:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:275
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:23
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:112
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:103
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:49
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:33
 msgid "General Settings"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:188
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:462
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:175
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:141
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:361
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:504
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:895
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:741
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:796
 msgid "General Setup"
 msgstr ""
 
@@ -2106,7 +2161,7 @@ msgstr ""
 msgid "Generate Config"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:945
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1355
 msgid "Generate PMK locally"
 msgstr ""
 
@@ -2114,11 +2169,7 @@ msgstr ""
 msgid "Generate archive"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:63
-msgid "Generic 802.11%s Wireless Controller"
-msgstr ""
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:26
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:74
 msgid "Given password confirmation did not match, password not changed!"
 msgstr ""
 
@@ -2126,7 +2177,7 @@ msgstr ""
 msgid "Global Settings"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:806
 msgid "Global network options"
 msgstr ""
 
@@ -2137,33 +2188,29 @@ msgstr ""
 msgid "Go to password configuration..."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:857
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1369
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1112
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1616
 #: modules/luci-base/luasrc/view/cbi/full_valueheader.htm:4
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:58
 msgid "Go to relevant configuration page"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:38
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:66
 msgid "Group Password"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:11
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:22
 msgid "Guest"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:73
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:81
 msgid "HE.net password"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:60
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:73
 msgid "HE.net username"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:310
-msgid "HT mode (802.11n)"
-msgstr ""
-
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:16
 msgid "Hang Up"
 msgstr ""
@@ -2172,15 +2219,13 @@ msgstr ""
 msgid "Header Error Code Errors (HEC)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:103
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 msgid ""
 "Here you can configure the basic aspects of your device like its hostname or "
 "the timezone."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:499
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:556
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:579
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:941
 msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr ""
 
@@ -2191,14 +2236,15 @@ msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:92
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1959
 msgid "Host"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:20
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:21
 msgid "Host entries"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:48
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:171
 msgid "Host expiry timeout"
 msgstr ""
 
@@ -2206,45 +2252,45 @@ msgstr ""
 msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:118
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:102
 msgid "Host-Uniq tag content"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:71
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:31
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:316
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:25
+#: 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:317
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:26
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:17
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:125
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:116
 msgid "Hostname"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:12
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:22
 msgid "Hostname to send when requesting DHCP"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:18
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:19
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:67
 msgid "Hostnames"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:13
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:24
 msgid "Hybrid"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:45
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:75
 msgid "IKE DH Group"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:41
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:59
 msgid "IP Addresses"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:40
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:80
 msgid "IP Protocol"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:29
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:30
 msgid "IP address"
 msgstr ""
 
@@ -2263,6 +2309,11 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:20
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:21
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:22
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:79
+#: 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/network.js:89
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:90
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:91
@@ -2270,7 +2321,7 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:93
 #: 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/luasrc/model/cbi/admin_network/proto_ncm.lua:42
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:82
 msgid "IPv4"
 msgstr ""
 
@@ -2282,24 +2333,23 @@ msgstr ""
 msgid "IPv4 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:57
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:178
 msgid "IPv4 address"
 msgstr "כתבות IPv4"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:26
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:33
 msgid "IPv4 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:104
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:181
 msgid "IPv4 broadcast"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:100
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:180
 msgid "IPv4 gateway"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:92
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:179
 msgid "IPv4 netmask"
 msgstr ""
 
@@ -2307,24 +2357,25 @@ msgstr ""
 msgid "IPv4 network in address/netmask notation"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:25
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:52
 msgid "IPv4 prefix"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:42
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:30
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:55
 msgid "IPv4 prefix length"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:43
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:83
 msgid "IPv4+IPv6"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:72
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:34
 msgid "IPv4-Address"
 msgstr ""
 
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:10
 #: protocols/luci-proto-ipip/luasrc/model/network/proto_ipip.lua:9
 msgid "IPv4-in-IPv4 (RFC2003)"
 msgstr ""
@@ -2339,6 +2390,16 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:30
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:31
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:32
+#: 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/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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:89
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:90
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:91
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:92
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:95
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:96
@@ -2351,7 +2412,7 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:103
 #: 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/luasrc/model/cbi/admin_network/proto_ncm.lua:44
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:84
 msgid "IPv6"
 msgstr ""
 
@@ -2363,11 +2424,11 @@ msgstr ""
 msgid "IPv6 Neighbours"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:464
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:506
 msgid "IPv6 Settings"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:195
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:810
 msgid "IPv6 ULA-Prefix"
 msgstr ""
 
@@ -2375,21 +2436,21 @@ msgstr ""
 msgid "IPv6 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:202
 msgid "IPv6 address"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:23
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:189
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:31
 msgid "IPv6 assignment hint"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:18
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:184
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:27
 msgid "IPv6 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:207
 msgid "IPv6 gateway"
 msgstr ""
 
@@ -2397,22 +2458,22 @@ msgstr ""
 msgid "IPv6 network in address/netmask notation"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:37
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:59
 msgid "IPv6 prefix"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:34
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:45
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:63
 msgid "IPv6 prefix length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:33
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:211
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:57
 msgid "IPv6 routed prefix"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:143
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:215
 msgid "IPv6 suffix"
 msgstr ""
 
@@ -2422,31 +2483,35 @@ msgid "IPv6-Address"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:93
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:104
 msgid "IPv6-PD"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:10
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:13
 msgid "IPv6-in-IPv4 (RFC4213)"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:17
 msgid "IPv6-over-IPv4 (6rd)"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:15
 msgid "IPv6-over-IPv4 (6to4)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1075
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1478
 msgid "Identity"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:70
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:96
 msgid "If checked, 1DES is enabled"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:65
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:93
 msgid "If checked, encryption is disabled"
 msgstr ""
 
@@ -2463,36 +2528,36 @@ msgid ""
 "device node"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:27
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:71
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:18
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:82
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:52
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:17
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:29
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:33
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:68
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:85
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:32
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:45
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:45
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:24
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:44
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:116
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:48
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:85
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:65
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:33
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:80
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:108
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:146
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:74
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:97
 msgid "If unchecked, no default route is configured"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:34
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:86
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:35
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:99
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:47
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:60
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:60
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:39
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:59
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:124
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:39
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:116
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:59
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:103
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:64
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:77
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:100
 msgid "If unchecked, the advertised DNS server addresses are ignored"
 msgstr ""
 
@@ -2505,15 +2570,15 @@ msgid ""
 "of the <abbr title=\"Random Access Memory\">RAM</abbr>."
 msgstr ""
 
-#: 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:102
 msgid "Ignore <code>/etc/hosts</code>"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:471
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:531
 msgid "Ignore interface"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:90
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:91
 msgid "Ignore resolve file"
 msgstr ""
 
@@ -2531,12 +2596,12 @@ msgid ""
 "blocked. Click \"Continue »\" below to return to the previous page."
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:145
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:118
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:124
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:126
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:97
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:118
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:157
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:141
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:115
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:138
 msgid "Inactivity timeout"
 msgstr ""
 
@@ -2544,23 +2609,25 @@ msgstr ""
 msgid "Inbound:"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:170
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:161
 msgid "Info"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:105
 msgid "Information"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:25
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:67
 msgid "Initialization failure"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:34
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:87
 msgid "Initscript"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:26
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:122
 msgid "Initscripts"
 msgstr ""
 
@@ -2568,55 +2635,74 @@ msgstr ""
 msgid "Install iputils-traceroute6 for IPv6 traceroute"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:223
-msgid "Install package %q"
-msgstr ""
-
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:220
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:120
 msgid "Install protocol extensions..."
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:416
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:423
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:683
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:687
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:26
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:284
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:342
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:47
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:134
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:14
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:16
 msgid "Interface"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:58
 msgid "Interface %q device auto-migrated from %q to %q."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:356
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:792
 msgid "Interface Configuration"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:51
-msgid "Interface Overview"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:99
+msgid "Interface has %d pending changes"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:57
+msgid "Interface is marked for deletion"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:162
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:3
 msgid "Interface is reconnecting..."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:162
+msgid "Interface is shutting down..."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:205
+msgid "Interface is starting..."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:208
+msgid "Interface is stopping..."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:954
 msgid "Interface name"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:34
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:224
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:131
 msgid "Interface not present or not connected yet."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:88
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:16
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:11
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:287
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:54
 msgid "Interfaces"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:9
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:20
 msgid "Internal"
 msgstr ""
 
@@ -2629,19 +2715,35 @@ msgstr ""
 msgid "Invalid"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:311
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:10
+msgid "Invalid Base64 key string"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:281
 msgid "Invalid VLAN ID given! Only IDs between %d and %d are allowed."
 msgstr "מספר VLAN שגוי! רק ערכים בין %d לבין %d הם חוקיים."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:307
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:290
 msgid "Invalid VLAN ID given! Only unique IDs are allowed"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:195
+msgid "Invalid argument"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:194
+msgid "Invalid command"
+msgstr ""
+
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:80
+msgid "Invalid hexadecimal value"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/sysauth.htm:12
 msgid "Invalid username and/or password! Please try again."
 msgstr "שם משתמש ו/או סיסמה שגויים! אנא נסה שנית."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:508
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:950
 msgid "Isolate Clients"
 msgstr ""
 
@@ -2658,15 +2760,15 @@ msgstr ""
 msgid "JavaScript required!"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:52
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1691
 msgid "Join Network"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:22
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1628
 msgid "Join Network: Wireless Scan"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:19
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1833
 msgid "Joining Network: %q"
 msgstr ""
 
@@ -2683,15 +2785,15 @@ msgstr ""
 msgid "Kernel Version"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:823
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1248
 msgid "Key"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:851
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:852
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:853
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:854
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:870
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1277
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1278
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1279
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1291
 msgid "Key #%d"
 msgstr ""
 
@@ -2699,33 +2801,34 @@ msgstr ""
 msgid "Kill"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:10
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:21
 msgid "L2TP"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:10
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:40
 msgid "L2TP Server"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:100
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:74
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:80
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:74
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:53
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:73
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:131
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:102
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:89
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:112
 msgid "LCP echo failure threshold"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:118
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:89
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:95
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:89
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:68
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:91
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:144
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:102
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:125
 msgid "LCP echo interval"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:181
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:902
 msgid "LLC"
 msgstr ""
 
@@ -2734,11 +2837,11 @@ msgstr ""
 msgid "Label"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:213
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:204
 msgid "Language"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:115
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:106
 msgid "Language and Style"
 msgstr ""
 
@@ -2746,51 +2849,51 @@ msgstr ""
 msgid "Latency"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:10
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:21
 msgid "Leaf"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:369
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:487
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:393
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:543
 msgid "Lease time"
 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:87
 msgid "Leasefile"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:74
 #: modules/luci-base/luasrc/view/lease_status.htm:95
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:34
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
 msgid "Leasetime remaining"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:9
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:20
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:27
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:50
 msgid "Leave empty to autodetect"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:21
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:45
 msgid "Leave empty to use the current WAN address"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1746
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2299
 msgid "Legend:"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:481
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:538
 msgid "Limit"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:287
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:288
 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:299
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:300
 msgid "Limit listening to these interfaces, and loopback."
 msgstr ""
 
@@ -2810,17 +2913,17 @@ msgstr ""
 msgid "Line Uptime"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:101
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:88
 msgid "Link On"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:185
 msgid ""
 "List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
 "requests to"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:972
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1377
 msgid ""
 "List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-"
 "Identifier,128-bit key as hex string. <br />This list is used to map R0KH-ID "
@@ -2829,7 +2932,7 @@ msgid ""
 "Association."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:981
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1381
 msgid ""
 "List of R1KHs in the same Mobility Domain. <br />Format: MAC-address,R1KH-ID "
 "as 6 octets with colons,128-bit key as hex string. <br />This list is used "
@@ -2838,31 +2941,31 @@ msgid ""
 "PMK-R1 keys."
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:21
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:82
 msgid "List of SSH key files for auth"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:206
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:207
 msgid "List of domains to allow RFC1918 responses for"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:174
 msgid "List of hosts that supply bogus NX domain results"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:298
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:299
 msgid "Listen Interfaces"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:30
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:54
 msgid "Listen Port"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:15
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:16
 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:216
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:217
 msgid "Listening port for inbound DNS queries"
 msgstr ""
 
@@ -2881,11 +2984,11 @@ msgstr "עומס ממוצע"
 msgid "Loading"
 msgstr "טוען"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:35
-msgid "Loading SSH keys…"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1819
+msgid "Loading directory contents…"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1204
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1296
 #: modules/luci-base/luasrc/view/view.htm:4
 msgid "Loading view…"
 msgstr ""
@@ -2895,77 +2998,73 @@ msgstr ""
 msgid "Local IP address is invalid"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:25
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:86
 msgid "Local IP address to assign"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:10
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:11
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:44
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:39
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:151
 msgid "Local IPv4 address"
 msgstr "כתובת IPv4 מקומית"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:20
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:54
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:45
 msgid "Local IPv6 address"
 msgstr "כתובת IPv6 מקומית"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:286
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:287
 msgid "Local Service Only"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:81
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:126
 msgid "Local Startup"
 msgstr ""
 
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:25
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:121
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:112
 msgid "Local Time"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:149
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
 msgid "Local domain"
 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:147
 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:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:151
 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:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
 msgid "Local server"
 msgstr "שרת מקומי"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:129
 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:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:128
 msgid "Localise queries"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:175
-msgid "Locked to channel %s used by: %s"
-msgstr ""
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:168
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:159
 msgid "Log output level"
 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:181
 msgid "Log queries"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:113
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:104
 msgid "Logging"
 msgstr ""
 
@@ -2973,7 +3072,7 @@ msgstr ""
 msgid "Login"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:95
+#: modules/luci-base/luasrc/controller/admin/index.lua:103
 msgid "Logout"
 msgstr ""
 
@@ -2981,11 +3080,13 @@ msgstr ""
 msgid "Loss of Signal Seconds (LOSS)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:476
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:533
 msgid "Lowest leased address as offset from the network address."
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:40
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:75
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:35
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:86
 msgid "MAC"
@@ -2993,32 +3094,32 @@ msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:73
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:109
-#: 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:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1958
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:86
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:133
 msgid "MAC-Address"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:457
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:586
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:886
 msgid "MAC-Address Filter"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:142
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:363
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:798
 msgid "MAC-Filter"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:464
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:590
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:893
 msgid "MAC-List"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:13
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:16
 msgid "MAP / LW4over6"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:62
 msgid "MAP rule is invalid"
 msgstr ""
@@ -3036,8 +3137,8 @@ msgid "MHz"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:53
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:29
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:66
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:53
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:71
 msgid "MTU"
 msgstr ""
 
@@ -3047,16 +3148,17 @@ msgid ""
 "below:"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:55
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:69
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:26
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:38
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:38
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:108
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:52
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:96
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:83
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:57
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:70
 msgid "Manual"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1949
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2188
 msgid "Master"
 msgstr ""
 
@@ -3064,48 +3166,46 @@ msgstr ""
 msgid "Max. Attainable Data Rate (ATTNDR)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:539
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:982
 msgid "Maximum allowed Listen Interval"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:234
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
 msgid "Maximum allowed number of active DHCP leases"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:252
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:253
 msgid "Maximum allowed number of concurrent DNS queries"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:244
 msgid "Maximum allowed size of EDNS.0 UDP packets"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:63
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:77
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:57
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:112
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:104
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:93
 msgid "Maximum amount of seconds to wait for the modem to become ready"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:27
-msgid ""
-"Maximum length of the name is 15 characters including the automatic protocol/"
-"bridge prefix (br-, 6in4-, pppoe- etc.)"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:538
+msgid "Maximum number of leased addresses."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:482
-msgid "Maximum number of leased addresses."
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:761
+msgid "Maximum transmit power"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:21
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:49
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:134
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:187
 #: modules/luci-mod-status/luasrc/view/admin_status/bandwidth.htm:79
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:284
 msgid "Mbit/s"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:18
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:32
 msgid "Medium"
 msgstr ""
 
@@ -3117,42 +3217,43 @@ msgstr ""
 msgid "Memory usage (%)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1952
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2191
 msgid "Mesh"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:372
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:806
 msgid "Mesh Id"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:196
+msgid "Method not found"
+msgstr ""
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:45
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:76
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:104
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:54
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:66
 msgid "Metric"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:154
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:198
 msgid "Mirror monitor port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:153
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:197
 msgid "Mirror source port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:408
-msgid "Missing protocol extension for proto %q"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:923
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1337
 msgid "Mobility Domain"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:154
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:41
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:74
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:366
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:31
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:360
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:801
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1619
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:175
 msgid "Mode"
 msgstr ""
@@ -3161,39 +3262,38 @@ msgstr ""
 msgid "Model"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:31
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:72
 msgid "Modem default"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:11
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:19
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:11
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:10
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:73
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:73
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:57
 msgid "Modem device"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:24
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:66
 msgid "Modem information query failed"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:62
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:76
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:56
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:112
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:104
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:93
 msgid "Modem init timeout"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1953
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:452
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:554
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:577
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2192
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:880
 msgid "Monitor"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:14
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
 msgid "More Characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:802
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1057
 msgid "More…"
 msgstr ""
 
@@ -3206,7 +3306,7 @@ msgstr ""
 msgid "Mount Point"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:26
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:36
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:137
 msgid "Mount Points"
@@ -3254,46 +3354,44 @@ msgstr ""
 msgid "Move up"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:912
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
 msgid "NAS ID"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:57
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:87
 msgid "NAT-T Mode"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:9
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 msgid "NAT64 Prefix"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:31
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:26
 msgid "NCM"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:535
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:589
 msgid "NDP-Proxy"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:43
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:72
 msgid "NT Domain"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:273
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:264
 msgid "NTP server candidates"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:837
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1092
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:27
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:502
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:65
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:553
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:658
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:49
 msgid "Name"
 msgstr "שם"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:17
-msgid "Name of the new interface"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1808
 msgid "Name of the new network"
 msgstr ""
 
@@ -3301,9 +3399,10 @@ msgstr ""
 msgid "Navigation"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:62
+#: modules/luci-base/luasrc/controller/admin/index.lua:69
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:108
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:402
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:834
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1957
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:389
 #: modules/luci-mod-status/luasrc/view/admin_status/index/30-network.htm:8
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:73
@@ -3315,7 +3414,7 @@ msgstr ""
 msgid "Network Utilities"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:278
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:279
 msgid "Network boot image"
 msgstr ""
 
@@ -3328,53 +3427,59 @@ msgstr ""
 msgid "Network without interfaces."
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:661
+msgid "New interface name…"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:11
 msgid "Next »"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1507
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1754
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:108
 msgid "No"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:453
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:514
 msgid "No DHCP Server configured for this interface"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1162
+msgid "No Encryption"
+msgstr ""
+
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:89
 msgid "No NAT-T"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:198
+msgid "No data received"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1764
+msgid "No entries in this directory"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/backupfiles.lua:82
 msgid "No files found"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:550
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:191
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:180
 msgid "No information available"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:8
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:63
 msgid "No matching prefix delegation"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:157
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
 msgid "No negative cache"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:53
-msgid "No network configured on this device"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:65
-msgid "No network name specified"
-msgstr ""
-
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:147
-msgid "No networks in range"
-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
@@ -3382,7 +3487,12 @@ msgstr ""
 msgid "No password set!"
 msgstr "לא הוגדרה סיסמה!"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:116
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:104
+msgid "No peers defined yet"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:129
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:271
 msgid "No public keys present yet."
 msgstr ""
 
@@ -3390,19 +3500,19 @@ msgstr ""
 msgid "No rules in this chain."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:150
-msgid "No scan results available yet..."
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:53
+msgid "No signal"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:7
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:756
 msgid "No zone assigned"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:111
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:35
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:48
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:133
 msgid "Noise"
 msgstr ""
 
@@ -3418,16 +3528,16 @@ msgstr ""
 msgid "Non Pre-emtive CRC errors (CRC_P)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:292
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:293
 msgid "Non-wildcard"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:129
 msgid "None"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:181
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:172
 msgid "Normal"
 msgstr ""
 
@@ -3435,25 +3545,29 @@ msgstr ""
 msgid "Not Found"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:27
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:5
-msgid "Not associated"
-msgstr ""
-
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:87
 msgid "Not connected"
 msgstr "לא מחובר"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:38
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:139
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:232
+msgid "Not present"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:105
 msgid "Not started on boot"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:26
-msgid "Note: interface name length"
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:201
+msgid "Not supported"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:171
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:162
 msgid "Notice"
 msgstr ""
 
@@ -3461,57 +3575,50 @@ msgstr ""
 msgid "Nslookup"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:261
 msgid "Number of cached DNS entries (max is 10000, 0 is no caching)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:203
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:194
 msgid "Number of parallel threads used for compression"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:40
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:69
 msgid "Obfuscated Group Password"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:35
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:61
 msgid "Obfuscated Password"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:22
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:34
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:40
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:105
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:97
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:49
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:80
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:54
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:67
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:93
 msgid "Obtain IPv6-Address"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:83
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:68
 msgid "Off-State Delay"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:16
-msgid ""
-"On this page you can configure the network interfaces. You can bridge "
-"several interfaces by ticking the \"bridge interfaces\" field and enter the "
-"names of several network interfaces separated by spaces. You can also use "
-"<abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
-"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
-"<samp>eth0.1</samp>)."
-msgstr ""
-
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:95
 msgid "On-Link route"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:80
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:64
 msgid "On-State Delay"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:360
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:382
 msgid "One of hostname or mac address must be specified!"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:456
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:462
 msgid "One of the following: %s"
 msgstr ""
 
@@ -3533,34 +3640,35 @@ msgstr ""
 msgid "Open list..."
 msgstr ""
 
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:61
 #: protocols/luci-proto-openconnect/luasrc/model/network/proto_openconnect.lua:9
 msgid "OpenConnect (CISCO AnyConnect)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:757
 msgid "Operating frequency"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1753
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2306
 msgid "Option changed"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1755
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2308
 msgid "Option removed"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1140
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:55
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1535
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:66
 msgid "Optional"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:78
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:76
 msgid ""
 "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, "
 "starting with <code>0x</code>."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:144
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:215
 msgid ""
 "Optional. Allowed values: 'eui64', 'random', fixed value like '::1' or "
 "'::1:2'. When IPv6 prefix (like 'a:b:c:d::') is received from a delegating "
@@ -3568,41 +3676,41 @@ msgid ""
 "for the interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:123
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:117
 msgid ""
 "Optional. Base64-encoded preshared key. Adds in an additional layer of "
 "symmetric-key cryptography for post-quantum resistance."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:148
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:126
 msgid "Optional. Create routes for Allowed IPs for this peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:103
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:108
 msgid "Optional. Description of peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:156
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:128
 msgid ""
 "Optional. Host of peer. Names are resolved prior to bringing up the "
 "interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:67
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:71
 msgid "Optional. Maximum Transmission Unit of tunnel interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:166
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:132
 msgid "Optional. Port of peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:175
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:136
 msgid ""
 "Optional. Seconds between keep alive messages. Default is 0 (disabled). "
 "Recommended value if this device is behind a NAT is 25."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:31
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:54
 msgid "Optional. UDP port used for outgoing and incoming packets."
 msgstr ""
 
@@ -3623,7 +3731,7 @@ msgstr ""
 msgid "Outbound:"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:26
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:50
 msgid "Output Interface"
 msgstr ""
 
@@ -3632,51 +3740,51 @@ msgstr ""
 msgid "Output zone"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:63
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:155
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:33
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:54
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:54
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:219
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:50
 msgid "Override MAC address"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:66
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:35
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:56
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:88
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:125
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:131
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:133
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:104
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:61
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:58
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:223
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:44
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:54
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:154
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:71
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:145
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:132
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:110
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:119
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:97
 msgid "Override MTU"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:30
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:63
 msgid "Override TOS"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:25
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:58
 msgid "Override TTL"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:954
 msgid "Override default interface name"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:41
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:167
 msgid "Override the gateway in DHCP responses"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:507
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:555
 msgid ""
 "Override the netmask sent to clients. Normally it is calculated from the "
 "subnet that is served."
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:65
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:179
 msgid "Override the table used for internal routes"
 msgstr ""
 
@@ -3684,29 +3792,33 @@ msgstr ""
 msgid "Overview"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1606
+msgid "Overwrite existing file \"%s\" ?"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:11
 msgid "Owner"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:42
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:56
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:17
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:28
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:34
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:14
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:18
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:43
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:98
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:45
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:44
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:63
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:82
 msgid "PAP/CHAP password"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:39
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:53
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:14
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:11
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:15
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:96
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:88
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:43
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:74
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:42
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:61
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:77
 msgid "PAP/CHAP username"
 msgstr ""
 
@@ -3714,9 +3826,9 @@ msgstr ""
 msgid "PID"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:36
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:50
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:26
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:95
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:87
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:68
 msgid "PIN"
 msgstr ""
 
@@ -3725,114 +3837,116 @@ msgstr ""
 msgid "PIN code rejected"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:966
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1372
 msgid "PMK R1 Push"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:43
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:13
 msgid "PPP"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:11
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:58
 msgid "PPPoA Encapsulation"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:19
 msgid "PPPoATM"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:17
 msgid "PPPoE"
 msgstr ""
 
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:28
 #: protocols/luci-proto-pppossh/luasrc/model/network/proto_pppossh.lua:9
 msgid "PPPoSSH"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:15
 msgid "PPtP"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:59
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:73
 msgid "PSID offset"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:56
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:70
 msgid "PSID-bits length"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:123
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:846
 msgid "PTM/EFM (Packet Transfer Mode)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:78
-msgid "Package libiwinfo required!"
-msgstr ""
-
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:45
 msgid "Packets"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:7
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:756
 msgid "Part of zone %q"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/sysauth.htm:29
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1111
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:35
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:42
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1514
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:46
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:104
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:58
 msgid "Password"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:29
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:24
 msgid "Password authentication"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1019
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1414
 msgid "Password of Private Key"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1067
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1471
 msgid "Password of inner Private Key"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:14
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:16
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:18
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:20
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:32
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:34
 msgid "Password strength"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:44
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:107
 msgid "Password2"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:37
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:244
 msgid "Paste or drag SSH key file…"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1000
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1396
 msgid "Path to CA-Certificate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1007
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1402
 msgid "Path to Client-Certificate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1013
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1408
 msgid "Path to Private Key"
 msgstr "נתיב למפתח הפרטי"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1049
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1453
 msgid "Path to inner CA-Certificate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1055
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1459
 msgid "Path to inner Client-Certificate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1061
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1465
 msgid "Path to inner Private Key"
 msgstr ""
 
@@ -3850,7 +3964,7 @@ msgstr ""
 msgid "Peak:"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:28
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:89
 msgid "Peer IP address to assign"
 msgstr ""
 
@@ -3859,11 +3973,11 @@ msgstr ""
 msgid "Peer address is missing"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:90
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:89
 msgid "Peers"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:50
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:80
 msgid "Perfect Forward Secrecy"
 msgstr ""
 
@@ -3875,7 +3989,11 @@ msgstr ""
 msgid "Perform reset"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:174
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:199
+msgid "Permission denied"
+msgstr ""
+
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:136
 msgid "Persistent Keep Alive"
 msgstr ""
 
@@ -3883,7 +4001,7 @@ msgstr ""
 msgid "Phy Rate:"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:190
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:277
 msgid "Physical Settings"
 msgstr ""
 
@@ -3894,6 +4012,10 @@ msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:16
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:17
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:41
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:77
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:87
@@ -3911,15 +4033,19 @@ msgstr "אנא הזן את שם המשתמש והסיסמה שלך:"
 msgid "Policy"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:22
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:20
 msgid "Port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:18
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:133
+msgid "Port %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:274
 msgid "Port status:"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:482
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:488
 msgid "Potential negation of: %s"
 msgstr ""
 
@@ -3931,11 +4057,11 @@ msgstr ""
 msgid "Pre-emtive CRC errors (CRCP_P)"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:32
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:73
 msgid "Prefer LTE"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:33
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:74
 msgid "Prefer UMTS"
 msgstr ""
 
@@ -3943,31 +4069,30 @@ msgstr ""
 msgid "Prefix Delegated"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:122
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:117
 msgid "Preshared Key"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:101
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:75
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:81
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:75
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:54
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:74
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:131
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:102
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:89
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:112
 msgid ""
 "Presume peer to be dead after given amount of LCP echo failures, use 0 to "
 "ignore failures"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:305
 msgid "Prevent listening on these interfaces."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:509
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:562
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:950
 msgid "Prevents client-to-client communication"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:18
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:49
 msgid "Private Key"
 msgstr ""
 
@@ -3988,39 +4113,33 @@ msgstr ""
 msgid "Prot."
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:72
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:349
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:675
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:84
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:216
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:87
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:390
 msgid "Protocol"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:31
-msgid "Protocol of the new interface"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:222
-msgid "Protocol support is not installed"
-msgstr ""
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:269
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:260
 msgid "Provide NTP server"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:701
 msgid "Provide new network"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:451
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:879
 msgid "Pseudo Ad-Hoc (ahdemo)"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:112
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:113
 msgid "Public Key"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:278
 msgid ""
 "Public keys allow for the passwordless SSH logins with a higher security "
 "compared to the use of plain passwords. In order to upload a new key to the "
@@ -4028,47 +4147,48 @@ msgid ""
 "code> file into the input field."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:139
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:211
 msgid "Public prefix routed to this device for distribution to clients."
 msgstr ""
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:27
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:9
 msgid "QMI Cellular"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:173
 msgid "Quality"
 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:171
 msgid ""
 "Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> "
 "servers"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:952
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1360
 msgid "R0 Key Lifetime"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:959
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1366
 msgid "R1 Key Holder"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:58
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:88
 msgid "RFC3947 NAT-T mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:381
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:814
 msgid "RSSI threshold for joining"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:256
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:597
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:778
 msgid "RTS/CTS Threshold"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:41
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:76
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:87
 msgid "RX"
@@ -4078,35 +4198,39 @@ msgstr ""
 msgid "RX Rate"
 msgstr "קצב קליטה"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:783
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1961
+msgid "RX Rate / TX Rate"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1207
 msgid "Radius-Accounting-Port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:791
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1215
 msgid "Radius-Accounting-Secret"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:775
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1199
 msgid "Radius-Accounting-Server"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:759
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1183
 msgid "Radius-Authentication-Port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:767
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1191
 msgid "Radius-Authentication-Secret"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:751
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1175
 msgid "Radius-Authentication-Server"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:119
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:102
 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:83
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:84
 msgid ""
 "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-Server"
@@ -4118,17 +4242,11 @@ msgid ""
 "access to this device if you are connected via this interface"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2
-msgid ""
-"Really delete this wireless network? The deletion cannot be undone! You "
-"might lose access to this device if you are connected via this network."
-msgstr ""
-
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:40
 msgid "Really reset all changes?"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:237
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:354
 msgid "Really switch protocol?"
 msgstr ""
 
@@ -4152,15 +4270,15 @@ msgstr ""
 msgid "Realtime Wireless"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:931
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1343
 msgid "Reassociation Deadline"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:191
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
 msgid "Rebind protection"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:48
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:46
 #: modules/luci-mod-system/luasrc/view/admin_system/reboot.htm:9
 msgid "Reboot"
 msgstr ""
@@ -4174,21 +4292,15 @@ msgstr ""
 msgid "Reboots the operating system of your device"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:103
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:90
 msgid "Receive"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:325
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:350
-msgid "Receiver Antenna"
-msgstr ""
-
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:42
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:59
 msgid "Recommended. IP addresses of the WireGuard interface."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:28
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:300
 msgid "Reconnect this interface"
 msgstr ""
 
@@ -4196,92 +4308,134 @@ msgstr ""
 msgid "References"
 msgstr ""
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:39
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:153
 msgid "Relay"
 msgstr ""
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:36
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:157
 msgid "Relay Bridge"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:17
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:154
 msgid "Relay between networks"
 msgstr ""
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:64
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:12
 msgid "Relay bridge"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:18
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:50
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:49
 msgid "Remote IPv4 address"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:8
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:40
 msgid "Remote IPv4 address or FQDN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:45
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:725
 msgid "Remove"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:53
-msgid "Repeat scan"
-msgstr ""
-
-#: modules/luci-base/luasrc/view/cbi/upload.htm:11
-msgid "Replace entry"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:46
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:51
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1806
 msgid "Replace wireless configuration"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:8
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:17
 msgid "Request IPv6-address"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:16
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:23
 msgid "Request IPv6-prefix of length"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1141
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:200
+msgid "Request timeout"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1536
 msgid "Required"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:20
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:31
 msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:19
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:49
 msgid "Required. Base64-encoded private key for this interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:113
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:113
 msgid "Required. Base64-encoded public key of peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:136
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:122
 msgid ""
 "Required. IP addresses and prefixes that this peer is allowed to use inside "
 "the tunnel. Usually the peer's tunnel IP addresses and the networks the peer "
 "routes through the tunnel."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1134
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1095
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1096
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1097
+msgid "Requires hostapd"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1101
+msgid "Requires hostapd with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1102
+msgid "Requires hostapd with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1098
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1099
+msgid "Requires hostapd with SAE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1533
 msgid ""
 "Requires the 'full' version of wpad/hostapd and support from the wifi driver "
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:141
 msgid ""
 "Requires upstream supports DNSSEC; verify unsigned domain responses really "
 "come from unsigned domains"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1268
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1109
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1119
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1120
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1121
+msgid "Requires wpa-supplicant"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1113
+msgid "Requires wpa-supplicant with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1114
+msgid "Requires wpa-supplicant with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1111
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1124
+msgid "Requires wpa-supplicant with SAE support"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1355
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:17
 #: modules/luci-base/luasrc/view/cbi/footer.htm:30
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:66
@@ -4297,17 +4451,22 @@ msgstr ""
 msgid "Reset to defaults"
 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:68
 msgid "Resolv and Hosts Files"
 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:94
 msgid "Resolve file"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:28
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:14
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:71
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:197
+msgid "Resource not found"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:302
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:693
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:90
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:112
 msgid "Restart"
 msgstr ""
 
@@ -4315,7 +4474,7 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:14
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:691
 msgid "Restart radio interface"
 msgstr ""
 
@@ -4327,26 +4486,24 @@ msgstr "שחזור"
 msgid "Restore backup"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:113
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:114
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:38
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:46
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:119
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:120
 msgid "Reveal/hide password"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1774
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2322
 msgid "Revert"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1861
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2405
 msgid "Revert changes"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2013
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2554
 msgid "Revert request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1993
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2534
 msgid "Reverting configuration…"
 msgstr ""
 
@@ -4354,7 +4511,7 @@ msgstr ""
 msgid "Root"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:271
 msgid "Root directory for files served via TFTP"
 msgstr ""
 
@@ -4362,7 +4519,7 @@ msgstr ""
 msgid "Root preparation"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:147
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:126
 msgid "Route Allowed IPs"
 msgstr ""
 
@@ -4374,12 +4531,12 @@ msgstr ""
 msgid "Route type"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:523
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:577
 msgid "Router Advertisement-Service"
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:43
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:15
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:27
 msgid "Router Password"
 msgstr ""
 
@@ -4407,7 +4564,7 @@ msgstr ""
 msgid "Run filesystem check"
 msgstr "הרץ בדיקת מערכת קבצים"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:651
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:669
 msgid "Runtime error"
 msgstr ""
 
@@ -4419,31 +4576,31 @@ msgstr ""
 msgid "SNR"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:5
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:18
 msgid "SSH Access"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:10
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:70
 msgid "SSH server address"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:13
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:74
 msgid "SSH server port"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:8
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:58
 msgid "SSH username"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:27
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:277
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
 msgid "SSH-Keys"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:42
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:73
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:29
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1617
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:174
 msgid "SSID"
 msgstr ""
@@ -4452,17 +4609,17 @@ msgstr ""
 msgid "SWAP"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1127
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1262
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1379
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1351
 #: modules/luci-base/luasrc/view/cbi/error.htm:17
 #: modules/luci-base/luasrc/view/cbi/footer.htm:26
 #: modules/luci-base/luasrc/view/cbi/header.htm:17
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:54
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:133
 msgid "Save"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1256
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1768
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1347
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2318
 #: modules/luci-base/luasrc/view/cbi/footer.htm:22
 msgid "Save & Apply"
 msgstr ""
@@ -4475,28 +4632,20 @@ msgstr ""
 msgid "Save mtdblock contents"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
-msgid "Saving keys…"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:698
 msgid "Scan"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:109
-msgid "Scan request failed"
-msgstr ""
-
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:8
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:39
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:23
 msgid "Scheduled Tasks"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1749
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2302
 msgid "Section added"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1751
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2304
 msgid "Section removed"
 msgstr ""
 
@@ -4511,61 +4660,66 @@ msgid ""
 "your device!"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:119
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:90
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:96
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:90
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:69
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:92
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1516
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1646
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1809
+msgid "Select file…"
+msgstr ""
+
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:144
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:102
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:125
 msgid ""
 "Send LCP echo requests at the given interval in seconds, only effective in "
 "conjunction with failure threshold"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:561
-msgid "Separate Clients"
-msgstr ""
-
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:62
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:63
 msgid "Server Settings"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:26
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:50
 msgid "Service Name"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:25
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:30
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:87
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:71
 msgid "Service Type"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:55
+#: modules/luci-base/luasrc/controller/admin/index.lua:62
 msgid "Services"
 msgstr "שירותים"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:815
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:861
 msgid "Session expired"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:83
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:107
 msgid "Set VPN as Default Route"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:258
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:795
 msgid ""
 "Set interface properties regardless of the link carrier (If set, carrier "
 "sense events do not invoke hotplug handlers)."
 msgstr ""
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:23
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:55
 msgid "Setting PLMN failed"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:26
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:68
 msgid "Setting operation mode failed"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:454
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:517
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:527
 msgid "Setup DHCP Server"
 msgstr ""
 
@@ -4577,7 +4731,7 @@ msgstr ""
 msgid "Short GI"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:516
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:960
 msgid "Short Preamble"
 msgstr ""
 
@@ -4589,21 +4743,23 @@ msgstr ""
 msgid "Show empty chains"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:306
 msgid "Shutdown this interface"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:111
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:34
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:47
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:132
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1616
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:173
 msgid "Signal"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1960
+msgid "Signal / Noise"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:125
 msgid "Signal Attenuation (SATN)"
 msgstr ""
@@ -4616,11 +4772,11 @@ msgstr ""
 msgid "Size"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:259
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:260
 msgid "Size of DNS query cache"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:191
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
 msgid "Size of the ZRam device in megabytes"
 msgstr ""
 
@@ -4637,11 +4793,7 @@ msgstr "דלג אל התוכן"
 msgid "Skip to navigation"
 msgstr "דלג אל הניווט"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:335
-msgid "Slot time"
-msgstr ""
-
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1640
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1846
 #: modules/luci-base/luasrc/model/network.lua:1427
 msgid "Software VLAN"
 msgstr ""
@@ -4681,61 +4833,65 @@ msgstr ""
 msgid "Specifies the directory the device is attached to"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:23
-msgid "Specifies the listening port of this <em>Dropbear</em> instance"
-msgstr ""
-
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:57
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:175
 msgid ""
 "Specifies the maximum amount of failed ARP requests until hosts are presumed "
 "to be dead"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:49
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:171
 msgid ""
 "Specifies the maximum amount of seconds after which hosts are presumed to be "
 "dead"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:761
+msgid ""
+"Specifies the maximum transmit power the wireless radio may use. Depending "
+"on regulatory requirements and wireless usage, the actual transmit power may "
+"be reduced by the driver."
+msgstr ""
+
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:63
 msgid "Specify a TOS (Type of Service)."
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:25
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:58
 msgid ""
 "Specify a TTL (Time to Live) for the encapsulating packet other than the "
 "default (64)."
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:53
 msgid ""
 "Specify an MTU (Maximum Transmission Unit) other than the default (1280 "
 "bytes)."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:60
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "Specify the secret encryption key here."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:475
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:64
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:533
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:89
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:111
 msgid "Start"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:33
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:86
 msgid "Start priority"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1958
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2499
 msgid "Starting configuration apply…"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1626
 msgid "Starting wireless scan..."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:24
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:120
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
 msgid "Startup"
 msgstr "אתחול"
 
@@ -4747,20 +4903,21 @@ msgstr "ניתובי IPv4 סטטיים"
 msgid "Static IPv6 Routes"
 msgstr "ניתובי IPv6 סטטיים"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:70
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:71
 msgid "Static Leases"
 msgstr "הקצאות סטטיות"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:118
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:73
 msgid "Static Routes"
 msgstr "ניתובים סטטיים"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1194
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1384
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:172
 #: modules/luci-base/luasrc/model/network.lua:966
 msgid "Static address"
 msgstr "כתובת סטטית"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:308
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:309
 msgid ""
 "Static leases are used to assign fixed IP addresses and symbolic hostnames "
 "to DHCP clients. They are also required for non-dynamic interface "
@@ -4770,39 +4927,41 @@ msgstr ""
 "הן נחוצות גם עבור הגדרות ממשק שאינן דינאמיות, בהן מטופלות רק ישויות בעלות "
 "הקצאה מתאימה."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:534
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:977
 msgid "Station inactivity limit"
 msgstr ""
 
 #: modules/luci-base/luasrc/controller/admin/index.lua:40
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:197
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:337
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:746
 #: modules/luci-mod-status/luasrc/view/admin_status/index.htm:128
 msgid "Status"
 msgstr "מצב"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:35
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:75
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:308
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:91
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:113
 msgid "Stop"
 msgstr "עצור"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:165
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Strict order"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:16
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:30
 msgid "Strong"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1843
 msgid "Submit"
 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:108
 msgid "Suppress logging"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:109
 msgid "Suppress logging of the routine operation of these protocols"
 msgstr ""
 
@@ -4814,42 +4973,44 @@ msgstr ""
 msgid "Swap Entry"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:23
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:5
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:135
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:21
 msgid "Switch"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:129
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:168
 msgid "Switch %q"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:128
-msgid "Switch %q (%s)"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:66
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:146
 msgid ""
 "Switch %q has an unknown topology - the VLAN settings might not be accurate."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:146
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:142
 msgid "Switch Port Mask"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1640
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1846
 #: modules/luci-base/luasrc/model/network.lua:1425
 msgid "Switch VLAN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:238
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:355
 msgid "Switch protocol"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:103
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:104
 #: modules/luci-base/luasrc/view/cbi/ipaddr.htm:26
 msgid "Switch to CIDR list notation"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:77
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1547
+msgid "Symbolic link"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:71
 msgid "Sync with NTP-Server"
 msgstr ""
 
@@ -4859,7 +5020,7 @@ msgstr ""
 
 #: modules/luci-base/luasrc/controller/admin/index.lua:47
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:14
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:102
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:94
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
 #: modules/luci-mod-system/luasrc/view/admin_system/applyreboot.htm:39
 msgid "System"
@@ -4870,11 +5031,11 @@ msgstr ""
 msgid "System Log"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:108
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:99
 msgid "System Properties"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:145
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:136
 msgid "System log buffer size"
 msgstr ""
 
@@ -4882,15 +5043,17 @@ msgstr ""
 msgid "TCP:"
 msgstr "TCP:"
 
-#: 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:69
 msgid "TFTP Settings"
 msgstr "הגדרות TFTP"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:269
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
 msgid "TFTP server root"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:17
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:77
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:88
 msgid "TX"
@@ -4913,7 +5076,7 @@ msgstr "טבלה"
 msgid "Target"
 msgstr "יעד"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:77
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:103
 msgid "Target network"
 msgstr ""
 
@@ -4921,40 +5084,24 @@ msgstr ""
 msgid "Terminate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:27
-msgid ""
-"The <em>Device Configuration</em> section covers physical settings of the "
-"radio hardware such as channel, transmit power or antenna selection which "
-"are shared among all defined wireless networks (if the radio hardware is "
-"multi-SSID capable). Per network settings like encryption or operation mode "
-"are grouped in the <em>Interface Configuration</em>."
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:79
-msgid ""
-"The <em>libiwinfo-lua</em> package is not installed. You must install this "
-"component for working wireless configuration!"
-msgstr ""
-
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:66
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:77
 msgid ""
 "The HE.net endpoint update configuration changed, you must now use the plain "
 "username instead of the user ID!"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:8
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:40
 msgid ""
 "The IPv4 address or the fully-qualified domain name of the remote tunnel end."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:27
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:38
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:59
 msgid ""
 "The IPv6 prefix assigned to the provider, usually ends with <code>::</code>"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:18
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1808
 msgid ""
 "The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
 "code> and <code>_</code>"
@@ -4968,7 +5115,7 @@ msgstr ""
 msgid "The configuration file could not be loaded due to the following error:"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1849
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2396
 msgid ""
 "The device could not be reached within %d seconds after applying the pending "
 "changes, which caused the configuration to be rolled back for safety "
@@ -4986,6 +5133,12 @@ msgid ""
 "</abbr> <code>/dev/sda1</code>)"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:612
+msgid ""
+"The existing wireless configuration needs to be changed for LuCI to function "
+"properly."
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:127
 msgid ""
 "The filesystem that was used to format the memory (<abbr title=\"for example"
@@ -5004,44 +5157,49 @@ msgstr ""
 msgid "The following rules are currently active on this system."
 msgstr "החוקים הבאים מאופשרים כרגע במערכת זו."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:144
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:154
+msgid "The gateway address must not be a local IP address"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:154
 msgid "The given SSH public key has already been added."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:150
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:160
 msgid ""
 "The given SSH public key is invalid. Please supply proper public RSA or "
 "ECDSA keys."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:67
-msgid "The given network name is not unique"
-msgstr "השם שניתן לרשת איננו ייחודי"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:664
+msgid "The interface name is already used"
+msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:52
-#, fuzzy
-msgid ""
-"The hardware is not multi-SSID capable and the existing configuration will "
-"be replaced if you proceed."
-msgstr "החומרה אינה תומכת בריבוי SSID ולכן ההגדרות הנוכחיות יוחלפו אם תמשיך."
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:670
+msgid "The interface name is too long"
+msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:43
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:31
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:55
 msgid ""
 "The length of the IPv4 prefix in bits, the remainder is used in the IPv6 "
 "addresses."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:35
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:46
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:63
 msgid "The length of the IPv6 prefix in bits"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:12
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:44
 msgid "The local IPv4 address over which the tunnel is created (optional)."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:5
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1814
+msgid "The network name is already used"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:135
 msgid ""
 "The network ports on this device can be combined to several <abbr title="
 "\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
@@ -5051,22 +5209,21 @@ msgid ""
 "next greater network like the internet and other ports for a local network."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:77
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:395
-msgid "The selected protocol needs a device assigned"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1149
+msgid "The selected %s mode is incompatible with %s encryption"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/csrftoken.htm:11
 msgid "The submitted security token is invalid or already expired!"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:274
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:272
 msgid ""
 "The system is erasing the configuration partition now and will reboot itself "
 "when finished."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:195
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:193
 msgid ""
 "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
 "few minutes before you try to reconnect. It might be necessary to renew the "
@@ -5074,7 +5231,7 @@ msgid ""
 "settings."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:15
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:80
 msgid "The system password has been successfully changed."
 msgstr ""
 
@@ -5084,7 +5241,7 @@ msgid ""
 "you choose the generic image format for your platform."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:427
 msgid "There are no active leases"
 msgstr ""
 
@@ -5093,16 +5250,10 @@ msgstr ""
 msgid "There are no active leases."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1973
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2514
 msgid "There are no changes to apply"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:204
-msgid ""
-"There is no device assigned yet, please attach a network device in the "
-"\"Physical Settings\" tab"
-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
@@ -5112,11 +5263,19 @@ msgid ""
 "protect the web interface and enable SSH."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:19
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:49
 msgid "This IPv4 address of the relay"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1448
+msgid "This authentication type is not applicable to the selected EAP method."
+msgstr ""
+
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:54
+msgid "This does not look like a valid PEM file"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
 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 "
@@ -5130,44 +5289,44 @@ msgid ""
 "configurations are automatically preserved."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:74
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:81
 msgid ""
 "This is either the \"Update Key\" configured for the tunnel or the account "
 "password if no update key has been configured"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:82
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:127
 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 ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:27
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:54
 msgid ""
 "This is the local endpoint address assigned by the tunnel broker, it usually "
 "ends with <code>...:2/64</code>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:79
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> in the local network"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:73
 msgid "This is the plain username for logging into the account"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:34
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:57
 msgid ""
 "This is the prefix routed to you by the tunnel broker for use by clients"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:9
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:41
 msgid "This is the system crontab in which scheduled tasks can be defined."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:19
+#: 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 ""
@@ -5182,26 +5341,26 @@ msgstr "רשימה זו מציגה סקירה של תהליכי המערכת ה
 msgid "This page gives an overview over currently active network connections."
 msgstr "דף זה מציג סקירה של חיבורי הרשת הפעילים כרגע."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:726
-#: modules/luci-base/htdocs/luci-static/resources/form.js:809
+#: modules/luci-base/htdocs/luci-static/resources/form.js:936
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1064
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:172
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:32
 msgid "This section contains no values yet"
 msgstr "אזור זה עדיין לא מכיל ערכים."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:114
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:105
 msgid "Time Synchronization"
 msgstr "סנכרון זמן"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:525
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:968
 msgid "Time interval for rekeying GTK"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:128
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:119
 msgid "Timezone"
 msgstr "אזור זמן"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:825
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:871
 msgid "To login…"
 msgstr ""
 
@@ -5213,7 +5372,7 @@ msgid ""
 msgstr ""
 "על מנת לשחזר את קבצי ההגדרות, באפשרותך להעלות ארכיון גיבוי שנוצר לפני כן."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:835
 msgid "Tone"
 msgstr ""
 
@@ -5237,55 +5396,41 @@ msgstr "תעבורה"
 msgid "Transfer"
 msgstr "העברה"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:595
-msgid "Transmission Rate"
-msgstr "קצב שידור"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:102
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:89
 msgid "Transmit"
 msgstr "שידור"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:211
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:273
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:345
-msgid "Transmit Power"
-msgstr "עוצמת שידור"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:318
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:349
-msgid "Transmitter Antenna"
-msgstr "אנטנת שידור"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:73
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:57
 msgid "Trigger"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:98
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:84
 msgid "Trigger Mode"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:54
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:69
 msgid "Tunnel ID"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1643
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1849
 #: modules/luci-base/luasrc/model/network.lua:1430
 msgid "Tunnel Interface"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:44
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:55
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:76
 msgid "Tunnel Link"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:46
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:131
 msgid "Tx-Power"
 msgstr "עוצמת שידור"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:32
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:185
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:11
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:43
 msgid "Type"
 msgstr ""
 
@@ -5293,19 +5438,20 @@ msgstr ""
 msgid "UDP:"
 msgstr "UDP:"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:28
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:90
 msgid "UMTS only"
 msgstr ""
 
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:43
 #: protocols/luci-proto-3g/luasrc/model/network/proto_3g.lua:10
 msgid "UMTS/GPRS/EV-DO"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:106
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:93
 msgid "USB Device"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:122
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:110
 msgid "USB Ports"
 msgstr ""
 
@@ -5335,10 +5481,12 @@ msgstr ""
 msgid "Unable to dispatch"
 msgstr ""
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:22
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:54
 msgid "Unable to obtain client ID"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:61
 msgid "Unable to resolve AFTR host name"
 msgstr ""
@@ -5348,21 +5496,31 @@ msgstr ""
 msgid "Unable to resolve peer host name"
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:33
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:68
+msgid "Unable to save contents: %s"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:132
 msgid "Unavailable Seconds (UAS)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1196
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1386
 #: modules/luci-base/luasrc/model/network.lua:970
 msgid "Unknown"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1349
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1539
 #: modules/luci-base/luasrc/model/network.lua:1137
 msgid "Unknown error (%s)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1193
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:204
+msgid "Unknown error code"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1383
+#: modules/luci-base/htdocs/luci-static/resources/protocol/none.js:6
 #: modules/luci-base/luasrc/model/network.lua:964
 msgid "Unmanaged"
 msgstr ""
@@ -5372,22 +5530,30 @@ msgstr ""
 msgid "Unmount"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:107
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:262
 msgid "Unnamed key"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1708
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2261
 msgid "Unsaved Changes"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:202
+msgid "Unspecified error"
+msgstr ""
+
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:64
 msgid "Unsupported MAP type"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:27
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:69
 msgid "Unsupported modem"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:219
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:119
 msgid "Unsupported protocol type."
 msgstr ""
@@ -5407,56 +5573,70 @@ msgstr ""
 msgid "Upload archive..."
 msgstr ""
 
-#: modules/luci-base/luasrc/view/cbi/upload.htm:8
-msgid "Uploaded File"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1703
+msgid "Upload file"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1678
+msgid "Upload file…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1623
+msgid "Upload request failed: %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:613
+msgid ""
+"Upon pressing \"Continue\", anonymous \"wifi-iface\" sections will be "
+"assigned with a name in the form <em>wifinet#</em> and the network will be "
+"restarted to apply the updated configuration."
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:14
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:74
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:85
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:26
 msgid "Uptime"
 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:83
 msgid "Use <code>/etc/ethers</code>"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:40
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:167
 msgid "Use DHCP gateway"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:33
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:85
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:34
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:98
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:46
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:65
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:38
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:58
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:124
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:39
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:116
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:59
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:103
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:64
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:77
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:100
 msgid "Use DNS servers advertised by peer"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:227
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:233
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:479
 msgid "Use ISO/IEC 3166 alpha2 country codes."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:31
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:100
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:70
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:35
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:51
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:86
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:56
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:97
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:77
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:75
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:92
 msgid "Use MTU on tunnel interface"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:95
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:65
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:30
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:46
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:81
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:93
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:73
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:88
 msgid "Use TTL on tunnel interface"
 msgstr ""
 
@@ -5468,68 +5648,65 @@ msgstr ""
 msgid "Use as root filesystem (/)"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:19
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:31
 msgid "Use broadcast flag"
 msgstr "השתמש בדגל broadcast"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:253
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:791
 msgid "Use builtin IPv6-management"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:40
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:109
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:92
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:45
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:105
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:53
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:72
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:45
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:65
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:40
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:182
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:127
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:42
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:119
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:62
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:67
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:80
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:103
 msgid "Use custom DNS servers"
 msgstr "השתמש בשרתי DNS מותאמים אישית"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:26
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:70
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:16
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:28
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:84
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:24
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:50
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:23
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:43
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:116
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:33
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:74
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:97
 msgid "Use default gateway"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:48
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:164
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:77
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:24
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:88
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:58
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:23
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:39
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:74
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:90
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:38
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:57
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:30
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:50
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:45
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:227
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:119
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:51
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:88
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:68
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:52
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:70
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:83
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:111
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:149
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:67
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:111
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:98
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:72
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:85
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:108
 msgid "Use gateway metric"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:64
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:179
 msgid "Use routing table"
 msgstr "השתמש בטבלת ניתוב"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:309
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:310
 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 "
@@ -5542,77 +5719,78 @@ msgstr ""
 msgid "Used"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:848
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1273
 msgid "Used Key Slot"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:913
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
 msgid ""
 "Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not "
 "needed with normal WPA(2)-PSK."
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:48
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:110
 msgid "User certificate (PEM encoded)"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:61
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:122
 msgid "User key (PEM encoded)"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/sysauth.htm:23
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:41
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:32
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:102
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:56
 msgid "Username"
 msgstr "שם משתמש"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:182
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:903
 msgid "VC-Mux"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:851
 msgid "VDSL"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:172
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:169
 msgid "VLANs on %q"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:171
-msgid "VLANs on %q (%s)"
+#: modules/luci-base/luasrc/controller/admin/index.lua:55
+msgid "VPN"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:18
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:42
 msgid "VPN Local address"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:22
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:46
 msgid "VPN Local port"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:15
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:11
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:15
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:58
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:39
 msgid "VPN Server"
 msgstr "שרת VPN"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:18
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:96
 msgid "VPN Server port"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:37
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:100
 msgid "VPN Server's certificate SHA1 hash"
 msgstr ""
 
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:9
 #: protocols/luci-proto-vpnc/luasrc/model/network/proto_vpnc.lua:9
 msgid "VPNC (CISCO 3000 (and others) VPN)"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:44
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:73
 msgid "Vendor"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:60
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:52
 msgid "Vendor Class to send when requesting DHCP"
 msgstr ""
 
@@ -5620,41 +5798,37 @@ msgstr ""
 msgid "Verify"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:52
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:76
 msgid "Virtual dynamic interface"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:470
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:471
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:553
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:576
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:908
 msgid "WDS"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:667
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1160
 msgid "WEP Open System"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:668
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1161
 msgid "WEP Shared Key"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "WEP passphrase"
 msgstr "סיסמת WEP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:503
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:566
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:945
 msgid "WMM Mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "WPA passphrase"
 msgstr "סיסמת WPA"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:716
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:735
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:740
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1074
 msgid ""
 "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
 "and ad-hoc mode) to be installed."
@@ -5668,7 +5842,7 @@ msgstr ""
 msgid "Waiting for command to complete..."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1940
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2481
 msgid "Waiting for configuration to get applied… %ds"
 msgstr ""
 
@@ -5676,8 +5850,8 @@ msgstr ""
 msgid "Waiting for device..."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:172
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:163
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:173
 msgid "Warning"
 msgstr "אזהרה"
 
@@ -5685,11 +5859,11 @@ msgstr "אזהרה"
 msgid "Warning: There are unsaved changes that will get lost on reboot!"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:20
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:34
 msgid "Weak"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:946
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1355
 msgid ""
 "When using a PSK, the PMK can be automatically generated. When enabled, the "
 "R0/R1 key options below are not applied. Disable this to use the R0 and R1 "
@@ -5697,78 +5871,85 @@ msgid ""
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:383
 msgid "Width"
 msgstr ""
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:17
 #: protocols/luci-proto-wireguard/luasrc/model/network/proto_wireguard.lua:9
 msgid "WireGuard VPN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:58
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:40
 #: modules/luci-mod-status/luasrc/controller/admin/status.lua:28
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:14
 msgid "Wireless"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1631
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1837
 #: modules/luci-base/luasrc/model/network.lua:1418
 msgid "Wireless Adapter"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1617
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2052
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1823
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2288
 #: modules/luci-base/luasrc/model/network.lua:1404
 #: modules/luci-base/luasrc/model/network.lua:1865
 msgid "Wireless Network"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:629
 msgid "Wireless Overview"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:362
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:797
 msgid "Wireless Security"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:54
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:611
+msgid "Wireless configuration migration"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:139
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:179
 msgid "Wireless is disabled"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:54
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:139
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:179
 msgid "Wireless is not associated"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:15
-msgid "Wireless is restarting..."
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:752
 msgid "Wireless network is disabled"
 msgstr "רשת אלחוטית מנוטרלת"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:752
 msgid "Wireless network is enabled"
 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:182
 msgid "Write received DNS requests to syslog"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:164
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:155
 msgid "Write system log to file"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1507
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:85
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1754
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:109
 msgid "Yes"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:26
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:943
+msgid ""
+"You appear to be currently connected to the device via the \"%h\" interface. "
+"Do you really want to shut down the interface?"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:123
 msgid ""
 "You can enable or disable installed init scripts here. Changes will applied "
 "after a device reboot.<br /><strong>Warning: If you disable essential init "
@@ -5783,38 +5964,34 @@ msgid ""
 "You must enable JavaScript in your browser or LuCI will not work properly."
 msgstr "אתה חייב להפעיל את JavaScript בדפדפן שלך; אחרת, LuCI לא יפעל כראוי."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:196
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:187
 msgid "ZRam Compression Algorithm"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:203
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:194
 msgid "ZRam Compression Streams"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:189
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:180
 msgid "ZRam Settings"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:191
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
 msgid "ZRam Size"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:229
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:230
 msgid "any"
 msgstr "כלשהו"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:113
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:121
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:126
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:218
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:282
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:321
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:328
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:621
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:37
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:22
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:29
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:121
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:836
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:844
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:849
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1030
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:78
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:48
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:51
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:103
 msgid "auto"
 msgstr "אוטומטי"
 
@@ -5822,11 +5999,11 @@ msgstr "אוטומטי"
 msgid "automatic"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:45
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:78
 msgid "baseT"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:909
 msgid "bridged"
 msgstr ""
 
@@ -5842,22 +6019,21 @@ msgstr ""
 msgid "create:"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:264
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:368
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:678
 msgid "creates a bridge over specified interface(s)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:277
 msgid "dB"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:34
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:35
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:46
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:47
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:48
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:131
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:132
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:133
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:277
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:279
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:331
@@ -5869,26 +6045,30 @@ msgstr ""
 msgid "dBm"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:460
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:587
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:889
 msgid "disable"
 msgstr "בטל"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:119
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:524
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:530
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:536
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:18
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:578
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:584
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:590
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:25
 msgid "disabled"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:433
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:467
+msgid "driver default"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/lease_status.htm:17
 #: modules/luci-base/luasrc/view/lease_status.htm:46
-#: 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:416
 msgid "expired"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:88
 msgid ""
 "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr>-leases will be stored"
@@ -5900,25 +6080,21 @@ msgstr ""
 msgid "forward"
 msgstr "קדימה"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:80
 msgid "full-duplex"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:80
 msgid "half-duplex"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:559
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:565
 msgid "hexadecimal encoded value"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:138
-msgid "hidden"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:527
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:533
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:538
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:581
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:587
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:592
 msgid "hybrid mode"
 msgstr ""
 
@@ -5926,6 +6102,10 @@ msgstr ""
 msgid "if target is a network"
 msgstr "אם היעד הוא רשת"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:63
+msgid "ignore"
+msgstr ""
+
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:177
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
@@ -5960,25 +6140,26 @@ msgstr ""
 msgid "key with either 5 or 13 characters"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:94
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:95
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:952
-msgid "minutes"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1168
+msgid "medium security"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:43
-msgid "mixed WPA/WPA2"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1360
+msgid "minutes"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:225
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:232
 msgid "no"
 msgstr "לא"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:54
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:72
 msgid "no link"
 msgstr ""
 
@@ -5986,7 +6167,7 @@ msgstr ""
 msgid "non-empty value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1195
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1446
 msgid "none"
 msgstr "ללא"
 
@@ -5996,7 +6177,9 @@ msgstr "ללא"
 msgid "not present"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:363
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:341
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:776
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:780
 #: 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
@@ -6011,8 +6194,8 @@ msgstr "כבוי"
 msgid "on"
 msgstr "פועל"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
-msgid "open"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1169
+msgid "open network"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
@@ -6032,73 +6215,77 @@ msgstr ""
 msgid "positive integer value"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:34
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:56
 msgid "random"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:526
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:532
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:537
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:580
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:586
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:591
 msgid "relay mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:910
 msgid "routed"
 msgstr "מנותב"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:525
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:534
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:968
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:977
 msgid "sec"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:525
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:531
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:579
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:585
 msgid "server mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:544
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:597
 msgid "stateful-only"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:542
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:595
 msgid "stateless"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:543
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:596
 msgid "stateless + stateful"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:369
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1167
+msgid "strong security"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:346
 msgid "tagged"
 msgstr "מתויג"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:932
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1343
 msgid "time units (TUs / 1.024 ms) [1000-65535]"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:549
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:555
 msgid "unique value"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:448
 msgid "unknown"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:15
 #: modules/luci-base/luasrc/view/lease_status.htm:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:238
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:390
+#: 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:414
 msgid "unlimited"
 msgstr "ללא הגבלה"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1401
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1648
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:63
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:355
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:378
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:413
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:446
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:512
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:450
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:545
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:53
 #: modules/luci-base/luasrc/view/cbi/network_netlist.htm:38
 msgid "unspecified"
@@ -6108,7 +6295,7 @@ msgstr "לא מוגדר"
 msgid "unspecified -or- create:"
 msgstr "לא מוגדר -או- יצר"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:366
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:344
 msgid "untagged"
 msgstr "לא מתויג"
 
@@ -6189,8 +6376,8 @@ msgstr ""
 msgid "valid address:port"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:523
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:527
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:529
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:533
 msgid "valid date (YYYY-MM-DD)"
 msgstr ""
 
@@ -6227,7 +6414,7 @@ msgstr ""
 msgid "valid network in address/netmask notation"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:498
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:504
 msgid "valid phone digit (0-9, \"*\", \"#\", \"!\" or \".\")"
 msgstr ""
 
@@ -6240,11 +6427,11 @@ msgstr ""
 msgid "valid port value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:503
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:509
 msgid "valid time (HH:MM:SS)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:425
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:431
 msgid "value between %d and %d characters"
 msgstr ""
 
@@ -6260,14 +6447,23 @@ msgstr ""
 msgid "value smaller or equal to %f"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:430
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:425
+msgid "value with %d characters"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:436
 msgid "value with at least %d characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:435
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:441
 msgid "value with at most %d characters"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1169
+msgid "weak security"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:221
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:232
@@ -6278,6 +6474,73 @@ msgstr "כן"
 msgid "« Back"
 msgstr "<< אחורה"
 
+#~ msgid "Antenna 1"
+#~ msgstr "אנטנה 1"
+
+#~ msgid "Antenna 2"
+#~ msgstr "אנטנה 2"
+
+#~ msgid "Antenna Configuration"
+#~ msgstr "הגדרות אנטנה"
+
+#~ msgid "Back to overview"
+#~ msgstr "חזרה לסקירה"
+
+#~ msgid "Back to scan results"
+#~ msgstr "חזרה לתוצאות סריקה"
+
+#~ msgid "Broadcom 802.11%s Wireless Controller"
+#~ msgstr "שלט אלחוטי Broadcom 802.11%s"
+
+#~ msgid "Broadcom BCM%04x 802.11 Wireless Controller"
+#~ msgstr "שלט אלחוטי Broadcom BCM%04x 802.11"
+
+#~ msgid "Common Configuration"
+#~ msgstr "הגדרות נפוצות"
+
+#~ msgid "Connect"
+#~ msgstr "התחבר"
+
+#~ msgid "Connection Limit"
+#~ msgstr "מגבלת חיבורים"
+
+#~ msgid "Cover the following interface"
+#~ msgstr "כסה את הממשק הבא"
+
+#~ msgid "Cover the following interfaces"
+#~ msgstr "כסה את הממשקים הבאים"
+
+#~ msgid "Create Interface"
+#~ msgstr "צור ממשק"
+
+#~ msgid "Create a bridge over multiple interfaces"
+#~ msgstr "צור גשר בין מספר ממשקים"
+
+#~ msgid "Diversity"
+#~ msgstr "גיוון"
+
+#~ msgid "Edit this interface"
+#~ msgstr "ערוך ממשק זה"
+
+#~ msgid "The given network name is not unique"
+#~ msgstr "השם שניתן לרשת איננו ייחודי"
+
+#, fuzzy
+#~ msgid ""
+#~ "The hardware is not multi-SSID capable and the existing configuration "
+#~ "will be replaced if you proceed."
+#~ msgstr ""
+#~ "החומרה אינה תומכת בריבוי SSID ולכן ההגדרות הנוכחיות יוחלפו אם תמשיך."
+
+#~ msgid "Transmission Rate"
+#~ msgstr "קצב שידור"
+
+#~ msgid "Transmit Power"
+#~ msgstr "עוצמת שידור"
+
+#~ msgid "Transmitter Antenna"
+#~ msgstr "אנטנת שידור"
+
 #~ msgid "Back"
 #~ msgstr "חזרה"
 
diff --git a/modules/luci-base/po/hu/base.po b/modules/luci-base/po/hu/base.po
index 201667b6d..87f484b18 100644
--- a/modules/luci-base/po/hu/base.po
+++ b/modules/luci-base/po/hu/base.po
@@ -11,19 +11,20 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.6\n"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:133
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:857
 msgid "%.1f dB"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:109
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:122
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 msgid "%d Bit"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1641
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2194
 msgid "%d invalid field(s)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:281
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:31
 msgid "%s is untagged in multiple VLANs!"
 msgstr ""
 
@@ -61,19 +62,19 @@ msgid "-- Additional Field --"
 msgstr "-- További mező --"
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:258
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1401
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1533
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:250
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:350
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1114
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1648
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1780
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:314
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:414
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1178
 #: modules/luci-base/luasrc/view/cbi/header.htm:5
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:26
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:88
 msgid "-- Please choose --"
 msgstr "-- Kérem válasszon --"
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:259
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:351
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1115
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:415
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1179
 #: modules/luci-base/luasrc/view/cbi/header.htm:6
 msgid "-- custom --"
 msgstr "-- egyéni --"
@@ -96,7 +97,7 @@ msgstr ""
 msgid "-- please select --"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:382
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:814
 msgid "0 = not using RSSI threshold, 1 = do not change driver default"
 msgstr ""
 
@@ -108,10 +109,11 @@ msgstr "Terhelés (utolsó 1 perc):"
 msgid "15 Minute Load:"
 msgstr "Terhelés (utolsó 15 perc):"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:924
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1337
 msgid "4-character hexadecimal ID"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:11
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:18
 msgid "464XLAT (CLAT)"
 msgstr ""
@@ -120,47 +122,47 @@ msgstr ""
 msgid "5 Minute Load:"
 msgstr "Terhelés (utolsó 5 perc):"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:960
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1366
 msgid "6-octet identifier as a hex string - no colons"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:891
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1310
 msgid "802.11r Fast Transition"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1157
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1567
 msgid "802.11w Association SA Query maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1574
 msgid "802.11w Association SA Query retry timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1133
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1533
 msgid "802.11w Management Frame Protection"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1156
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1567
 msgid "802.11w maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1165
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1574
 msgid "802.11w retry timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:399
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:831
 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:224
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:225
 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:215
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:216
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
 msgstr "<abbr title=\"Domain Name System\">DNS</abbr> szerver port"
 
-#: 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:167
 msgid ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
 "order of the resolvfile"
@@ -168,11 +170,11 @@ msgstr ""
 "<abbr title=\"Domain Name System\">DNS</abbr> szerverek a resolv fájl "
 "sorrendjében"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:388
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:820
 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:351
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:373
 #: 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"
@@ -182,8 +184,8 @@ msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-cím"
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
 msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-útválasztó"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:555
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:35
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:506
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 
@@ -199,29 +201,29 @@ msgstr ""
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 msgstr "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-útválasztó"
 
-#: 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:402
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:58
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:35
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:33
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> konfiguráció"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:67
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:51
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> Név"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:328
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:329
 #: 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:372
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:233
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:234
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> leases"
@@ -229,7 +231,7 @@ msgstr ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> bérlés"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:242
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> packet size"
@@ -237,65 +239,69 @@ 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:251
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:252
 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
 msgstr "<abbr title=\"maximal\">Max.</abbr> párhuzamos lekérdezés"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:10
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:42
 msgid ""
 "<br/>Note: you need to manually restart the cron service if the crontab file "
 "was empty before editing."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:817
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1605
+msgid "A directory with the same name already exists."
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:863
 msgid "A new login is required since the authentication session expired."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:114
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:837
 msgid "A43C + J43 + A43"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:838
 msgid "A43C + J43 + A43 + V43"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:850
 msgid "ADSL"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:826
 msgid "ANSI T1.413"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:33
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:47
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:23
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:94
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:86
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:67
 msgid "APN"
 msgstr "APN"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:56
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:175
 msgid "ARP retry threshold"
 msgstr "ARP újrapróbálkozási küszöbérték"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:122
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:845
 msgid "ATM (Asynchronous Transfer Mode)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:144
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:866
 msgid "ATM Bridges"
 msgstr "ATM Hidak"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:178
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:21
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:898
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:66
 msgid "ATM Virtual Channel Identifier (VCI)"
 msgstr "ATM Virtuális Csatorna Azonosító (VCI)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:179
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:26
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:899
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:70
 msgid "ATM Virtual Path Identifier (VPI)"
 msgstr "ATM Virtuális Út Azonosító (VPI)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:866
 msgid ""
 "ATM bridges expose encapsulated ethernet in AAL5 connections as virtual "
 "Linux network interfaces which can be used in conjunction with DHCP or PPP "
@@ -305,8 +311,8 @@ msgstr ""
 "hálózati interfész mutatják, mely így DHCP-vel vagy PPP-vel összekapcsolva "
 "használható a szolgáltatói hálózatba történő betárcsázáshoz."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:184
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:905
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:62
 msgid "ATM device number"
 msgstr "ATM eszközszám"
 
@@ -315,17 +321,17 @@ msgid "ATU-C System Vendor ID"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:251
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:495
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:499
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:528
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:532
 msgid "Absent Interface"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:19
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
 msgid "Access Concentrator"
 msgstr "Elérési központ"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:368
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:470
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:802
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
 msgid "Access Point"
 msgstr "Hozzáférési pont"
 
@@ -350,7 +356,7 @@ msgid "Active Connections"
 msgstr "Aktív kapcsolatok"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:68
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:30
 msgid "Active DHCP Leases"
 msgstr "Aktív DHCP bérletek"
 
@@ -358,56 +364,76 @@ msgstr "Aktív DHCP bérletek"
 msgid "Active DHCPv6 Leases"
 msgstr "Aktív DHCPv6 bérletek"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1951
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:370
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:12
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2190
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:804
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:23
 msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:650
-#: modules/luci-base/htdocs/luci-static/resources/form.js:651
-#: modules/luci-base/htdocs/luci-static/resources/form.js:666
-#: modules/luci-base/htdocs/luci-static/resources/form.js:667
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1290
+#: modules/luci-base/htdocs/luci-static/resources/form.js:902
+#: modules/luci-base/htdocs/luci-static/resources/form.js:904
+#: modules/luci-base/htdocs/luci-static/resources/form.js:917
+#: modules/luci-base/htdocs/luci-static/resources/form.js:918
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1539
 #: modules/luci-base/luasrc/view/cbi/nsection.htm:25
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:189
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:197
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:39
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:47
 #: modules/luci-base/luasrc/view/cbi/ucisection.htm:54
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:703
 msgid "Add"
 msgstr "Hozzáadás"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:60
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:870
+msgid "Add ATM Bridge"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:92
 msgid "Add IPv4 address…"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:129
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:204
 msgid "Add IPv6 address…"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:143
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:149
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:38
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:47
+msgid "Add LED action"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:215
+msgid "Add VLAN"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:14
+msgid "Add instance"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:153
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:159
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:250
 msgid "Add key"
 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:155
 msgid "Add local domain suffix to names served from hosts files"
 msgstr ""
 "Helyi tartomány utótag hozzáadása a hosts fájlokból kiszolgált nevekhez"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:705
 msgid "Add new interface..."
 msgstr "Új interfész hozzáadása..."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:104
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:99
+msgid "Add peer"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:105
 msgid "Additional Hosts files"
 msgstr "További 'hosts' fájlok"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:161
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
 msgid "Additional servers file"
 msgstr ""
 
@@ -434,7 +460,7 @@ msgstr ""
 msgid "Address"
 msgstr "Cím"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:12
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:151
 msgid "Address to access local relay bridge"
 msgstr "Helyi közvetítő híd elérési címe"
 
@@ -443,13 +469,13 @@ msgstr "Helyi közvetítő híd elérési címe"
 msgid "Administration"
 msgstr "Adminisztráció"
 
-#: 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:70
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:505
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:896
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:24
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:189
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:463
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:176
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:143
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:364
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:742
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:799
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:50
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:34
 msgid "Advanced Settings"
@@ -459,170 +485,170 @@ msgstr "Haladó beállítások"
 msgid "Aggregate Transmit Power(ACTATP)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:175
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:166
 msgid "Alert"
 msgstr "Riasztás"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1628
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1834
 #: modules/luci-base/luasrc/model/network.lua:1416
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:54
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:78
 msgid "Alias Interface"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:138
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:66
 msgid "Alias of \"%s\""
 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:170
 msgid "All Servers"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:114
 msgid ""
 "Allocate IP addresses sequentially, starting from the lowest available "
 "address"
 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:113
 msgid "Allocate IP sequentially"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:24
 msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
 msgstr ""
 "<abbr title=\"Secure Shell\">SSH</abbr> jelszó hitelesítés engedélyezése"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:545
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:987
 msgid "Allow AP mode to disconnect STAs based on low ACK condition"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:462
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:589
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:891
 msgid "Allow all except listed"
 msgstr "Összes engedélyezése a felsoroltakon kívül"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:236
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:767
 msgid "Allow legacy 802.11b rates"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:461
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:588
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:890
 msgid "Allow listed only"
 msgstr "Csak a felsoroltak engedélyezése"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:198
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:199
 msgid "Allow localhost"
 msgstr "Lolcalhost engedélyezése"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:47
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:35
 msgid "Allow remote hosts to connect to local SSH forwarded ports"
 msgstr ""
 "Távoli hostok csatlakozásának engedélyezése a helyi SSH továbbított "
 "portokhoz."
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:38
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:30
 msgid "Allow root logins with password"
 msgstr "root jelszavas bejelentkezésének engedélyezése"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:39
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:30
 msgid "Allow the <em>root</em> user to login with password"
 msgstr "Engedélyezi a <em>root</em> felhasználó jelszavas bejelentkezését"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:199
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:200
 msgid ""
 "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
 msgstr ""
 "A 127.0.0.0/8-as tartományba eső DNS válaszok engedélyezése (pl. RBL "
 "szervizek)"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:135
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:122
 msgid "Allowed IPs"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:549
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:602
 msgid "Always announce default router"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:259
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:782
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
 "option does not comply with IEEE 802.11n-2009!"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:95
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:818
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:119
 msgid "Annex"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:96
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:819
 msgid "Annex A + L + M (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:827
 msgid "Annex A G.992.1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:828
 msgid "Annex A G.992.2"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:829
 msgid "Annex A G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:830
 msgid "Annex A G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:97
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:820
 msgid "Annex B (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:823
 msgid "Annex B G.992.1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:824
 msgid "Annex B G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:102
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:825
 msgid "Annex B G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:98
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:821
 msgid "Annex J (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:831
 msgid "Annex L G.992.3 POTS 1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:99
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:822
 msgid "Annex M (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:109
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:832
 msgid "Annex M G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:833
 msgid "Annex M G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:550
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:602
 msgid "Announce as default router even if no public prefix is available."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:555
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:607
 msgid "Announced DNS domains"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:554
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:606
 msgid "Announced DNS servers"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1093
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1496
 msgid "Anonymous Identity"
 msgstr ""
 
@@ -634,20 +660,6 @@ msgstr ""
 msgid "Anonymous Swap"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:322
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:329
-msgid "Antenna 1"
-msgstr "1-es antenna"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:323
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:330
-msgid "Antenna 2"
-msgstr "2-es antenna"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:246
-msgid "Antenna Configuration"
-msgstr "Antenna beállítások"
-
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:71
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:160
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:181
@@ -655,11 +667,11 @@ msgstr "Antenna beállítások"
 msgid "Any zone"
 msgstr "Bármelyik zóna"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1981
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2522
 msgid "Apply request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1867
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2409
 msgid "Apply unchecked"
 msgstr ""
 
@@ -667,8 +679,8 @@ msgstr ""
 msgid "Architecture"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:19
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:184
+#: 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 ""
@@ -677,13 +689,13 @@ msgstr ""
 msgid "Assign interfaces..."
 msgstr "Interfészek összekapcsolása..."
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:124
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:24
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:189
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:31
 msgid ""
 "Assign prefix parts using this hexadecimal subprefix ID for this interface."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:148
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1967
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:22
 msgid "Associated Stations"
 msgstr "Kapcsolódó kliensek"
@@ -692,20 +704,20 @@ msgstr "Kapcsolódó kliensek"
 msgid "Associations"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:39
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:37
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:101
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:64
 msgid "Auth Group"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1027
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1421
 msgid "Authentication"
 msgstr "Hitelesítés"
 
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:29
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:70
 msgid "Authentication Type"
 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:78
 msgid "Authoritative"
 msgstr "Hiteles"
 
@@ -723,17 +735,19 @@ msgstr "Hitelesítés szükséges"
 msgid "Auto Refresh"
 msgstr "Automatikus frissítés"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:53
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:7
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:17
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:67
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:24
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:36
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:42
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:36
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:106
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:24
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:98
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:50
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:94
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:81
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:55
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:68
 msgid "Automatic"
 msgstr ""
 
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:7
 #: protocols/luci-proto-hnet/luasrc/model/network/proto_hnet.lua:7
 msgid "Automatic Homenet (HNCP)"
 msgstr ""
@@ -776,21 +790,21 @@ msgstr "Elérhető"
 msgid "Average:"
 msgstr "Átlag:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:116
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:839
 msgid "B43 + B43C"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:840
 msgid "B43 + B43C + V43"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:48
 msgid "BR / DMR / AFTR"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:43
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:75
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1620
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:176
 msgid "BSSID"
 msgstr "BSSID"
@@ -804,19 +818,11 @@ msgstr "Vissza az áttekintéshez"
 msgid "Back to configuration"
 msgstr "Vissza a beállításokhoz"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:48
-msgid "Back to overview"
-msgstr "Vissza az áttekintéshez"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:20
-msgid "Back to scan results"
-msgstr "Vissza a felderítési eredményekhez"
-
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:17
 msgid "Backup"
 msgstr "Mentés"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:38
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:36
 msgid "Backup / Flash Firmware"
 msgstr "Mentés / Firmware frissítés"
 
@@ -829,11 +835,11 @@ msgid "Bad address specified!"
 msgstr "Hibás címet adott meg!"
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:158
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:288
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:368
 msgid "Band"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:261
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:785
 msgid "Beacon Interval"
 msgstr ""
 
@@ -848,79 +854,85 @@ msgstr ""
 "fájlokból valamint a felhasználó által megadott mintáknak megfelelő "
 "fájlokból áll."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:293
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:294
 msgid ""
 "Bind dynamically to interfaces rather than wildcard address (recommended as "
 "linux default)"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:16
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:48
 msgid "Bind interface"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:16
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:48
 msgid "Bind the tunnel to this interface (optional)."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:49
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:134
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:187
 msgid "Bitrate"
 msgstr "Bitráta"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:172
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
 msgid "Bogus NX Domain Override"
 msgstr "Hamis NX tartomány felülbírálása"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1634
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1840
 #: modules/luci-base/luasrc/model/network.lua:1420
 msgid "Bridge"
 msgstr "Híd"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:264
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:368
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:678
 msgid "Bridge interfaces"
 msgstr "Híd interfészek"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:906
 msgid "Bridge unit number"
 msgstr "Híd eszközszám"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:250
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:364
 msgid "Bring up on boot"
 msgstr "Hozza fel a rendszer indításakor"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:35
-msgid "Broadcom 802.11%s Wireless Controller"
-msgstr "Broadcom 802.11%s vezeték-nélküli vezérlő"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:45
-msgid "Broadcom BCM%04x 802.11 Wireless Controller"
-msgstr "Broadcom BCM%04x 802.11 vezeték-nélküli vezérlő"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1697
+msgid "Browse…"
+msgstr ""
 
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:18
 msgid "Buffered"
 msgstr "Átmeneti tárban van"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:75
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:134
 msgid "CA certificate; if empty it will be saved after the first connection."
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:7
+msgid "CLAT configuration failed"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:13
 msgid "CPU usage (%)"
 msgstr "Processzor használat (%)"
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:21
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:53
 msgid "Call failed"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1789
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:14
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:52
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:711
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:948
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1839
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:191
 #: modules/luci-mod-system/luasrc/view/admin_system/upgrade.htm:60
 msgid "Cancel"
 msgstr "Mégsem"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:6
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:17
 msgid "Category"
 msgstr ""
 
@@ -938,13 +950,7 @@ msgstr ""
 msgid "Chain"
 msgstr "Lánc"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:9
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:14
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:24
-msgid "Change login password"
-msgstr ""
-
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1744
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 msgid "Changes"
 msgstr "Módosítások"
 
@@ -952,34 +958,24 @@ msgstr "Módosítások"
 msgid "Changes applied."
 msgstr "A módosítások alkalmazva."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2004
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2545
 msgid "Changes have been reverted."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:43
 msgid "Changes the administrator password for accessing the device"
 msgstr ""
 "Itt módosíthatja az eszköz eléréséhez szükséges adminisztrátori jelszót"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:10
-msgid "Changing password…"
-msgstr ""
-
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:162
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:45
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:87
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:174
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:376
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1618
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:186
 msgid "Channel"
 msgstr "Csatorna"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:119
-msgid ""
-"Channel %d is not available in the %s regulatory domain and has been auto-"
-"adjusted to %d."
-msgstr ""
-
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:229
 msgid "Check"
 msgstr "Ellenőrzés"
@@ -988,7 +984,7 @@ msgstr "Ellenőrzés"
 msgid "Check filesystems before mount"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1806
 msgid "Check this option to delete the existing networks from this radio."
 msgstr ""
 
@@ -1000,8 +996,8 @@ msgstr "Ellenőrző összeg"
 msgid "Choose mtdblock"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:358
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:443
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1829
 msgid ""
 "Choose the firewall zone you want to assign to this interface. Select "
 "<em>unspecified</em> to remove the interface from the associated zone or "
@@ -1013,7 +1009,7 @@ msgstr ""
 "zónából történő eltávolításához, vagy töltse ki az <em>új</em> mezőt új zóna "
 "megadásához és csatlakoztassa az interfészt ahhoz."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:834
 msgid ""
 "Choose the network(s) you want to attach to this wireless interface or fill "
 "out the <em>create</em> field to define a new network."
@@ -1022,11 +1018,11 @@ msgstr ""
 "vezetéknélküli interfészhez, vagy töltse ki az <em>új</em> mezőt egy új "
 "hálózat definiálásához."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:614
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1023
 msgid "Cipher"
 msgstr "Titkosító"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:61
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:91
 msgid "Cisco UDP encapsulation"
 msgstr ""
 
@@ -1044,28 +1040,28 @@ msgid ""
 "FEATURE IS FOR PROFESSIONALS! )"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1950
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:369
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:471
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2189
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:803
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:908
 msgid "Client"
 msgstr "Ügyfél"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:55
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:52
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:47
 msgid "Client ID to send when requesting DHCP"
 msgstr "DHCP kérés során küldendő kliens azonosító"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:145
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:151
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:155
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:161
 msgid "Close"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:146
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:119
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:125
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:127
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:98
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:119
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:157
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:141
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:115
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:138
 msgid ""
 "Close inactive connection after the given amount of seconds, use 0 to "
 "persist connection"
@@ -1080,12 +1076,9 @@ msgstr "Lista bezárása..."
 #: modules/luci-base/luasrc/view/lease_status.htm:77
 #: modules/luci-base/luasrc/view/lease_status.htm:98
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:118
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:37
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:24
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1965
 #: modules/luci-mod-network/luasrc/view/admin_network/iface_status.htm:6
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:40
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:30
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:8
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:398
 #: modules/luci-mod-status/luasrc/view/admin_status/index/30-network.htm:11
 #: modules/luci-mod-status/luasrc/view/admin_status/index/50-dsl.htm:17
@@ -1099,15 +1092,19 @@ msgstr "Adatok összegyűjtése..."
 msgid "Command"
 msgstr "Parancs"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:193
+msgid "Command OK"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:41
+msgid "Command failed"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:64
 msgid "Comment"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:185
-msgid "Common Configuration"
-msgstr "Álatános beállítás"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
 msgid ""
 "Complicates key reinstallation attacks on the client side by disabling "
 "retransmission of EAPOL-Key frames that are used to install keys. This "
@@ -1115,13 +1112,14 @@ msgid ""
 "negotiation especially in environments with heavy traffic load."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1744
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 #: modules/luci-base/luasrc/controller/admin/uci.lua:11
 #: modules/luci-mod-system/luasrc/view/admin_system/backupfiles.htm:9
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:13
 msgid "Configuration"
 msgstr "Beállítás"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:21
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:63
 msgid "Configuration failed"
 msgstr ""
@@ -1130,89 +1128,89 @@ msgstr ""
 msgid "Configuration files will be kept"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1915
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2456
 msgid "Configuration has been applied."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1848
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2395
 msgid "Configuration has been rolled back!"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:43
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:942
+msgid "Confirm disconnect"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:50
 msgid "Confirmation"
 msgstr "Megerősítés"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:32
-msgid "Connect"
-msgstr "Kapcsolódás"
-
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:72
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:105
 msgid "Connected"
 msgstr "Kapcsolódva"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:338
-msgid "Connection Limit"
-msgstr "Kapcsolati korlát"
-
 #: modules/luci-base/htdocs/luci-static/resources/network.js:7
 #: modules/luci-base/luasrc/model/network.lua:27
 msgid "Connection attempt failed"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:203
+msgid "Connection lost"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/controller/admin/status.lua:32
 msgid "Connections"
 msgstr "Kapcsolatok"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1890
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:66
+msgid "Contents have been saved."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:618
+msgid "Continue"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2431
 msgid ""
 "Could not regain access to the device after applying the configuration "
 "changes. You might need to reconnect if you modified network related "
 "settings such as the IP address or wireless security credentials."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:135
 msgid "Country"
 msgstr "Ország"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:227
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:233
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:337
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:764
 msgid "Country Code"
 msgstr "Országkód"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:36
-msgid "Cover the following interface"
-msgstr "A következő interfészt tartalmazza"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:43
-msgid "Cover the following interfaces"
-msgstr "A következő interfészeket tartalmazza"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:357
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:86
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:443
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1829
 msgid "Create / Assign firewall-zone"
 msgstr "Tűzfal zóna készítés / hozzárendelés"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:9
-msgid "Create Interface"
-msgstr "Új interfész"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:33
-msgid "Create a bridge over multiple interfaces"
-msgstr "Híd létrehozása több interfész között"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:735
+msgid "Create interface"
+msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:174
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:165
 msgid "Critical"
 msgstr "Kritikus"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:178
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:169
 msgid "Cron Log Level"
 msgstr "Cron naplózási szint"
 
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:519
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:521
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:447
+msgid "Current power"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:552
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:554
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:51
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:53
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:82
@@ -1220,7 +1218,7 @@ msgstr "Cron naplózási szint"
 msgid "Custom Interface"
 msgstr "Egyéni interfész"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:36
 msgid "Custom delegated IPv6-prefix"
 msgstr ""
 
@@ -1230,7 +1228,7 @@ msgid ""
 "this, perform a factory-reset first."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:59
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:41
 msgid ""
 "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
 "\">LED</abbr>s if possible."
@@ -1238,46 +1236,47 @@ msgstr ""
 "Az eszköz <abbr title=\"Light Emitting Diode\">LED</abbr>-jei működésének "
 "testreszabása."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:799
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1223
 msgid "DAE-Client"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:807
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1231
 msgid "DAE-Port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:815
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1239
 msgid "DAE-Secret"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:448
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:459
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:279
 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:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:61
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:62
 msgid "DHCP and DNS"
 msgstr "DHCP és DNS"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1195
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1385
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:16
 #: modules/luci-base/luasrc/model/network.lua:968
 msgid "DHCP client"
 msgstr "DHCP ügyfél"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:571
 msgid "DHCP-Options"
 msgstr "DHCP beállítások"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_dhcpv6.lua:7
 msgid "DHCPv6 client"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:540
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:594
 msgid "DHCPv6-Mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:529
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:583
 msgid "DHCPv6-Service"
 msgstr ""
 
@@ -1294,31 +1293,31 @@ msgstr ""
 msgid "DNS"
 msgstr "DNS"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:183
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
 msgid "DNS forwardings"
 msgstr "DNS továbbítások"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:30
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:37
 msgid "DNS-Label / FQDN"
 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:136
 msgid "DNSSEC"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:139
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
 msgid "DNSSEC check unsigned"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:73
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:99
 msgid "DPD Idle Timeout"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:14
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:41
 msgid "DS-Lite AFTR address"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:92
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:815
 #: modules/luci-mod-status/luasrc/view/admin_status/index/50-dsl.htm:14
 msgid "DSL"
 msgstr ""
@@ -1327,11 +1326,11 @@ msgstr ""
 msgid "DSL Status"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:125
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:848
 msgid "DSL line mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:519
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:963
 msgid "DTIM Interval"
 msgstr ""
 
@@ -1343,42 +1342,45 @@ msgstr "DUID"
 msgid "Data Rate"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:169
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:180
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:160
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:171
 msgid "Debug"
 msgstr "Hibakeresés"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:759
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:783
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:807
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1183
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1207
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1231
 msgid "Default %d"
 msgstr "Alapértelmezés %d"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:82
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:107
 msgid "Default Route"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:17
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:81
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:51
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:32
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:48
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:85
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:65
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:80
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:108
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:146
 msgid "Default gateway"
 msgstr "Alapértelmezett átjáró"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:541
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:594
 msgid "Default is stateless + stateful"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:70
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:54
 msgid "Default state"
 msgstr "Alapértelmezett állapot"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:503
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:553
 msgid "Define a name for this network."
 msgstr "Adja meg a hálózat nevét."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:514
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:571
 msgid ""
 "Define additional DHCP options, for example "
 "\"<code>6,192.168.2.1,192.168.2.2</code>\" which advertises different DNS "
@@ -1387,35 +1389,47 @@ msgstr ""
 "Adjon meg további DHCP opciókat, például \"<code>6,192.168.2.1,192.168.2.2</"
 "code>\", mely különböző DNS kiszolgálókat hirdet az ügyfelek részére."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:705
-#: modules/luci-base/htdocs/luci-static/resources/form.js:958
-#: modules/luci-base/htdocs/luci-static/resources/form.js:959
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1271
+#: modules/luci-base/htdocs/luci-static/resources/form.js:966
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1210
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1216
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1524
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1758
 #: modules/luci-base/luasrc/view/cbi/nsection.htm:11
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:162
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:16
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:41
 msgid "Delete"
 msgstr "Törlés"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:178
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:187
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:193
 msgid "Delete key"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:45
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1654
+msgid "Delete permission denied"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1656
+msgid "Delete request failed: %d %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:723
 msgid "Delete this network"
 msgstr "Hálózat törlése"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:519
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:963
 msgid "Delivery Traffic Indication Message Interval"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:102
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:108
 msgid "Description"
 msgstr "Leírás"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:224
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1754
+msgid "Deselect"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:215
 msgid "Design"
 msgstr "Megjelenés"
 
@@ -1433,10 +1447,12 @@ msgstr ""
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:177
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:43
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:13
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:38
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:73
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:33
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:52
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:85
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:86
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:72
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:154
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:253
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:86
@@ -1444,15 +1460,24 @@ msgstr ""
 msgid "Device"
 msgstr "Eszköz"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:138
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:737
 msgid "Device Configuration"
 msgstr "Eszköz beállítások"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:81
+msgid "Device is not active"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/reboot.htm:23
 msgid "Device is rebooting..."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1889
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:167
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:513
+msgid "Device is restarting…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2430
 msgid "Device unreachable!"
 msgstr ""
 
@@ -1460,26 +1485,26 @@ msgstr ""
 msgid "Device unreachable! Still waiting for device..."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:123
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:78
 #: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:61
 msgid "Diagnostics"
 msgstr "Diagnosztika"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:45
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:60
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:101
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:93
 msgid "Dial number"
 msgstr ""
 
-#: modules/luci-base/luasrc/view/cbi/filebrowser.htm:99
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1554
 msgid "Directory"
 msgstr "Könyvtár"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:131
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:715
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:754
 msgid "Disable"
 msgstr "Letiltás"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:472
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:531
 msgid ""
 "Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for "
 "this interface."
@@ -1487,71 +1512,66 @@ msgstr ""
 "<abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> tiltása ezen "
 "az interfészen."
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:64
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:93
 msgid "Disable Encryption"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:530
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:973
 msgid "Disable Inactivity Polling"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:713
 msgid "Disable this network"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:44
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:54
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:68
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:37
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:43
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:37
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1534
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:76
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:107
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:99
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:51
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:95
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:82
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:69
 msgid "Disabled"
 msgstr "Letiltva"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1139
-msgid "Disabled (default)"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:544
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:987
 msgid "Disassociate On Low Acknowledgement"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:193
 msgid "Discard upstream RFC1918 responses"
 msgstr "Beérkező RFC1918 DHCP válaszok elvetése. "
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:92
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:114
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:956
 msgid "Disconnect"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:22
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:64
 msgid "Disconnection attempt failed"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1121
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1762
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1855
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:17
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1375
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1995
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2314
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2401
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1634
 msgid "Dismiss"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:240
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:334
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:770
 msgid "Distance Optimization"
 msgstr "Távolság optimalizáció"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:241
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:770
 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/luasrc/model/cbi/admin_network/wifi.lua:347
-msgid "Diversity"
-msgstr "Diverzitás"
-
-#: 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:61
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
@@ -1563,37 +1583,45 @@ msgstr ""
 "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:158
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:159
 msgid "Do not cache negative replies, e.g. for not existing domains"
 msgstr ""
 "Ne gyorsítótárazza a negatív válaszokat, pl. nem létező domain-ok esetén"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:123
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:124
 msgid "Do not forward requests that cannot be answered by public name servers"
 msgstr ""
 "Ne továbbítsa a publikus név szerverek által nem megválaszolható kéréseket"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:118
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
 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"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:173
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1639
+msgid "Do you really want to delete \"%s\" ?"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:188
 msgid "Do you really want to delete the following SSH key?"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1637
+msgid "Do you really want to recursively delete the directory \"%s\" ?"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:74
 msgid "Domain required"
 msgstr "Tartomány szükséges"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:205
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:206
 msgid "Domain whitelist"
 msgstr "Tartomány fehérlista"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:34
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:67
 msgid "Don't Fragment"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:74
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:75
 msgid ""
 "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
 "<abbr title=\"Domain Name System\">DNS</abbr>-Name"
@@ -1613,19 +1641,19 @@ msgstr "Biztonsági mentés letöltése"
 msgid "Download mtdblock"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:853
 msgid "Downstream SNR offset"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:914
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1169
 msgid "Drag to reorder"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:9
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:11
 msgid "Dropbear Instance"
 msgstr "Dropbear példány"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:6
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 msgid ""
 "Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access "
 "and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
@@ -1634,20 +1662,21 @@ msgstr ""
 "tesz lehetővé, valamint integrált <abbr title=\"Secure Copy\">SCP</abbr> "
 "szolgáltatást nyújt."
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:11
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:14
 msgid "Dual-Stack Lite (RFC6333)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:493
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:547
 msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 msgstr ""
 "Dinamikus <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:60
 msgid "Dynamic tunnel"
 msgstr "Dinamikus alagút"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:494
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:547
 msgid ""
 "Dynamically allocate DHCP addresses for clients. If disabled, only clients "
 "having static leases will be served."
@@ -1656,21 +1685,21 @@ msgstr ""
 "esetén csak a statikus DHCP bérlettel rendelkező kliensek lesznek "
 "kiszolgálva."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:67
 msgid "EA-bits length"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:990
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1386
 msgid "EAP-Method"
 msgstr "EAP metódus"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:934
-#: modules/luci-base/htdocs/luci-static/resources/form.js:935
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1199
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1188
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1191
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1450
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:154
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:160
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:38
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:291
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:720
 msgid "Edit"
 msgstr "Szerkesztés"
 
@@ -1680,90 +1709,91 @@ msgid ""
 "reload the page."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:38
-msgid "Edit this interface"
-msgstr "Interfész szerkesztése"
-
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:718
 msgid "Edit this network"
 msgstr "Hálózat szerkesztése"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:669
+msgid "Edit wireless network"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:167
 msgid "Emergency"
 msgstr "Vészhelyzet"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:127
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:715
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:754
 msgid "Enable"
 msgstr "Engedélyezés"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:414
 msgid ""
 "Enable <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> "
 "snooping"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:271
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:412
 msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 msgstr "<abbr title=\"Spanning Tree Protocol\">STP</abbr> engedélyezése"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:41
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:60
 msgid "Enable HE.net dynamic endpoint update"
 msgstr "HE.net dinamikus végpont frissítésének engedélyezése"
 
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:51
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:89
 msgid "Enable IPv6 negotiation"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:23
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:35
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:41
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:35
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:37
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:49
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:80
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:54
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:67
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:93
 msgid "Enable IPv6 negotiation on the PPP link"
 msgstr "IPv6 egyeztetés engedélyezése a PPP linken"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:143
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:188
 msgid "Enable Jumbo Frame passthrough"
 msgstr "Óriás keretek átengedésének engedélyezése"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:244
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:235
 msgid "Enable NTP client"
 msgstr "NTP-kliens engedélyezése"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:69
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:96
 msgid "Enable Single DES"
 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:267
 msgid "Enable TFTP server"
 msgstr "TFTP kiszolgáló engedélyezése"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:134
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:180
 msgid "Enable VLAN functionality"
 msgstr "VLAN funkció engedélyezése"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1595
 msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1175
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
 msgid "Enable key reinstallation (KRACK) countermeasures"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:138
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:183
 msgid "Enable learning and aging"
 msgstr "Tanulás és aging engedélyezése"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:194
 msgid "Enable mirroring of incoming packets"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:151
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:195
 msgid "Enable mirroring of outgoing packets"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:34
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:67
 msgid "Enable the DF (Don't Fragment) flag of the encapsulating packets."
 msgstr ""
 
@@ -1771,7 +1801,7 @@ msgstr ""
 msgid "Enable this mount"
 msgstr "A csatolás engedélyezése"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:713
 msgid "Enable this network"
 msgstr ""
 
@@ -1779,48 +1809,52 @@ msgstr ""
 msgid "Enable this swap"
 msgstr "A lapozó terület engedélyezése"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:37
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:88
 msgid "Enable/Disable"
 msgstr "Engedélyezés/Letiltás"
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:76
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:152
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:251
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:41
 msgid "Enabled"
 msgstr "Engedélyezve"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:277
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:414
 msgid "Enables IGMP snooping on this bridge"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:892
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1310
 msgid ""
 "Enables fast roaming among access points that belong to the same Mobility "
 "Domain"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:272
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:412
 msgid "Enables the Spanning Tree Protocol on this bridge"
 msgstr "A Spanning Tree prokoll engedélyezése erre a hídra"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:120
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:180
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:59
+msgid "Encapsulation limit"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:843
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:901
 msgid "Encapsulation mode"
 msgstr "Beágyazási mód"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:76
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:603
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:129
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:992
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1621
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:177
 msgid "Encryption"
 msgstr "Titkosítás"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:155
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:128
 msgid "Endpoint Host"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:165
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:132
 msgid "Endpoint Port"
 msgstr ""
 
@@ -1832,16 +1866,21 @@ msgstr ""
 msgid "Enter custom values"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:273
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:271
 msgid "Erasing..."
 msgstr "Törlés..."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:95
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:96
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:97
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:98
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:99
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:106
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:107
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:108
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:109
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:110
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:173
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:164
 msgid "Error"
 msgstr "Hiba"
 
@@ -1849,24 +1888,28 @@ msgstr "Hiba"
 msgid "Errored seconds (ES)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1646
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1852
 #: modules/luci-base/luasrc/model/network.lua:1432
 msgid "Ethernet Adapter"
 msgstr "Ethernet adapter"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1637
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1843
 #: modules/luci-base/luasrc/model/network.lua:1422
 msgid "Ethernet Switch"
 msgstr "Ethernet switch"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:303
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
 msgid "Exclude interfaces"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:153
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
 msgid "Expand hosts"
 msgstr "Gépek kibontása"
 
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:195
+msgid "Expecting an hexadecimal assignment hint"
+msgstr ""
+
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:59
 msgid "Expecting: %s"
 msgstr ""
@@ -1875,61 +1918,77 @@ msgstr ""
 msgid "Expires"
 msgstr "Lejárat"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:488
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:543
 #, fuzzy
 msgid ""
 "Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
 msgstr "A bérelt címek lejárati ideje, a minimális érték 2 perc."
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:8
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:19
 msgid "External"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:971
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1377
 msgid "External R0 Key Holder List"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:980
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1381
 msgid "External R1 Key Holder List"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:150
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:141
 msgid "External system log server"
 msgstr "Külső rendszernapló kiszolgáló"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:155
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:146
 msgid "External system log server port"
 msgstr "Külső rendszernapló kiszolgáló port"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:160
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:151
 msgid "External system log server protocol"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:18
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:79
 msgid "Extra SSH command options"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:940
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1351
 msgid "FT over DS"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:941
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1352
 msgid "FT over the Air"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:938
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1349
 msgid "FT protocol"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1842
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:82
+msgid "Failed to change the system password."
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2389
 msgid "Failed to confirm apply within %ds, waiting for rollback…"
 msgstr ""
 
-#: modules/luci-base/luasrc/view/cbi/filebrowser.htm:106
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:45
+msgid "Failed to execute \"/etc/init.d/%s %s\" action: %s"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1561
 msgid "File"
 msgstr "Fájl"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:279
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1514
+msgid "File not accessible"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1698
+msgid "Filename"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:280
 msgid "Filename of the boot image advertised to clients"
 msgstr "A kliensek részére közzétett betöltö kép fájlneve"
 
@@ -1939,14 +1998,15 @@ msgstr "A kliensek részére közzétett betöltö kép fájlneve"
 msgid "Filesystem"
 msgstr "Fájlrendszer"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:118
 msgid "Filter private"
 msgstr "Privát kérések szűrése"
 
-#: 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:123
 msgid "Filter useless"
 msgstr "Használhahatlan kérések szűrése"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:23
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:65
 msgid "Finalizing failed"
 msgstr ""
@@ -1957,7 +2017,7 @@ msgid ""
 "with defaults based on what was detected"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:696
 msgid "Find and join network"
 msgstr "Hálózatok keresése és csatlakozás"
 
@@ -1969,11 +2029,11 @@ msgstr "Befejezés"
 msgid "Firewall"
 msgstr "Tűzfal"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:77
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:76
 msgid "Firewall Mark"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:193
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:278
 msgid "Firewall Settings"
 msgstr "Tűzfal Beállítások"
 
@@ -1981,7 +2041,7 @@ msgstr "Tűzfal Beállítások"
 msgid "Firewall Status"
 msgstr "Tűzfal Állapot"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:137
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:860
 msgid "Firmware File"
 msgstr ""
 
@@ -1989,7 +2049,7 @@ msgstr ""
 msgid "Firmware Version"
 msgstr "Tűzfal verzió"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:225
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:226
 msgid "Fixed source port for outbound DNS queries"
 msgstr "Rögzített forrás port a kimenő DNS kérésekhez"
 
@@ -2009,37 +2069,37 @@ msgstr "Új firmware image flash-elése"
 msgid "Flash operations"
 msgstr "Flash műveletek"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:194
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:192
 msgid "Flashing..."
 msgstr "Flash-elés..."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:498
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:550
 msgid "Force"
 msgstr "Kényszerítés"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:258
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:782
 msgid "Force 40MHz mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:622
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1031
 msgid "Force CCMP (AES)"
 msgstr "CCMP (AES) kényszerítése"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:499
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:550
 msgid "Force DHCP on this network even if another server is detected."
 msgstr ""
 "DHCP kényszerítése ezen a hálózaton még akkor is ha van másik szerver "
 "észlelve."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:623
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1032
 msgid "Force TKIP"
 msgstr "TKIP kényszerítése"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:624
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1033
 msgid "Force TKIP and CCMP (AES)"
 msgstr "TKIP és CCMP (AES) kényszerítése"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:795
 msgid "Force link"
 msgstr ""
 
@@ -2047,7 +2107,7 @@ msgstr ""
 msgid "Force upgrade"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:60
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:90
 msgid "Force use of NAT-T"
 msgstr ""
 
@@ -2055,7 +2115,7 @@ msgstr ""
 msgid "Form token mismatch"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:34
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:164
 msgid "Forward DHCP traffic"
 msgstr "DHCP forgalom továbbítás"
 
@@ -2063,46 +2123,41 @@ msgstr "DHCP forgalom továbbítás"
 msgid "Forward Error Correction Seconds (FECS)"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:28
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:161
 msgid "Forward broadcast traffic"
 msgstr "Broadcast forgalom továbbítás"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:375
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:809
 msgid "Forward mesh peer traffic"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:186
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:908
 msgid "Forwarding mode"
 msgstr "Továbbítás módja"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:255
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:596
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:774
 msgid "Fragmentation Threshold"
 msgstr "Töredezettségi küszöb"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:332
-msgid "Frame Bursting"
-msgstr "Keretfűzés"
-
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:17
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:28
 msgid "Free"
 msgstr "Szabad"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:91
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:89
 msgid ""
-"Further information about WireGuard interfaces and peers at <a href=\"http://"
-"wireguard.com\">wireguard.com</a>."
+"Further information about WireGuard interfaces and peers at <a href='http://"
+"wireguard.com'>wireguard.com</a>."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:45
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:130
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:186
 msgid "GHz"
 msgstr "GHz"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:29
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:36
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:91
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:77
 msgid "GPRS only"
 msgstr "Csak GPRS"
 
@@ -2111,28 +2166,28 @@ msgstr "Csak GPRS"
 msgid "Gateway"
 msgstr "Átjáró"
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:35
+msgid "Gateway Ports"
+msgstr "Átjáró portok"
+
 #: modules/luci-base/htdocs/luci-static/resources/network.js:9
 #: modules/luci-base/luasrc/model/network.lua:29
 msgid "Gateway address is invalid"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:46
-msgid "Gateway ports"
-msgstr "Átjáró portok"
-
-#: 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:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:275
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:23
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:112
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:103
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:49
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:33
 msgid "General Settings"
 msgstr "Általános beállítások"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:188
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:462
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:175
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:141
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:361
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:504
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:895
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:741
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:796
 msgid "General Setup"
 msgstr "Általános beállítások"
 
@@ -2140,7 +2195,7 @@ msgstr "Általános beállítások"
 msgid "Generate Config"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:945
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1355
 msgid "Generate PMK locally"
 msgstr ""
 
@@ -2148,11 +2203,7 @@ msgstr ""
 msgid "Generate archive"
 msgstr "Archívum készítése"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:63
-msgid "Generic 802.11%s Wireless Controller"
-msgstr "Általános 802.11%s vezeték-nélküli vezérlő"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:26
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:74
 msgid "Given password confirmation did not match, password not changed!"
 msgstr "A megadott jelszavak nem egyeznek, a jelszó nem lett megváltoztatva!"
 
@@ -2160,7 +2211,7 @@ msgstr "A megadott jelszavak nem egyeznek, a jelszó nem lett megváltoztatva!"
 msgid "Global Settings"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:806
 msgid "Global network options"
 msgstr ""
 
@@ -2171,33 +2222,29 @@ msgstr ""
 msgid "Go to password configuration..."
 msgstr "Ugrás a jelszó beállításhoz..."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:857
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1369
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1112
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1616
 #: modules/luci-base/luasrc/view/cbi/full_valueheader.htm:4
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:58
 msgid "Go to relevant configuration page"
 msgstr "Ugrás a tárgyhoz tartozó beállításokhoz"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:38
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:66
 msgid "Group Password"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:11
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:22
 msgid "Guest"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:73
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:81
 msgid "HE.net password"
 msgstr "HE.net jelszó"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:60
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:73
 msgid "HE.net username"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:310
-msgid "HT mode (802.11n)"
-msgstr ""
-
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:16
 msgid "Hang Up"
 msgstr "Befejezés"
@@ -2206,7 +2253,7 @@ msgstr "Befejezés"
 msgid "Header Error Code Errors (HEC)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:103
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 msgid ""
 "Here you can configure the basic aspects of your device like its hostname or "
 "the timezone."
@@ -2214,9 +2261,7 @@ msgstr ""
 "Itt állíthatja be az eszköz alapvető tulajdonságait, mint például a gépnév "
 "vagy az időzóna."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:499
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:556
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:579
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:941
 msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr> elrejtése"
 
@@ -2227,14 +2272,15 @@ msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:92
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1959
 msgid "Host"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:20
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:21
 msgid "Host entries"
 msgstr "Host bejegyzések"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:48
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:171
 msgid "Host expiry timeout"
 msgstr "Host lejárati idő"
 
@@ -2242,45 +2288,45 @@ msgstr "Host lejárati idő"
 msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
 msgstr "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> vagy hálózat"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:118
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:102
 msgid "Host-Uniq tag content"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:71
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:31
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:316
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:25
+#: 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:317
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:26
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:17
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:125
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:116
 msgid "Hostname"
 msgstr "Gépnév"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:12
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:22
 msgid "Hostname to send when requesting DHCP"
 msgstr "DHCP kérés során küldendő gépnév"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:18
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:19
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:67
 msgid "Hostnames"
 msgstr "Gépnevek"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:13
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:24
 msgid "Hybrid"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:45
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:75
 msgid "IKE DH Group"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:41
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:59
 msgid "IP Addresses"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:40
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:80
 msgid "IP Protocol"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:29
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:30
 msgid "IP address"
 msgstr "IP cím"
 
@@ -2299,6 +2345,11 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:20
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:21
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:22
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:79
+#: 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/network.js:89
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:90
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:91
@@ -2306,7 +2357,7 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:93
 #: 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/luasrc/model/cbi/admin_network/proto_ncm.lua:42
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:82
 msgid "IPv4"
 msgstr "IPv4"
 
@@ -2318,24 +2369,23 @@ msgstr "IPv4 tűzfal"
 msgid "IPv4 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:57
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:178
 msgid "IPv4 address"
 msgstr "IPv4 cím"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:26
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:33
 msgid "IPv4 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:104
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:181
 msgid "IPv4 broadcast"
 msgstr "IPv4 broadcast"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:100
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:180
 msgid "IPv4 gateway"
 msgstr "IPv4 átjáró"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:92
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:179
 msgid "IPv4 netmask"
 msgstr "IPv4 hálózati maszk"
 
@@ -2343,24 +2393,25 @@ msgstr "IPv4 hálózati maszk"
 msgid "IPv4 network in address/netmask notation"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:25
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:52
 msgid "IPv4 prefix"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:42
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:30
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:55
 msgid "IPv4 prefix length"
 msgstr "IPv4 prefix hossza"
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:43
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:83
 msgid "IPv4+IPv6"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:72
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:34
 msgid "IPv4-Address"
 msgstr "IPv4-cím"
 
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:10
 #: protocols/luci-proto-ipip/luasrc/model/network/proto_ipip.lua:9
 msgid "IPv4-in-IPv4 (RFC2003)"
 msgstr ""
@@ -2375,6 +2426,16 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:30
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:31
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:32
+#: 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/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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:89
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:90
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:91
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:92
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:95
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:96
@@ -2387,7 +2448,7 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:103
 #: 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/luasrc/model/cbi/admin_network/proto_ncm.lua:44
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:84
 msgid "IPv6"
 msgstr "IPv6"
 
@@ -2399,11 +2460,11 @@ msgstr "IPv6 tűzfal"
 msgid "IPv6 Neighbours"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:464
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:506
 msgid "IPv6 Settings"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:195
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:810
 msgid "IPv6 ULA-Prefix"
 msgstr ""
 
@@ -2411,21 +2472,21 @@ msgstr ""
 msgid "IPv6 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:202
 msgid "IPv6 address"
 msgstr "IPv6 cím"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:23
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:189
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:31
 msgid "IPv6 assignment hint"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:18
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:184
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:27
 msgid "IPv6 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:207
 msgid "IPv6 gateway"
 msgstr "IPv6 átjáró"
 
@@ -2433,22 +2494,22 @@ msgstr "IPv6 átjáró"
 msgid "IPv6 network in address/netmask notation"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:37
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:59
 msgid "IPv6 prefix"
 msgstr "IPv6 előtag"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:34
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:45
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:63
 msgid "IPv6 prefix length"
 msgstr "IPv6 prefix hossz"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:33
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:211
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:57
 msgid "IPv6 routed prefix"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:143
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:215
 msgid "IPv6 suffix"
 msgstr ""
 
@@ -2458,31 +2519,35 @@ msgid "IPv6-Address"
 msgstr "IPv6-cím"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:93
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:104
 msgid "IPv6-PD"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:10
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:13
 msgid "IPv6-in-IPv4 (RFC4213)"
 msgstr "IPv6 IPv4-ben (RFC4213)"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:17
 msgid "IPv6-over-IPv4 (6rd)"
 msgstr "IPv6 IPv4 felett (6rd)"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:15
 msgid "IPv6-over-IPv4 (6to4)"
 msgstr "IPv6 IPv4 felett (6to4)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1075
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1478
 msgid "Identity"
 msgstr "Identitás"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:70
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:96
 msgid "If checked, 1DES is enabled"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:65
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:93
 msgid "If checked, encryption is disabled"
 msgstr ""
 
@@ -2501,36 +2566,36 @@ msgid ""
 msgstr ""
 "Megadás esetén az eszköz csomópont helyett címke alapján történő csatolása"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:27
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:71
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:18
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:82
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:52
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:17
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:29
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:33
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:68
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:85
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:32
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:45
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:45
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:24
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:44
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:116
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:48
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:85
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:65
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:33
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:80
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:108
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:146
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:74
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:97
 msgid "If unchecked, no default route is configured"
 msgstr "Ha nincs kiválasztva, akkor nincs alapértelmezett útvonal beállítva"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:34
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:86
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:35
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:99
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:47
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:60
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:60
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:39
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:59
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:124
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:39
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:116
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:59
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:103
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:64
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:77
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:100
 msgid "If unchecked, the advertised DNS server addresses are ignored"
 msgstr ""
 "Ha nincs kiválasztva, akkor a hirdetett DNS kiszolgáló címeket nem veszi "
@@ -2550,15 +2615,15 @@ msgstr ""
 "nagyon lassú folyamat mivel a swap-eszköz nem érhető el akkora sebességgel "
 "mint a <abbr title=\"Random Access Memory\">RAM</abbr>."
 
-#: 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:102
 msgid "Ignore <code>/etc/hosts</code>"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:471
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:531
 msgid "Ignore interface"
 msgstr "Interfész figyelmen kívül hagyása"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:90
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:91
 msgid "Ignore resolve file"
 msgstr "A resolve fájl figyelmen kívül hagyása"
 
@@ -2576,12 +2641,12 @@ msgid ""
 "blocked. Click \"Continue »\" below to return to the previous page."
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:145
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:118
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:124
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:126
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:97
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:118
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:157
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:141
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:115
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:138
 msgid "Inactivity timeout"
 msgstr "Inaktivitási időtúllépés"
 
@@ -2589,23 +2654,25 @@ msgstr "Inaktivitási időtúllépés"
 msgid "Inbound:"
 msgstr "Bejövő"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:170
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:161
 msgid "Info"
 msgstr "Információk"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:105
 msgid "Information"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:25
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:67
 msgid "Initialization failure"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:34
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:87
 msgid "Initscript"
 msgstr "Indítási állomány"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:26
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:122
 msgid "Initscripts"
 msgstr "Indítási állományok"
 
@@ -2613,55 +2680,74 @@ msgstr "Indítási állományok"
 msgid "Install iputils-traceroute6 for IPv6 traceroute"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:223
-msgid "Install package %q"
-msgstr "%q csomag telepítése"
-
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:220
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:120
 msgid "Install protocol extensions..."
 msgstr "Protokoll kiterjesztések telepítése..."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:416
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:423
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:683
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:687
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:26
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:284
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:342
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:47
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:134
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:14
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:16
 msgid "Interface"
 msgstr "Interfész"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:58
 msgid "Interface %q device auto-migrated from %q to %q."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:356
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:792
 msgid "Interface Configuration"
 msgstr "Interfész beállítások"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:51
-msgid "Interface Overview"
-msgstr "Interfész áttekintés"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:99
+msgid "Interface has %d pending changes"
+msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:57
+msgid "Interface is marked for deletion"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:162
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:3
 msgid "Interface is reconnecting..."
 msgstr "Interfész újracsatlakoztatása..."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:162
+msgid "Interface is shutting down..."
+msgstr "Interfész leállítása..."
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:205
+msgid "Interface is starting..."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:208
+msgid "Interface is stopping..."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:954
 msgid "Interface name"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:34
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:224
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:131
 msgid "Interface not present or not connected yet."
 msgstr "Az interfész nincs jelen, vagy még nincs csatlakoztatva."
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:88
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:16
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:11
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:287
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:54
 msgid "Interfaces"
 msgstr "Interfészek"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:9
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:20
 msgid "Internal"
 msgstr ""
 
@@ -2674,22 +2760,38 @@ msgstr "Belső szerverhiba"
 msgid "Invalid"
 msgstr "Érvénytelen"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:311
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:10
+msgid "Invalid Base64 key string"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:281
 msgid "Invalid VLAN ID given! Only IDs between %d and %d are allowed."
 msgstr ""
 "A megadott VLAN azonosító érvénytelen. Az azonosítónak %d és %d közé kell "
 "esnie."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:307
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:290
 msgid "Invalid VLAN ID given! Only unique IDs are allowed"
 msgstr ""
 "A megadott VLAN azonosító érvénytelen! Minden VLAN-hoz egyedi azonosító kell."
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:195
+msgid "Invalid argument"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:194
+msgid "Invalid command"
+msgstr ""
+
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:80
+msgid "Invalid hexadecimal value"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/sysauth.htm:12
 msgid "Invalid username and/or password! Please try again."
 msgstr "Érvénytelen felhasználói név és/vagy jelszó! Kérem próbálja újra!"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:508
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:950
 msgid "Isolate Clients"
 msgstr ""
 
@@ -2709,15 +2811,15 @@ msgstr ""
 msgid "JavaScript required!"
 msgstr "JavaScript szükséges!"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:52
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1691
 msgid "Join Network"
 msgstr "Csatlakozás a hálózathoz"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:22
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1628
 msgid "Join Network: Wireless Scan"
 msgstr "Csatlakozás a hálózathoz: vezetéknélküli hálózatok keresése"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:19
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1833
 msgid "Joining Network: %q"
 msgstr ""
 
@@ -2734,15 +2836,15 @@ msgstr "Kernel napló"
 msgid "Kernel Version"
 msgstr "Kernel verzió"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:823
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1248
 msgid "Key"
 msgstr "Kulcs"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:851
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:852
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:853
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:854
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:870
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1277
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1278
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1279
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1291
 msgid "Key #%d"
 msgstr "Kulcs #%d"
 
@@ -2750,33 +2852,34 @@ msgstr "Kulcs #%d"
 msgid "Kill"
 msgstr "Kilövés"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:10
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:21
 msgid "L2TP"
 msgstr "L2TP"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:10
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:40
 msgid "L2TP Server"
 msgstr "L2TP szerver"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:100
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:74
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:80
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:74
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:53
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:73
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:131
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:102
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:89
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:112
 msgid "LCP echo failure threshold"
 msgstr "LCP echo hibaküszöb"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:118
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:89
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:95
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:89
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:68
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:91
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:144
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:102
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:125
 msgid "LCP echo interval"
 msgstr "LCP Echo időtartam"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:181
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:902
 msgid "LLC"
 msgstr "LLC"
 
@@ -2785,11 +2888,11 @@ msgstr "LLC"
 msgid "Label"
 msgstr "Címke"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:213
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:204
 msgid "Language"
 msgstr "Nyelv"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:115
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:106
 msgid "Language and Style"
 msgstr "Nyelv és megjelenés"
 
@@ -2797,51 +2900,51 @@ msgstr "Nyelv és megjelenés"
 msgid "Latency"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:10
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:21
 msgid "Leaf"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:369
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:487
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:393
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:543
 msgid "Lease time"
 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:87
 msgid "Leasefile"
 msgstr "Bérlet fájl"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:74
 #: modules/luci-base/luasrc/view/lease_status.htm:95
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:34
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
 msgid "Leasetime remaining"
 msgstr "A bérletből hátralévő idő"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:9
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:20
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:27
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:50
 msgid "Leave empty to autodetect"
 msgstr "Automatikus észleléshez hagyja üresen"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:21
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:45
 msgid "Leave empty to use the current WAN address"
 msgstr "A jelenlegi WAN cím használatához hagyja üresen"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1746
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2299
 msgid "Legend:"
 msgstr "Jelmagyarázat:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:481
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:538
 msgid "Limit"
 msgstr "Korlát"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:287
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:288
 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:299
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:300
 msgid "Limit listening to these interfaces, and loopback."
 msgstr ""
 
@@ -2861,11 +2964,11 @@ msgstr ""
 msgid "Line Uptime"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:101
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:88
 msgid "Link On"
 msgstr "Kapcsolat létrehozva"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:185
 msgid ""
 "List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
 "requests to"
@@ -2873,7 +2976,7 @@ msgstr ""
 "<abbr title=\"Domain Name System\">DNS</abbr> szerverek listája, ahová a "
 "kérések továbbításra kerülnek"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:972
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1377
 msgid ""
 "List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-"
 "Identifier,128-bit key as hex string. <br />This list is used to map R0KH-ID "
@@ -2882,7 +2985,7 @@ msgid ""
 "Association."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:981
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1381
 msgid ""
 "List of R1KHs in the same Mobility Domain. <br />Format: MAC-address,R1KH-ID "
 "as 6 octets with colons,128-bit key as hex string. <br />This list is used "
@@ -2891,33 +2994,33 @@ msgid ""
 "PMK-R1 keys."
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:21
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:82
 msgid "List of SSH key files for auth"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:206
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:207
 msgid "List of domains to allow RFC1918 responses for"
 msgstr "Domain-ok listája, melyeknél az RFC1918 válaszok megengedettek"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:174
 msgid "List of hosts that supply bogus NX domain results"
 msgstr "A hamis NX tartomány eredményeket szolgáltató gépek listája"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:298
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:299
 msgid "Listen Interfaces"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:30
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:54
 msgid "Listen Port"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:15
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:16
 msgid "Listen only on the given interface or, if unspecified, on all"
 msgstr ""
 "Csak a megadott interfészen hallgat, vagy az összesen, amennyiben nem adja "
 "meg"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:216
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:217
 msgid "Listening port for inbound DNS queries"
 msgstr "Szerver port a beérkező DNS kérések számára"
 
@@ -2936,11 +3039,11 @@ msgstr "Átlagos terhelés"
 msgid "Loading"
 msgstr "Betöltés"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:35
-msgid "Loading SSH keys…"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1819
+msgid "Loading directory contents…"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1204
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1296
 #: modules/luci-base/luasrc/view/view.htm:4
 msgid "Loading view…"
 msgstr ""
@@ -2950,41 +3053,41 @@ msgstr ""
 msgid "Local IP address is invalid"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:25
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:86
 msgid "Local IP address to assign"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:10
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:11
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:44
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:39
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:151
 msgid "Local IPv4 address"
 msgstr "Helyi IPv4 cím"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:20
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:54
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:45
 msgid "Local IPv6 address"
 msgstr "Helyi IPv6 cím"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:286
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:287
 msgid "Local Service Only"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:81
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:126
 msgid "Local Startup"
 msgstr "Helyi indítóscript"
 
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:25
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:121
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:112
 msgid "Local Time"
 msgstr "Helyi idő"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:149
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
 msgid "Local domain"
 msgstr "Helyi tartomány"
 
-#: 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:147
 #, fuzzy
 msgid ""
 "Local domain specification. Names matching this domain are never forwarded "
@@ -2994,17 +3097,17 @@ msgstr ""
 "nincsenek 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:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:151
 msgid "Local domain suffix appended to DHCP names and hosts file entries"
 msgstr ""
 "A helyi tartomány utótag csatolása a DHCP nevekhez és hosts fájl "
 "bejegyzésekhez"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
 msgid "Local server"
 msgstr "Helyi kiszolgáló"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:129
 msgid ""
 "Localise hostname depending on the requesting subnet if multiple IPs are "
 "available"
@@ -3012,23 +3115,19 @@ msgstr ""
 "Gépnév lokalizációja a lekérdező alhálózattól függően, ha több IP cím is "
 "elérhető"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:128
 msgid "Localise queries"
 msgstr "Lekérdezések lokalizációja"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:175
-msgid "Locked to channel %s used by: %s"
-msgstr ""
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:168
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:159
 msgid "Log output level"
 msgstr "Napló kimeneti szintje"
 
-#: 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:181
 msgid "Log queries"
 msgstr "Kérések naplózása"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:113
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:104
 msgid "Logging"
 msgstr "Naplózás"
 
@@ -3036,7 +3135,7 @@ msgstr "Naplózás"
 msgid "Login"
 msgstr "Bejelentkezés"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:95
+#: modules/luci-base/luasrc/controller/admin/index.lua:103
 msgid "Logout"
 msgstr "Kijelentkezés"
 
@@ -3044,11 +3143,13 @@ msgstr "Kijelentkezés"
 msgid "Loss of Signal Seconds (LOSS)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:476
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:533
 msgid "Lowest leased address as offset from the network address."
 msgstr "A legalacsonyabb bérleti címnek az interfész címétől való távolsága"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:40
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:75
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:35
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:86
 msgid "MAC"
@@ -3056,32 +3157,32 @@ msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:73
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:109
-#: 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:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1958
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:86
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:133
 msgid "MAC-Address"
 msgstr "MAC-cím"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:457
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:586
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:886
 msgid "MAC-Address Filter"
 msgstr "MAC-cím szűrő"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:142
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:363
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:798
 msgid "MAC-Filter"
 msgstr "MAC-szűrő"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:464
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:590
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:893
 msgid "MAC-List"
 msgstr "MAC-lista"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:13
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:16
 msgid "MAP / LW4over6"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:62
 msgid "MAP rule is invalid"
 msgstr ""
@@ -3099,8 +3200,8 @@ msgid "MHz"
 msgstr "MHz"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:53
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:29
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:66
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:53
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:71
 msgid "MTU"
 msgstr "MTU"
 
@@ -3110,16 +3211,17 @@ msgid ""
 "below:"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:55
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:69
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:26
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:38
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:38
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:108
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:52
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:96
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:83
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:57
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:70
 msgid "Manual"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1949
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2188
 msgid "Master"
 msgstr ""
 
@@ -3127,48 +3229,46 @@ msgstr ""
 msgid "Max. Attainable Data Rate (ATTNDR)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:539
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:982
 msgid "Maximum allowed Listen Interval"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:234
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
 msgid "Maximum allowed number of active DHCP leases"
 msgstr "Aktív DHCP bérletek maximális száma"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:252
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:253
 msgid "Maximum allowed number of concurrent DNS queries"
 msgstr "Párhuzamos DNS kérések maximális száma"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:244
 msgid "Maximum allowed size of EDNS.0 UDP packets"
 msgstr "EDNS.0 UDP csomagok maximális mérete"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:63
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:77
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:57
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:112
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:104
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:93
 msgid "Maximum amount of seconds to wait for the modem to become ready"
 msgstr "Maximális várakozási idő a modem kész állapotára (másodpercben)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:27
-msgid ""
-"Maximum length of the name is 15 characters including the automatic protocol/"
-"bridge prefix (br-, 6in4-, pppoe- etc.)"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:482
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:538
 msgid "Maximum number of leased addresses."
 msgstr "DHCP címek maximális száma"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:761
+msgid "Maximum transmit power"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:21
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:49
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:134
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:187
 #: modules/luci-mod-status/luasrc/view/admin_status/bandwidth.htm:79
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:284
 msgid "Mbit/s"
 msgstr "Mbit/s"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:18
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:32
 msgid "Medium"
 msgstr ""
 
@@ -3180,42 +3280,43 @@ msgstr "Memória"
 msgid "Memory usage (%)"
 msgstr "Memória használat (%)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1952
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2191
 msgid "Mesh"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:372
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:806
 msgid "Mesh Id"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:196
+msgid "Method not found"
+msgstr ""
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:45
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:76
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:104
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:54
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:66
 msgid "Metric"
 msgstr "Metrika"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:154
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:198
 msgid "Mirror monitor port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:153
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:197
 msgid "Mirror source port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:408
-msgid "Missing protocol extension for proto %q"
-msgstr "Hiányzó protokoll kiterjesztés a %q progokoll számára"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:923
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1337
 msgid "Mobility Domain"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:154
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:41
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:74
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:366
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:31
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:360
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:801
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1619
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:175
 msgid "Mode"
 msgstr "Mód"
@@ -3224,39 +3325,38 @@ msgstr "Mód"
 msgid "Model"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:31
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:72
 msgid "Modem default"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:11
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:19
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:11
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:10
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:73
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:73
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:57
 msgid "Modem device"
 msgstr "Modemeszköz"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:24
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:66
 msgid "Modem information query failed"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:62
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:76
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:56
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:112
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:104
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:93
 msgid "Modem init timeout"
 msgstr "Modem inicializálás időtúllépés"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1953
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:452
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:554
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:577
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2192
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:880
 msgid "Monitor"
 msgstr "Ellenőrzés"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:14
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
 msgid "More Characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:802
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1057
 msgid "More…"
 msgstr ""
 
@@ -3269,7 +3369,7 @@ msgstr "Csatolási bejegyzés"
 msgid "Mount Point"
 msgstr "Csatolási pont"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:26
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:36
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:137
 msgid "Mount Points"
@@ -3319,46 +3419,44 @@ msgstr "Mozgatás lefelé"
 msgid "Move up"
 msgstr "Mozgatás felfelé"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:912
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
 msgid "NAS ID"
 msgstr "NAS azonosító"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:57
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:87
 msgid "NAT-T Mode"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:9
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 msgid "NAT64 Prefix"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:31
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:26
 msgid "NCM"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:535
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:589
 msgid "NDP-Proxy"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:43
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:72
 msgid "NT Domain"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:273
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:264
 msgid "NTP server candidates"
 msgstr "Kijelölt NTP kiszolgálók"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:837
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1092
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:27
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:502
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:65
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:553
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:658
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:49
 msgid "Name"
 msgstr "Név"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:17
-msgid "Name of the new interface"
-msgstr "Az új interfész neve"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1808
 msgid "Name of the new network"
 msgstr "Az új hálózat neve"
 
@@ -3366,9 +3464,10 @@ msgstr "Az új hálózat neve"
 msgid "Navigation"
 msgstr "Navigáció"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:62
+#: modules/luci-base/luasrc/controller/admin/index.lua:69
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:108
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:402
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:834
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1957
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:389
 #: modules/luci-mod-status/luasrc/view/admin_status/index/30-network.htm:8
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:73
@@ -3380,7 +3479,7 @@ msgstr "Hálózat"
 msgid "Network Utilities"
 msgstr "Hálózati eszközök"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:278
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:279
 msgid "Network boot image"
 msgstr "Hálózati rendszertöltő lemezkép"
 
@@ -3393,53 +3492,59 @@ msgstr ""
 msgid "Network without interfaces."
 msgstr "Interfészhez nem rendelt hálózat"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:661
+msgid "New interface name…"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:11
 msgid "Next »"
 msgstr "Következő »"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1507
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1754
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:108
 msgid "No"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:453
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:514
 msgid "No DHCP Server configured for this interface"
 msgstr "Ehhez az interfészhez nincs DHCP kiszolgáló beállítva"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1162
+msgid "No Encryption"
+msgstr ""
+
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:89
 msgid "No NAT-T"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:198
+msgid "No data received"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1764
+msgid "No entries in this directory"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/backupfiles.lua:82
 msgid "No files found"
 msgstr "Nem találhatók fájlok"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:550
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:191
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:180
 msgid "No information available"
 msgstr "Nincs elérhető információ"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:8
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:63
 msgid "No matching prefix delegation"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:157
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
 msgid "No negative cache"
 msgstr "Nincs negatív gyorsítótár"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:53
-msgid "No network configured on this device"
-msgstr "Ehhez az eszközhöz nincs hálózat beállítva"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:65
-msgid "No network name specified"
-msgstr "Nincs megadva hálózatnév"
-
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:147
-msgid "No networks in range"
-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
@@ -3447,7 +3552,12 @@ msgstr ""
 msgid "No password set!"
 msgstr "Nincs jelszó!"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:116
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:104
+msgid "No peers defined yet"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:129
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:271
 msgid "No public keys present yet."
 msgstr ""
 
@@ -3455,19 +3565,19 @@ msgstr ""
 msgid "No rules in this chain."
 msgstr "Ez a lánc nem tartalmaz szabályokat"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:150
-msgid "No scan results available yet..."
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:53
+msgid "No signal"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:7
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:756
 msgid "No zone assigned"
 msgstr "Nincs hozzárendelt zóna"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:111
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:35
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:48
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:133
 msgid "Noise"
 msgstr "Zaj"
 
@@ -3483,16 +3593,16 @@ msgstr "Zaj:"
 msgid "Non Pre-emtive CRC errors (CRC_P)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:292
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:293
 msgid "Non-wildcard"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:129
 msgid "None"
 msgstr "Nincs"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:181
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:172
 msgid "Normal"
 msgstr "Normál"
 
@@ -3500,25 +3610,29 @@ msgstr "Normál"
 msgid "Not Found"
 msgstr "Nem található"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:27
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:5
-msgid "Not associated"
-msgstr "Nincs hozzárendelve"
-
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:87
 msgid "Not connected"
 msgstr "Nincs kapcsolódva"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:38
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:139
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:232
+msgid "Not present"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:105
 msgid "Not started on boot"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:26
-msgid "Note: interface name length"
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:201
+msgid "Not supported"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:171
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:162
 msgid "Notice"
 msgstr "Megjegyzés"
 
@@ -3526,62 +3640,50 @@ msgstr "Megjegyzés"
 msgid "Nslookup"
 msgstr "Nslookup"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:261
 msgid "Number of cached DNS entries (max is 10000, 0 is no caching)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:203
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:194
 msgid "Number of parallel threads used for compression"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:40
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:69
 msgid "Obfuscated Group Password"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:35
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:61
 msgid "Obfuscated Password"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:22
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:34
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:40
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:105
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:97
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:49
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:80
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:54
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:67
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:93
 msgid "Obtain IPv6-Address"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:83
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:68
 msgid "Off-State Delay"
 msgstr "Kikapcsolt állapot késleltetés"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:16
-msgid ""
-"On this page you can configure the network interfaces. You can bridge "
-"several interfaces by ticking the \"bridge interfaces\" field and enter the "
-"names of several network interfaces separated by spaces. You can also use "
-"<abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
-"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
-"<samp>eth0.1</samp>)."
-msgstr ""
-"Ezen az oldalon a hálózati interfészeket állíthatja be. Több interfész "
-"között híd hozható létre a \"híd interfész\" mező bejelölésével és több "
-"hálózati interfész nevének szóközzel történő elválasztásával. Lehetőség van "
-"<abbr title=\"Virtual Local Area Network\">VLAN</abbr> jelölés "
-"<samp>INTERFÉSZ.VLANSZÁM</samp> használatára is, pl. <samp>eth0.1</samp>)."
-
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:95
 msgid "On-Link route"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:80
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:64
 msgid "On-State Delay"
 msgstr "Bekapcsolt állapot késleltetés"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:360
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:382
 msgid "One of hostname or mac address must be specified!"
 msgstr "Legalább gépnevet vagy MAC-címet meg kell adni!"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:456
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:462
 msgid "One of the following: %s"
 msgstr ""
 
@@ -3603,34 +3705,35 @@ msgstr "Egy vagy több kötelezően kitöltendő mező üres!"
 msgid "Open list..."
 msgstr "Lista megnyitása..."
 
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:61
 #: protocols/luci-proto-openconnect/luasrc/model/network/proto_openconnect.lua:9
 msgid "OpenConnect (CISCO AnyConnect)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:757
 msgid "Operating frequency"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1753
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2306
 msgid "Option changed"
 msgstr "Beállítás módosítva"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1755
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2308
 msgid "Option removed"
 msgstr "Beállítás eltávolítva"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1140
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:55
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1535
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:66
 msgid "Optional"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:78
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:76
 msgid ""
 "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, "
 "starting with <code>0x</code>."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:144
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:215
 msgid ""
 "Optional. Allowed values: 'eui64', 'random', fixed value like '::1' or "
 "'::1:2'. When IPv6 prefix (like 'a:b:c:d::') is received from a delegating "
@@ -3638,41 +3741,41 @@ msgid ""
 "for the interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:123
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:117
 msgid ""
 "Optional. Base64-encoded preshared key. Adds in an additional layer of "
 "symmetric-key cryptography for post-quantum resistance."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:148
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:126
 msgid "Optional. Create routes for Allowed IPs for this peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:103
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:108
 msgid "Optional. Description of peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:156
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:128
 msgid ""
 "Optional. Host of peer. Names are resolved prior to bringing up the "
 "interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:67
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:71
 msgid "Optional. Maximum Transmission Unit of tunnel interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:166
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:132
 msgid "Optional. Port of peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:175
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:136
 msgid ""
 "Optional. Seconds between keep alive messages. Default is 0 (disabled). "
 "Recommended value if this device is behind a NAT is 25."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:31
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:54
 msgid "Optional. UDP port used for outgoing and incoming packets."
 msgstr ""
 
@@ -3693,7 +3796,7 @@ msgstr "Ki"
 msgid "Outbound:"
 msgstr "Kimenő:"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:26
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:50
 msgid "Output Interface"
 msgstr ""
 
@@ -3702,45 +3805,45 @@ msgstr ""
 msgid "Output zone"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:63
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:155
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:33
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:54
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:54
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:219
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:50
 msgid "Override MAC address"
 msgstr "MAC cím felülbírálása"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:66
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:35
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:56
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:88
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:125
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:131
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:133
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:104
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:61
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:58
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:223
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:44
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:54
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:154
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:71
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:145
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:132
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:110
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:119
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:97
 msgid "Override MTU"
 msgstr "MTU felülbíráslás"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:30
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:63
 msgid "Override TOS"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:25
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:58
 msgid "Override TTL"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:954
 msgid "Override default interface name"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:41
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:167
 msgid "Override the gateway in DHCP responses"
 msgstr "Átjáró felülbírálása a DHCP válaszokban"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:507
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:555
 msgid ""
 "Override the netmask sent to clients. Normally it is calculated from the "
 "subnet that is served."
@@ -3748,7 +3851,7 @@ msgstr ""
 "Az ügyfelek részére küldött hálózati masz felülbírálása. Ez alapesetben a "
 "kiszolgált alhálózat alapján kerül meghatározásra."
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:65
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:179
 msgid "Override the table used for internal routes"
 msgstr "A belső útvonalakhoz használt tábla felülbírálása"
 
@@ -3756,29 +3859,33 @@ msgstr "A belső útvonalakhoz használt tábla felülbírálása"
 msgid "Overview"
 msgstr "Áttekintés"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1606
+msgid "Overwrite existing file \"%s\" ?"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:11
 msgid "Owner"
 msgstr "Tulajdonos"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:42
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:56
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:17
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:28
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:34
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:14
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:18
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:43
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:98
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:45
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:44
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:63
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:82
 msgid "PAP/CHAP password"
 msgstr "PAP/CHAP jelszó"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:39
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:53
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:14
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:11
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:15
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:96
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:88
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:43
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:74
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:42
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:61
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:77
 msgid "PAP/CHAP username"
 msgstr "PAP/CHAP felhasználói név"
 
@@ -3786,9 +3893,9 @@ msgstr "PAP/CHAP felhasználói név"
 msgid "PID"
 msgstr "PID"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:36
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:50
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:26
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:95
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:87
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:68
 msgid "PIN"
 msgstr "PIN"
 
@@ -3797,114 +3904,116 @@ msgstr "PIN"
 msgid "PIN code rejected"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:966
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1372
 msgid "PMK R1 Push"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:43
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:13
 msgid "PPP"
 msgstr "PPP"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:11
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:58
 msgid "PPPoA Encapsulation"
 msgstr "PPPoA beágyazás"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:19
 msgid "PPPoATM"
 msgstr "PPPoATM"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:17
 msgid "PPPoE"
 msgstr "PPPoE"
 
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:28
 #: protocols/luci-proto-pppossh/luasrc/model/network/proto_pppossh.lua:9
 msgid "PPPoSSH"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:15
 msgid "PPtP"
 msgstr "PPtP"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:59
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:73
 msgid "PSID offset"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:56
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:70
 msgid "PSID-bits length"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:123
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:846
 msgid "PTM/EFM (Packet Transfer Mode)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:78
-msgid "Package libiwinfo required!"
-msgstr "A libiwinfo csomag szükséges!"
-
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:45
 msgid "Packets"
 msgstr "Csomagok"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:7
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:756
 msgid "Part of zone %q"
 msgstr "A %q zóna része"
 
 #: modules/luci-base/luasrc/view/sysauth.htm:29
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1111
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:35
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:42
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1514
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:46
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:104
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:58
 msgid "Password"
 msgstr "Jelszó"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:29
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:24
 msgid "Password authentication"
 msgstr "Jelszó hitelesítés"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1019
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1414
 msgid "Password of Private Key"
 msgstr "A privát kulcsh jelszava"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1067
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1471
 msgid "Password of inner Private Key"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:14
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:16
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:18
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:20
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:32
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:34
 msgid "Password strength"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:44
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:107
 msgid "Password2"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:37
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:244
 msgid "Paste or drag SSH key file…"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1000
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1396
 msgid "Path to CA-Certificate"
 msgstr "CA tanúsítvány elérési útja"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1007
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1402
 msgid "Path to Client-Certificate"
 msgstr "Kliens tanúsítvány elérési útja"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1013
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1408
 msgid "Path to Private Key"
 msgstr "A privát kulcs elérési útja"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1049
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1453
 msgid "Path to inner CA-Certificate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1055
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1459
 msgid "Path to inner Client-Certificate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1061
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1465
 msgid "Path to inner Private Key"
 msgstr ""
 
@@ -3922,7 +4031,7 @@ msgstr ""
 msgid "Peak:"
 msgstr "Csúcs:"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:28
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:89
 msgid "Peer IP address to assign"
 msgstr ""
 
@@ -3931,11 +4040,11 @@ msgstr ""
 msgid "Peer address is missing"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:90
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:89
 msgid "Peers"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:50
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:80
 msgid "Perfect Forward Secrecy"
 msgstr ""
 
@@ -3947,7 +4056,11 @@ msgstr "Újraindítás végrehajtása"
 msgid "Perform reset"
 msgstr "Visszaállítás végrehajtása"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:174
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:199
+msgid "Permission denied"
+msgstr ""
+
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:136
 msgid "Persistent Keep Alive"
 msgstr ""
 
@@ -3955,7 +4068,7 @@ msgstr ""
 msgid "Phy Rate:"
 msgstr "Phy sebesség:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:190
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:277
 msgid "Physical Settings"
 msgstr "Fizikai beállítások"
 
@@ -3966,6 +4079,10 @@ msgstr "Ping"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:16
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:17
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:41
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:77
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:87
@@ -3983,15 +4100,19 @@ msgstr "Adja meg a felhasználónevét és a jelszavát."
 msgid "Policy"
 msgstr "Szabály"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:22
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:20
 msgid "Port"
 msgstr "Port"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:18
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:133
+msgid "Port %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:274
 msgid "Port status:"
 msgstr "Port állapot:"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:482
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:488
 msgid "Potential negation of: %s"
 msgstr ""
 
@@ -4003,11 +4124,11 @@ msgstr ""
 msgid "Pre-emtive CRC errors (CRCP_P)"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:32
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:73
 msgid "Prefer LTE"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:33
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:74
 msgid "Prefer UMTS"
 msgstr ""
 
@@ -4015,16 +4136,16 @@ msgstr ""
 msgid "Prefix Delegated"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:122
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:117
 msgid "Preshared Key"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:101
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:75
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:81
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:75
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:54
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:74
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:131
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:102
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:89
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:112
 msgid ""
 "Presume peer to be dead after given amount of LCP echo failures, use 0 to "
 "ignore failures"
@@ -4032,16 +4153,15 @@ msgstr ""
 "A peer halottnak tekintése a megadott számú LCP echo hibák után. Használjon "
 "0-t a hibák figyelmen kívül hagyásához."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:305
 msgid "Prevent listening on these interfaces."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:509
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:562
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:950
 msgid "Prevents client-to-client communication"
 msgstr "Ügyfél-ügyfél közötti kommunikáció megakadályozása"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:18
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:49
 msgid "Private Key"
 msgstr ""
 
@@ -4062,39 +4182,33 @@ msgstr ""
 msgid "Prot."
 msgstr "Prot."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:72
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:349
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:675
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:84
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:216
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:87
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:390
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:31
-msgid "Protocol of the new interface"
-msgstr "Az új interfész protokollja"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:222
-msgid "Protocol support is not installed"
-msgstr "Protokoll támogatás nincs telepítve"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:269
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:260
 msgid "Provide NTP server"
 msgstr "NTP kiszolgáló"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:701
 msgid "Provide new network"
 msgstr "Új hálózat nyújtása"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:451
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:879
 msgid "Pseudo Ad-Hoc (ahdemo)"
 msgstr "Ál Ad-hoc (ahdemo)"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:112
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:113
 msgid "Public Key"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:278
 msgid ""
 "Public keys allow for the passwordless SSH logins with a higher security "
 "compared to the use of plain passwords. In order to upload a new key to the "
@@ -4102,47 +4216,48 @@ msgid ""
 "code> file into the input field."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:139
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:211
 msgid "Public prefix routed to this device for distribution to clients."
 msgstr ""
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:27
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:9
 msgid "QMI Cellular"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:173
 msgid "Quality"
 msgstr "Minőség"
 
-#: 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:171
 msgid ""
 "Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> "
 "servers"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:952
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1360
 msgid "R0 Key Lifetime"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:959
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1366
 msgid "R1 Key Holder"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:58
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:88
 msgid "RFC3947 NAT-T mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:381
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:814
 msgid "RSSI threshold for joining"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:256
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:597
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:778
 msgid "RTS/CTS Threshold"
 msgstr "RTS/CTS küszöbérték"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:41
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:76
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:87
 msgid "RX"
@@ -4152,35 +4267,39 @@ msgstr "RX"
 msgid "RX Rate"
 msgstr "RX sebesség"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:783
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1961
+msgid "RX Rate / TX Rate"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1207
 msgid "Radius-Accounting-Port"
 msgstr "Radius-Naplózási-Port"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:791
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1215
 msgid "Radius-Accounting-Secret"
 msgstr "Radius-Naplózás-Kulcs"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:775
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1199
 msgid "Radius-Accounting-Server"
 msgstr "Radius-Naplózás-Kiszolgáló"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:759
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1183
 msgid "Radius-Authentication-Port"
 msgstr "Radius-Hitelesítés-Port"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:767
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1191
 msgid "Radius-Authentication-Secret"
 msgstr "Radius-Hitelesítés-Kulcs"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:751
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1175
 msgid "Radius-Authentication-Server"
 msgstr "Radius-Hitelesítés-Kiszolgáló"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:119
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:102
 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:83
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:84
 msgid ""
 "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-Server"
@@ -4194,20 +4313,11 @@ msgid ""
 "access to this device if you are connected via this interface"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2
-msgid ""
-"Really delete this wireless network? The deletion cannot be undone! You "
-"might lose access to this device if you are connected via this network."
-msgstr ""
-"Biztosan törli ezt a vezetéknélküli hálózatot? A törlés nem visszavonható!\n"
-"Lehet, hogy elveszti a hozzáférést az eszközhöz, amennyiben ezen a hálózaton "
-"keresztül kapcsolódik."
-
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:40
 msgid "Really reset all changes?"
 msgstr "Biztos, hogy visszavonja az összes módosítást?"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:237
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:354
 msgid "Really switch protocol?"
 msgstr "Biztos, hogy cserélni szeretné a protokollt?"
 
@@ -4231,15 +4341,15 @@ msgstr "Valósidejű forgalom"
 msgid "Realtime Wireless"
 msgstr "Valósidejű vezetéknélküli adatok"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:931
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1343
 msgid "Reassociation Deadline"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:191
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
 msgid "Rebind protection"
 msgstr "Rebind elleni védelem"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:48
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:46
 #: modules/luci-mod-system/luasrc/view/admin_system/reboot.htm:9
 msgid "Reboot"
 msgstr "Újraindítás"
@@ -4253,21 +4363,15 @@ msgstr "Újraindítás..."
 msgid "Reboots the operating system of your device"
 msgstr "Újraindítja az eszköz operációs rendszerét"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:103
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:90
 msgid "Receive"
 msgstr "Fogadás"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:325
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:350
-msgid "Receiver Antenna"
-msgstr "Vevő antenna"
-
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:42
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:59
 msgid "Recommended. IP addresses of the WireGuard interface."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:28
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:300
 msgid "Reconnect this interface"
 msgstr "Csatlakoztassa újra az interfészt"
 
@@ -4275,93 +4379,135 @@ msgstr "Csatlakoztassa újra az interfészt"
 msgid "References"
 msgstr "Hivatkozások"
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:39
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:153
 msgid "Relay"
 msgstr "Átjátszás"
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:36
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:157
 msgid "Relay Bridge"
 msgstr "Átjátszó híd"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:17
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:154
 msgid "Relay between networks"
 msgstr "Átjátszás hálózatok között"
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:64
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:12
 msgid "Relay bridge"
 msgstr "Átjátszó híd"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:18
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:50
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:49
 msgid "Remote IPv4 address"
 msgstr "Távoli IPv4 cím"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:8
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:40
 msgid "Remote IPv4 address or FQDN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:45
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:725
 msgid "Remove"
 msgstr "Eltávolítás"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:53
-msgid "Repeat scan"
-msgstr "Felderítés ismétlése"
-
-#: modules/luci-base/luasrc/view/cbi/upload.htm:11
-msgid "Replace entry"
-msgstr "Bejegyés lecserélése"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:46
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:51
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1806
 msgid "Replace wireless configuration"
 msgstr "Vezetéknélküli beállítások lecserélése"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:8
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:17
 msgid "Request IPv6-address"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:16
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:23
 msgid "Request IPv6-prefix of length"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1141
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:200
+msgid "Request timeout"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1536
 msgid "Required"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:20
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:31
 msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3"
 msgstr ""
 "Szükséges bizonyos internetszolgáltatók esetén, pl. Charter 'DOCSIS 3'-al"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:19
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:49
 msgid "Required. Base64-encoded private key for this interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:113
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:113
 msgid "Required. Base64-encoded public key of peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:136
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:122
 msgid ""
 "Required. IP addresses and prefixes that this peer is allowed to use inside "
 "the tunnel. Usually the peer's tunnel IP addresses and the networks the peer "
 "routes through the tunnel."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1134
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1095
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1096
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1097
+msgid "Requires hostapd"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1101
+msgid "Requires hostapd with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1102
+msgid "Requires hostapd with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1098
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1099
+msgid "Requires hostapd with SAE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1533
 msgid ""
 "Requires the 'full' version of wpad/hostapd and support from the wifi driver "
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:141
 msgid ""
 "Requires upstream supports DNSSEC; verify unsigned domain responses really "
 "come from unsigned domains"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1268
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1109
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1119
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1120
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1121
+msgid "Requires wpa-supplicant"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1113
+msgid "Requires wpa-supplicant with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1114
+msgid "Requires wpa-supplicant with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1111
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1124
+msgid "Requires wpa-supplicant with SAE support"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1355
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:17
 #: modules/luci-base/luasrc/view/cbi/footer.htm:30
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:66
@@ -4377,17 +4523,22 @@ msgstr "Számlálók nullázása"
 msgid "Reset to defaults"
 msgstr "Alapértelmezések visszaállítása"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:68
 msgid "Resolv and Hosts Files"
 msgstr "Resolv és hosts fájlok"
 
-#: 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:94
 msgid "Resolve file"
 msgstr "Resolv fájl"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:28
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:14
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:71
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:197
+msgid "Resource not found"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:302
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:693
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:90
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:112
 msgid "Restart"
 msgstr "Újraindítás"
 
@@ -4395,7 +4546,7 @@ msgstr "Újraindítás"
 msgid "Restart Firewall"
 msgstr "Tűzfal újraindítása"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:14
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:691
 msgid "Restart radio interface"
 msgstr ""
 
@@ -4407,26 +4558,24 @@ msgstr "Visszaállítás"
 msgid "Restore backup"
 msgstr "Biztonsági mentés visszaállítása"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:113
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:114
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:38
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:46
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:119
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:120
 msgid "Reveal/hide password"
 msgstr "Jelszó mutatása/elrejtése"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1774
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2322
 msgid "Revert"
 msgstr "Visszavonás"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1861
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2405
 msgid "Revert changes"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2013
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2554
 msgid "Revert request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1993
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2534
 msgid "Reverting configuration…"
 msgstr ""
 
@@ -4434,7 +4583,7 @@ msgstr ""
 msgid "Root"
 msgstr "Gyökérkönyvtár"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:271
 msgid "Root directory for files served via TFTP"
 msgstr "TFTP-n keresztül megosztott fájlok gyökérkönyvtára"
 
@@ -4442,7 +4591,7 @@ msgstr "TFTP-n keresztül megosztott fájlok gyökérkönyvtára"
 msgid "Root preparation"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:147
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:126
 msgid "Route Allowed IPs"
 msgstr ""
 
@@ -4454,12 +4603,12 @@ msgstr ""
 msgid "Route type"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:523
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:577
 msgid "Router Advertisement-Service"
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:43
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:15
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:27
 msgid "Router Password"
 msgstr "Router jelszó"
 
@@ -4489,7 +4638,7 @@ msgstr "Fájlrendszer ellenőrzés futtatása az eszköz csatolása előtt"
 msgid "Run filesystem check"
 msgstr "Fájlrendszer ellenőrzés futtatása"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:651
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:669
 msgid "Runtime error"
 msgstr ""
 
@@ -4501,31 +4650,31 @@ msgstr ""
 msgid "SNR"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:5
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:18
 msgid "SSH Access"
 msgstr "SSH hozzáférés"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:10
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:70
 msgid "SSH server address"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:13
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:74
 msgid "SSH server port"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:8
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:58
 msgid "SSH username"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:27
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:277
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
 msgid "SSH-Keys"
 msgstr "SSH kulcsok"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:42
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:73
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:29
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1617
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:174
 msgid "SSID"
 msgstr "SSID"
@@ -4534,17 +4683,17 @@ msgstr "SSID"
 msgid "SWAP"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1127
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1262
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1379
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1351
 #: modules/luci-base/luasrc/view/cbi/error.htm:17
 #: modules/luci-base/luasrc/view/cbi/footer.htm:26
 #: modules/luci-base/luasrc/view/cbi/header.htm:17
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:54
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:133
 msgid "Save"
 msgstr "Mentés"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1256
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1768
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1347
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2318
 #: modules/luci-base/luasrc/view/cbi/footer.htm:22
 msgid "Save & Apply"
 msgstr "Mentés & Alkalmazás"
@@ -4557,28 +4706,20 @@ msgstr ""
 msgid "Save mtdblock contents"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
-msgid "Saving keys…"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:698
 msgid "Scan"
 msgstr "Felderítés"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:109
-msgid "Scan request failed"
-msgstr ""
-
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:8
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:39
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:23
 msgid "Scheduled Tasks"
 msgstr "Ütemezett feladatok"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1749
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2302
 msgid "Section added"
 msgstr "Szakasz hozzáadva"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1751
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2304
 msgid "Section removed"
 msgstr "Szakasz eltávolítva"
 
@@ -4593,12 +4734,18 @@ msgid ""
 "your device!"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:119
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:90
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:96
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:90
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:69
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:92
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1516
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1646
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1809
+msgid "Select file…"
+msgstr ""
+
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:144
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:102
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:125
 msgid ""
 "Send LCP echo requests at the given interval in seconds, only effective in "
 "conjunction with failure threshold"
@@ -4606,50 +4753,49 @@ msgstr ""
 "LCP echo kérések küldése a másodpercben megadott időközönként, csak a "
 "hibaküszöbbel együtt van hatása."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:561
-msgid "Separate Clients"
-msgstr "Kliensek szétválasztása"
-
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:62
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:63
 msgid "Server Settings"
 msgstr "Kiszolgáló beállításai"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:26
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:50
 msgid "Service Name"
 msgstr "Szolgáltatás neve"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:25
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:30
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:87
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:71
 msgid "Service Type"
 msgstr "Szolgáltatás típusa"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:55
+#: modules/luci-base/luasrc/controller/admin/index.lua:62
 msgid "Services"
 msgstr "Szolgáltatások"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:815
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:861
 msgid "Session expired"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:83
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:107
 msgid "Set VPN as Default Route"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:258
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:795
 msgid ""
 "Set interface properties regardless of the link carrier (If set, carrier "
 "sense events do not invoke hotplug handlers)."
 msgstr ""
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:23
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:55
 msgid "Setting PLMN failed"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:26
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:68
 msgid "Setting operation mode failed"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:454
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:517
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:527
 msgid "Setup DHCP Server"
 msgstr "DHCP kiszolgáló beállítása"
 
@@ -4661,7 +4807,7 @@ msgstr ""
 msgid "Short GI"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:516
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:960
 msgid "Short Preamble"
 msgstr ""
 
@@ -4673,21 +4819,23 @@ msgstr "Mentendő fájlok aktuális listájának megjelenítése"
 msgid "Show empty chains"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:306
 msgid "Shutdown this interface"
 msgstr "Interfész leállítása"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:111
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:34
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:47
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:132
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1616
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:173
 msgid "Signal"
 msgstr "Jel"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1960
+msgid "Signal / Noise"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:125
 msgid "Signal Attenuation (SATN)"
 msgstr ""
@@ -4700,11 +4848,11 @@ msgstr "Jel:"
 msgid "Size"
 msgstr "Méret"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:259
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:260
 msgid "Size of DNS query cache"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:191
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
 msgid "Size of the ZRam device in megabytes"
 msgstr ""
 
@@ -4721,11 +4869,7 @@ msgstr "Ugrás a tartalomhoz"
 msgid "Skip to navigation"
 msgstr "Ugrás a navigációhoz"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:335
-msgid "Slot time"
-msgstr "Időrés"
-
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1640
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1846
 #: modules/luci-base/luasrc/model/network.lua:1427
 msgid "Software VLAN"
 msgstr ""
@@ -4766,11 +4910,7 @@ msgstr ""
 msgid "Specifies the directory the device is attached to"
 msgstr "Megadja az eszköz csatlakozási könyvtárát."
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:23
-msgid "Specifies the listening port of this <em>Dropbear</em> instance"
-msgstr "Megadja a <em>Dropbear</em> példány portját"
-
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:57
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:175
 msgid ""
 "Specifies the maximum amount of failed ARP requests until hosts are presumed "
 "to be dead"
@@ -4778,52 +4918,60 @@ msgstr ""
 "Megadja a maximális sikertelen ARP kérések számát, amik után a host nem "
 "elérhetőnek tekinthető"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:49
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:171
 msgid ""
 "Specifies the maximum amount of seconds after which hosts are presumed to be "
 "dead"
 msgstr ""
 "Megadja a másodpercek számát, amik után a host nem elérhetőnek tekinthető"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:761
+msgid ""
+"Specifies the maximum transmit power the wireless radio may use. Depending "
+"on regulatory requirements and wireless usage, the actual transmit power may "
+"be reduced by the driver."
+msgstr ""
+
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:63
 msgid "Specify a TOS (Type of Service)."
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:25
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:58
 msgid ""
 "Specify a TTL (Time to Live) for the encapsulating packet other than the "
 "default (64)."
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:53
 msgid ""
 "Specify an MTU (Maximum Transmission Unit) other than the default (1280 "
 "bytes)."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:60
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "Specify the secret encryption key here."
 msgstr "Itt adja meg a titkosító kulcsot."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:475
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:64
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:533
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:89
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:111
 msgid "Start"
 msgstr "Indítás"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:33
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:86
 msgid "Start priority"
 msgstr "Indítás prioritása"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1958
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2499
 msgid "Starting configuration apply…"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1626
 msgid "Starting wireless scan..."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:24
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:120
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
 msgid "Startup"
 msgstr "Rendszerindítás"
 
@@ -4835,20 +4983,21 @@ msgstr "Statikus IPv4 útvonalak"
 msgid "Static IPv6 Routes"
 msgstr "Statikus IPv6 útvonalak"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:70
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:71
 msgid "Static Leases"
 msgstr "Statikus bérletek"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:118
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:73
 msgid "Static Routes"
 msgstr "Statikus útvonalak"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1194
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1384
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:172
 #: modules/luci-base/luasrc/model/network.lua:966
 msgid "Static address"
 msgstr "Statikus cím"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:308
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:309
 msgid ""
 "Static leases are used to assign fixed IP addresses and symbolic hostnames "
 "to DHCP clients. They are also required for non-dynamic interface "
@@ -4859,39 +5008,41 @@ msgstr ""
 "szükségesek, ahol a csak a megfelelő bérlettel rendelkező hosztok kerülnek "
 "kiszolgálásra."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:534
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:977
 msgid "Station inactivity limit"
 msgstr ""
 
 #: modules/luci-base/luasrc/controller/admin/index.lua:40
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:197
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:337
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:746
 #: modules/luci-mod-status/luasrc/view/admin_status/index.htm:128
 msgid "Status"
 msgstr "Állapot"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:35
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:75
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:308
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:91
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:113
 msgid "Stop"
 msgstr "Leállítás"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:165
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Strict order"
 msgstr "Kötött sorrend"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:16
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:30
 msgid "Strong"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1843
 msgid "Submit"
 msgstr "Elküldés"
 
-#: 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:108
 msgid "Suppress logging"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:109
 msgid "Suppress logging of the routine operation of these protocols"
 msgstr ""
 
@@ -4903,42 +5054,44 @@ msgstr ""
 msgid "Swap Entry"
 msgstr "Lapozóterület"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:23
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:5
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:135
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:21
 msgid "Switch"
 msgstr "Kapcsoló"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:129
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:168
 msgid "Switch %q"
 msgstr "Kapcsoló %q"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:128
-msgid "Switch %q (%s)"
-msgstr "Kapcsoló %q (%s)"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:66
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:146
 msgid ""
 "Switch %q has an unknown topology - the VLAN settings might not be accurate."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:146
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:142
 msgid "Switch Port Mask"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1640
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1846
 #: modules/luci-base/luasrc/model/network.lua:1425
 msgid "Switch VLAN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:238
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:355
 msgid "Switch protocol"
 msgstr "Protokoll csere"
 
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:103
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:104
 #: modules/luci-base/luasrc/view/cbi/ipaddr.htm:26
 msgid "Switch to CIDR list notation"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:77
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1547
+msgid "Symbolic link"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:71
 msgid "Sync with NTP-Server"
 msgstr ""
 
@@ -4948,7 +5101,7 @@ msgstr "Szinkronizálás a böngészővel"
 
 #: modules/luci-base/luasrc/controller/admin/index.lua:47
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:14
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:102
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:94
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
 #: modules/luci-mod-system/luasrc/view/admin_system/applyreboot.htm:39
 msgid "System"
@@ -4959,11 +5112,11 @@ msgstr "Rendszer"
 msgid "System Log"
 msgstr "Rendszernapló"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:108
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:99
 msgid "System Properties"
 msgstr "Rendszer tulajdonságok"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:145
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:136
 msgid "System log buffer size"
 msgstr "Rendszer napló puffer méret"
 
@@ -4971,15 +5124,17 @@ msgstr "Rendszer napló puffer méret"
 msgid "TCP:"
 msgstr "TCP:"
 
-#: 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:69
 msgid "TFTP Settings"
 msgstr "TFTP beállítások"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:269
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
 msgid "TFTP server root"
 msgstr "TFTP szerver gyökér könyvtár"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:17
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:77
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:88
 msgid "TX"
@@ -5002,7 +5157,7 @@ msgstr "Tábla"
 msgid "Target"
 msgstr "Cél"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:77
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:103
 msgid "Target network"
 msgstr ""
 
@@ -5010,49 +5165,25 @@ msgstr ""
 msgid "Terminate"
 msgstr "Megszakítás"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:27
-#, fuzzy
-msgid ""
-"The <em>Device Configuration</em> section covers physical settings of the "
-"radio hardware such as channel, transmit power or antenna selection which "
-"are shared among all defined wireless networks (if the radio hardware is "
-"multi-SSID capable). Per network settings like encryption or operation mode "
-"are grouped in the <em>Interface Configuration</em>."
-msgstr ""
-"Az <em>Eszköz beállítások</em> szakasz a rádió hardver fizikai beállításait, "
-"úgymint csatorna, adóteljesítmény vagy antenna választás teszi lehetővé, "
-"amelyen az összes definiált vezeték nélküli hálózat (ha a rádió hardver "
-"multi-SSID képes) osztozik. A hálózatonkénti beállítások, mint az "
-"titkosítás, mód az <em>Interfész beállítások</em> alá vannak csoportosítva."
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:79
-msgid ""
-"The <em>libiwinfo-lua</em> package is not installed. You must install this "
-"component for working wireless configuration!"
-msgstr ""
-"A <em>libiwinfo-lua</em> nincs telepítve. A vezetéknélküli beállítás "
-"működéséhez ezt az összetevőt telepítnei kell."
-
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:66
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:77
 msgid ""
 "The HE.net endpoint update configuration changed, you must now use the plain "
 "username instead of the user ID!"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:8
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:40
 msgid ""
 "The IPv4 address or the fully-qualified domain name of the remote tunnel end."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:27
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:38
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:59
 msgid ""
 "The IPv6 prefix assigned to the provider, usually ends with <code>::</code>"
 msgstr ""
 "A szolgáltatóhoz rendelt IPv6 előtag, általában így végződik: <code>::</code>"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:18
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1808
 msgid ""
 "The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
 "code> and <code>_</code>"
@@ -5068,7 +5199,7 @@ msgstr ""
 msgid "The configuration file could not be loaded due to the following error:"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1849
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2396
 msgid ""
 "The device could not be reached within %d seconds after applying the pending "
 "changes, which caused the configuration to be rolled back for safety "
@@ -5088,6 +5219,12 @@ msgstr ""
 "A memória vagy partíció eszköz fájlja (<abbr title=\"például\">pl.</abbr> "
 "<code>/dev/sda1</code>)"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:612
+msgid ""
+"The existing wireless configuration needs to be changed for LuCI to function "
+"properly."
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:127
 msgid ""
 "The filesystem that was used to format the memory (<abbr title=\"for example"
@@ -5113,47 +5250,50 @@ msgstr ""
 msgid "The following rules are currently active on this system."
 msgstr "Jelenleg a következő szabályok aktívak a rendszeren."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:144
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:154
+msgid "The gateway address must not be a local IP address"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:154
 msgid "The given SSH public key has already been added."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:150
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:160
 msgid ""
 "The given SSH public key is invalid. Please supply proper public RSA or "
 "ECDSA keys."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:67
-msgid "The given network name is not unique"
-msgstr "A megadott hálózati név már létezik"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:664
+msgid "The interface name is already used"
+msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:52
-#, fuzzy
-msgid ""
-"The hardware is not multi-SSID capable and the existing configuration will "
-"be replaced if you proceed."
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:670
+msgid "The interface name is too long"
 msgstr ""
-"A hardver nem képes többszörös SSID kezelésre ezért a meglévő beállítások "
-"elvesznek ha folytatja."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:43
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:31
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:55
 msgid ""
 "The length of the IPv4 prefix in bits, the remainder is used in the IPv6 "
 "addresses."
 msgstr ""
 "Az IPv4 előtag hossza bitekben, a maradék az IPv6 címekben használatos."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:35
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:46
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:63
 msgid "The length of the IPv6 prefix in bits"
 msgstr "Az IPv6 előtag hossza bitekben"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:12
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:44
 msgid "The local IPv4 address over which the tunnel is created (optional)."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:5
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1814
+msgid "The network name is already used"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:135
 msgid ""
 "The network ports on this device can be combined to several <abbr title="
 "\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
@@ -5170,22 +5310,21 @@ msgstr ""
 "hálózathoz (pl. az internet) való kapcsolódásra és a többi port a helyi "
 "hálózathoz."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:77
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:395
-msgid "The selected protocol needs a device assigned"
-msgstr "A kiválasztott protokoll eszköz hozzárendelést igényel"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1149
+msgid "The selected %s mode is incompatible with %s encryption"
+msgstr ""
 
 #: modules/luci-base/luasrc/view/csrftoken.htm:11
 msgid "The submitted security token is invalid or already expired!"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:274
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:272
 msgid ""
 "The system is erasing the configuration partition now and will reboot itself "
 "when finished."
 msgstr "A rendszer most törli a konfigurációs partíciót majd újraindul."
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:195
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:193
 #, fuzzy
 msgid ""
 "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
@@ -5198,7 +5337,7 @@ msgstr ""
 "eléréséhez a beállításaitól függően szükséges lehet a számítógépe IP-címének "
 "megújítása."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:15
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:80
 msgid "The system password has been successfully changed."
 msgstr ""
 
@@ -5210,7 +5349,7 @@ msgstr ""
 "A feltöltött image fájl formátuma nem támogatott. Ügyeljen arra, hogy a "
 "platformjának megfelelő általános image formátumot válassza ki."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:427
 msgid "There are no active leases"
 msgstr ""
 
@@ -5219,18 +5358,10 @@ msgstr ""
 msgid "There are no active leases."
 msgstr "Nincsenek aktív bérletek."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1973
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2514
 msgid "There are no changes to apply"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:204
-msgid ""
-"There is no device assigned yet, please attach a network device in the "
-"\"Physical Settings\" tab"
-msgstr ""
-"Nincs hozzárendelt eszköz, kérem csatoljon egy hálózati eszközt a \"Fizikai "
-"beállítások\" fülön."
-
 #: 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
@@ -5243,11 +5374,19 @@ msgstr ""
 "jelszavát a felhasználói felület védelme és az SSH elérés engélyezése "
 "érdekében."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:19
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:49
 msgid "This IPv4 address of the relay"
 msgstr "Az átjátszó IPV4 címe"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1448
+msgid "This authentication type is not applicable to the selected EAP method."
+msgstr ""
+
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:54
+msgid "This does not look like a valid PEM file"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
 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 "
@@ -5264,13 +5403,13 @@ msgstr ""
 "fájlok és könytárak meghatározására. Az /etc/config/ könyvtárban található "
 "módosított fájlok és bizonyos további beállítások automatikusan megőrződnek."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:74
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:81
 msgid ""
 "This is either the \"Update Key\" configured for the tunnel or the account "
 "password if no update key has been configured"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:82
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:127
 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."
@@ -5278,7 +5417,7 @@ msgstr ""
 "Ez a /etc/rc.local fájl tartalma. Ide írhatja be a saját parancsait (az "
 "'exit 0' sor elé) a boot folyamat végén történő futtatásukhoz."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:27
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:54
 msgid ""
 "This is the local endpoint address assigned by the tunnel broker, it usually "
 "ends with <code>...:2/64</code>"
@@ -5286,7 +5425,7 @@ msgstr ""
 "Ez az alagút közvetítő (tunnel broker) által megadott helyi végpont címe, "
 "általában így végződik: <code>...:2/64</code>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:79
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> in the local network"
@@ -5294,20 +5433,20 @@ msgstr ""
 "Ez az egyetlen <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> a helyi hálózaton"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:73
 msgid "This is the plain username for logging into the account"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:34
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:57
 msgid ""
 "This is the prefix routed to you by the tunnel broker for use by clients"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:9
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:41
 msgid "This is the system crontab in which scheduled tasks can be defined."
 msgstr "Ez a rendszer crontab, amiben időzített feladatok definiálhatók."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:19
+#: 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 ""
@@ -5327,26 +5466,26 @@ msgid "This page gives an overview over currently active network connections."
 msgstr ""
 "Ez a lap a rendszerben jelenleg aktív hálózati kapcsolatokról ad áttekintést."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:726
-#: modules/luci-base/htdocs/luci-static/resources/form.js:809
+#: modules/luci-base/htdocs/luci-static/resources/form.js:936
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1064
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:172
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:32
 msgid "This section contains no values yet"
 msgstr "Ez a szakasz még nem tartalmaz értékeket"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:114
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:105
 msgid "Time Synchronization"
 msgstr "Idő szinkronizálás"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:525
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:968
 msgid "Time interval for rekeying GTK"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:128
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:119
 msgid "Timezone"
 msgstr "Időzóna"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:825
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:871
 msgid "To login…"
 msgstr ""
 
@@ -5361,7 +5500,7 @@ msgstr ""
 "visszaállításához kattintson a \"Visszaállítás végrehajtása\" gombra (csak "
 "squashfs image-ek esetén lehetséges)."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:835
 msgid "Tone"
 msgstr ""
 
@@ -5385,55 +5524,41 @@ msgstr "Forgalom"
 msgid "Transfer"
 msgstr "Átvitel"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:595
-msgid "Transmission Rate"
-msgstr "Átviteli sebesség"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:102
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:89
 msgid "Transmit"
 msgstr "Küldés"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:211
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:273
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:345
-msgid "Transmit Power"
-msgstr "Adóteljesítmény"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:318
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:349
-msgid "Transmitter Antenna"
-msgstr "Adó antenna"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:73
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:57
 msgid "Trigger"
 msgstr "Trigger"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:98
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:84
 msgid "Trigger Mode"
 msgstr "Trigger mód"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:54
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:69
 msgid "Tunnel ID"
 msgstr "Tunnel azonosító"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1643
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1849
 #: modules/luci-base/luasrc/model/network.lua:1430
 msgid "Tunnel Interface"
 msgstr "Tunnel interfész"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:44
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:55
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:76
 msgid "Tunnel Link"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:46
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:131
 msgid "Tx-Power"
 msgstr "Adóteljesítmény"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:32
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:185
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:11
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:43
 msgid "Type"
 msgstr "Típus"
 
@@ -5441,19 +5566,20 @@ msgstr "Típus"
 msgid "UDP:"
 msgstr "UDP:"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:28
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:90
 msgid "UMTS only"
 msgstr "Csak UTMS"
 
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:43
 #: protocols/luci-proto-3g/luasrc/model/network/proto_3g.lua:10
 msgid "UMTS/GPRS/EV-DO"
 msgstr "UMTS/GPRS/EV-DO"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:106
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:93
 msgid "USB Device"
 msgstr "USB eszköz"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:122
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:110
 msgid "USB Ports"
 msgstr ""
 
@@ -5483,10 +5609,12 @@ msgstr ""
 msgid "Unable to dispatch"
 msgstr "Nem indiítható"
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:22
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:54
 msgid "Unable to obtain client ID"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:61
 msgid "Unable to resolve AFTR host name"
 msgstr ""
@@ -5496,21 +5624,31 @@ msgstr ""
 msgid "Unable to resolve peer host name"
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:33
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:68
+msgid "Unable to save contents: %s"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:132
 msgid "Unavailable Seconds (UAS)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1196
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1386
 #: modules/luci-base/luasrc/model/network.lua:970
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1349
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1539
 #: modules/luci-base/luasrc/model/network.lua:1137
 msgid "Unknown error (%s)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1193
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:204
+msgid "Unknown error code"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1383
+#: modules/luci-base/htdocs/luci-static/resources/protocol/none.js:6
 #: modules/luci-base/luasrc/model/network.lua:964
 msgid "Unmanaged"
 msgstr "Nem kezelt"
@@ -5520,22 +5658,30 @@ msgstr "Nem kezelt"
 msgid "Unmount"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:107
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:262
 msgid "Unnamed key"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1708
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2261
 msgid "Unsaved Changes"
 msgstr "El nem mentett módosítások"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:202
+msgid "Unspecified error"
+msgstr ""
+
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:64
 msgid "Unsupported MAP type"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:27
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:69
 msgid "Unsupported modem"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:219
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:119
 msgid "Unsupported protocol type."
 msgstr "Nem támogatott protokoll típus."
@@ -5558,56 +5704,70 @@ msgstr ""
 msgid "Upload archive..."
 msgstr "Archívum feltöltése..."
 
-#: modules/luci-base/luasrc/view/cbi/upload.htm:8
-msgid "Uploaded File"
-msgstr "Feltöltött fájl"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1703
+msgid "Upload file"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1678
+msgid "Upload file…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1623
+msgid "Upload request failed: %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:613
+msgid ""
+"Upon pressing \"Continue\", anonymous \"wifi-iface\" sections will be "
+"assigned with a name in the form <em>wifinet#</em> and the network will be "
+"restarted to apply the updated configuration."
+msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:14
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:74
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:85
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:26
 msgid "Uptime"
 msgstr "Működési idő"
 
-#: 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:83
 msgid "Use <code>/etc/ethers</code>"
 msgstr "<code>/etc/ethers</code> használata"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:40
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:167
 msgid "Use DHCP gateway"
 msgstr "DHCP kiszolgáló használata"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:33
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:85
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:34
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:98
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:46
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:65
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:38
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:58
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:124
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:39
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:116
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:59
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:103
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:64
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:77
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:100
 msgid "Use DNS servers advertised by peer"
 msgstr "Másik fél által ajánlott DNS szerverek használata"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:227
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:233
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:479
 msgid "Use ISO/IEC 3166 alpha2 country codes."
 msgstr "ISO/IEC 3166 alpha2 országkódok használata"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:31
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:100
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:70
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:35
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:51
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:86
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:56
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:97
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:77
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:75
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:92
 msgid "Use MTU on tunnel interface"
 msgstr "MTU használata az alagút interfészen"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:95
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:65
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:30
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:46
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:81
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:93
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:73
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:88
 msgid "Use TTL on tunnel interface"
 msgstr "TTL használata az alagút interfészen"
 
@@ -5619,68 +5779,65 @@ msgstr ""
 msgid "Use as root filesystem (/)"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:19
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:31
 msgid "Use broadcast flag"
 msgstr "Broadcast flag használata"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:253
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:791
 msgid "Use builtin IPv6-management"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:40
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:109
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:92
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:45
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:105
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:53
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:72
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:45
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:65
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:40
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:182
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:127
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:42
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:119
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:62
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:67
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:80
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:103
 msgid "Use custom DNS servers"
 msgstr "Egyedi DNS szerverek használata"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:26
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:70
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:16
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:28
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:84
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:24
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:50
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:23
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:43
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:116
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:33
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:74
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:97
 msgid "Use default gateway"
 msgstr "Alapértelmezett átjáró használata"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:48
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:164
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:77
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:24
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:88
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:58
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:23
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:39
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:74
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:90
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:38
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:57
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:30
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:50
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:45
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:227
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:119
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:51
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:88
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:68
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:52
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:70
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:83
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:111
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:149
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:67
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:111
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:98
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:72
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:85
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:108
 msgid "Use gateway metric"
 msgstr "Átjáró metrikájának használata"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:64
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:179
 msgid "Use routing table"
 msgstr "Útválasztó tábla használata"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:309
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:310
 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 "
@@ -5697,77 +5854,78 @@ msgstr ""
 msgid "Used"
 msgstr "Használt"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:848
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1273
 msgid "Used Key Slot"
 msgstr "Használt kulcsindex"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:913
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
 msgid ""
 "Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not "
 "needed with normal WPA(2)-PSK."
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:48
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:110
 msgid "User certificate (PEM encoded)"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:61
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:122
 msgid "User key (PEM encoded)"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/sysauth.htm:23
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:41
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:32
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:102
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:56
 msgid "Username"
 msgstr "Felhasználónév"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:182
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:903
 msgid "VC-Mux"
 msgstr "VC-Mux"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:851
 msgid "VDSL"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:172
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:169
 msgid "VLANs on %q"
 msgstr "VLAN-ok %q-n"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:171
-msgid "VLANs on %q (%s)"
-msgstr "VLAN-ok %q-n (%s)"
+#: modules/luci-base/luasrc/controller/admin/index.lua:55
+msgid "VPN"
+msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:18
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:42
 msgid "VPN Local address"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:22
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:46
 msgid "VPN Local port"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:15
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:11
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:15
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:58
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:39
 msgid "VPN Server"
 msgstr "VPN kiszolgáló"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:18
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:96
 msgid "VPN Server port"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:37
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:100
 msgid "VPN Server's certificate SHA1 hash"
 msgstr ""
 
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:9
 #: protocols/luci-proto-vpnc/luasrc/model/network/proto_vpnc.lua:9
 msgid "VPNC (CISCO 3000 (and others) VPN)"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:44
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:73
 msgid "Vendor"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:60
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:52
 msgid "Vendor Class to send when requesting DHCP"
 msgstr "DHCP kérés során küldendő 'Vendor Class'"
 
@@ -5775,41 +5933,37 @@ msgstr "DHCP kérés során küldendő 'Vendor Class'"
 msgid "Verify"
 msgstr "Ellenőrzés"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:52
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:76
 msgid "Virtual dynamic interface"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:470
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:471
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:553
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:576
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:908
 msgid "WDS"
 msgstr "WDS"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:667
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1160
 msgid "WEP Open System"
 msgstr "WEP nyílt rendszer"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:668
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1161
 msgid "WEP Shared Key"
 msgstr "WEP megosztott kulcs"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "WEP passphrase"
 msgstr "WEP jelmondat"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:503
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:566
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:945
 msgid "WMM Mode"
 msgstr "WMM mód"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "WPA passphrase"
 msgstr "WPA jelmondat"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:716
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:735
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:740
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1074
 msgid ""
 "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
 "and ad-hoc mode) to be installed."
@@ -5825,7 +5979,7 @@ msgstr "Várakozás a változtatások alkalmazására..."
 msgid "Waiting for command to complete..."
 msgstr "Várakozás a parancs befejezésére..."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1940
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2481
 msgid "Waiting for configuration to get applied… %ds"
 msgstr ""
 
@@ -5833,8 +5987,8 @@ msgstr ""
 msgid "Waiting for device..."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:172
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:163
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:173
 msgid "Warning"
 msgstr "Figyelmeztetés"
 
@@ -5842,11 +5996,11 @@ msgstr "Figyelmeztetés"
 msgid "Warning: There are unsaved changes that will get lost on reboot!"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:20
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:34
 msgid "Weak"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:946
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1355
 msgid ""
 "When using a PSK, the PMK can be automatically generated. When enabled, the "
 "R0/R1 key options below are not applied. Disable this to use the R0 and R1 "
@@ -5854,78 +6008,85 @@ msgid ""
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:383
 msgid "Width"
 msgstr ""
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:17
 #: protocols/luci-proto-wireguard/luasrc/model/network/proto_wireguard.lua:9
 msgid "WireGuard VPN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:58
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:40
 #: modules/luci-mod-status/luasrc/controller/admin/status.lua:28
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:14
 msgid "Wireless"
 msgstr "Vezetéknélküli rész"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1631
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1837
 #: modules/luci-base/luasrc/model/network.lua:1418
 msgid "Wireless Adapter"
 msgstr "Vezetéknélküli adapter"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1617
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2052
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1823
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2288
 #: modules/luci-base/luasrc/model/network.lua:1404
 #: modules/luci-base/luasrc/model/network.lua:1865
 msgid "Wireless Network"
 msgstr "Vezetéknélküli hálózat"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:629
 msgid "Wireless Overview"
 msgstr "Vezetéknélküli rész áttekintés"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:362
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:797
 msgid "Wireless Security"
 msgstr "Vezetéknélküli biztonság"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:54
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:611
+msgid "Wireless configuration migration"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:139
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:179
 msgid "Wireless is disabled"
 msgstr "Vezetéknélküli hálózat le van tiltva"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:54
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:139
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:179
 msgid "Wireless is not associated"
 msgstr "Vezetéknélküli hálózat nincs kapcsolódva"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:15
-msgid "Wireless is restarting..."
-msgstr "Vezetéknélküli rész újraindítása folyamatban..."
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:752
 msgid "Wireless network is disabled"
 msgstr "Vezetéknélküli hálózat letiltva"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:752
 msgid "Wireless network is enabled"
 msgstr "Vezetéknélküli hálózat engedélyezve"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:182
 msgid "Write received DNS requests to syslog"
 msgstr "A kapott DNS kéréseket írja a rendszernaplóba"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:164
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:155
 msgid "Write system log to file"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1507
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:85
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1754
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:109
 msgid "Yes"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:26
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:943
+msgid ""
+"You appear to be currently connected to the device via the \"%h\" interface. "
+"Do you really want to shut down the interface?"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:123
 msgid ""
 "You can enable or disable installed init scripts here. Changes will applied "
 "after a device reboot.<br /><strong>Warning: If you disable essential init "
@@ -5946,38 +6107,34 @@ msgstr ""
 "Engélyezze a Java Szkripteket a böngészőjében, mert anélkül a LuCI nem fog "
 "megfelelően működni."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:196
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:187
 msgid "ZRam Compression Algorithm"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:203
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:194
 msgid "ZRam Compression Streams"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:189
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:180
 msgid "ZRam Settings"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:191
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
 msgid "ZRam Size"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:229
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:230
 msgid "any"
 msgstr "bármelyik"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:113
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:121
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:126
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:218
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:282
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:321
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:328
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:621
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:37
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:22
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:29
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:121
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:836
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:844
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:849
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1030
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:78
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:48
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:51
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:103
 msgid "auto"
 msgstr "automatikus"
 
@@ -5985,11 +6142,11 @@ msgstr "automatikus"
 msgid "automatic"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:45
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:78
 msgid "baseT"
 msgstr "baseT"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:909
 msgid "bridged"
 msgstr "áthidalt"
 
@@ -6005,22 +6162,21 @@ msgstr ""
 msgid "create:"
 msgstr "új:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:264
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:368
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:678
 msgid "creates a bridge over specified interface(s)"
 msgstr "híd létrehozása a megadott interfész(ek) között"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:277
 msgid "dB"
 msgstr "dB"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:34
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:35
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:46
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:47
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:48
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:131
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:132
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:133
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:277
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:279
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:331
@@ -6032,26 +6188,30 @@ msgstr "dB"
 msgid "dBm"
 msgstr "dBm"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:460
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:587
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:889
 msgid "disable"
 msgstr "letiltás"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:119
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:524
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:530
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:536
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:18
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:578
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:584
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:590
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:25
 msgid "disabled"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:433
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:467
+msgid "driver default"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/lease_status.htm:17
 #: modules/luci-base/luasrc/view/lease_status.htm:46
-#: 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:416
 msgid "expired"
 msgstr "lejárt"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:88
 msgid ""
 "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr>-leases will be stored"
@@ -6065,25 +6225,21 @@ msgstr ""
 msgid "forward"
 msgstr "továbbítás"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:80
 msgid "full-duplex"
 msgstr "full-duplex"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:80
 msgid "half-duplex"
 msgstr "half-duplex"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:559
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:565
 msgid "hexadecimal encoded value"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:138
-msgid "hidden"
-msgstr "rejtett"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:527
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:533
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:538
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:581
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:587
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:592
 msgid "hybrid mode"
 msgstr ""
 
@@ -6091,6 +6247,10 @@ msgstr ""
 msgid "if target is a network"
 msgstr "ha a cél hálózat"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:63
+msgid "ignore"
+msgstr ""
+
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:177
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
@@ -6125,25 +6285,26 @@ msgstr ""
 msgid "key with either 5 or 13 characters"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:94
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:95
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr "helyi <abbr title=\"Domain Name System\">DNS</abbr> fájl"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:952
-msgid "minutes"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1168
+msgid "medium security"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:43
-msgid "mixed WPA/WPA2"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1360
+msgid "minutes"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:225
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:232
 msgid "no"
 msgstr "nem"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:54
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:72
 msgid "no link"
 msgstr "nincs link"
 
@@ -6151,7 +6312,7 @@ msgstr "nincs link"
 msgid "non-empty value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1195
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1446
 msgid "none"
 msgstr "nincs"
 
@@ -6161,7 +6322,9 @@ msgstr "nincs"
 msgid "not present"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:363
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:341
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:776
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:780
 #: 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
@@ -6176,9 +6339,9 @@ msgstr "ki"
 msgid "on"
 msgstr "be"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
-msgid "open"
-msgstr "nyitás"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1169
+msgid "open network"
+msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
@@ -6197,73 +6360,77 @@ msgstr ""
 msgid "positive integer value"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:34
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:56
 msgid "random"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:526
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:532
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:537
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:580
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:586
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:591
 msgid "relay mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:910
 msgid "routed"
 msgstr "irányított"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:525
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:534
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:968
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:977
 msgid "sec"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:525
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:531
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:579
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:585
 msgid "server mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:544
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:597
 msgid "stateful-only"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:542
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:595
 msgid "stateless"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:543
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:596
 msgid "stateless + stateful"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:369
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1167
+msgid "strong security"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:346
 msgid "tagged"
 msgstr "cimkézett"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:932
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1343
 msgid "time units (TUs / 1.024 ms) [1000-65535]"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:549
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:555
 msgid "unique value"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:448
 msgid "unknown"
 msgstr "ismeretlen"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:15
 #: modules/luci-base/luasrc/view/lease_status.htm:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:238
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:390
+#: 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:414
 msgid "unlimited"
 msgstr "korlátlan"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1401
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1648
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:63
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:355
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:378
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:413
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:446
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:512
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:450
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:545
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:53
 #: modules/luci-base/luasrc/view/cbi/network_netlist.htm:38
 msgid "unspecified"
@@ -6273,7 +6440,7 @@ msgstr "nincs meghatározva"
 msgid "unspecified -or- create:"
 msgstr "nincs magadva -vagy- új:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:366
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:344
 msgid "untagged"
 msgstr "cimkézetlen"
 
@@ -6354,8 +6521,8 @@ msgstr ""
 msgid "valid address:port"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:523
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:527
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:529
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:533
 msgid "valid date (YYYY-MM-DD)"
 msgstr ""
 
@@ -6392,7 +6559,7 @@ msgstr ""
 msgid "valid network in address/netmask notation"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:498
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:504
 msgid "valid phone digit (0-9, \"*\", \"#\", \"!\" or \".\")"
 msgstr ""
 
@@ -6405,11 +6572,11 @@ msgstr ""
 msgid "valid port value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:503
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:509
 msgid "valid time (HH:MM:SS)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:425
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:431
 msgid "value between %d and %d characters"
 msgstr ""
 
@@ -6425,14 +6592,23 @@ msgstr ""
 msgid "value smaller or equal to %f"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:430
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:425
+msgid "value with %d characters"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:436
 msgid "value with at least %d characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:435
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:441
 msgid "value with at most %d characters"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1169
+msgid "weak security"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:221
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:232
@@ -6443,6 +6619,201 @@ msgstr "igen"
 msgid "« Back"
 msgstr "« Vissza"
 
+#~ msgid "Specifies the listening port of this <em>Dropbear</em> instance"
+#~ msgstr "Megadja a <em>Dropbear</em> példány portját"
+
+#~ msgid "Switch %q (%s)"
+#~ msgstr "Kapcsoló %q (%s)"
+
+#~ msgid "VLANs on %q (%s)"
+#~ msgstr "VLAN-ok %q-n (%s)"
+
+#~ msgid "Antenna 1"
+#~ msgstr "1-es antenna"
+
+#~ msgid "Antenna 2"
+#~ msgstr "2-es antenna"
+
+#~ msgid "Antenna Configuration"
+#~ msgstr "Antenna beállítások"
+
+#~ msgid "Back to overview"
+#~ msgstr "Vissza az áttekintéshez"
+
+#~ msgid "Back to scan results"
+#~ msgstr "Vissza a felderítési eredményekhez"
+
+#~ msgid "Broadcom 802.11%s Wireless Controller"
+#~ msgstr "Broadcom 802.11%s vezeték-nélküli vezérlő"
+
+#~ msgid "Broadcom BCM%04x 802.11 Wireless Controller"
+#~ msgstr "Broadcom BCM%04x 802.11 vezeték-nélküli vezérlő"
+
+#~ msgid "Common Configuration"
+#~ msgstr "Álatános beállítás"
+
+#~ msgid "Connect"
+#~ msgstr "Kapcsolódás"
+
+#~ msgid "Connection Limit"
+#~ msgstr "Kapcsolati korlát"
+
+#~ msgid "Cover the following interface"
+#~ msgstr "A következő interfészt tartalmazza"
+
+#~ msgid "Cover the following interfaces"
+#~ msgstr "A következő interfészeket tartalmazza"
+
+#~ msgid "Create Interface"
+#~ msgstr "Új interfész"
+
+#~ msgid "Create a bridge over multiple interfaces"
+#~ msgstr "Híd létrehozása több interfész között"
+
+#~ msgid "Diversity"
+#~ msgstr "Diverzitás"
+
+#~ msgid "Edit this interface"
+#~ msgstr "Interfész szerkesztése"
+
+#~ msgid "Frame Bursting"
+#~ msgstr "Keretfűzés"
+
+#~ msgid "Generic 802.11%s Wireless Controller"
+#~ msgstr "Általános 802.11%s vezeték-nélküli vezérlő"
+
+#~ msgid "Install package %q"
+#~ msgstr "%q csomag telepítése"
+
+#~ msgid "Interface Overview"
+#~ msgstr "Interfész áttekintés"
+
+#~ msgid "Missing protocol extension for proto %q"
+#~ msgstr "Hiányzó protokoll kiterjesztés a %q progokoll számára"
+
+#~ msgid "Name of the new interface"
+#~ msgstr "Az új interfész neve"
+
+#~ msgid "No network configured on this device"
+#~ msgstr "Ehhez az eszközhöz nincs hálózat beállítva"
+
+#~ msgid "No network name specified"
+#~ msgstr "Nincs megadva hálózatnév"
+
+#~ msgid "Not associated"
+#~ msgstr "Nincs hozzárendelve"
+
+#~ msgid ""
+#~ "On this page you can configure the network interfaces. You can bridge "
+#~ "several interfaces by ticking the \"bridge interfaces\" field and enter "
+#~ "the names of several network interfaces separated by spaces. You can also "
+#~ "use <abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
+#~ "<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
+#~ "<samp>eth0.1</samp>)."
+#~ msgstr ""
+#~ "Ezen az oldalon a hálózati interfészeket állíthatja be. Több interfész "
+#~ "között híd hozható létre a \"híd interfész\" mező bejelölésével és több "
+#~ "hálózati interfész nevének szóközzel történő elválasztásával. Lehetőség "
+#~ "van <abbr title=\"Virtual Local Area Network\">VLAN</abbr> jelölés "
+#~ "<samp>INTERFÉSZ.VLANSZÁM</samp> használatára is, pl. <samp>eth0.1</samp>)."
+
+#~ msgid "Package libiwinfo required!"
+#~ msgstr "A libiwinfo csomag szükséges!"
+
+#~ msgid "Protocol of the new interface"
+#~ msgstr "Az új interfész protokollja"
+
+#~ msgid "Protocol support is not installed"
+#~ msgstr "Protokoll támogatás nincs telepítve"
+
+#~ msgid ""
+#~ "Really delete this wireless network? The deletion cannot be undone! You "
+#~ "might lose access to this device if you are connected via this network."
+#~ msgstr ""
+#~ "Biztosan törli ezt a vezetéknélküli hálózatot? A törlés nem "
+#~ "visszavonható!\n"
+#~ "Lehet, hogy elveszti a hozzáférést az eszközhöz, amennyiben ezen a "
+#~ "hálózaton keresztül kapcsolódik."
+
+#~ msgid "Receiver Antenna"
+#~ msgstr "Vevő antenna"
+
+#~ msgid "Repeat scan"
+#~ msgstr "Felderítés ismétlése"
+
+#~ msgid "Replace entry"
+#~ msgstr "Bejegyés lecserélése"
+
+#~ msgid "Separate Clients"
+#~ msgstr "Kliensek szétválasztása"
+
+#~ msgid "Slot time"
+#~ msgstr "Időrés"
+
+#, fuzzy
+#~ msgid ""
+#~ "The <em>Device Configuration</em> section covers physical settings of the "
+#~ "radio hardware such as channel, transmit power or antenna selection which "
+#~ "are shared among all defined wireless networks (if the radio hardware is "
+#~ "multi-SSID capable). Per network settings like encryption or operation "
+#~ "mode are grouped in the <em>Interface Configuration</em>."
+#~ msgstr ""
+#~ "Az <em>Eszköz beállítások</em> szakasz a rádió hardver fizikai "
+#~ "beállításait, úgymint csatorna, adóteljesítmény vagy antenna választás "
+#~ "teszi lehetővé, amelyen az összes definiált vezeték nélküli hálózat (ha a "
+#~ "rádió hardver multi-SSID képes) osztozik. A hálózatonkénti beállítások, "
+#~ "mint az titkosítás, mód az <em>Interfész beállítások</em> alá vannak "
+#~ "csoportosítva."
+
+#~ msgid ""
+#~ "The <em>libiwinfo-lua</em> package is not installed. You must install "
+#~ "this component for working wireless configuration!"
+#~ msgstr ""
+#~ "A <em>libiwinfo-lua</em> nincs telepítve. A vezetéknélküli beállítás "
+#~ "működéséhez ezt az összetevőt telepítnei kell."
+
+#~ msgid "The given network name is not unique"
+#~ msgstr "A megadott hálózati név már létezik"
+
+#, fuzzy
+#~ msgid ""
+#~ "The hardware is not multi-SSID capable and the existing configuration "
+#~ "will be replaced if you proceed."
+#~ msgstr ""
+#~ "A hardver nem képes többszörös SSID kezelésre ezért a meglévő beállítások "
+#~ "elvesznek ha folytatja."
+
+#~ msgid "The selected protocol needs a device assigned"
+#~ msgstr "A kiválasztott protokoll eszköz hozzárendelést igényel"
+
+#~ msgid ""
+#~ "There is no device assigned yet, please attach a network device in the "
+#~ "\"Physical Settings\" tab"
+#~ msgstr ""
+#~ "Nincs hozzárendelt eszköz, kérem csatoljon egy hálózati eszközt a "
+#~ "\"Fizikai beállítások\" fülön."
+
+#~ msgid "Transmission Rate"
+#~ msgstr "Átviteli sebesség"
+
+#~ msgid "Transmit Power"
+#~ msgstr "Adóteljesítmény"
+
+#~ msgid "Transmitter Antenna"
+#~ msgstr "Adó antenna"
+
+#~ msgid "Uploaded File"
+#~ msgstr "Feltöltött fájl"
+
+#~ msgid "Wireless is restarting..."
+#~ msgstr "Vezetéknélküli rész újraindítása folyamatban..."
+
+#~ msgid "hidden"
+#~ msgstr "rejtett"
+
+#~ msgid "open"
+#~ msgstr "nyitás"
+
 #~ msgid "Back"
 #~ msgstr "Vissza"
 
@@ -6574,9 +6945,6 @@ msgstr "« Vissza"
 #~ msgid "Hermes 802.11b Wireless Controller"
 #~ msgstr "Hermes 802.11b vezeték nélküli vezérlő"
 
-#~ msgid "Interface is shutting down..."
-#~ msgstr "Interfész leállítása..."
-
 #~ msgid "Interface reconnected"
 #~ msgstr "Interfész újracsatlakoztatva"
 
diff --git a/modules/luci-base/po/it/base.po b/modules/luci-base/po/it/base.po
index 8c19006f5..e419b2105 100644
--- a/modules/luci-base/po/it/base.po
+++ b/modules/luci-base/po/it/base.po
@@ -13,19 +13,20 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.6.10\n"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:133
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:857
 msgid "%.1f dB"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:109
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:122
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 msgid "%d Bit"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1641
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2194
 msgid "%d invalid field(s)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:281
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:31
 msgid "%s is untagged in multiple VLANs!"
 msgstr ""
 
@@ -63,19 +64,19 @@ msgid "-- Additional Field --"
 msgstr "-- Campo aggiuntivo --"
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:258
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1401
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1533
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:250
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:350
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1114
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1648
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1780
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:314
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:414
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1178
 #: modules/luci-base/luasrc/view/cbi/header.htm:5
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:26
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:88
 msgid "-- Please choose --"
 msgstr "-- Per favore scegli --"
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:259
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:351
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1115
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:415
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1179
 #: modules/luci-base/luasrc/view/cbi/header.htm:6
 msgid "-- custom --"
 msgstr "-- personalizzato --"
@@ -98,7 +99,7 @@ msgstr ""
 msgid "-- please select --"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:382
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:814
 msgid "0 = not using RSSI threshold, 1 = do not change driver default"
 msgstr ""
 
@@ -110,10 +111,11 @@ msgstr "Carico in 1 minuto:"
 msgid "15 Minute Load:"
 msgstr "Carico in 15 minut:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:924
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1337
 msgid "4-character hexadecimal ID"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:11
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:18
 msgid "464XLAT (CLAT)"
 msgstr ""
@@ -122,48 +124,48 @@ msgstr ""
 msgid "5 Minute Load:"
 msgstr "Carico in 5 minuti:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:960
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1366
 msgid "6-octet identifier as a hex string - no colons"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:891
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1310
 msgid "802.11r Fast Transition"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1157
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1567
 msgid "802.11w Association SA Query maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1574
 msgid "802.11w Association SA Query retry timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1133
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1533
 msgid "802.11w Management Frame Protection"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1156
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1567
 msgid "802.11w maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1165
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1574
 msgid "802.11w retry timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:399
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:831
 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:224
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:225
 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:215
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:216
 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:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
 msgid ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
 "order of the resolvfile"
@@ -171,12 +173,12 @@ msgstr ""
 "<abbr title=\"Sistema Nome Dominio\">DNS</abbr> I server che verranno "
 "interrogati nell'ordine del resolv file"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:388
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:820
 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:351
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:373
 #: 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>"
@@ -186,8 +188,8 @@ msgstr "Indirizzo <abbr title=\"Protocollo Internet Versione 4\">IPv4</abbr>"
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
 msgstr "Gateway <abbr title=\"Protocollo Internet Versione 4\">IPv4</abbr>"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:555
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:35
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:506
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr ""
 "Maschera di rete <abbr title=\"Protocollo Internet Versione 4\">IPv4</abbr>"
@@ -204,29 +206,29 @@ 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:378
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:402
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:58
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:35
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:33
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "Configurazione <abbr title=\"Diodo ad Emissione di Luce\">LED</abbr>"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:67
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:51
 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:328
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:329
 #: 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:372
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:233
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:234
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> leases"
@@ -234,7 +236,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:242
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> packet size"
@@ -242,11 +244,11 @@ 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:251
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:252
 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
 msgstr "<abbr title=\"maximal\">Max.</abbr> Richiesta in uso"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:10
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:42
 msgid ""
 "<br/>Note: you need to manually restart the cron service if the crontab file "
 "was empty before editing."
@@ -254,55 +256,59 @@ msgstr ""
 "<br/>Nota: devi riavviare manualmente il servizio cron se il file crontab "
 "era vuoto prima delle modifiche."
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:817
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1605
+msgid "A directory with the same name already exists."
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:863
 msgid "A new login is required since the authentication session expired."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:114
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:837
 msgid "A43C + J43 + A43"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:838
 msgid "A43C + J43 + A43 + V43"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:850
 msgid "ADSL"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:826
 msgid "ANSI T1.413"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:33
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:47
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:23
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:94
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:86
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:67
 msgid "APN"
 msgstr "APN"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:56
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:175
 msgid "ARP retry threshold"
 msgstr "riprova soglia ARP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:122
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:845
 msgid "ATM (Asynchronous Transfer Mode)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:144
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:866
 msgid "ATM Bridges"
 msgstr "Ponti ATM"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:178
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:21
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:898
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:66
 msgid "ATM Virtual Channel Identifier (VCI)"
 msgstr "Identificatore Canale Virtuale ATM (VCI)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:179
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:26
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:899
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:70
 msgid "ATM Virtual Path Identifier (VPI)"
 msgstr "Identificatore Percorso Virtuale ATM (VPI)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:866
 msgid ""
 "ATM bridges expose encapsulated ethernet in AAL5 connections as virtual "
 "Linux network interfaces which can be used in conjunction with DHCP or PPP "
@@ -312,8 +318,8 @@ msgstr ""
 "virtuali si possono interfacciare con le reti virtuali Linux in congiunzione "
 "con la comunicazione DHCP o PPP dell'ISP."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:184
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:905
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:62
 msgid "ATM device number"
 msgstr "Numero dispositivo ATM "
 
@@ -322,17 +328,17 @@ msgid "ATU-C System Vendor ID"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:251
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:495
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:499
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:528
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:532
 msgid "Absent Interface"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:19
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
 msgid "Access Concentrator"
 msgstr "Accesso Concentratore"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:368
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:470
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:802
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
 msgid "Access Point"
 msgstr "Punto di Accesso"
 
@@ -359,7 +365,7 @@ msgid "Active Connections"
 msgstr "Connessioni attive"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:68
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:30
 msgid "Active DHCP Leases"
 msgstr "Contratti attivi DHCP"
 
@@ -367,56 +373,76 @@ msgstr "Contratti attivi DHCP"
 msgid "Active DHCPv6 Leases"
 msgstr "Contratti attivi DHCPv6"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1951
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:370
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:12
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2190
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:804
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:23
 msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:650
-#: modules/luci-base/htdocs/luci-static/resources/form.js:651
-#: modules/luci-base/htdocs/luci-static/resources/form.js:666
-#: modules/luci-base/htdocs/luci-static/resources/form.js:667
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1290
+#: modules/luci-base/htdocs/luci-static/resources/form.js:902
+#: modules/luci-base/htdocs/luci-static/resources/form.js:904
+#: modules/luci-base/htdocs/luci-static/resources/form.js:917
+#: modules/luci-base/htdocs/luci-static/resources/form.js:918
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1539
 #: modules/luci-base/luasrc/view/cbi/nsection.htm:25
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:189
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:197
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:39
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:47
 #: modules/luci-base/luasrc/view/cbi/ucisection.htm:54
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:703
 msgid "Add"
 msgstr "Aggiungi"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:60
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:870
+msgid "Add ATM Bridge"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:92
 msgid "Add IPv4 address…"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:129
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:204
 msgid "Add IPv6 address…"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:143
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:149
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:38
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:47
+msgid "Add LED action"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:215
+msgid "Add VLAN"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:14
+msgid "Add instance"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:153
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:159
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:250
 msgid "Add key"
 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:155
 msgid "Add local domain suffix to names served from hosts files"
 msgstr ""
 "Aggiungere il suffisso di dominio locale ai nomi serviti dal file hosts"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:705
 msgid "Add new interface..."
 msgstr "Aggiungi nuova interfaccia..."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:104
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:99
+msgid "Add peer"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:105
 msgid "Additional Hosts files"
 msgstr "File Hosts Aggiuntivo"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:161
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
 msgid "Additional servers file"
 msgstr ""
 
@@ -443,7 +469,7 @@ msgstr ""
 msgid "Address"
 msgstr "Indirizzo"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:12
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:151
 msgid "Address to access local relay bridge"
 msgstr "Indirizzo per accedere al ponte locale di trasmissione"
 
@@ -452,13 +478,13 @@ msgstr "Indirizzo per accedere al ponte locale di trasmissione"
 msgid "Administration"
 msgstr "Amministrazione"
 
-#: 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:70
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:505
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:896
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:24
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:189
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:463
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:176
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:143
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:364
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:742
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:799
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:50
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:34
 msgid "Advanced Settings"
@@ -468,170 +494,170 @@ msgstr "Opzioni Avanzate"
 msgid "Aggregate Transmit Power(ACTATP)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:175
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:166
 msgid "Alert"
 msgstr "Allerta"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1628
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1834
 #: modules/luci-base/luasrc/model/network.lua:1416
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:54
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:78
 msgid "Alias Interface"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:138
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:66
 msgid "Alias of \"%s\""
 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:170
 msgid "All Servers"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:114
 msgid ""
 "Allocate IP addresses sequentially, starting from the lowest available "
 "address"
 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:113
 msgid "Allocate IP sequentially"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:24
 msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
 msgstr ""
 "Permetti autenticazione <abbr title=\"Secure Shell\">SSH</abbr> tramite "
 "password"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:545
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:987
 msgid "Allow AP mode to disconnect STAs based on low ACK condition"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:462
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:589
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:891
 msgid "Allow all except listed"
 msgstr "Consenti tutti tranne quelli nell'elenco"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:236
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:767
 msgid "Allow legacy 802.11b rates"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:461
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:588
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:890
 msgid "Allow listed only"
 msgstr "Consenti solo quelli nell'elenco"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:198
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:199
 msgid "Allow localhost"
 msgstr "Permetti localhost"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:47
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:35
 msgid "Allow remote hosts to connect to local SSH forwarded ports"
 msgstr ""
 "Permetti agli host remoti di connettersi tramite ssh reindirizzando le porte"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:38
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:30
 msgid "Allow root logins with password"
 msgstr "Permetti l'accesso a root con password"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:39
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:30
 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:199
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:200
 msgid ""
 "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
 msgstr ""
 "Permetti le risposte upstream nell'intervallo 127.0.0.0/8, per esempio nei "
 "servizi RBL"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:135
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:122
 msgid "Allowed IPs"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:549
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:602
 msgid "Always announce default router"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:259
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:782
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
 "option does not comply with IEEE 802.11n-2009!"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:95
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:818
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:119
 msgid "Annex"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:96
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:819
 msgid "Annex A + L + M (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:827
 msgid "Annex A G.992.1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:828
 msgid "Annex A G.992.2"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:829
 msgid "Annex A G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:830
 msgid "Annex A G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:97
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:820
 msgid "Annex B (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:823
 msgid "Annex B G.992.1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:824
 msgid "Annex B G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:102
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:825
 msgid "Annex B G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:98
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:821
 msgid "Annex J (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:831
 msgid "Annex L G.992.3 POTS 1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:99
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:822
 msgid "Annex M (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:109
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:832
 msgid "Annex M G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:833
 msgid "Annex M G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:550
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:602
 msgid "Announce as default router even if no public prefix is available."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:555
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:607
 msgid "Announced DNS domains"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:554
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:606
 msgid "Announced DNS servers"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1093
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1496
 msgid "Anonymous Identity"
 msgstr ""
 
@@ -643,20 +669,6 @@ msgstr ""
 msgid "Anonymous Swap"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:322
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:329
-msgid "Antenna 1"
-msgstr "Antenna 1"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:323
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:330
-msgid "Antenna 2"
-msgstr "Antenna 2"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:246
-msgid "Antenna Configuration"
-msgstr "Configurazione dell'Antenna"
-
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:71
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:160
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:181
@@ -664,11 +676,11 @@ msgstr "Configurazione dell'Antenna"
 msgid "Any zone"
 msgstr "Qualsiasi Zona"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1981
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2522
 msgid "Apply request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1867
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2409
 msgid "Apply unchecked"
 msgstr ""
 
@@ -676,8 +688,8 @@ msgstr ""
 msgid "Architecture"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:19
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:184
+#: 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 ""
@@ -686,13 +698,13 @@ msgstr ""
 msgid "Assign interfaces..."
 msgstr "Assegna Interfacce..."
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:124
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:24
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:189
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:31
 msgid ""
 "Assign prefix parts using this hexadecimal subprefix ID for this interface."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:148
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1967
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:22
 msgid "Associated Stations"
 msgstr "Dispositivi Wi-Fi connessi"
@@ -701,20 +713,20 @@ msgstr "Dispositivi Wi-Fi connessi"
 msgid "Associations"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:39
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:37
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:101
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:64
 msgid "Auth Group"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1027
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1421
 msgid "Authentication"
 msgstr "Autenticazione PEAP"
 
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:29
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:70
 msgid "Authentication Type"
 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:78
 msgid "Authoritative"
 msgstr "Autoritativo"
 
@@ -732,17 +744,19 @@ msgstr "Autorizzazione richiesta"
 msgid "Auto Refresh"
 msgstr "Aggiornamento Automatico"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:53
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:7
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:17
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:67
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:24
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:36
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:42
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:36
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:106
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:24
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:98
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:50
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:94
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:81
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:55
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:68
 msgid "Automatic"
 msgstr "Automatico"
 
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:7
 #: protocols/luci-proto-hnet/luasrc/model/network/proto_hnet.lua:7
 msgid "Automatic Homenet (HNCP)"
 msgstr "Homenet (HNCP) automatico"
@@ -785,21 +799,21 @@ msgstr "Disponibile"
 msgid "Average:"
 msgstr "Media:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:116
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:839
 msgid "B43 + B43C"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:840
 msgid "B43 + B43C + V43"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:48
 msgid "BR / DMR / AFTR"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:43
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:75
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1620
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:176
 msgid "BSSID"
 msgstr "BSSID"
@@ -813,19 +827,11 @@ msgstr "Ritorna alla panoramica"
 msgid "Back to configuration"
 msgstr "Indietro alla configurazione"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:48
-msgid "Back to overview"
-msgstr "Ritorna alla panoramica"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:20
-msgid "Back to scan results"
-msgstr "Ritorno ai risultati della scansione"
-
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:17
 msgid "Backup"
 msgstr "Copia di Sicurezza"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:38
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:36
 msgid "Backup / Flash Firmware"
 msgstr "Copia di Sicurezza / Flash Firmware"
 
@@ -838,11 +844,11 @@ msgid "Bad address specified!"
 msgstr "E' stato specificato un indirizzo errato!"
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:158
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:288
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:368
 msgid "Band"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:261
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:785
 msgid "Beacon Interval"
 msgstr ""
 
@@ -856,79 +862,85 @@ 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:293
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:294
 msgid ""
 "Bind dynamically to interfaces rather than wildcard address (recommended as "
 "linux default)"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:16
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:48
 msgid "Bind interface"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:16
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:48
 msgid "Bind the tunnel to this interface (optional)."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:49
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:134
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:187
 msgid "Bitrate"
 msgstr "Bitrate"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:172
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
 msgid "Bogus NX Domain Override"
 msgstr "Ignora Dominio Bogus NX"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1634
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1840
 #: modules/luci-base/luasrc/model/network.lua:1420
 msgid "Bridge"
 msgstr "Ponte"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:264
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:368
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:678
 msgid "Bridge interfaces"
 msgstr "Interfacce Ponte"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:906
 msgid "Bridge unit number"
 msgstr "Numero Unità Ponte"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:250
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:364
 msgid "Bring up on boot"
 msgstr "Attivare all'avvio"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:35
-msgid "Broadcom 802.11%s Wireless Controller"
-msgstr "Dispositivo Wireless Broadcom 802.11%s"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:45
-msgid "Broadcom BCM%04x 802.11 Wireless Controller"
-msgstr "Dispositivo Wireless Broadcom BCM%04x 802.11"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1697
+msgid "Browse…"
+msgstr ""
 
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:18
 msgid "Buffered"
 msgstr "Buffered"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:75
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:134
 msgid "CA certificate; if empty it will be saved after the first connection."
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:7
+msgid "CLAT configuration failed"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:13
 msgid "CPU usage (%)"
 msgstr "Uso CPU (%)"
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:21
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:53
 msgid "Call failed"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1789
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:14
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:52
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:711
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:948
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1839
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:191
 #: modules/luci-mod-system/luasrc/view/admin_system/upgrade.htm:60
 msgid "Cancel"
 msgstr "Annulla"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:6
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:17
 msgid "Category"
 msgstr "Categoria"
 
@@ -946,13 +958,7 @@ msgstr ""
 msgid "Chain"
 msgstr "Catena"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:9
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:14
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:24
-msgid "Change login password"
-msgstr ""
-
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1744
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 msgid "Changes"
 msgstr "Modifiche"
 
@@ -960,33 +966,23 @@ msgstr "Modifiche"
 msgid "Changes applied."
 msgstr "Modifiche applicate."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2004
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2545
 msgid "Changes have been reverted."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:43
 msgid "Changes the administrator password for accessing the device"
 msgstr "Cambia la password di amministratore per accedere al dispositivo"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:10
-msgid "Changing password…"
-msgstr ""
-
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:162
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:45
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:87
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:174
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:376
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1618
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:186
 msgid "Channel"
 msgstr "Canale"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:119
-msgid ""
-"Channel %d is not available in the %s regulatory domain and has been auto-"
-"adjusted to %d."
-msgstr ""
-
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:229
 msgid "Check"
 msgstr "Verifica"
@@ -995,7 +991,7 @@ msgstr "Verifica"
 msgid "Check filesystems before mount"
 msgstr "Controlla i filesystem prima di montare"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1806
 msgid "Check this option to delete the existing networks from this radio."
 msgstr "Marca questa opzione per cancellare le reti esistenti da questa radio."
 
@@ -1007,8 +1003,8 @@ msgstr "Checksum"
 msgid "Choose mtdblock"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:358
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:443
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1829
 msgid ""
 "Choose the firewall zone you want to assign to this interface. Select "
 "<em>unspecified</em> to remove the interface from the associated zone or "
@@ -1020,7 +1016,7 @@ msgstr ""
 "associata o compilare il campo <em>crea</em> per definire una nuova zona e "
 "collegare l'interfaccia ad esso."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:834
 msgid ""
 "Choose the network(s) you want to attach to this wireless interface or fill "
 "out the <em>create</em> field to define a new network."
@@ -1028,11 +1024,11 @@ msgstr ""
 "Scegliere la/le rete/reti a cui vuoi collegare questa interfaccia wireless o "
 "riempire il campo <em>crea<em> per definire una nuova rete."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:614
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1023
 msgid "Cipher"
 msgstr "Cifratura"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:61
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:91
 msgid "Cisco UDP encapsulation"
 msgstr ""
 
@@ -1050,28 +1046,28 @@ msgid ""
 "FEATURE IS FOR PROFESSIONALS! )"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1950
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:369
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:471
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2189
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:803
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:908
 msgid "Client"
 msgstr "Cliente"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:55
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:52
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:47
 msgid "Client ID to send when requesting DHCP"
 msgstr "ID Cliente da inviare all'interno della richiesta DHCP"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:145
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:151
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:155
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:161
 msgid "Close"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:146
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:119
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:125
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:127
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:98
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:119
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:157
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:141
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:115
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:138
 msgid ""
 "Close inactive connection after the given amount of seconds, use 0 to "
 "persist connection"
@@ -1086,12 +1082,9 @@ msgstr "Scegliere dall'elenco..."
 #: modules/luci-base/luasrc/view/lease_status.htm:77
 #: modules/luci-base/luasrc/view/lease_status.htm:98
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:118
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:37
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:24
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1965
 #: modules/luci-mod-network/luasrc/view/admin_network/iface_status.htm:6
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:40
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:30
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:8
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:398
 #: modules/luci-mod-status/luasrc/view/admin_status/index/30-network.htm:11
 #: modules/luci-mod-status/luasrc/view/admin_status/index/50-dsl.htm:17
@@ -1105,15 +1098,19 @@ msgstr "Raccolgo i dati..."
 msgid "Command"
 msgstr "Comando"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:193
+msgid "Command OK"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:41
+msgid "Command failed"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:64
 msgid "Comment"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:185
-msgid "Common Configuration"
-msgstr "Configurazioni Comuni"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
 msgid ""
 "Complicates key reinstallation attacks on the client side by disabling "
 "retransmission of EAPOL-Key frames that are used to install keys. This "
@@ -1121,13 +1118,14 @@ msgid ""
 "negotiation especially in environments with heavy traffic load."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1744
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 #: modules/luci-base/luasrc/controller/admin/uci.lua:11
 #: modules/luci-mod-system/luasrc/view/admin_system/backupfiles.htm:9
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:13
 msgid "Configuration"
 msgstr "Configurazione"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:21
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:63
 msgid "Configuration failed"
 msgstr ""
@@ -1136,89 +1134,89 @@ msgstr ""
 msgid "Configuration files will be kept"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1915
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2456
 msgid "Configuration has been applied."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1848
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2395
 msgid "Configuration has been rolled back!"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:43
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:942
+msgid "Confirm disconnect"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:50
 msgid "Confirmation"
 msgstr "Conferma"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:32
-msgid "Connect"
-msgstr "Connetti"
-
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:72
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:105
 msgid "Connected"
 msgstr "Connesso"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:338
-msgid "Connection Limit"
-msgstr "Limite connessioni"
-
 #: modules/luci-base/htdocs/luci-static/resources/network.js:7
 #: modules/luci-base/luasrc/model/network.lua:27
 msgid "Connection attempt failed"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:203
+msgid "Connection lost"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/controller/admin/status.lua:32
 msgid "Connections"
 msgstr "Connessioni"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1890
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:66
+msgid "Contents have been saved."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:618
+msgid "Continue"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2431
 msgid ""
 "Could not regain access to the device after applying the configuration "
 "changes. You might need to reconnect if you modified network related "
 "settings such as the IP address or wireless security credentials."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:135
 msgid "Country"
 msgstr "Nazione"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:227
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:233
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:337
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:764
 msgid "Country Code"
 msgstr "Codice Nazione"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:36
-msgid "Cover the following interface"
-msgstr "Coprire la seguente interfaccia"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:43
-msgid "Cover the following interfaces"
-msgstr "Coprire le seguenti interfacce"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:357
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:86
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:443
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1829
 msgid "Create / Assign firewall-zone"
 msgstr "Crea / Assegna zona firewall"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:9
-msgid "Create Interface"
-msgstr "Crea Interfaccia"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:33
-msgid "Create a bridge over multiple interfaces"
-msgstr "Crea un ponte tra interfacce multiple"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:735
+msgid "Create interface"
+msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:174
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:165
 msgid "Critical"
 msgstr "Critico"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:178
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:169
 msgid "Cron Log Level"
 msgstr "Livello di log del Cron"
 
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:519
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:521
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:447
+msgid "Current power"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:552
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:554
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:51
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:53
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:82
@@ -1226,7 +1224,7 @@ msgstr "Livello di log del Cron"
 msgid "Custom Interface"
 msgstr "Interfaccia personalizzata"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:36
 msgid "Custom delegated IPv6-prefix"
 msgstr ""
 
@@ -1236,7 +1234,7 @@ msgid ""
 "this, perform a factory-reset first."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:59
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:41
 msgid ""
 "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
 "\">LED</abbr>s if possible."
@@ -1244,46 +1242,47 @@ msgstr ""
 "Personalizza la configurazione dei <abbr title=\"Light Emitting Diode\">LED</"
 "abbr> del sistema se possibile."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:799
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1223
 msgid "DAE-Client"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:807
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1231
 msgid "DAE-Port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:815
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1239
 msgid "DAE-Secret"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:448
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:459
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:279
 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:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:61
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:62
 msgid "DHCP and DNS"
 msgstr "DHCP e DNS"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1195
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1385
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:16
 #: modules/luci-base/luasrc/model/network.lua:968
 msgid "DHCP client"
 msgstr "Cliente DHCP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:571
 msgid "DHCP-Options"
 msgstr "Opzioni DHCP"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_dhcpv6.lua:7
 msgid "DHCPv6 client"
 msgstr "Cliente DHCPv6"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:540
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:594
 msgid "DHCPv6-Mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:529
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:583
 msgid "DHCPv6-Service"
 msgstr ""
 
@@ -1300,31 +1299,31 @@ msgstr ""
 msgid "DNS"
 msgstr "DNS"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:183
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
 msgid "DNS forwardings"
 msgstr "Inoltri DNS"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:30
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:37
 msgid "DNS-Label / FQDN"
 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:136
 msgid "DNSSEC"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:139
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
 msgid "DNSSEC check unsigned"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:73
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:99
 msgid "DPD Idle Timeout"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:14
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:41
 msgid "DS-Lite AFTR address"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:92
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:815
 #: modules/luci-mod-status/luasrc/view/admin_status/index/50-dsl.htm:14
 msgid "DSL"
 msgstr ""
@@ -1333,11 +1332,11 @@ msgstr ""
 msgid "DSL Status"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:125
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:848
 msgid "DSL line mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:519
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:963
 msgid "DTIM Interval"
 msgstr ""
 
@@ -1349,42 +1348,45 @@ msgstr "DUID"
 msgid "Data Rate"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:169
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:180
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:160
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:171
 msgid "Debug"
 msgstr "Debug"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:759
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:783
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:807
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1183
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1207
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1231
 msgid "Default %d"
 msgstr "Predefinito %d"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:82
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:107
 msgid "Default Route"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:17
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:81
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:51
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:32
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:48
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:85
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:65
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:80
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:108
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:146
 msgid "Default gateway"
 msgstr "Gateway predefinito"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:541
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:594
 msgid "Default is stateless + stateful"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:70
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:54
 msgid "Default state"
 msgstr "Stato Predefinito"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:503
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:553
 msgid "Define a name for this network."
 msgstr "Definisci un nome per questa rete."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:514
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:571
 msgid ""
 "Define additional DHCP options, for example "
 "\"<code>6,192.168.2.1,192.168.2.2</code>\" which advertises different DNS "
@@ -1394,35 +1396,47 @@ msgstr ""
 "\"<code>6,192.168.2.1,192.168.2.2</code>\" fornisce differenti server DNS ai "
 "client."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:705
-#: modules/luci-base/htdocs/luci-static/resources/form.js:958
-#: modules/luci-base/htdocs/luci-static/resources/form.js:959
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1271
+#: modules/luci-base/htdocs/luci-static/resources/form.js:966
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1210
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1216
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1524
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1758
 #: modules/luci-base/luasrc/view/cbi/nsection.htm:11
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:162
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:16
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:41
 msgid "Delete"
 msgstr "Elimina"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:178
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:187
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:193
 msgid "Delete key"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:45
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1654
+msgid "Delete permission denied"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1656
+msgid "Delete request failed: %d %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:723
 msgid "Delete this network"
 msgstr "Rimuovi questa rete"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:519
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:963
 msgid "Delivery Traffic Indication Message Interval"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:102
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:108
 msgid "Description"
 msgstr "Descrizione"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:224
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1754
+msgid "Deselect"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:215
 msgid "Design"
 msgstr "Tema"
 
@@ -1440,10 +1454,12 @@ msgstr ""
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:177
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:43
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:13
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:38
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:73
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:33
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:52
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:85
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:86
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:72
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:154
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:253
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:86
@@ -1451,15 +1467,24 @@ msgstr ""
 msgid "Device"
 msgstr "Dispositivo"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:138
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:737
 msgid "Device Configuration"
 msgstr "Configurazione del dispositivo"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:81
+msgid "Device is not active"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/reboot.htm:23
 msgid "Device is rebooting..."
 msgstr "Dispositivo in riavvio..."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1889
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:167
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:513
+msgid "Device is restarting…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2430
 msgid "Device unreachable!"
 msgstr "Dispositivo irraggiungibile"
 
@@ -1467,26 +1492,26 @@ msgstr "Dispositivo irraggiungibile"
 msgid "Device unreachable! Still waiting for device..."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:123
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:78
 #: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:61
 msgid "Diagnostics"
 msgstr "Diagnostica"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:45
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:60
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:101
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:93
 msgid "Dial number"
 msgstr ""
 
-#: modules/luci-base/luasrc/view/cbi/filebrowser.htm:99
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1554
 msgid "Directory"
 msgstr "Cartella"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:131
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:715
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:754
 msgid "Disable"
 msgstr "Disabilita"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:472
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:531
 msgid ""
 "Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for "
 "this interface."
@@ -1494,71 +1519,66 @@ msgstr ""
 "Disabilita <abbr title=\"Protocollo di Configurazione Host Dinamico\">DHCP</"
 "abbr> per questa interfaccia."
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:64
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:93
 msgid "Disable Encryption"
 msgstr "Disabilita Crittografia"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:530
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:973
 msgid "Disable Inactivity Polling"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:713
 msgid "Disable this network"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:44
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:54
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:68
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:37
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:43
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:37
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1534
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:76
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:107
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:99
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:51
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:95
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:82
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:69
 msgid "Disabled"
 msgstr "Disabilitato"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1139
-msgid "Disabled (default)"
-msgstr "Disabilitato (default)"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:544
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:987
 msgid "Disassociate On Low Acknowledgement"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:193
 msgid "Discard upstream RFC1918 responses"
 msgstr "Ignora risposte RFC1918 upstream"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:92
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:114
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:956
 msgid "Disconnect"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:22
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:64
 msgid "Disconnection attempt failed"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1121
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1762
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1855
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:17
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1375
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1995
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2314
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2401
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1634
 msgid "Dismiss"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:240
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:334
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:770
 msgid "Distance Optimization"
 msgstr "Ottimizzazione distanza"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:241
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:770
 msgid "Distance to farthest network member in meters."
 msgstr "Distanza del membro più lontano della rete in metri."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:347
-msgid "Diversity"
-msgstr "Diversità"
-
-#: 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:61
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
@@ -1569,37 +1589,45 @@ 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:158
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:159
 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:123
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:124
 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:118
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
 msgid "Do not forward reverse lookups for local networks"
 msgstr "Non proseguire con le ricerche inverse per le reti locali."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:173
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1639
+msgid "Do you really want to delete \"%s\" ?"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:188
 msgid "Do you really want to delete the following SSH key?"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1637
+msgid "Do you really want to recursively delete the directory \"%s\" ?"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:74
 msgid "Domain required"
 msgstr "Dominio richiesto"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:205
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:206
 msgid "Domain whitelist"
 msgstr "Elenco Domini consentiti"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:34
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:67
 msgid "Don't Fragment"
 msgstr "Non Frammentare"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:74
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:75
 msgid ""
 "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
 "<abbr title=\"Domain Name System\">DNS</abbr>-Name"
@@ -1619,19 +1647,19 @@ msgstr "Download backup"
 msgid "Download mtdblock"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:853
 msgid "Downstream SNR offset"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:914
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1169
 msgid "Drag to reorder"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:9
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:11
 msgid "Dropbear Instance"
 msgstr "Instanza di Dropbear"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:6
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 msgid ""
 "Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access "
 "and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
@@ -1639,20 +1667,21 @@ msgstr ""
 "Dropbear offre accesso <abbr title=\"Secure Shell\">SSH</abbr> e integra un "
 "server <abbr title=\"Secure Copy\">SCP</abbr>"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:11
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:14
 msgid "Dual-Stack Lite (RFC6333)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:493
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:547
 msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 msgstr ""
 "<abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> dinamico"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:60
 msgid "Dynamic tunnel"
 msgstr "Dynamic tunnel"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:494
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:547
 msgid ""
 "Dynamically allocate DHCP addresses for clients. If disabled, only clients "
 "having static leases will be served."
@@ -1660,21 +1689,21 @@ msgstr ""
 "Fornisci dinamicamente gli indirizzi DHCP ai client. Se disabilitato, solo i "
 "client con un indirizzo statico saranno serviti."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:67
 msgid "EA-bits length"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:990
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1386
 msgid "EAP-Method"
 msgstr "Metodo EAP"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:934
-#: modules/luci-base/htdocs/luci-static/resources/form.js:935
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1199
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1188
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1191
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1450
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:154
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:160
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:38
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:291
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:720
 msgid "Edit"
 msgstr "Modifica"
 
@@ -1684,90 +1713,91 @@ msgid ""
 "reload the page."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:38
-msgid "Edit this interface"
-msgstr "Modifica questa interfaccia"
-
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:718
 msgid "Edit this network"
 msgstr "Modifica questa rete"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:669
+msgid "Edit wireless network"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:167
 msgid "Emergency"
 msgstr "Emergenza"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:127
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:715
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:754
 msgid "Enable"
 msgstr "Abilita"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:414
 msgid ""
 "Enable <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> "
 "snooping"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:271
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:412
 msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 msgstr "Abilita <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:41
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:60
 msgid "Enable HE.net dynamic endpoint update"
 msgstr "Abilitazione aggiornamento endpoint dinamico HE.net"
 
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:51
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:89
 msgid "Enable IPv6 negotiation"
 msgstr "Abilita negoziazione IPv6"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:23
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:35
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:41
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:35
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:37
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:49
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:80
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:54
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:67
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:93
 msgid "Enable IPv6 negotiation on the PPP link"
 msgstr "Attiva la negoziazione IPv6 sul collegamento PPP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:143
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:188
 msgid "Enable Jumbo Frame passthrough"
 msgstr "Abilita Jumbo Frame passthrough"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:244
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:235
 msgid "Enable NTP client"
 msgstr "Attiva il cliente NTP"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:69
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:96
 msgid "Enable Single DES"
 msgstr "Abilita Single DES"
 
-#: 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:267
 msgid "Enable TFTP server"
 msgstr "Abilita il server TFTP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:134
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:180
 msgid "Enable VLAN functionality"
 msgstr "Abilita la funzionalità VLAN"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1595
 msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
 msgstr "Abilita pulsante WPS, richiede WPA(2)-PSK"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1175
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
 msgid "Enable key reinstallation (KRACK) countermeasures"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:138
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:183
 msgid "Enable learning and aging"
 msgstr "Attivare l'apprendimento e l'invecchiamento"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:194
 msgid "Enable mirroring of incoming packets"
 msgstr "Abilita mirroring dei pacchetti in ingresso"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:151
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:195
 msgid "Enable mirroring of outgoing packets"
 msgstr "Abilita mirroring dei pacchetti in uscita"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:34
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:67
 msgid "Enable the DF (Don't Fragment) flag of the encapsulating packets."
 msgstr "Abilita l'opzione DF (non Frammentare) dei pacchetti incapsulati"
 
@@ -1775,7 +1805,7 @@ msgstr "Abilita l'opzione DF (non Frammentare) dei pacchetti incapsulati"
 msgid "Enable this mount"
 msgstr "Abilita questo mount"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:713
 msgid "Enable this network"
 msgstr ""
 
@@ -1783,48 +1813,52 @@ msgstr ""
 msgid "Enable this swap"
 msgstr "Abilita questo swap"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:37
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:88
 msgid "Enable/Disable"
 msgstr "Abilita/Disabilita"
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:76
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:152
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:251
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:41
 msgid "Enabled"
 msgstr "Abilitato"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:277
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:414
 msgid "Enables IGMP snooping on this bridge"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:892
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1310
 msgid ""
 "Enables fast roaming among access points that belong to the same Mobility "
 "Domain"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:272
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:412
 msgid "Enables the Spanning Tree Protocol on this bridge"
 msgstr "Abilita il protocollo di Spanning Tree su questo bridge"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:120
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:180
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:59
+msgid "Encapsulation limit"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:843
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:901
 msgid "Encapsulation mode"
 msgstr "Modalità di incapsulamento"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:76
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:603
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:129
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:992
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1621
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:177
 msgid "Encryption"
 msgstr "Crittografia"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:155
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:128
 msgid "Endpoint Host"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:165
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:132
 msgid "Endpoint Port"
 msgstr ""
 
@@ -1836,16 +1870,21 @@ msgstr ""
 msgid "Enter custom values"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:273
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:271
 msgid "Erasing..."
 msgstr "Cancellazione..."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:95
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:96
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:97
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:98
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:99
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:106
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:107
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:108
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:109
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:110
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:173
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:164
 msgid "Error"
 msgstr "Errore"
 
@@ -1853,24 +1892,28 @@ msgstr "Errore"
 msgid "Errored seconds (ES)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1646
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1852
 #: modules/luci-base/luasrc/model/network.lua:1432
 msgid "Ethernet Adapter"
 msgstr "Scheda di Rete"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1637
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1843
 #: modules/luci-base/luasrc/model/network.lua:1422
 msgid "Ethernet Switch"
 msgstr "Switch di Rete"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:303
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
 msgid "Exclude interfaces"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:153
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
 msgid "Expand hosts"
 msgstr "Espandi gli hosts"
 
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:195
+msgid "Expecting an hexadecimal assignment hint"
+msgstr ""
+
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:59
 msgid "Expecting: %s"
 msgstr ""
@@ -1879,62 +1922,78 @@ msgstr ""
 msgid "Expires"
 msgstr "Scadenze"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:488
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:543
 msgid ""
 "Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
 msgstr ""
 "Tempo di scadenza di indirizzi a contratto, il minimo è di 2 minuti (<code> "
 "2m </code>)."
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:8
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:19
 msgid "External"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:971
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1377
 msgid "External R0 Key Holder List"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:980
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1381
 msgid "External R1 Key Holder List"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:150
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:141
 msgid "External system log server"
 msgstr "Server Log di Sistema esterno"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:155
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:146
 msgid "External system log server port"
 msgstr "Porta Server Log di Sistema esterno"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:160
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:151
 msgid "External system log server protocol"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:18
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:79
 msgid "Extra SSH command options"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:940
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1351
 msgid "FT over DS"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:941
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1352
 msgid "FT over the Air"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:938
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1349
 msgid "FT protocol"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1842
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:82
+msgid "Failed to change the system password."
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2389
 msgid "Failed to confirm apply within %ds, waiting for rollback…"
 msgstr ""
 
-#: modules/luci-base/luasrc/view/cbi/filebrowser.htm:106
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:45
+msgid "Failed to execute \"/etc/init.d/%s %s\" action: %s"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1561
 msgid "File"
 msgstr "File"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:279
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1514
+msgid "File not accessible"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1698
+msgid "Filename"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:280
 msgid "Filename of the boot image advertised to clients"
 msgstr "Nome del file dell'immagine di avvio annunciato ai clienti."
 
@@ -1944,14 +2003,15 @@ 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:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:118
 msgid "Filter private"
 msgstr "Filtra privati"
 
-#: 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:123
 msgid "Filter useless"
 msgstr "Filtra inutili"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:23
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:65
 msgid "Finalizing failed"
 msgstr ""
@@ -1962,7 +2022,7 @@ msgid ""
 "with defaults based on what was detected"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:696
 msgid "Find and join network"
 msgstr "Trova e aggiungi una rete"
 
@@ -1974,11 +2034,11 @@ msgstr "Fine"
 msgid "Firewall"
 msgstr "Firewall"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:77
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:76
 msgid "Firewall Mark"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:193
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:278
 msgid "Firewall Settings"
 msgstr "Impostazioni Firewall"
 
@@ -1986,7 +2046,7 @@ msgstr "Impostazioni Firewall"
 msgid "Firewall Status"
 msgstr "Stato del Firewall"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:137
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:860
 msgid "Firmware File"
 msgstr ""
 
@@ -1994,7 +2054,7 @@ msgstr ""
 msgid "Firmware Version"
 msgstr "Versione del Firmware"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:225
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:226
 msgid "Fixed source port for outbound DNS queries"
 msgstr "Porta di origine fissa per le richieste DNS in uscita"
 
@@ -2014,35 +2074,35 @@ msgstr "Flash immagine nuovo firmware"
 msgid "Flash operations"
 msgstr "Operazioni Flash"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:194
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:192
 msgid "Flashing..."
 msgstr "Flashing..."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:498
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:550
 msgid "Force"
 msgstr "Forza"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:258
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:782
 msgid "Force 40MHz mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:622
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1031
 msgid "Force CCMP (AES)"
 msgstr "Forza CCMP (AES)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:499
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:550
 msgid "Force DHCP on this network even if another server is detected."
 msgstr "Forza DHCP su questa rete, anche se un altro server viene rilevato."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:623
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1032
 msgid "Force TKIP"
 msgstr "Forza TKIP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:624
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1033
 msgid "Force TKIP and CCMP (AES)"
 msgstr "Forza TKIP e CCMP (AES)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:795
 msgid "Force link"
 msgstr "Forza collegamento"
 
@@ -2050,7 +2110,7 @@ msgstr "Forza collegamento"
 msgid "Force upgrade"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:60
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:90
 msgid "Force use of NAT-T"
 msgstr "Forza uso del NAT-T"
 
@@ -2058,7 +2118,7 @@ msgstr "Forza uso del NAT-T"
 msgid "Form token mismatch"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:34
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:164
 msgid "Forward DHCP traffic"
 msgstr "Inoltra il traffico DHCP"
 
@@ -2066,46 +2126,41 @@ msgstr "Inoltra il traffico DHCP"
 msgid "Forward Error Correction Seconds (FECS)"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:28
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:161
 msgid "Forward broadcast traffic"
 msgstr "Inoltra il traffico broadcast"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:375
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:809
 msgid "Forward mesh peer traffic"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:186
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:908
 msgid "Forwarding mode"
 msgstr "Modalità di Inoltro"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:255
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:596
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:774
 msgid "Fragmentation Threshold"
 msgstr "Soglia di frammentazione"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:332
-msgid "Frame Bursting"
-msgstr "Frame Bursting"
-
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:17
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:28
 msgid "Free"
 msgstr "Disponibile"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:91
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:89
 msgid ""
-"Further information about WireGuard interfaces and peers at <a href=\"http://"
-"wireguard.com\">wireguard.com</a>."
+"Further information about WireGuard interfaces and peers at <a href='http://"
+"wireguard.com'>wireguard.com</a>."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:45
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:130
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:186
 msgid "GHz"
 msgstr "GHz"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:29
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:36
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:91
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:77
 msgid "GPRS only"
 msgstr "Solo GPRS"
 
@@ -2114,28 +2169,28 @@ msgstr "Solo GPRS"
 msgid "Gateway"
 msgstr "Gateway"
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:35
+msgid "Gateway Ports"
+msgstr "Porte Gateway"
+
 #: modules/luci-base/htdocs/luci-static/resources/network.js:9
 #: modules/luci-base/luasrc/model/network.lua:29
 msgid "Gateway address is invalid"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:46
-msgid "Gateway ports"
-msgstr "Porte Gateway"
-
-#: 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:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:275
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:23
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:112
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:103
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:49
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:33
 msgid "General Settings"
 msgstr "Opzioni Generali"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:188
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:462
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:175
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:141
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:361
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:504
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:895
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:741
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:796
 msgid "General Setup"
 msgstr "Impostazioni Generali"
 
@@ -2143,7 +2198,7 @@ msgstr "Impostazioni Generali"
 msgid "Generate Config"
 msgstr "Genera Configurazione"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:945
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1355
 msgid "Generate PMK locally"
 msgstr ""
 
@@ -2151,11 +2206,7 @@ msgstr ""
 msgid "Generate archive"
 msgstr "Genera Archivio"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:63
-msgid "Generic 802.11%s Wireless Controller"
-msgstr "Dispositivo Wireless 802.11%s Generico"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:26
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:74
 msgid "Given password confirmation did not match, password not changed!"
 msgstr ""
 "La conferma della password assegnata non ha prodotto risultati, la password "
@@ -2165,7 +2216,7 @@ msgstr ""
 msgid "Global Settings"
 msgstr "Impostazioni Globali"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:806
 msgid "Global network options"
 msgstr "Opzioni rete globale"
 
@@ -2176,33 +2227,29 @@ msgstr "Opzioni rete globale"
 msgid "Go to password configuration..."
 msgstr "Vai alla configurazione della password..."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:857
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1369
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1112
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1616
 #: modules/luci-base/luasrc/view/cbi/full_valueheader.htm:4
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:58
 msgid "Go to relevant configuration page"
 msgstr "Vai alla pagina di configurazione relativa"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:38
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:66
 msgid "Group Password"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:11
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:22
 msgid "Guest"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:73
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:81
 msgid "HE.net password"
 msgstr "Password HE.net"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:60
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:73
 msgid "HE.net username"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:310
-msgid "HT mode (802.11n)"
-msgstr ""
-
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:16
 msgid "Hang Up"
 msgstr "Hangup"
@@ -2211,7 +2258,7 @@ msgstr "Hangup"
 msgid "Header Error Code Errors (HEC)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:103
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 msgid ""
 "Here you can configure the basic aspects of your device like its hostname or "
 "the timezone."
@@ -2219,9 +2266,7 @@ msgstr ""
 "Qui puoi configurare gli aspetti base del tuo dispositivo come l&#39;"
 "hostname o il fuso orario."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:499
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:556
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:579
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:941
 msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "Nascondi <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 
@@ -2232,14 +2277,15 @@ msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:92
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1959
 msgid "Host"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:20
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:21
 msgid "Host entries"
 msgstr "Campi host"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:48
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:171
 msgid "Host expiry timeout"
 msgstr "Timeout scadenza Host"
 
@@ -2248,45 +2294,45 @@ msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
 msgstr ""
 "<abbr title=\"Internet Protocol Address\">IP</abbr> dell&#39;host o rete"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:118
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:102
 msgid "Host-Uniq tag content"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:71
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:31
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:316
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:25
+#: 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:317
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:26
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:17
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:125
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:116
 msgid "Hostname"
 msgstr "Hostname"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:12
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:22
 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:18
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:19
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:67
 msgid "Hostnames"
 msgstr "Hostname"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:13
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:24
 msgid "Hybrid"
 msgstr "Ibrido"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:45
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:75
 msgid "IKE DH Group"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:41
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:59
 msgid "IP Addresses"
 msgstr "Indirizzi IP"
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:40
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:80
 msgid "IP Protocol"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:29
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:30
 msgid "IP address"
 msgstr "Indirizzo IP"
 
@@ -2305,6 +2351,11 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:20
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:21
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:22
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:79
+#: 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/network.js:89
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:90
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:91
@@ -2312,7 +2363,7 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:93
 #: 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/luasrc/model/cbi/admin_network/proto_ncm.lua:42
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:82
 msgid "IPv4"
 msgstr "IPv4"
 
@@ -2324,24 +2375,23 @@ msgstr "IPv4 Firewall"
 msgid "IPv4 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:57
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:178
 msgid "IPv4 address"
 msgstr "Indirizzi IPv4"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:26
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:33
 msgid "IPv4 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:104
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:181
 msgid "IPv4 broadcast"
 msgstr "trasmissione IPv4"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:100
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:180
 msgid "IPv4 gateway"
 msgstr "Gateway IPv4"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:92
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:179
 msgid "IPv4 netmask"
 msgstr "Maschera rete IPv4"
 
@@ -2349,24 +2399,25 @@ msgstr "Maschera rete IPv4"
 msgid "IPv4 network in address/netmask notation"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:25
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:52
 msgid "IPv4 prefix"
 msgstr "Prefisso IPv4"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:42
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:30
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:55
 msgid "IPv4 prefix length"
 msgstr "Lunghezza prefisso IPv4"
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:43
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:83
 msgid "IPv4+IPv6"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:72
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:34
 msgid "IPv4-Address"
 msgstr "Indirizzo-IPv4"
 
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:10
 #: protocols/luci-proto-ipip/luasrc/model/network/proto_ipip.lua:9
 msgid "IPv4-in-IPv4 (RFC2003)"
 msgstr ""
@@ -2381,6 +2432,16 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:30
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:31
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:32
+#: 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/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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:89
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:90
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:91
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:92
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:95
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:96
@@ -2393,7 +2454,7 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:103
 #: 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/luasrc/model/cbi/admin_network/proto_ncm.lua:44
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:84
 msgid "IPv6"
 msgstr "IPv6"
 
@@ -2405,11 +2466,11 @@ msgstr "IPv6 Firewall"
 msgid "IPv6 Neighbours"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:464
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:506
 msgid "IPv6 Settings"
 msgstr "Impostazioni IPv6"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:195
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:810
 msgid "IPv6 ULA-Prefix"
 msgstr ""
 
@@ -2417,21 +2478,21 @@ msgstr ""
 msgid "IPv6 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:202
 msgid "IPv6 address"
 msgstr "Indirizzi IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:23
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:189
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:31
 msgid "IPv6 assignment hint"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:18
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:184
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:27
 msgid "IPv6 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:207
 msgid "IPv6 gateway"
 msgstr "Gateway IPv6"
 
@@ -2439,22 +2500,22 @@ msgstr "Gateway IPv6"
 msgid "IPv6 network in address/netmask notation"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:37
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:59
 msgid "IPv6 prefix"
 msgstr "Prefisso IPv6"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:34
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:45
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:63
 msgid "IPv6 prefix length"
 msgstr "Lunghezza prefisso IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:33
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:211
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:57
 msgid "IPv6 routed prefix"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:143
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:215
 msgid "IPv6 suffix"
 msgstr "Suffisso IPv6"
 
@@ -2464,31 +2525,35 @@ msgid "IPv6-Address"
 msgstr "Indirizzo-IPv6"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:93
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:104
 msgid "IPv6-PD"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:10
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:13
 msgid "IPv6-in-IPv4 (RFC4213)"
 msgstr "IPv6-in-IPv4 (RFC4213)"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:17
 msgid "IPv6-over-IPv4 (6rd)"
 msgstr "IPv6-su-IPv4 (6rd)"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:15
 msgid "IPv6-over-IPv4 (6to4)"
 msgstr "IPv6-su-IPv4 (6to4)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1075
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1478
 msgid "Identity"
 msgstr "Identità PEAP"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:70
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:96
 msgid "If checked, 1DES is enabled"
 msgstr "Se selezionata, 1DES è abilitata"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:65
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:93
 msgid "If checked, encryption is disabled"
 msgstr "Se selezionata, crittografia è disabilitata"
 
@@ -2509,36 +2574,36 @@ msgstr ""
 "Se specificato, montare il dispositivo dall'etichetta della partizione al "
 "posto di un nodo di un dispositivo fisso"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:27
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:71
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:18
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:82
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:52
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:17
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:29
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:33
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:68
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:85
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:32
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:45
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:45
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:24
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:44
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:116
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:48
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:85
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:65
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:33
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:80
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:108
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:146
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:74
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:97
 msgid "If unchecked, no default route is configured"
 msgstr "Se deselezionata, alcun percorso predefinito è configurato"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:34
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:86
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:35
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:99
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:47
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:60
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:60
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:39
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:59
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:124
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:39
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:116
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:59
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:103
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:64
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:77
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:100
 msgid "If unchecked, the advertised DNS server addresses are ignored"
 msgstr ""
 "Se deselezionata, gli indirizzi ai Server DNS annunciati saranno ignorati"
@@ -2558,15 +2623,15 @@ 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:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:102
 msgid "Ignore <code>/etc/hosts</code>"
 msgstr "Ignora <code>/etc/hosts</code>"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:471
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:531
 msgid "Ignore interface"
 msgstr "Ignora interfaccia"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:90
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:91
 msgid "Ignore resolve file"
 msgstr "Ignora file resolv"
 
@@ -2584,12 +2649,12 @@ msgid ""
 "blocked. Click \"Continue »\" below to return to the previous page."
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:145
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:118
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:124
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:126
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:97
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:118
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:157
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:141
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:115
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:138
 msgid "Inactivity timeout"
 msgstr "Tempo di Inattività"
 
@@ -2597,23 +2662,25 @@ msgstr "Tempo di Inattività"
 msgid "Inbound:"
 msgstr "In entrata:"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:170
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:161
 msgid "Info"
 msgstr "Informazioni"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:105
 msgid "Information"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:25
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:67
 msgid "Initialization failure"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:34
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:87
 msgid "Initscript"
 msgstr "Script di avvio"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:26
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:122
 msgid "Initscripts"
 msgstr "Scripts di avvio"
 
@@ -2621,55 +2688,74 @@ msgstr "Scripts di avvio"
 msgid "Install iputils-traceroute6 for IPv6 traceroute"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:223
-msgid "Install package %q"
-msgstr "Installa il pacchetto %q"
-
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:220
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:120
 msgid "Install protocol extensions..."
 msgstr "Installa le estensioni del protocollo..."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:416
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:423
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:683
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:687
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:26
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:284
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:342
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:47
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:134
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:14
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:16
 msgid "Interface"
 msgstr "Interfaccia"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:58
 msgid "Interface %q device auto-migrated from %q to %q."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:356
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:792
 msgid "Interface Configuration"
 msgstr "Configurazione Interfaccia"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:51
-msgid "Interface Overview"
-msgstr "Riassunto Interfaccia"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:99
+msgid "Interface has %d pending changes"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:57
+msgid "Interface is marked for deletion"
+msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:162
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:3
 msgid "Interface is reconnecting..."
 msgstr "L'interfaccia si sta ricollegando..."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:162
+msgid "Interface is shutting down..."
+msgstr "L'intefaccia si sta spegnendo..."
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:205
+msgid "Interface is starting..."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:208
+msgid "Interface is stopping..."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:954
 msgid "Interface name"
 msgstr "Nome Interfaccia"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:34
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:224
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:131
 msgid "Interface not present or not connected yet."
 msgstr "Interfaccia non presente o non ancora connessa."
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:88
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:16
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:11
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:287
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:54
 msgid "Interfaces"
 msgstr "Interfacce"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:9
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:20
 msgid "Internal"
 msgstr "Interno"
 
@@ -2682,19 +2768,35 @@ msgstr "Errore del Server Interno"
 msgid "Invalid"
 msgstr "Valore immesso non valido"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:311
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:10
+msgid "Invalid Base64 key string"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:281
 msgid "Invalid VLAN ID given! Only IDs between %d and %d are allowed."
 msgstr "ID VLAN non valido! Solo gli ID compresi tra %d e %d sono consentiti."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:307
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:290
 msgid "Invalid VLAN ID given! Only unique IDs are allowed"
 msgstr "ID VLAN non valido! Solo gli ID unici sono consentiti"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:195
+msgid "Invalid argument"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:194
+msgid "Invalid command"
+msgstr ""
+
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:80
+msgid "Invalid hexadecimal value"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/sysauth.htm:12
 msgid "Invalid username and/or password! Please try again."
 msgstr "Username o password non validi! Per favore riprova."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:508
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:950
 msgid "Isolate Clients"
 msgstr "Isola Clienti"
 
@@ -2714,15 +2816,15 @@ msgstr ""
 msgid "JavaScript required!"
 msgstr "Richiesto JavaScript!"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:52
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1691
 msgid "Join Network"
 msgstr "Aggiungi Rete"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:22
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1628
 msgid "Join Network: Wireless Scan"
 msgstr "Aggiunta Rete: Rilevamento Wireless"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:19
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1833
 msgid "Joining Network: %q"
 msgstr ""
 
@@ -2739,15 +2841,15 @@ msgstr "Registro del Kernel"
 msgid "Kernel Version"
 msgstr "Versione del Kernel"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:823
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1248
 msgid "Key"
 msgstr "Chiave"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:851
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:852
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:853
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:854
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:870
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1277
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1278
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1279
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1291
 msgid "Key #%d"
 msgstr "Chiave #%d"
 
@@ -2755,33 +2857,34 @@ msgstr "Chiave #%d"
 msgid "Kill"
 msgstr "Uccidi"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:10
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:21
 msgid "L2TP"
 msgstr "L2TP"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:10
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:40
 msgid "L2TP Server"
 msgstr "Server L2TP"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:100
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:74
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:80
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:74
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:53
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:73
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:131
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:102
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:89
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:112
 msgid "LCP echo failure threshold"
 msgstr "Fallimento soglia echo LCP"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:118
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:89
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:95
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:89
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:68
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:91
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:144
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:102
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:125
 msgid "LCP echo interval"
 msgstr "Intervallo echo LCP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:181
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:902
 msgid "LLC"
 msgstr "LLC"
 
@@ -2790,11 +2893,11 @@ msgstr "LLC"
 msgid "Label"
 msgstr "Etichetta"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:213
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:204
 msgid "Language"
 msgstr "Lingua"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:115
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:106
 msgid "Language and Style"
 msgstr "Lingua e Stile"
 
@@ -2802,51 +2905,51 @@ msgstr "Lingua e Stile"
 msgid "Latency"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:10
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:21
 msgid "Leaf"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:369
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:487
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:393
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:543
 msgid "Lease time"
 msgstr "Tempo Contratto"
 
-#: 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:87
 msgid "Leasefile"
 msgstr "File di contratti"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:74
 #: modules/luci-base/luasrc/view/lease_status.htm:95
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:34
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
 msgid "Leasetime remaining"
 msgstr "Tempo contratto residuo"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:9
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:20
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:27
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:50
 msgid "Leave empty to autodetect"
 msgstr "Lasciare vuoto per l'autorilevamento"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:21
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:45
 msgid "Leave empty to use the current WAN address"
 msgstr "Lasciare vuoto per usare l'indirizzo WAN attuale"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1746
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2299
 msgid "Legend:"
 msgstr "Legenda:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:481
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:538
 msgid "Limit"
 msgstr "Limite"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:287
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:288
 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:299
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:300
 msgid "Limit listening to these interfaces, and loopback."
 msgstr ""
 
@@ -2866,11 +2969,11 @@ msgstr ""
 msgid "Line Uptime"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:101
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:88
 msgid "Link On"
 msgstr "Collegamento on"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:185
 msgid ""
 "List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
 "requests to"
@@ -2878,7 +2981,7 @@ msgstr ""
 "Elenco di Server <abbr title=\"Sistema Nome Dimio\">DNS</abbr>a cui "
 "inoltrare le richieste in"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:972
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1377
 msgid ""
 "List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-"
 "Identifier,128-bit key as hex string. <br />This list is used to map R0KH-ID "
@@ -2887,7 +2990,7 @@ msgid ""
 "Association."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:981
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1381
 msgid ""
 "List of R1KHs in the same Mobility Domain. <br />Format: MAC-address,R1KH-ID "
 "as 6 octets with colons,128-bit key as hex string. <br />This list is used "
@@ -2896,31 +2999,31 @@ msgid ""
 "PMK-R1 keys."
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:21
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:82
 msgid "List of SSH key files for auth"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:206
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:207
 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:173
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:174
 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:298
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:299
 msgid "Listen Interfaces"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:30
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:54
 msgid "Listen Port"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:15
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:16
 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:216
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:217
 msgid "Listening port for inbound DNS queries"
 msgstr "Porta di ascolto per le richieste DNS in entrata"
 
@@ -2939,11 +3042,11 @@ msgstr "Carico Medio"
 msgid "Loading"
 msgstr "Caricamento"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:35
-msgid "Loading SSH keys…"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1819
+msgid "Loading directory contents…"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1204
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1296
 #: modules/luci-base/luasrc/view/view.htm:4
 msgid "Loading view…"
 msgstr ""
@@ -2953,41 +3056,41 @@ msgstr ""
 msgid "Local IP address is invalid"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:25
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:86
 msgid "Local IP address to assign"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:10
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:11
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:44
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:39
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:151
 msgid "Local IPv4 address"
 msgstr "Indirizzo IPv4 locale"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:20
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:54
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:45
 msgid "Local IPv6 address"
 msgstr "Indirizzo IPv6 locale"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:286
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:287
 msgid "Local Service Only"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:81
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:126
 msgid "Local Startup"
 msgstr "Avvio Locale"
 
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:25
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:121
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:112
 msgid "Local Time"
 msgstr "Ora locale"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:149
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
 msgid "Local domain"
 msgstr "Dominio 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:147
 #, fuzzy
 msgid ""
 "Local domain specification. Names matching this domain are never forwarded "
@@ -2996,16 +3099,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:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:151
 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:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
 msgid "Local server"
 msgstr "Server Locale"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:129
 msgid ""
 "Localise hostname depending on the requesting subnet if multiple IPs are "
 "available"
@@ -3013,23 +3116,19 @@ 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:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:128
 msgid "Localise queries"
 msgstr "Localizza richieste"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:175
-msgid "Locked to channel %s used by: %s"
-msgstr ""
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:168
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:159
 msgid "Log output level"
 msgstr "Livello di dettaglio registro"
 
-#: 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:181
 msgid "Log queries"
 msgstr "Logga richieste"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:113
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:104
 msgid "Logging"
 msgstr "Logging"
 
@@ -3037,7 +3136,7 @@ msgstr "Logging"
 msgid "Login"
 msgstr "Login"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:95
+#: modules/luci-base/luasrc/controller/admin/index.lua:103
 msgid "Logout"
 msgstr "Slogga"
 
@@ -3045,11 +3144,13 @@ msgstr "Slogga"
 msgid "Loss of Signal Seconds (LOSS)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:476
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:533
 msgid "Lowest leased address as offset from the network address."
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:40
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:75
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:35
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:86
 msgid "MAC"
@@ -3057,32 +3158,32 @@ msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:73
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:109
-#: 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:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1958
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:86
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:133
 msgid "MAC-Address"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:457
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:586
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:886
 msgid "MAC-Address Filter"
 msgstr "Filtro indirizzo MAC"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:142
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:363
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:798
 msgid "MAC-Filter"
 msgstr "Filtro MAC"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:464
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:590
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:893
 msgid "MAC-List"
 msgstr "Lista MAC"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:13
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:16
 msgid "MAP / LW4over6"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:62
 msgid "MAP rule is invalid"
 msgstr ""
@@ -3100,8 +3201,8 @@ msgid "MHz"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:53
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:29
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:66
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:53
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:71
 msgid "MTU"
 msgstr "MTU"
 
@@ -3111,16 +3212,17 @@ msgid ""
 "below:"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:55
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:69
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:26
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:38
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:38
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:108
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:52
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:96
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:83
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:57
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:70
 msgid "Manual"
 msgstr "Manuale"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1949
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2188
 msgid "Master"
 msgstr ""
 
@@ -3128,48 +3230,46 @@ msgstr ""
 msgid "Max. Attainable Data Rate (ATTNDR)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:539
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:982
 msgid "Maximum allowed Listen Interval"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:234
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
 msgid "Maximum allowed number of active DHCP leases"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:252
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:253
 msgid "Maximum allowed number of concurrent DNS queries"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:244
 msgid "Maximum allowed size of EDNS.0 UDP packets"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:63
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:77
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:57
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:112
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:104
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:93
 msgid "Maximum amount of seconds to wait for the modem to become ready"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:27
-msgid ""
-"Maximum length of the name is 15 characters including the automatic protocol/"
-"bridge prefix (br-, 6in4-, pppoe- etc.)"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:482
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:538
 msgid "Maximum number of leased addresses."
 msgstr "Numero massimo indirizzi in contratto"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:761
+msgid "Maximum transmit power"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:21
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:49
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:134
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:187
 #: modules/luci-mod-status/luasrc/view/admin_status/bandwidth.htm:79
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:284
 msgid "Mbit/s"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:18
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:32
 msgid "Medium"
 msgstr ""
 
@@ -3181,42 +3281,43 @@ msgstr "Memoria"
 msgid "Memory usage (%)"
 msgstr "Uso Memoria (%)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1952
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2191
 msgid "Mesh"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:372
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:806
 msgid "Mesh Id"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:196
+msgid "Method not found"
+msgstr ""
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:45
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:76
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:104
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:54
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:66
 msgid "Metric"
 msgstr "Metrica"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:154
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:198
 msgid "Mirror monitor port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:153
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:197
 msgid "Mirror source port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:408
-msgid "Missing protocol extension for proto %q"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:923
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1337
 msgid "Mobility Domain"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:154
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:41
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:74
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:366
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:31
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:360
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:801
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1619
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:175
 msgid "Mode"
 msgstr "Modalità"
@@ -3225,39 +3326,38 @@ msgstr "Modalità"
 msgid "Model"
 msgstr "Modello"
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:31
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:72
 msgid "Modem default"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:11
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:19
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:11
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:10
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:73
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:73
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:57
 msgid "Modem device"
 msgstr "Dispositivo modem"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:24
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:66
 msgid "Modem information query failed"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:62
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:76
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:56
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:112
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:104
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:93
 msgid "Modem init timeout"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1953
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:452
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:554
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:577
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2192
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:880
 msgid "Monitor"
 msgstr "Monitor"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:14
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
 msgid "More Characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:802
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1057
 msgid "More…"
 msgstr ""
 
@@ -3270,7 +3370,7 @@ msgstr "Voce di Mount"
 msgid "Mount Point"
 msgstr "Punto di Mount"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:26
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:36
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:137
 msgid "Mount Points"
@@ -3320,46 +3420,44 @@ msgstr "Muovi giù"
 msgid "Move up"
 msgstr "Muovi su"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:912
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
 msgid "NAS ID"
 msgstr "ID della NAS"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:57
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:87
 msgid "NAT-T Mode"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:9
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 msgid "NAT64 Prefix"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:31
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:26
 msgid "NCM"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:535
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:589
 msgid "NDP-Proxy"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:43
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:72
 msgid "NT Domain"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:273
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:264
 msgid "NTP server candidates"
 msgstr "Candidati server NTP"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:837
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1092
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:27
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:502
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:65
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:553
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:658
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:49
 msgid "Name"
 msgstr "Nome"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:17
-msgid "Name of the new interface"
-msgstr "Nome della nuova interfaccia"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1808
 msgid "Name of the new network"
 msgstr "Nome della nuova rete"
 
@@ -3367,9 +3465,10 @@ msgstr "Nome della nuova rete"
 msgid "Navigation"
 msgstr "Navigazione"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:62
+#: modules/luci-base/luasrc/controller/admin/index.lua:69
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:108
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:402
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:834
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1957
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:389
 #: modules/luci-mod-status/luasrc/view/admin_status/index/30-network.htm:8
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:73
@@ -3381,7 +3480,7 @@ msgstr "Rete"
 msgid "Network Utilities"
 msgstr "Utilità di Rete"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:278
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:279
 msgid "Network boot image"
 msgstr ""
 
@@ -3394,53 +3493,59 @@ msgstr ""
 msgid "Network without interfaces."
 msgstr "Rete senza interfaccia"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:661
+msgid "New interface name…"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:11
 msgid "Next »"
 msgstr "Prossimo »"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1507
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1754
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:108
 msgid "No"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:453
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:514
 msgid "No DHCP Server configured for this interface"
 msgstr "Nessun Server DHCP configurato per questa interfaccia"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1162
+msgid "No Encryption"
+msgstr ""
+
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:89
 msgid "No NAT-T"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:198
+msgid "No data received"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1764
+msgid "No entries in this directory"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/backupfiles.lua:82
 msgid "No files found"
 msgstr "Nessun file trovato"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:550
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:191
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:180
 msgid "No information available"
 msgstr "Nessuna informazione disponibile"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:8
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:63
 msgid "No matching prefix delegation"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:157
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
 msgid "No negative cache"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:53
-msgid "No network configured on this device"
-msgstr "Nessuna rete è configurata su questo dispositivo"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:65
-msgid "No network name specified"
-msgstr ""
-
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:147
-msgid "No networks in range"
-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
@@ -3448,7 +3553,12 @@ msgstr ""
 msgid "No password set!"
 msgstr "Nessuna password immessa!"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:116
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:104
+msgid "No peers defined yet"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:129
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:271
 msgid "No public keys present yet."
 msgstr ""
 
@@ -3456,19 +3566,19 @@ msgstr ""
 msgid "No rules in this chain."
 msgstr "Nessuna regola in questa catena"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:150
-msgid "No scan results available yet..."
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:53
+msgid "No signal"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:7
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:756
 msgid "No zone assigned"
 msgstr "Nessuna zona assegnata"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:111
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:35
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:48
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:133
 msgid "Noise"
 msgstr "Rumore"
 
@@ -3484,16 +3594,16 @@ msgstr "Rumore:"
 msgid "Non Pre-emtive CRC errors (CRC_P)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:292
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:293
 msgid "Non-wildcard"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:129
 msgid "None"
 msgstr "Nessuno"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:181
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:172
 msgid "Normal"
 msgstr "Normale"
 
@@ -3501,25 +3611,29 @@ msgstr "Normale"
 msgid "Not Found"
 msgstr "Non Trovato"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:27
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:5
-msgid "Not associated"
-msgstr "Non associato"
-
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:87
 msgid "Not connected"
 msgstr "Non connesso"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:38
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:139
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:232
+msgid "Not present"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:105
 msgid "Not started on boot"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:26
-msgid "Note: interface name length"
-msgstr "Nota: lunghezza nome interfaccia"
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:201
+msgid "Not supported"
+msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:171
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:162
 msgid "Notice"
 msgstr "Notifica"
 
@@ -3527,62 +3641,50 @@ msgstr "Notifica"
 msgid "Nslookup"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:261
 msgid "Number of cached DNS entries (max is 10000, 0 is no caching)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:203
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:194
 msgid "Number of parallel threads used for compression"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:40
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:69
 msgid "Obfuscated Group Password"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:35
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:61
 msgid "Obfuscated Password"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:22
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:34
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:40
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:105
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:97
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:49
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:80
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:54
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:67
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:93
 msgid "Obtain IPv6-Address"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:83
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:68
 msgid "Off-State Delay"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:16
-msgid ""
-"On this page you can configure the network interfaces. You can bridge "
-"several interfaces by ticking the \"bridge interfaces\" field and enter the "
-"names of several network interfaces separated by spaces. You can also use "
-"<abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
-"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
-"<samp>eth0.1</samp>)."
-msgstr ""
-"In questa pagina puoi configurare le interfacce di rete.Puoi unire più "
-"interfacce spuntando la voce \"unisci interfacce\" e inserendo i nomi di più "
-"interfacce di rete separate da spazi. Puoi anche usare la notazione <abbr "
-"title=\"Virtual Local Area Network\">VLAN</abbr> <samp>INTERFACCIA.VLANNUM</"
-"samp> (<abbr title=\"per esempio\">e.s.</abbr>: <samp>eth0.1</samp>)."
-
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:95
 msgid "On-Link route"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:80
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:64
 msgid "On-State Delay"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:360
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:382
 msgid "One of hostname or mac address must be specified!"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:456
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:462
 msgid "One of the following: %s"
 msgstr ""
 
@@ -3604,34 +3706,35 @@ msgstr "Uno o più campi obbligatori sono vuoti!"
 msgid "Open list..."
 msgstr "Apri lista..."
 
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:61
 #: protocols/luci-proto-openconnect/luasrc/model/network/proto_openconnect.lua:9
 msgid "OpenConnect (CISCO AnyConnect)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:757
 msgid "Operating frequency"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1753
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2306
 msgid "Option changed"
 msgstr "Opzione cambiata"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1755
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2308
 msgid "Option removed"
 msgstr "Opzione cancellata"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1140
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:55
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1535
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:66
 msgid "Optional"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:78
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:76
 msgid ""
 "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, "
 "starting with <code>0x</code>."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:144
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:215
 msgid ""
 "Optional. Allowed values: 'eui64', 'random', fixed value like '::1' or "
 "'::1:2'. When IPv6 prefix (like 'a:b:c:d::') is received from a delegating "
@@ -3639,41 +3742,41 @@ msgid ""
 "for the interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:123
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:117
 msgid ""
 "Optional. Base64-encoded preshared key. Adds in an additional layer of "
 "symmetric-key cryptography for post-quantum resistance."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:148
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:126
 msgid "Optional. Create routes for Allowed IPs for this peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:103
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:108
 msgid "Optional. Description of peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:156
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:128
 msgid ""
 "Optional. Host of peer. Names are resolved prior to bringing up the "
 "interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:67
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:71
 msgid "Optional. Maximum Transmission Unit of tunnel interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:166
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:132
 msgid "Optional. Port of peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:175
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:136
 msgid ""
 "Optional. Seconds between keep alive messages. Default is 0 (disabled). "
 "Recommended value if this device is behind a NAT is 25."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:31
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:54
 msgid "Optional. UDP port used for outgoing and incoming packets."
 msgstr ""
 
@@ -3694,7 +3797,7 @@ msgstr "Uscita"
 msgid "Outbound:"
 msgstr "In uscita:"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:26
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:50
 msgid "Output Interface"
 msgstr ""
 
@@ -3703,45 +3806,45 @@ msgstr ""
 msgid "Output zone"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:63
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:155
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:33
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:54
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:54
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:219
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:50
 msgid "Override MAC address"
 msgstr "Sovrascrivi indirizzo MAC"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:66
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:35
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:56
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:88
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:125
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:131
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:133
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:104
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:61
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:58
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:223
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:44
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:54
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:154
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:71
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:145
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:132
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:110
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:119
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:97
 msgid "Override MTU"
 msgstr "Sovrascrivi MTU"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:30
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:63
 msgid "Override TOS"
 msgstr "Sovrascrivi TOS"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:25
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:58
 msgid "Override TTL"
 msgstr "Sovrascrivi TTL"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:954
 msgid "Override default interface name"
 msgstr "Sovrascrivi nome interfaccia di default"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:41
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:167
 msgid "Override the gateway in DHCP responses"
 msgstr "Sovrascrivi il gateway nelle risposte DHCP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:507
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:555
 msgid ""
 "Override the netmask sent to clients. Normally it is calculated from the "
 "subnet that is served."
@@ -3749,7 +3852,7 @@ msgstr ""
 "Sovrascrivi la netmask data ai clienti. Normalmente è calcolata dalla subnet "
 "servita."
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:65
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:179
 msgid "Override the table used for internal routes"
 msgstr "Sovrascrivi la tabella usata per le route interne"
 
@@ -3757,29 +3860,33 @@ msgstr "Sovrascrivi la tabella usata per le route interne"
 msgid "Overview"
 msgstr "Riassunto"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1606
+msgid "Overwrite existing file \"%s\" ?"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:11
 msgid "Owner"
 msgstr "Proprietario"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:42
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:56
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:17
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:28
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:34
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:14
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:18
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:43
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:98
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:45
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:44
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:63
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:82
 msgid "PAP/CHAP password"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:39
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:53
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:14
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:11
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:15
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:96
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:88
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:43
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:74
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:42
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:61
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:77
 msgid "PAP/CHAP username"
 msgstr ""
 
@@ -3787,9 +3894,9 @@ msgstr ""
 msgid "PID"
 msgstr "PID"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:36
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:50
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:26
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:95
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:87
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:68
 msgid "PIN"
 msgstr ""
 
@@ -3798,114 +3905,116 @@ msgstr ""
 msgid "PIN code rejected"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:966
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1372
 msgid "PMK R1 Push"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:43
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:13
 msgid "PPP"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:11
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:58
 msgid "PPPoA Encapsulation"
 msgstr "Incapsulamento PPPoA"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:19
 msgid "PPPoATM"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:17
 msgid "PPPoE"
 msgstr ""
 
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:28
 #: protocols/luci-proto-pppossh/luasrc/model/network/proto_pppossh.lua:9
 msgid "PPPoSSH"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:15
 msgid "PPtP"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:59
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:73
 msgid "PSID offset"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:56
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:70
 msgid "PSID-bits length"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:123
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:846
 msgid "PTM/EFM (Packet Transfer Mode)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:78
-msgid "Package libiwinfo required!"
-msgstr "E' richiesto il pacchetto libiwinfo!"
-
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:45
 msgid "Packets"
 msgstr "Pacchetti"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:7
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:756
 msgid "Part of zone %q"
 msgstr "Parte della zona %q"
 
 #: modules/luci-base/luasrc/view/sysauth.htm:29
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1111
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:35
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:42
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1514
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:46
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:104
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:58
 msgid "Password"
 msgstr "Password"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:29
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:24
 msgid "Password authentication"
 msgstr "Password di authenticazione"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1019
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1414
 msgid "Password of Private Key"
 msgstr "Password della chiave privata"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1067
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1471
 msgid "Password of inner Private Key"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:14
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:16
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:18
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:20
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:32
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:34
 msgid "Password strength"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:44
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:107
 msgid "Password2"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:37
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:244
 msgid "Paste or drag SSH key file…"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1000
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1396
 msgid "Path to CA-Certificate"
 msgstr "Percorso al certificato CA"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1007
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1402
 msgid "Path to Client-Certificate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1013
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1408
 msgid "Path to Private Key"
 msgstr "Percorso alla chiave privata"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1049
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1453
 msgid "Path to inner CA-Certificate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1055
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1459
 msgid "Path to inner Client-Certificate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1061
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1465
 msgid "Path to inner Private Key"
 msgstr ""
 
@@ -3923,7 +4032,7 @@ msgstr ""
 msgid "Peak:"
 msgstr "Picco:"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:28
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:89
 msgid "Peer IP address to assign"
 msgstr ""
 
@@ -3932,11 +4041,11 @@ msgstr ""
 msgid "Peer address is missing"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:90
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:89
 msgid "Peers"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:50
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:80
 msgid "Perfect Forward Secrecy"
 msgstr ""
 
@@ -3948,7 +4057,11 @@ msgstr "Esegui un riavvio"
 msgid "Perform reset"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:174
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:199
+msgid "Permission denied"
+msgstr ""
+
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:136
 msgid "Persistent Keep Alive"
 msgstr ""
 
@@ -3956,7 +4069,7 @@ msgstr ""
 msgid "Phy Rate:"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:190
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:277
 msgid "Physical Settings"
 msgstr ""
 
@@ -3967,6 +4080,10 @@ msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:16
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:17
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:41
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:77
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:87
@@ -3984,15 +4101,19 @@ msgstr "Per favore inserisci il tuo username e la password."
 msgid "Policy"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:22
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:20
 msgid "Port"
 msgstr "Porta"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:18
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:133
+msgid "Port %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:274
 msgid "Port status:"
 msgstr "Status porta:"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:482
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:488
 msgid "Potential negation of: %s"
 msgstr ""
 
@@ -4004,11 +4125,11 @@ msgstr ""
 msgid "Pre-emtive CRC errors (CRCP_P)"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:32
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:73
 msgid "Prefer LTE"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:33
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:74
 msgid "Prefer UMTS"
 msgstr ""
 
@@ -4016,31 +4137,30 @@ msgstr ""
 msgid "Prefix Delegated"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:122
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:117
 msgid "Preshared Key"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:101
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:75
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:81
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:75
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:54
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:74
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:131
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:102
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:89
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:112
 msgid ""
 "Presume peer to be dead after given amount of LCP echo failures, use 0 to "
 "ignore failures"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:305
 msgid "Prevent listening on these interfaces."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:509
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:562
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:950
 msgid "Prevents client-to-client communication"
 msgstr "Impedisci la comunicazione fra Client"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:18
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:49
 msgid "Private Key"
 msgstr ""
 
@@ -4061,39 +4181,33 @@ msgstr "Profilo"
 msgid "Prot."
 msgstr "Prot."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:72
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:349
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:675
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:84
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:216
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:87
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:390
 msgid "Protocol"
 msgstr "Protocollo"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:31
-msgid "Protocol of the new interface"
-msgstr "Protocollo della nuova interfaccia"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:222
-msgid "Protocol support is not installed"
-msgstr "Supporto protocollo non installato"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:269
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:260
 msgid "Provide NTP server"
 msgstr "Fornisci server NTP"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:701
 msgid "Provide new network"
 msgstr "Fornisci nuova rete"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:451
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:879
 msgid "Pseudo Ad-Hoc (ahdemo)"
 msgstr "Pseudo Ad-Hoc (ahdemo)"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:112
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:113
 msgid "Public Key"
 msgstr "Chiave Pubblica"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:278
 msgid ""
 "Public keys allow for the passwordless SSH logins with a higher security "
 "compared to the use of plain passwords. In order to upload a new key to the "
@@ -4101,47 +4215,48 @@ msgid ""
 "code> file into the input field."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:139
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:211
 msgid "Public prefix routed to this device for distribution to clients."
 msgstr ""
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:27
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:9
 msgid "QMI Cellular"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:173
 msgid "Quality"
 msgstr "Qualità"
 
-#: 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:171
 msgid ""
 "Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> "
 "servers"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:952
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1360
 msgid "R0 Key Lifetime"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:959
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1366
 msgid "R1 Key Holder"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:58
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:88
 msgid "RFC3947 NAT-T mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:381
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:814
 msgid "RSSI threshold for joining"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:256
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:597
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:778
 msgid "RTS/CTS Threshold"
 msgstr "Soglia RTS/CTS"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:41
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:76
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:87
 msgid "RX"
@@ -4151,35 +4266,39 @@ msgstr ""
 msgid "RX Rate"
 msgstr "Velocità RX"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:783
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1961
+msgid "RX Rate / TX Rate"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1207
 msgid "Radius-Accounting-Port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:791
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1215
 msgid "Radius-Accounting-Secret"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:775
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1199
 msgid "Radius-Accounting-Server"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:759
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1183
 msgid "Radius-Authentication-Port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:767
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1191
 msgid "Radius-Authentication-Secret"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:751
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1175
 msgid "Radius-Authentication-Server"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:119
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:102
 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:83
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:84
 msgid ""
 "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-Server"
@@ -4193,20 +4312,11 @@ msgid ""
 "access to this device if you are connected via this interface"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2
-msgid ""
-"Really delete this wireless network? The deletion cannot be undone! You "
-"might lose access to this device if you are connected via this network."
-msgstr ""
-"Vuoi davvero rimuovere questa interfaccia wireless? La rimozione non può "
-"essere ripristinata! Potresti perdere l'accesso a questo dispositivo se sei "
-"connesso con questa rete."
-
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:40
 msgid "Really reset all changes?"
 msgstr "Azzerare veramente tutte le modifiche?"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:237
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:354
 msgid "Really switch protocol?"
 msgstr "Cambiare veramente il protocollo?"
 
@@ -4230,15 +4340,15 @@ msgstr "Traffico in Tempo Reale"
 msgid "Realtime Wireless"
 msgstr "Wireless in Tempo Reale"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:931
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1343
 msgid "Reassociation Deadline"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:191
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
 msgid "Rebind protection"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:48
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:46
 #: modules/luci-mod-system/luasrc/view/admin_system/reboot.htm:9
 msgid "Reboot"
 msgstr "Riavvia"
@@ -4252,21 +4362,15 @@ msgstr "Riavviando..."
 msgid "Reboots the operating system of your device"
 msgstr "Riavvia il sistema operativo del tuo dispositivo"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:103
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:90
 msgid "Receive"
 msgstr "Ricezione"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:325
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:350
-msgid "Receiver Antenna"
-msgstr "Antenna Ricevente"
-
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:42
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:59
 msgid "Recommended. IP addresses of the WireGuard interface."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:28
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:300
 msgid "Reconnect this interface"
 msgstr "Ricollega questa interfaccia"
 
@@ -4274,92 +4378,134 @@ msgstr "Ricollega questa interfaccia"
 msgid "References"
 msgstr "Riferimenti"
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:39
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:153
 msgid "Relay"
 msgstr ""
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:36
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:157
 msgid "Relay Bridge"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:17
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:154
 msgid "Relay between networks"
 msgstr ""
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:64
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:12
 msgid "Relay bridge"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:18
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:50
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:49
 msgid "Remote IPv4 address"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:8
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:40
 msgid "Remote IPv4 address or FQDN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:45
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:725
 msgid "Remove"
 msgstr "Rimuovi"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:53
-msgid "Repeat scan"
-msgstr "Ripeti scan"
-
-#: modules/luci-base/luasrc/view/cbi/upload.htm:11
-msgid "Replace entry"
-msgstr "Sostituisci campo"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:46
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:51
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1806
 msgid "Replace wireless configuration"
 msgstr "Sostituisci configurazione wireless"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:8
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:17
 msgid "Request IPv6-address"
 msgstr "Richiede indirizzo-IPv6"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:16
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:23
 msgid "Request IPv6-prefix of length"
 msgstr "Richiede prefisso-IPv6 di lunghezza"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1141
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:200
+msgid "Request timeout"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1536
 msgid "Required"
 msgstr "Richiesto"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:20
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:31
 msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:19
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:49
 msgid "Required. Base64-encoded private key for this interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:113
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:113
 msgid "Required. Base64-encoded public key of peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:136
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:122
 msgid ""
 "Required. IP addresses and prefixes that this peer is allowed to use inside "
 "the tunnel. Usually the peer's tunnel IP addresses and the networks the peer "
 "routes through the tunnel."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1134
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1095
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1096
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1097
+msgid "Requires hostapd"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1101
+msgid "Requires hostapd with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1102
+msgid "Requires hostapd with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1098
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1099
+msgid "Requires hostapd with SAE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1533
 msgid ""
 "Requires the 'full' version of wpad/hostapd and support from the wifi driver "
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:141
 msgid ""
 "Requires upstream supports DNSSEC; verify unsigned domain responses really "
 "come from unsigned domains"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1268
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1109
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1119
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1120
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1121
+msgid "Requires wpa-supplicant"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1113
+msgid "Requires wpa-supplicant with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1114
+msgid "Requires wpa-supplicant with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1111
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1124
+msgid "Requires wpa-supplicant with SAE support"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1355
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:17
 #: modules/luci-base/luasrc/view/cbi/footer.htm:30
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:66
@@ -4375,17 +4521,22 @@ msgstr "Azzera Contatori"
 msgid "Reset to defaults"
 msgstr "Azzera a default"
 
-#: 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:68
 msgid "Resolv and Hosts Files"
 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:94
 msgid "Resolve file"
 msgstr "File Resolve"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:28
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:14
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:71
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:197
+msgid "Resource not found"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:302
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:693
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:90
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:112
 msgid "Restart"
 msgstr "Riavvia"
 
@@ -4393,7 +4544,7 @@ msgstr "Riavvia"
 msgid "Restart Firewall"
 msgstr "Riavvia Firewall"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:14
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:691
 msgid "Restart radio interface"
 msgstr ""
 
@@ -4405,26 +4556,24 @@ msgstr "Ripristina"
 msgid "Restore backup"
 msgstr "Ripristina backup"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:113
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:114
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:38
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:46
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:119
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:120
 msgid "Reveal/hide password"
 msgstr "Rivela/nascondi password"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1774
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2322
 msgid "Revert"
 msgstr "Ripristina"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1861
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2405
 msgid "Revert changes"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2013
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2554
 msgid "Revert request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1993
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2534
 msgid "Reverting configuration…"
 msgstr ""
 
@@ -4432,7 +4581,7 @@ msgstr ""
 msgid "Root"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:271
 msgid "Root directory for files served via TFTP"
 msgstr ""
 
@@ -4440,7 +4589,7 @@ msgstr ""
 msgid "Root preparation"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:147
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:126
 msgid "Route Allowed IPs"
 msgstr ""
 
@@ -4452,12 +4601,12 @@ msgstr ""
 msgid "Route type"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:523
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:577
 msgid "Router Advertisement-Service"
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:43
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:15
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:27
 msgid "Router Password"
 msgstr ""
 
@@ -4487,7 +4636,7 @@ msgstr "Esegui un controllo del filesystem prima di montare il dispositivo"
 msgid "Run filesystem check"
 msgstr "Esegui controllo del filesystem"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:651
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:669
 msgid "Runtime error"
 msgstr ""
 
@@ -4499,31 +4648,31 @@ msgstr ""
 msgid "SNR"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:5
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:18
 msgid "SSH Access"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:10
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:70
 msgid "SSH server address"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:13
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:74
 msgid "SSH server port"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:8
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:58
 msgid "SSH username"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:27
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:277
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
 msgid "SSH-Keys"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:42
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:73
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:29
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1617
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:174
 msgid "SSID"
 msgstr ""
@@ -4532,17 +4681,17 @@ msgstr ""
 msgid "SWAP"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1127
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1262
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1379
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1351
 #: modules/luci-base/luasrc/view/cbi/error.htm:17
 #: modules/luci-base/luasrc/view/cbi/footer.htm:26
 #: modules/luci-base/luasrc/view/cbi/header.htm:17
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:54
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:133
 msgid "Save"
 msgstr "Salva"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1256
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1768
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1347
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2318
 #: modules/luci-base/luasrc/view/cbi/footer.htm:22
 msgid "Save & Apply"
 msgstr "Salva & applica"
@@ -4555,28 +4704,20 @@ msgstr ""
 msgid "Save mtdblock contents"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
-msgid "Saving keys…"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:698
 msgid "Scan"
 msgstr "Scan"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:109
-msgid "Scan request failed"
-msgstr ""
-
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:8
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:39
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:23
 msgid "Scheduled Tasks"
 msgstr "Operazioni programmate"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1749
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2302
 msgid "Section added"
 msgstr "Sezione aggiunta"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1751
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2304
 msgid "Section removed"
 msgstr "Sezione rimossa"
 
@@ -4591,61 +4732,66 @@ msgid ""
 "your device!"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:119
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:90
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:96
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:90
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:69
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:92
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1516
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1646
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1809
+msgid "Select file…"
+msgstr ""
+
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:144
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:102
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:125
 msgid ""
 "Send LCP echo requests at the given interval in seconds, only effective in "
 "conjunction with failure threshold"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:561
-msgid "Separate Clients"
-msgstr "Isola utenti"
-
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:62
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:63
 msgid "Server Settings"
 msgstr "Impostazioni Server"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:26
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:50
 msgid "Service Name"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:25
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:30
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:87
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:71
 msgid "Service Type"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:55
+#: modules/luci-base/luasrc/controller/admin/index.lua:62
 msgid "Services"
 msgstr "Servizi"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:815
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:861
 msgid "Session expired"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:83
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:107
 msgid "Set VPN as Default Route"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:258
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:795
 msgid ""
 "Set interface properties regardless of the link carrier (If set, carrier "
 "sense events do not invoke hotplug handlers)."
 msgstr ""
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:23
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:55
 msgid "Setting PLMN failed"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:26
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:68
 msgid "Setting operation mode failed"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:454
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:517
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:527
 msgid "Setup DHCP Server"
 msgstr ""
 
@@ -4657,7 +4803,7 @@ msgstr ""
 msgid "Short GI"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:516
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:960
 msgid "Short Preamble"
 msgstr ""
 
@@ -4669,21 +4815,23 @@ msgstr ""
 msgid "Show empty chains"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:306
 msgid "Shutdown this interface"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:111
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:34
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:47
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:132
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1616
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:173
 msgid "Signal"
 msgstr "Segnale"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1960
+msgid "Signal / Noise"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:125
 msgid "Signal Attenuation (SATN)"
 msgstr ""
@@ -4696,11 +4844,11 @@ msgstr ""
 msgid "Size"
 msgstr "Dimensione"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:259
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:260
 msgid "Size of DNS query cache"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:191
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
 msgid "Size of the ZRam device in megabytes"
 msgstr ""
 
@@ -4717,11 +4865,7 @@ msgstr "Salta a contenuto"
 msgid "Skip to navigation"
 msgstr "Salta a navigazione"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:335
-msgid "Slot time"
-msgstr "Slot time"
-
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1640
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1846
 #: modules/luci-base/luasrc/model/network.lua:1427
 msgid "Software VLAN"
 msgstr ""
@@ -4763,11 +4907,7 @@ msgstr ""
 msgid "Specifies the directory the device is attached to"
 msgstr "Specifica la cartella a cui è collegato il dispositivo in"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:23
-msgid "Specifies the listening port of this <em>Dropbear</em> instance"
-msgstr "Specifica la porta di ascolto di questa istanza <em>Dropbear</em>"
-
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:57
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:175
 msgid ""
 "Specifies the maximum amount of failed ARP requests until hosts are presumed "
 "to be dead"
@@ -4775,7 +4915,7 @@ msgstr ""
 "Consente di specificare la quantità massima di richieste ARP fallite finché "
 "gli host si presume siano morti."
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:49
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:171
 msgid ""
 "Specifies the maximum amount of seconds after which hosts are presumed to be "
 "dead"
@@ -4783,45 +4923,53 @@ msgstr ""
 "Specifica la quantità massima di secondi dopo di che si presume che gli host "
 "siano morti."
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:761
+msgid ""
+"Specifies the maximum transmit power the wireless radio may use. Depending "
+"on regulatory requirements and wireless usage, the actual transmit power may "
+"be reduced by the driver."
+msgstr ""
+
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:63
 msgid "Specify a TOS (Type of Service)."
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:25
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:58
 msgid ""
 "Specify a TTL (Time to Live) for the encapsulating packet other than the "
 "default (64)."
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:53
 msgid ""
 "Specify an MTU (Maximum Transmission Unit) other than the default (1280 "
 "bytes)."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:60
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "Specify the secret encryption key here."
 msgstr "Specificare la chiave di cifratura qui."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:475
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:64
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:533
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:89
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:111
 msgid "Start"
 msgstr "Inizio"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:33
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:86
 msgid "Start priority"
 msgstr "Priorità di avvio"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1958
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2499
 msgid "Starting configuration apply…"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1626
 msgid "Starting wireless scan..."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:24
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:120
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
 msgid "Startup"
 msgstr "Avvio"
 
@@ -4833,20 +4981,21 @@ msgstr "Instradamento statico IPv4"
 msgid "Static IPv6 Routes"
 msgstr "Instradamento statico IPv6"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:70
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:71
 msgid "Static Leases"
 msgstr "Contratti statici"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:118
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:73
 msgid "Static Routes"
 msgstr "Instradamenti Statici"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1194
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1384
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:172
 #: modules/luci-base/luasrc/model/network.lua:966
 msgid "Static address"
 msgstr "Indirizzo Statico"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:308
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:309
 msgid ""
 "Static leases are used to assign fixed IP addresses and symbolic hostnames "
 "to DHCP clients. They are also required for non-dynamic interface "
@@ -4857,39 +5006,41 @@ msgstr ""
 "di configurazione non dinamici, dove solo gli host col contratto "
 "corrispondente vengono serviti."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:534
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:977
 msgid "Station inactivity limit"
 msgstr ""
 
 #: modules/luci-base/luasrc/controller/admin/index.lua:40
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:197
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:337
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:746
 #: modules/luci-mod-status/luasrc/view/admin_status/index.htm:128
 msgid "Status"
 msgstr "Stato"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:35
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:75
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:308
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:91
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:113
 msgid "Stop"
 msgstr "Ferma"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:165
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Strict order"
 msgstr "Ordine severo"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:16
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:30
 msgid "Strong"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1843
 msgid "Submit"
 msgstr "Invia"
 
-#: 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:108
 msgid "Suppress logging"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:109
 msgid "Suppress logging of the routine operation of these protocols"
 msgstr ""
 
@@ -4901,42 +5052,44 @@ msgstr ""
 msgid "Swap Entry"
 msgstr "Scambia ingresso"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:23
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:5
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:135
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:21
 msgid "Switch"
 msgstr "Switch"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:129
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:168
 msgid "Switch %q"
 msgstr "Switch %q"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:128
-msgid "Switch %q (%s)"
-msgstr "Switch %q (%s)"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:66
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:146
 msgid ""
 "Switch %q has an unknown topology - the VLAN settings might not be accurate."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:146
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:142
 msgid "Switch Port Mask"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1640
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1846
 #: modules/luci-base/luasrc/model/network.lua:1425
 msgid "Switch VLAN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:238
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:355
 msgid "Switch protocol"
 msgstr "Cambia protocollo"
 
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:103
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:104
 #: modules/luci-base/luasrc/view/cbi/ipaddr.htm:26
 msgid "Switch to CIDR list notation"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:77
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1547
+msgid "Symbolic link"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:71
 msgid "Sync with NTP-Server"
 msgstr ""
 
@@ -4946,7 +5099,7 @@ msgstr "Sincronizza con il browser"
 
 #: modules/luci-base/luasrc/controller/admin/index.lua:47
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:14
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:102
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:94
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
 #: modules/luci-mod-system/luasrc/view/admin_system/applyreboot.htm:39
 msgid "System"
@@ -4957,11 +5110,11 @@ msgstr "Sistema"
 msgid "System Log"
 msgstr "Registro di Sistema"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:108
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:99
 msgid "System Properties"
 msgstr "Proprietà di Sistema"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:145
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:136
 msgid "System log buffer size"
 msgstr "Dimensione Buffer Log di Sistema"
 
@@ -4969,15 +5122,17 @@ msgstr "Dimensione Buffer Log di Sistema"
 msgid "TCP:"
 msgstr "TCP:"
 
-#: 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:69
 msgid "TFTP Settings"
 msgstr "Impostazioni TFTP"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:269
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
 msgid "TFTP server root"
 msgstr "Server TFTP principale"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:17
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:77
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:88
 msgid "TX"
@@ -5000,7 +5155,7 @@ msgstr "Tabella"
 msgid "Target"
 msgstr "Destinazione"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:77
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:103
 msgid "Target network"
 msgstr ""
 
@@ -5008,51 +5163,26 @@ msgstr ""
 msgid "Terminate"
 msgstr "Termina"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:27
-#, fuzzy
-msgid ""
-"The <em>Device Configuration</em> section covers physical settings of the "
-"radio hardware such as channel, transmit power or antenna selection which "
-"are shared among all defined wireless networks (if the radio hardware is "
-"multi-SSID capable). Per network settings like encryption or operation mode "
-"are grouped in the <em>Interface Configuration</em>."
-msgstr ""
-"La sezione <em>Configurazione del Dispositivo</em> illustra le impostazioni "
-"fisiche del hardware radio come canale, la potenza di trasmissione o la "
-"selezione dell'antenna che viene condiviso tra tutte le reti wireless "
-"definite (se l'hardware radio è multi-SSID compatibilie). Per le "
-"impostazioni di rete come la crittografia o la modalità di funzionamento "
-"sono raggruppati nella <em>configurazione dell'interfaccia</em>."
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:79
-msgid ""
-"The <em>libiwinfo-lua</em> package is not installed. You must install this "
-"component for working wireless configuration!"
-msgstr ""
-"Il pacchetto <em>libiwinfo-lua</em> non è installato. È necessario "
-"installare questo componente per il lavoro di configurazione wireless!"
-
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:66
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:77
 msgid ""
 "The HE.net endpoint update configuration changed, you must now use the plain "
 "username instead of the user ID!"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:8
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:40
 msgid ""
 "The IPv4 address or the fully-qualified domain name of the remote tunnel end."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:27
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:38
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:59
 msgid ""
 "The IPv6 prefix assigned to the provider, usually ends with <code>::</code>"
 msgstr ""
 "Il prefisso IPv6 assegnati dal provider, si conclude di solito con <code>::</"
 "code>"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:18
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1808
 msgid ""
 "The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
 "code> and <code>_</code>"
@@ -5066,7 +5196,7 @@ msgstr ""
 msgid "The configuration file could not be loaded due to the following error:"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1849
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2396
 msgid ""
 "The device could not be reached within %d seconds after applying the pending "
 "changes, which caused the configuration to be rolled back for safety "
@@ -5086,6 +5216,12 @@ msgstr ""
 "Il file del dispositivo di memoria o della partizione (<abbr title=\"per "
 "esempio\">e.s.</abbr> <code>/dev/sda1</code>)"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:612
+msgid ""
+"The existing wireless configuration needs to be changed for LuCI to function "
+"properly."
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:127
 msgid ""
 "The filesystem that was used to format the memory (<abbr title=\"for example"
@@ -5106,43 +5242,49 @@ msgstr ""
 msgid "The following rules are currently active on this system."
 msgstr "Le seguenti regole sono al momento attive su questo sistema."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:144
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:154
+msgid "The gateway address must not be a local IP address"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:154
 msgid "The given SSH public key has already been added."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:150
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:160
 msgid ""
 "The given SSH public key is invalid. Please supply proper public RSA or "
 "ECDSA keys."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:67
-msgid "The given network name is not unique"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:664
+msgid "The interface name is already used"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:52
-msgid ""
-"The hardware is not multi-SSID capable and the existing configuration will "
-"be replaced if you proceed."
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:670
+msgid "The interface name is too long"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:43
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:31
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:55
 msgid ""
 "The length of the IPv4 prefix in bits, the remainder is used in the IPv6 "
 "addresses."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:35
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:46
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:63
 msgid "The length of the IPv6 prefix in bits"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:12
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:44
 msgid "The local IPv4 address over which the tunnel is created (optional)."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:5
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1814
+msgid "The network name is already used"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:135
 msgid ""
 "The network ports on this device can be combined to several <abbr title="
 "\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
@@ -5152,22 +5294,21 @@ msgid ""
 "next greater network like the internet and other ports for a local network."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:77
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:395
-msgid "The selected protocol needs a device assigned"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1149
+msgid "The selected %s mode is incompatible with %s encryption"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/csrftoken.htm:11
 msgid "The submitted security token is invalid or already expired!"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:274
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:272
 msgid ""
 "The system is erasing the configuration partition now and will reboot itself "
 "when finished."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:195
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:193
 #, fuzzy
 msgid ""
 "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
@@ -5180,7 +5321,7 @@ msgstr ""
 "address of your computer to reach the device again, depending on your "
 "settings."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:15
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:80
 msgid "The system password has been successfully changed."
 msgstr ""
 
@@ -5192,7 +5333,7 @@ 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:403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:427
 msgid "There are no active leases"
 msgstr ""
 
@@ -5201,16 +5342,10 @@ msgstr ""
 msgid "There are no active leases."
 msgstr "Non ci sono contratti attivi."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1973
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2514
 msgid "There are no changes to apply"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:204
-msgid ""
-"There is no device assigned yet, please attach a network device in the "
-"\"Physical Settings\" tab"
-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
@@ -5220,11 +5355,19 @@ msgid ""
 "protect the web interface and enable SSH."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:19
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:49
 msgid "This IPv4 address of the relay"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1448
+msgid "This authentication type is not applicable to the selected EAP method."
+msgstr ""
+
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:54
+msgid "This does not look like a valid PEM file"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
 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 "
@@ -5238,25 +5381,25 @@ msgid ""
 "configurations are automatically preserved."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:74
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:81
 msgid ""
 "This is either the \"Update Key\" configured for the tunnel or the account "
 "password if no update key has been configured"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:82
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:127
 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 ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:27
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:54
 msgid ""
 "This is the local endpoint address assigned by the tunnel broker, it usually "
 "ends with <code>...:2/64</code>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:79
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> in the local network"
@@ -5264,22 +5407,22 @@ msgstr ""
 "Questo è l&#39;unico server <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr> nella tua rete locale"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:73
 msgid "This is the plain username for logging into the account"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:34
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:57
 msgid ""
 "This is the prefix routed to you by the tunnel broker for use by clients"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:9
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:41
 msgid "This is the system crontab in which scheduled tasks can be defined."
 msgstr ""
 "Questa è la crontab del sistema nella quale possono essere definiti le "
 "operazioni da programmare."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:19
+#: 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 ""
@@ -5296,26 +5439,26 @@ msgstr ""
 msgid "This page gives an overview over currently active network connections."
 msgstr "Questa pagina ti da una riassunto delle connessioni al momento attive."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:726
-#: modules/luci-base/htdocs/luci-static/resources/form.js:809
+#: modules/luci-base/htdocs/luci-static/resources/form.js:936
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1064
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:172
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:32
 msgid "This section contains no values yet"
 msgstr "Questa sezione non contiene ancora valori"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:114
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:105
 msgid "Time Synchronization"
 msgstr "Sincronizzazione Orario"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:525
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:968
 msgid "Time interval for rekeying GTK"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:128
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:119
 msgid "Timezone"
 msgstr "Fuso orario"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:825
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:871
 msgid "To login…"
 msgstr ""
 
@@ -5329,7 +5472,7 @@ msgstr ""
 "generato precedentemente qui. Per ripristinare il firmware al suo stato "
 "iniziale premi \"Esegui Ripristino\" (solo per firmware basati su squashfs)."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:835
 msgid "Tone"
 msgstr ""
 
@@ -5353,55 +5496,41 @@ msgstr "Traffico"
 msgid "Transfer"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:595
-msgid "Transmission Rate"
-msgstr "Velocità di transmissione"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:102
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:89
 msgid "Transmit"
 msgstr "Trasmissione"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:211
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:273
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:345
-msgid "Transmit Power"
-msgstr "Potenza di trasmissione"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:318
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:349
-msgid "Transmitter Antenna"
-msgstr "Antenna trasmettente"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:73
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:57
 msgid "Trigger"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:98
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:84
 msgid "Trigger Mode"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:54
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:69
 msgid "Tunnel ID"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1643
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1849
 #: modules/luci-base/luasrc/model/network.lua:1430
 msgid "Tunnel Interface"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:44
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:55
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:76
 msgid "Tunnel Link"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:46
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:131
 msgid "Tx-Power"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:32
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:185
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:11
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:43
 msgid "Type"
 msgstr "Tipo"
 
@@ -5409,19 +5538,20 @@ msgstr "Tipo"
 msgid "UDP:"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:28
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:90
 msgid "UMTS only"
 msgstr ""
 
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:43
 #: protocols/luci-proto-3g/luasrc/model/network/proto_3g.lua:10
 msgid "UMTS/GPRS/EV-DO"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:106
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:93
 msgid "USB Device"
 msgstr "Periferica USB"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:122
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:110
 msgid "USB Ports"
 msgstr "Porte USB"
 
@@ -5451,10 +5581,12 @@ msgstr ""
 msgid "Unable to dispatch"
 msgstr ""
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:22
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:54
 msgid "Unable to obtain client ID"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:61
 msgid "Unable to resolve AFTR host name"
 msgstr ""
@@ -5464,21 +5596,31 @@ msgstr ""
 msgid "Unable to resolve peer host name"
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:33
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:68
+msgid "Unable to save contents: %s"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:132
 msgid "Unavailable Seconds (UAS)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1196
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1386
 #: modules/luci-base/luasrc/model/network.lua:970
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1349
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1539
 #: modules/luci-base/luasrc/model/network.lua:1137
 msgid "Unknown error (%s)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1193
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:204
+msgid "Unknown error code"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1383
+#: modules/luci-base/htdocs/luci-static/resources/protocol/none.js:6
 #: modules/luci-base/luasrc/model/network.lua:964
 msgid "Unmanaged"
 msgstr "Non gestito"
@@ -5488,22 +5630,30 @@ msgstr "Non gestito"
 msgid "Unmount"
 msgstr "Smonta"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:107
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:262
 msgid "Unnamed key"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1708
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2261
 msgid "Unsaved Changes"
 msgstr "Modifiche non salvate"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:202
+msgid "Unspecified error"
+msgstr ""
+
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:64
 msgid "Unsupported MAP type"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:27
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:69
 msgid "Unsupported modem"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:219
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:119
 msgid "Unsupported protocol type."
 msgstr "Tipo protocollo non supportato."
@@ -5526,56 +5676,70 @@ msgstr ""
 msgid "Upload archive..."
 msgstr "Carica archivio..."
 
-#: modules/luci-base/luasrc/view/cbi/upload.htm:8
-msgid "Uploaded File"
-msgstr "File Inviato"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1703
+msgid "Upload file"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1678
+msgid "Upload file…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1623
+msgid "Upload request failed: %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:613
+msgid ""
+"Upon pressing \"Continue\", anonymous \"wifi-iface\" sections will be "
+"assigned with a name in the form <em>wifinet#</em> and the network will be "
+"restarted to apply the updated configuration."
+msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:14
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:74
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:85
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:26
 msgid "Uptime"
 msgstr "Tempo di attività"
 
-#: 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:83
 msgid "Use <code>/etc/ethers</code>"
 msgstr "Usa <code>/etc/ethers</code>"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:40
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:167
 msgid "Use DHCP gateway"
 msgstr "Usa il DHCP del gateway"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:33
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:85
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:34
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:98
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:46
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:65
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:38
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:58
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:124
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:39
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:116
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:59
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:103
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:64
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:77
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:100
 msgid "Use DNS servers advertised by peer"
 msgstr "Usa i server DNS annunciati dal peer"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:227
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:233
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:479
 msgid "Use ISO/IEC 3166 alpha2 country codes."
 msgstr "Usa i codici delle nazioni ISO/IEC 3166 alpha2."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:31
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:100
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:70
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:35
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:51
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:86
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:56
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:97
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:77
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:75
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:92
 msgid "Use MTU on tunnel interface"
 msgstr "Usa MTU nel tunnel dell'interfaccia"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:95
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:65
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:30
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:46
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:81
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:93
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:73
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:88
 msgid "Use TTL on tunnel interface"
 msgstr "Usa TTL nel tunnel dell'interfaccia"
 
@@ -5587,68 +5751,65 @@ msgstr ""
 msgid "Use as root filesystem (/)"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:19
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:31
 msgid "Use broadcast flag"
 msgstr "Usa flag broadcast"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:253
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:791
 msgid "Use builtin IPv6-management"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:40
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:109
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:92
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:45
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:105
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:53
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:72
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:45
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:65
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:40
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:182
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:127
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:42
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:119
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:62
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:67
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:80
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:103
 msgid "Use custom DNS servers"
 msgstr "Usa server DNS personalizzati"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:26
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:70
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:16
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:28
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:84
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:24
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:50
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:23
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:43
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:116
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:33
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:74
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:97
 msgid "Use default gateway"
 msgstr "Usa il gateway predefinito"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:48
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:164
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:77
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:24
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:88
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:58
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:23
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:39
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:74
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:90
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:38
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:57
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:30
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:50
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:45
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:227
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:119
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:51
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:88
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:68
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:52
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:70
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:83
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:111
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:149
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:67
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:111
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:98
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:72
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:85
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:108
 msgid "Use gateway metric"
 msgstr "Usa la metrica del gateway"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:64
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:179
 msgid "Use routing table"
 msgstr "Utilizzare tabella di instradamento"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:309
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:310
 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 "
@@ -5667,77 +5828,78 @@ msgstr ""
 msgid "Used"
 msgstr "Usato"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:848
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1273
 msgid "Used Key Slot"
 msgstr "Slot Chiave Usata"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:913
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
 msgid ""
 "Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not "
 "needed with normal WPA(2)-PSK."
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:48
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:110
 msgid "User certificate (PEM encoded)"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:61
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:122
 msgid "User key (PEM encoded)"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/sysauth.htm:23
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:41
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:32
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:102
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:56
 msgid "Username"
 msgstr "Nome Utente"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:182
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:903
 msgid "VC-Mux"
 msgstr "VC-Mux"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:851
 msgid "VDSL"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:172
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:169
 msgid "VLANs on %q"
 msgstr "VLANs su %q"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:171
-msgid "VLANs on %q (%s)"
-msgstr "VLANs su %q (%s)"
+#: modules/luci-base/luasrc/controller/admin/index.lua:55
+msgid "VPN"
+msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:18
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:42
 msgid "VPN Local address"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:22
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:46
 msgid "VPN Local port"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:15
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:11
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:15
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:58
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:39
 msgid "VPN Server"
 msgstr "Server VPN"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:18
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:96
 msgid "VPN Server port"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:37
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:100
 msgid "VPN Server's certificate SHA1 hash"
 msgstr ""
 
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:9
 #: protocols/luci-proto-vpnc/luasrc/model/network/proto_vpnc.lua:9
 msgid "VPNC (CISCO 3000 (and others) VPN)"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:44
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:73
 msgid "Vendor"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:60
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:52
 msgid "Vendor Class to send when requesting DHCP"
 msgstr "Classe del Produttore da 'inviare al momento della richiesta DHCP"
 
@@ -5745,41 +5907,37 @@ msgstr "Classe del Produttore da 'inviare al momento della richiesta DHCP"
 msgid "Verify"
 msgstr "Verifica"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:52
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:76
 msgid "Virtual dynamic interface"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:470
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:471
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:553
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:576
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:908
 msgid "WDS"
 msgstr "WDS"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:667
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1160
 msgid "WEP Open System"
 msgstr "Sistema Aperto WEP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:668
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1161
 msgid "WEP Shared Key"
 msgstr "Chiave Condivisa WEP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "WEP passphrase"
 msgstr "frase di accesso WEP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:503
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:566
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:945
 msgid "WMM Mode"
 msgstr "Modalità WMM"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "WPA passphrase"
 msgstr "frase di accesso WPA"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:716
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:735
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:740
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1074
 msgid ""
 "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
 "and ad-hoc mode) to be installed."
@@ -5795,7 +5953,7 @@ msgstr "In attesa delle modifiche da applicare ..."
 msgid "Waiting for command to complete..."
 msgstr "In attesa del comando da completare..."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1940
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2481
 msgid "Waiting for configuration to get applied… %ds"
 msgstr ""
 
@@ -5803,8 +5961,8 @@ msgstr ""
 msgid "Waiting for device..."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:172
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:163
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:173
 msgid "Warning"
 msgstr "Avviso"
 
@@ -5812,11 +5970,11 @@ msgstr "Avviso"
 msgid "Warning: There are unsaved changes that will get lost on reboot!"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:20
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:34
 msgid "Weak"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:946
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1355
 msgid ""
 "When using a PSK, the PMK can be automatically generated. When enabled, the "
 "R0/R1 key options below are not applied. Disable this to use the R0 and R1 "
@@ -5824,78 +5982,85 @@ msgid ""
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:383
 msgid "Width"
 msgstr ""
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:17
 #: protocols/luci-proto-wireguard/luasrc/model/network/proto_wireguard.lua:9
 msgid "WireGuard VPN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:58
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:40
 #: modules/luci-mod-status/luasrc/controller/admin/status.lua:28
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:14
 msgid "Wireless"
 msgstr "Wireless"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1631
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1837
 #: modules/luci-base/luasrc/model/network.lua:1418
 msgid "Wireless Adapter"
 msgstr "Dispositivo Wireless"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1617
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2052
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1823
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2288
 #: modules/luci-base/luasrc/model/network.lua:1404
 #: modules/luci-base/luasrc/model/network.lua:1865
 msgid "Wireless Network"
 msgstr "Rete Wireless"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:629
 msgid "Wireless Overview"
 msgstr "Panoramica Wireless"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:362
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:797
 msgid "Wireless Security"
 msgstr "Sicurezza Wireless"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:54
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:611
+msgid "Wireless configuration migration"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:139
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:179
 msgid "Wireless is disabled"
 msgstr "La rete Wireless è disattivata"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:54
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:139
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:179
 msgid "Wireless is not associated"
 msgstr "La rete Wireless è non associata"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:15
-msgid "Wireless is restarting..."
-msgstr "Riavvio della Wireless..."
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:752
 msgid "Wireless network is disabled"
 msgstr "La rete Wireless è disattivata"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:752
 msgid "Wireless network is enabled"
 msgstr "La rete wireless è attivata"
 
-#: 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:182
 msgid "Write received DNS requests to syslog"
 msgstr "Scrittura delle richiesta DNS ricevute nel syslog"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:164
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:155
 msgid "Write system log to file"
 msgstr "Scrivi registro di sistema su file"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1507
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:85
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1754
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:109
 msgid "Yes"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:26
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:943
+msgid ""
+"You appear to be currently connected to the device via the \"%h\" interface. "
+"Do you really want to shut down the interface?"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:123
 msgid ""
 "You can enable or disable installed init scripts here. Changes will applied "
 "after a device reboot.<br /><strong>Warning: If you disable essential init "
@@ -5917,38 +6082,34 @@ msgstr ""
 "È necessario attivare JavaScript nel tuo browser o LuCI non funzionerà "
 "correttamente."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:196
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:187
 msgid "ZRam Compression Algorithm"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:203
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:194
 msgid "ZRam Compression Streams"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:189
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:180
 msgid "ZRam Settings"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:191
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
 msgid "ZRam Size"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:229
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:230
 msgid "any"
 msgstr "qualsiasi"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:113
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:121
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:126
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:218
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:282
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:321
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:328
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:621
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:37
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:22
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:29
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:121
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:836
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:844
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:849
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1030
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:78
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:48
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:51
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:103
 msgid "auto"
 msgstr "auto"
 
@@ -5956,11 +6117,11 @@ msgstr "auto"
 msgid "automatic"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:45
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:78
 msgid "baseT"
 msgstr "baseT"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:909
 msgid "bridged"
 msgstr "ponte"
 
@@ -5976,22 +6137,21 @@ msgstr ""
 msgid "create:"
 msgstr "crea:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:264
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:368
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:678
 msgid "creates a bridge over specified interface(s)"
 msgstr "Crea un ponte sulle interfacce selezionate"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:277
 msgid "dB"
 msgstr "dB"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:34
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:35
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:46
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:47
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:48
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:131
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:132
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:133
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:277
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:279
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:331
@@ -6003,26 +6163,30 @@ msgstr "dB"
 msgid "dBm"
 msgstr "dBm"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:460
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:587
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:889
 msgid "disable"
 msgstr "disabilita"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:119
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:524
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:530
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:536
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:18
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:578
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:584
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:590
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:25
 msgid "disabled"
 msgstr "disabilitato"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:433
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:467
+msgid "driver default"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/lease_status.htm:17
 #: modules/luci-base/luasrc/view/lease_status.htm:46
-#: 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:416
 msgid "expired"
 msgstr "scaduto"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:88
 msgid ""
 "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr>-leases will be stored"
@@ -6036,25 +6200,21 @@ msgstr ""
 msgid "forward"
 msgstr "inoltro"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:80
 msgid "full-duplex"
 msgstr "full-duplex"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:80
 msgid "half-duplex"
 msgstr "half-duplex"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:559
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:565
 msgid "hexadecimal encoded value"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:138
-msgid "hidden"
-msgstr "nascosto"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:527
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:533
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:538
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:581
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:587
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:592
 msgid "hybrid mode"
 msgstr "modo ibrido"
 
@@ -6062,6 +6222,10 @@ msgstr "modo ibrido"
 msgid "if target is a network"
 msgstr "se la destinazione è una rete"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:63
+msgid "ignore"
+msgstr ""
+
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:177
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
@@ -6096,25 +6260,26 @@ msgstr ""
 msgid "key with either 5 or 13 characters"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:94
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:95
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr "File <abbr title=\"Sistema Nome Dominio\">DNS</abbr> locale"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:952
-msgid "minutes"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1168
+msgid "medium security"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:43
-msgid "mixed WPA/WPA2"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1360
+msgid "minutes"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:225
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:232
 msgid "no"
 msgstr "no"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:54
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:72
 msgid "no link"
 msgstr "Nessun collegamento"
 
@@ -6122,7 +6287,7 @@ msgstr "Nessun collegamento"
 msgid "non-empty value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1195
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1446
 msgid "none"
 msgstr "nessuna"
 
@@ -6132,7 +6297,9 @@ msgstr "nessuna"
 msgid "not present"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:363
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:341
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:776
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:780
 #: 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
@@ -6147,9 +6314,9 @@ msgstr "spento"
 msgid "on"
 msgstr "acceso"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
-msgid "open"
-msgstr "apri"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1169
+msgid "open network"
+msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
@@ -6168,73 +6335,77 @@ msgstr ""
 msgid "positive integer value"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:34
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:56
 msgid "random"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:526
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:532
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:537
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:580
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:586
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:591
 msgid "relay mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:910
 msgid "routed"
 msgstr "instradato"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:525
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:534
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:968
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:977
 msgid "sec"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:525
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:531
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:579
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:585
 msgid "server mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:544
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:597
 msgid "stateful-only"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:542
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:595
 msgid "stateless"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:543
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:596
 msgid "stateless + stateful"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:369
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1167
+msgid "strong security"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:346
 msgid "tagged"
 msgstr "etichettato"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:932
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1343
 msgid "time units (TUs / 1.024 ms) [1000-65535]"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:549
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:555
 msgid "unique value"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:448
 msgid "unknown"
 msgstr "sconosciuto"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:15
 #: modules/luci-base/luasrc/view/lease_status.htm:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:238
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:390
+#: 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:414
 msgid "unlimited"
 msgstr "illimitato"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1401
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1648
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:63
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:355
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:378
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:413
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:446
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:512
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:450
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:545
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:53
 #: modules/luci-base/luasrc/view/cbi/network_netlist.htm:38
 msgid "unspecified"
@@ -6244,7 +6415,7 @@ msgstr "non specificato"
 msgid "unspecified -or- create:"
 msgstr "non specificato - o - creato:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:366
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:344
 msgid "untagged"
 msgstr "non etichettato"
 
@@ -6325,8 +6496,8 @@ msgstr ""
 msgid "valid address:port"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:523
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:527
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:529
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:533
 msgid "valid date (YYYY-MM-DD)"
 msgstr ""
 
@@ -6363,7 +6534,7 @@ msgstr ""
 msgid "valid network in address/netmask notation"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:498
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:504
 msgid "valid phone digit (0-9, \"*\", \"#\", \"!\" or \".\")"
 msgstr ""
 
@@ -6376,11 +6547,11 @@ msgstr ""
 msgid "valid port value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:503
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:509
 msgid "valid time (HH:MM:SS)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:425
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:431
 msgid "value between %d and %d characters"
 msgstr ""
 
@@ -6396,14 +6567,23 @@ msgstr ""
 msgid "value smaller or equal to %f"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:430
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:425
+msgid "value with %d characters"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:436
 msgid "value with at least %d characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:435
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:441
 msgid "value with at most %d characters"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1169
+msgid "weak security"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:221
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:232
@@ -6414,6 +6594,181 @@ msgstr "Sì"
 msgid "« Back"
 msgstr "« Indietro"
 
+#~ msgid "Disabled (default)"
+#~ msgstr "Disabilitato (default)"
+
+#~ msgid "Specifies the listening port of this <em>Dropbear</em> instance"
+#~ msgstr "Specifica la porta di ascolto di questa istanza <em>Dropbear</em>"
+
+#~ msgid "Switch %q (%s)"
+#~ msgstr "Switch %q (%s)"
+
+#~ msgid "VLANs on %q (%s)"
+#~ msgstr "VLANs su %q (%s)"
+
+#~ msgid "Antenna 1"
+#~ msgstr "Antenna 1"
+
+#~ msgid "Antenna 2"
+#~ msgstr "Antenna 2"
+
+#~ msgid "Antenna Configuration"
+#~ msgstr "Configurazione dell'Antenna"
+
+#~ msgid "Back to overview"
+#~ msgstr "Ritorna alla panoramica"
+
+#~ msgid "Back to scan results"
+#~ msgstr "Ritorno ai risultati della scansione"
+
+#~ msgid "Broadcom 802.11%s Wireless Controller"
+#~ msgstr "Dispositivo Wireless Broadcom 802.11%s"
+
+#~ msgid "Broadcom BCM%04x 802.11 Wireless Controller"
+#~ msgstr "Dispositivo Wireless Broadcom BCM%04x 802.11"
+
+#~ msgid "Common Configuration"
+#~ msgstr "Configurazioni Comuni"
+
+#~ msgid "Connect"
+#~ msgstr "Connetti"
+
+#~ msgid "Connection Limit"
+#~ msgstr "Limite connessioni"
+
+#~ msgid "Cover the following interface"
+#~ msgstr "Coprire la seguente interfaccia"
+
+#~ msgid "Cover the following interfaces"
+#~ msgstr "Coprire le seguenti interfacce"
+
+#~ msgid "Create Interface"
+#~ msgstr "Crea Interfaccia"
+
+#~ msgid "Create a bridge over multiple interfaces"
+#~ msgstr "Crea un ponte tra interfacce multiple"
+
+#~ msgid "Diversity"
+#~ msgstr "Diversità"
+
+#~ msgid "Edit this interface"
+#~ msgstr "Modifica questa interfaccia"
+
+#~ msgid "Frame Bursting"
+#~ msgstr "Frame Bursting"
+
+#~ msgid "Generic 802.11%s Wireless Controller"
+#~ msgstr "Dispositivo Wireless 802.11%s Generico"
+
+#~ msgid "Install package %q"
+#~ msgstr "Installa il pacchetto %q"
+
+#~ msgid "Interface Overview"
+#~ msgstr "Riassunto Interfaccia"
+
+#~ msgid "Name of the new interface"
+#~ msgstr "Nome della nuova interfaccia"
+
+#~ msgid "No network configured on this device"
+#~ msgstr "Nessuna rete è configurata su questo dispositivo"
+
+#~ msgid "Not associated"
+#~ msgstr "Non associato"
+
+#~ msgid "Note: interface name length"
+#~ msgstr "Nota: lunghezza nome interfaccia"
+
+#~ msgid ""
+#~ "On this page you can configure the network interfaces. You can bridge "
+#~ "several interfaces by ticking the \"bridge interfaces\" field and enter "
+#~ "the names of several network interfaces separated by spaces. You can also "
+#~ "use <abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
+#~ "<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
+#~ "<samp>eth0.1</samp>)."
+#~ msgstr ""
+#~ "In questa pagina puoi configurare le interfacce di rete.Puoi unire più "
+#~ "interfacce spuntando la voce \"unisci interfacce\" e inserendo i nomi di "
+#~ "più interfacce di rete separate da spazi. Puoi anche usare la notazione "
+#~ "<abbr title=\"Virtual Local Area Network\">VLAN</abbr> <samp>INTERFACCIA."
+#~ "VLANNUM</samp> (<abbr title=\"per esempio\">e.s.</abbr>: <samp>eth0.1</"
+#~ "samp>)."
+
+#~ msgid "Package libiwinfo required!"
+#~ msgstr "E' richiesto il pacchetto libiwinfo!"
+
+#~ msgid "Protocol of the new interface"
+#~ msgstr "Protocollo della nuova interfaccia"
+
+#~ msgid "Protocol support is not installed"
+#~ msgstr "Supporto protocollo non installato"
+
+#~ msgid ""
+#~ "Really delete this wireless network? The deletion cannot be undone! You "
+#~ "might lose access to this device if you are connected via this network."
+#~ msgstr ""
+#~ "Vuoi davvero rimuovere questa interfaccia wireless? La rimozione non può "
+#~ "essere ripristinata! Potresti perdere l'accesso a questo dispositivo se "
+#~ "sei connesso con questa rete."
+
+#~ msgid "Receiver Antenna"
+#~ msgstr "Antenna Ricevente"
+
+#~ msgid "Repeat scan"
+#~ msgstr "Ripeti scan"
+
+#~ msgid "Replace entry"
+#~ msgstr "Sostituisci campo"
+
+#~ msgid "Separate Clients"
+#~ msgstr "Isola utenti"
+
+#~ msgid "Slot time"
+#~ msgstr "Slot time"
+
+#, fuzzy
+#~ msgid ""
+#~ "The <em>Device Configuration</em> section covers physical settings of the "
+#~ "radio hardware such as channel, transmit power or antenna selection which "
+#~ "are shared among all defined wireless networks (if the radio hardware is "
+#~ "multi-SSID capable). Per network settings like encryption or operation "
+#~ "mode are grouped in the <em>Interface Configuration</em>."
+#~ msgstr ""
+#~ "La sezione <em>Configurazione del Dispositivo</em> illustra le "
+#~ "impostazioni fisiche del hardware radio come canale, la potenza di "
+#~ "trasmissione o la selezione dell'antenna che viene condiviso tra tutte le "
+#~ "reti wireless definite (se l'hardware radio è multi-SSID compatibilie). "
+#~ "Per le impostazioni di rete come la crittografia o la modalità di "
+#~ "funzionamento sono raggruppati nella <em>configurazione dell'interfaccia</"
+#~ "em>."
+
+#~ msgid ""
+#~ "The <em>libiwinfo-lua</em> package is not installed. You must install "
+#~ "this component for working wireless configuration!"
+#~ msgstr ""
+#~ "Il pacchetto <em>libiwinfo-lua</em> non è installato. È necessario "
+#~ "installare questo componente per il lavoro di configurazione wireless!"
+
+#~ msgid "Transmission Rate"
+#~ msgstr "Velocità di transmissione"
+
+#~ msgid "Transmit Power"
+#~ msgstr "Potenza di trasmissione"
+
+#~ msgid "Transmitter Antenna"
+#~ msgstr "Antenna trasmettente"
+
+#~ msgid "Uploaded File"
+#~ msgstr "File Inviato"
+
+#~ msgid "Wireless is restarting..."
+#~ msgstr "Riavvio della Wireless..."
+
+#~ msgid "hidden"
+#~ msgstr "nascosto"
+
+#~ msgid "open"
+#~ msgstr "apri"
+
 #~ msgid "Back"
 #~ msgstr "Indietro"
 
@@ -6538,9 +6893,6 @@ msgstr "« Indietro"
 #~ msgid "Hermes 802.11b Wireless Controller"
 #~ msgstr "Dispositivo Wireless Hermes 802.11b"
 
-#~ msgid "Interface is shutting down..."
-#~ msgstr "L'intefaccia si sta spegnendo..."
-
 #~ msgid "Interface reconnected"
 #~ msgstr "Interfaccia ricollegata."
 
diff --git a/modules/luci-base/po/ja/base.po b/modules/luci-base/po/ja/base.po
index 24c13abd2..2e89d1e39 100644
--- a/modules/luci-base/po/ja/base.po
+++ b/modules/luci-base/po/ja/base.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-06-10 03:40+0200\n"
-"PO-Revision-Date: 2019-07-13 18:28+0900\n"
+"PO-Revision-Date: 2019-09-21 17:09+0900\n"
 "Last-Translator: INAGAKI Hiroshi <musashino.open@gmail.com>\n"
 "Language-Team: \n"
 "Language: ja\n"
@@ -13,19 +13,20 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 2.2.3\n"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:133
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:857
 msgid "%.1f dB"
 msgstr "%.1f dB"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:109
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:122
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 msgid "%d Bit"
 msgstr "%d ビット"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1641
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2194
 msgid "%d invalid field(s)"
 msgstr "無効な入力欄: %d 個"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:281
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:31
 msgid "%s is untagged in multiple VLANs!"
 msgstr "%s は複数のVLANにUntaggedしています!"
 
@@ -63,19 +64,19 @@ msgid "-- Additional Field --"
 msgstr "-- 追加項目 --"
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:258
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1401
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1533
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:250
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:350
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1114
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1648
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1780
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:314
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:414
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1178
 #: modules/luci-base/luasrc/view/cbi/header.htm:5
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:26
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:88
 msgid "-- Please choose --"
 msgstr "-- 選択してください --"
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:259
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:351
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1115
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:415
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1179
 #: modules/luci-base/luasrc/view/cbi/header.htm:6
 msgid "-- custom --"
 msgstr "-- 手動設定 --"
@@ -98,7 +99,7 @@ msgstr "-- UUID を指定 --"
 msgid "-- please select --"
 msgstr "-- 選択してください --"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:382
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:814
 msgid "0 = not using RSSI threshold, 1 = do not change driver default"
 msgstr "0: RSSI しきい値を使用しない, 1: ドライバのデフォルトを使用する"
 
@@ -110,10 +111,11 @@ msgstr "過去1分の負荷:"
 msgid "15 Minute Load:"
 msgstr "過去15分の負荷:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:924
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1337
 msgid "4-character hexadecimal ID"
 msgstr "4 文字かつ 16 進数の ID"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:11
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:18
 msgid "464XLAT (CLAT)"
 msgstr "464XLAT (CLAT)"
@@ -122,47 +124,47 @@ msgstr "464XLAT (CLAT)"
 msgid "5 Minute Load:"
 msgstr "過去5分の負荷:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:960
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1366
 msgid "6-octet identifier as a hex string - no colons"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:891
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1310
 msgid "802.11r Fast Transition"
 msgstr "802.11r 高速ローミング"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1157
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1567
 msgid "802.11w Association SA Query maximum timeout"
 msgstr "802.11w アソシエーションSAクエリの最大タイムアウト時間です。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1574
 msgid "802.11w Association SA Query retry timeout"
 msgstr "802.11w アソシエーションSAクエリの再試行タイムアウト時間です。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1133
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1533
 msgid "802.11w Management Frame Protection"
 msgstr "802.11w 管理フレーム保護"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1156
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1567
 msgid "802.11w maximum timeout"
 msgstr "802.11w 最大タイムアウト"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1165
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1574
 msgid "802.11w retry timeout"
 msgstr "802.11w 再試行タイムアウト"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:399
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:831
 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:224
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:225
 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:215
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:216
 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:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
 msgid ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
 "order of the resolvfile"
@@ -170,11 +172,11 @@ msgstr ""
 "リゾルバファイルの順番に、<abbr title=\"Domain Name System\">DNS</abbr>サー"
 "バーに問い合わせを行います"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:388
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:820
 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:351
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:373
 #: 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>-アドレス"
@@ -184,8 +186,8 @@ msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-アドレス"
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
 msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-ゲートウェイ"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:555
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:35
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:506
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-ネットマスク"
 
@@ -201,30 +203,30 @@ 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:378
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:402
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
 msgstr ""
 "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-サフィックス (16進数)"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:58
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:35
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:33
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> 設定"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:67
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:51
 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:328
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:329
 #: 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:372
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 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:233
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:234
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> leases"
@@ -232,7 +234,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:242
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> packet size"
@@ -240,11 +242,11 @@ 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:251
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:252
 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
 msgstr "<abbr title=\"maximal\">最大</abbr> 並列処理クエリ"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:10
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:42
 msgid ""
 "<br/>Note: you need to manually restart the cron service if the crontab file "
 "was empty before editing."
@@ -252,63 +254,67 @@ msgstr ""
 "<br />注意: 編集前の crontab ファイルが空の場合、手動で cron サービスの再起動"
 "を行う必要があります。"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:817
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1605
+msgid "A directory with the same name already exists."
+msgstr "同名のディレクトリが既に存在します。"
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:863
 msgid "A new login is required since the authentication session expired."
 msgstr "認証セッションの期限切れのため、再ログインが必要です。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:114
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:837
 msgid "A43C + J43 + A43"
 msgstr "A43C + J43 + A43"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:838
 msgid "A43C + J43 + A43 + V43"
 msgstr "A43C + J43 + A43 + V43"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:850
 msgid "ADSL"
 msgstr "ADSL"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:826
 msgid "ANSI T1.413"
 msgstr "ANSI T1.413"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:33
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:47
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:23
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:94
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:86
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:67
 msgid "APN"
 msgstr "APN"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:56
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:175
 msgid "ARP retry threshold"
 msgstr "ARP 再試行しきい値"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:122
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:845
 msgid "ATM (Asynchronous Transfer Mode)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:144
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:866
 msgid "ATM Bridges"
 msgstr "ATMブリッジ"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:178
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:21
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:898
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:66
 msgid "ATM Virtual Channel Identifier (VCI)"
 msgstr "ATM仮想チャネル識別子 (VCI)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:179
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:26
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:899
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:70
 msgid "ATM Virtual Path Identifier (VPI)"
 msgstr "ATM仮想パス識別子 (VPI)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:866
 msgid ""
 "ATM bridges expose encapsulated ethernet in AAL5 connections as virtual "
 "Linux network interfaces which can be used in conjunction with DHCP or PPP "
 "to dial into the provider network."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:184
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:905
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:62
 msgid "ATM device number"
 msgstr "ATMデバイス番号"
 
@@ -317,17 +323,17 @@ msgid "ATU-C System Vendor ID"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:251
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:495
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:499
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:528
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:532
 msgid "Absent Interface"
-msgstr ""
+msgstr "存在しないインターフェース"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:19
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
 msgid "Access Concentrator"
 msgstr "Access Concentrator"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:368
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:470
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:802
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
 msgid "Access Point"
 msgstr "アクセスポイント"
 
@@ -352,7 +358,7 @@ msgid "Active Connections"
 msgstr "アクティブ コネクション"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:68
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:30
 msgid "Active DHCP Leases"
 msgstr "アクティブなDHCPリース"
 
@@ -360,57 +366,77 @@ msgstr "アクティブなDHCPリース"
 msgid "Active DHCPv6 Leases"
 msgstr "アクティブなDHCPv6リース"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1951
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:370
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:12
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2190
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:804
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:23
 msgid "Ad-Hoc"
 msgstr "アドホック"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:650
-#: modules/luci-base/htdocs/luci-static/resources/form.js:651
-#: modules/luci-base/htdocs/luci-static/resources/form.js:666
-#: modules/luci-base/htdocs/luci-static/resources/form.js:667
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1290
+#: modules/luci-base/htdocs/luci-static/resources/form.js:902
+#: modules/luci-base/htdocs/luci-static/resources/form.js:904
+#: modules/luci-base/htdocs/luci-static/resources/form.js:917
+#: modules/luci-base/htdocs/luci-static/resources/form.js:918
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1539
 #: modules/luci-base/luasrc/view/cbi/nsection.htm:25
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:189
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:197
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:39
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:47
 #: modules/luci-base/luasrc/view/cbi/ucisection.htm:54
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:703
 msgid "Add"
 msgstr "追加"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:60
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:870
+msgid "Add ATM Bridge"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:92
 msgid "Add IPv4 address…"
 msgstr "IPv4 アドレスを追加…"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:129
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:204
 msgid "Add IPv6 address…"
 msgstr "IPv6 アドレスを追加…"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:143
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:149
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:38
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:47
+msgid "Add LED action"
+msgstr "LED の動作を追加"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:215
+msgid "Add VLAN"
+msgstr "VLAN を追加"
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:14
+msgid "Add instance"
+msgstr "インスタンスを追加"
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:153
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:159
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:250
 msgid "Add key"
 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:155
 msgid "Add local domain suffix to names served from hosts files"
 msgstr ""
 "hosts ファイルにより解決される名前にローカルドメイン サフィックスを付加しま"
 "す。"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:705
 msgid "Add new interface..."
 msgstr "インターフェースの新規作成..."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:104
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:99
+msgid "Add peer"
+msgstr "ピアを追加"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:105
 msgid "Additional Hosts files"
 msgstr "追加のホストファイル"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:161
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
 msgid "Additional servers file"
 msgstr "追加のサーバー ファイル"
 
@@ -437,7 +463,7 @@ msgstr "追加のサーバー ファイル"
 msgid "Address"
 msgstr "アドレス"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:12
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:151
 msgid "Address to access local relay bridge"
 msgstr "ローカル リレーブリッジにアクセスするためのIPアドレス"
 
@@ -446,13 +472,13 @@ msgstr "ローカル リレーブリッジにアクセスするためのIPアド
 msgid "Administration"
 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:70
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:505
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:896
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:24
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:189
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:463
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:176
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:143
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:364
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:742
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:799
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:50
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:34
 msgid "Advanced Settings"
@@ -462,87 +488,90 @@ msgstr "詳細設定"
 msgid "Aggregate Transmit Power(ACTATP)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:175
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:166
 msgid "Alert"
 msgstr "警告"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1628
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1834
 #: modules/luci-base/luasrc/model/network.lua:1416
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:54
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:78
 msgid "Alias Interface"
 msgstr "エイリアス インターフェース"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:138
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:66
 msgid "Alias of \"%s\""
 msgstr "\"%s\" のエイリアス"
 
-#: 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:170
 msgid "All Servers"
 msgstr "全てのサーバー"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:114
 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:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:113
 msgid "Allocate IP sequentially"
-msgstr ""
+msgstr "連続 IP"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:24
 msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
 msgstr "<abbr title=\"Secure Shell\">SSH</abbr> パスワード認証を許可します。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:545
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:987
 msgid "Allow AP mode to disconnect STAs based on low ACK condition"
 msgstr "AP モード動作時に、低 ACK（確認応答）状態の STA の切断を許可します。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:462
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:589
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:891
 msgid "Allow all except listed"
 msgstr "リスト内の端末からのアクセスを禁止"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:236
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:767
 msgid "Allow legacy 802.11b rates"
 msgstr "レガシー 802.11b レートを許可"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:461
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:588
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:890
 msgid "Allow listed only"
 msgstr "リスト内の端末からのアクセスを許可"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:198
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:199
 msgid "Allow localhost"
 msgstr "ローカルホストを許可する"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:47
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:35
 msgid "Allow remote hosts to connect to local SSH forwarded ports"
 msgstr ""
 "リモートホストがSSH転送されたローカルのポートに接続することを許可します。"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:38
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:30
 msgid "Allow root logins with password"
 msgstr "パスワードでの root ログインを許可"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:39
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:30
 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:199
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:200
 msgid ""
 "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
 msgstr ""
+"上位サーバーからの特定範囲内 (127.0.0.0/8) の応答を許可します。例: RBL サービ"
+"スのため"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:135
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:122
 msgid "Allowed IPs"
 msgstr "許可されるIP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:549
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:602
 msgid "Always announce default router"
 msgstr "常にデフォルト ルーターを通知する"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:259
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:782
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
 "option does not comply with IEEE 802.11n-2009!"
@@ -550,82 +579,82 @@ msgstr ""
 "セカンダリ チャンネルの重複にかかわらず、常に 40MHz チャンネルを使用します。"
 "このオプションの使用は、 IEEE 802.11n-2009 に準拠しません！"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:95
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:818
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:119
 msgid "Annex"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:96
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:819
 msgid "Annex A + L + M (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:827
 msgid "Annex A G.992.1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:828
 msgid "Annex A G.992.2"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:829
 msgid "Annex A G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:830
 msgid "Annex A G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:97
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:820
 msgid "Annex B (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:823
 msgid "Annex B G.992.1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:824
 msgid "Annex B G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:102
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:825
 msgid "Annex B G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:98
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:821
 msgid "Annex J (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:831
 msgid "Annex L G.992.3 POTS 1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:99
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:822
 msgid "Annex M (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:109
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:832
 msgid "Annex M G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:833
 msgid "Annex M G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:550
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:602
 msgid "Announce as default router even if no public prefix is available."
 msgstr ""
 "利用可能なパブリック プレフィクスが無くても、デフォルトのルーターとして通知し"
 "ます。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:555
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:607
 msgid "Announced DNS domains"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:554
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:606
 msgid "Announced DNS servers"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1093
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1496
 msgid "Anonymous Identity"
 msgstr ""
 
@@ -637,20 +666,6 @@ msgstr "アノニマス マウント"
 msgid "Anonymous Swap"
 msgstr "アノニマス スワップ"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:322
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:329
-msgid "Antenna 1"
-msgstr "アンテナ 1"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:323
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:330
-msgid "Antenna 2"
-msgstr "アンテナ 2"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:246
-msgid "Antenna Configuration"
-msgstr "アンテナ設定"
-
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:71
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:160
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:181
@@ -658,11 +673,11 @@ msgstr "アンテナ設定"
 msgid "Any zone"
 msgstr "全てのゾーン"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1981
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2522
 msgid "Apply request failed with status <code>%h</code>"
 msgstr "適用リクエストはステータス <code>%h</code> で失敗しました"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1867
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2409
 msgid "Apply unchecked"
 msgstr "チェック無しの適用"
 
@@ -670,23 +685,27 @@ msgstr "チェック無しの適用"
 msgid "Architecture"
 msgstr "アーキテクチャ"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:19
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:184
+#: 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 ""
+"パブリック IPv6 プレフィクスのうち、指定されたプレフィクス長をこのインター"
+"フェースに割り当てます。"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:127
 msgid "Assign interfaces..."
 msgstr "インターフェースの割当て..."
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:124
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:24
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:189
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:31
 msgid ""
 "Assign prefix parts using this hexadecimal subprefix ID for this interface."
 msgstr ""
+"このサブ プレフィクス ID（16進数）を使用するプレフィクス領域を、このインター"
+"フェースに割り当てます。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:148
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1967
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:22
 msgid "Associated Stations"
 msgstr "アソシエーション済み端末"
@@ -695,20 +714,20 @@ msgstr "アソシエーション済み端末"
 msgid "Associations"
 msgstr "アソシエーション数"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:39
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:37
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:101
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:64
 msgid "Auth Group"
 msgstr "認証グループ"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1027
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1421
 msgid "Authentication"
 msgstr "認証"
 
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:29
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:70
 msgid "Authentication Type"
-msgstr ""
+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:78
 msgid "Authoritative"
 msgstr "Authoritative"
 
@@ -726,17 +745,19 @@ msgstr "ログイン認証"
 msgid "Auto Refresh"
 msgstr "自動更新"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:53
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:7
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:17
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:67
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:24
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:36
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:42
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:36
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:106
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:24
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:98
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:50
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:94
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:81
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:55
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:68
 msgid "Automatic"
 msgstr "自動"
 
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:7
 #: protocols/luci-proto-hnet/luasrc/model/network/proto_hnet.lua:7
 msgid "Automatic Homenet (HNCP)"
 msgstr ""
@@ -779,21 +800,21 @@ msgstr "使用可"
 msgid "Average:"
 msgstr "平均値:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:116
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:839
 msgid "B43 + B43C"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:840
 msgid "B43 + B43C + V43"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:48
 msgid "BR / DMR / AFTR"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:43
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:75
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1620
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:176
 msgid "BSSID"
 msgstr "BSSID"
@@ -807,19 +828,11 @@ msgstr "概要へ戻る"
 msgid "Back to configuration"
 msgstr "設定へ戻る"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:48
-msgid "Back to overview"
-msgstr "概要へ戻る"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:20
-msgid "Back to scan results"
-msgstr "スキャン結果へ戻る"
-
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:17
 msgid "Backup"
 msgstr "バックアップ"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:38
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:36
 msgid "Backup / Flash Firmware"
 msgstr "バックアップ / ファームウェア更新"
 
@@ -832,11 +845,11 @@ msgid "Bad address specified!"
 msgstr "無効なアドレスです!"
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:158
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:288
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:368
 msgid "Band"
 msgstr "バンド"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:261
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:785
 msgid "Beacon Interval"
 msgstr "ビーコン間隔"
 
@@ -850,7 +863,7 @@ msgstr ""
 "よって認識されている設定ファイル、重要なベースファイル、ユーザーが設定したパ"
 "ターンに一致したファイルの一覧です。"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:293
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:294
 msgid ""
 "Bind dynamically to interfaces rather than wildcard address (recommended as "
 "linux default)"
@@ -858,73 +871,79 @@ msgstr ""
 "ワイルドカード アドレスよりもインターフェースへ動的にバインド（Linux のデフォ"
 "ルトとして推奨されます）"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:16
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:48
 msgid "Bind interface"
 msgstr "インターフェースのバインド"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:16
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:48
 msgid "Bind the tunnel to this interface (optional)."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:49
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:134
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:187
 msgid "Bitrate"
 msgstr "ビットレート"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:172
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
 msgid "Bogus NX Domain Override"
 msgstr "偽の NX ドメイン オーバーライド"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1634
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1840
 #: modules/luci-base/luasrc/model/network.lua:1420
 msgid "Bridge"
 msgstr "ブリッジ"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:264
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:368
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:678
 msgid "Bridge interfaces"
 msgstr "ブリッジ インターフェース"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:906
 msgid "Bridge unit number"
 msgstr "ブリッジ ユニット番号"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:250
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:364
 msgid "Bring up on boot"
 msgstr "デフォルトで起動する"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:35
-msgid "Broadcom 802.11%s Wireless Controller"
-msgstr "Broadcom 802.11%s 無線LANコントローラ"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:45
-msgid "Broadcom BCM%04x 802.11 Wireless Controller"
-msgstr "Broadcom BCM%04x 802.11 無線LANコントローラ"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1697
+msgid "Browse…"
+msgstr "参照..."
 
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:18
 msgid "Buffered"
 msgstr "バッファ"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:75
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:134
 msgid "CA certificate; if empty it will be saved after the first connection."
 msgstr "CA証明書（空白の場合、初回の接続後に保存されます。）"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:7
+msgid "CLAT configuration failed"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:13
 msgid "CPU usage (%)"
 msgstr "CPU使用率 (%)"
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:21
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:53
 msgid "Call failed"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1789
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:14
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:52
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:711
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:948
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1839
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:191
 #: modules/luci-mod-system/luasrc/view/admin_system/upgrade.htm:60
 msgid "Cancel"
 msgstr "キャンセル"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:6
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:17
 msgid "Category"
 msgstr "カテゴリー"
 
@@ -942,13 +961,7 @@ msgstr "注意: システムは強制的にアップグレードされます"
 msgid "Chain"
 msgstr "チェイン"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:9
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:14
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:24
-msgid "Change login password"
-msgstr "ログイン パスワードの変更"
-
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1744
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 msgid "Changes"
 msgstr "変更"
 
@@ -956,35 +969,23 @@ msgstr "変更"
 msgid "Changes applied."
 msgstr "変更が適用されました。"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2004
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2545
 msgid "Changes have been reverted."
 msgstr "変更は取り消されました。"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:43
 msgid "Changes the administrator password for accessing the device"
 msgstr "デバイスの管理者パスワードを変更します"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:10
-msgid "Changing password…"
-msgstr "パスワードを変更中…"
-
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:162
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:45
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:87
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:174
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:376
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1618
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:186
 msgid "Channel"
 msgstr "チャネル"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:119
-msgid ""
-"Channel %d is not available in the %s regulatory domain and has been auto-"
-"adjusted to %d."
-msgstr ""
-"チャンネル %d は、 %s 領域内では規制により利用できません。%d へ自動調整されま"
-"した。"
-
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:229
 msgid "Check"
 msgstr "チェック"
@@ -993,7 +994,7 @@ msgstr "チェック"
 msgid "Check filesystems before mount"
 msgstr "マウント前にファイルシステムをチェックする"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1806
 msgid "Check this option to delete the existing networks from this radio."
 msgstr ""
 "この無線から既存のネットワークを削除する場合、このオプションを有効にします。"
@@ -1006,8 +1007,8 @@ msgstr "チェックサム"
 msgid "Choose mtdblock"
 msgstr "mtdblock を選択"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:358
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:443
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1829
 msgid ""
 "Choose the firewall zone you want to assign to this interface. Select "
 "<em>unspecified</em> to remove the interface from the associated zone or "
@@ -1019,7 +1020,7 @@ msgstr ""
 "フィールドにゾーン名を入力すると、新しくゾーンを作成し、このインターフェース"
 "に設定します。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:834
 msgid ""
 "Choose the network(s) you want to attach to this wireless interface or fill "
 "out the <em>create</em> field to define a new network."
@@ -1027,11 +1028,11 @@ msgstr ""
 "無線インターフェースをアタッチするネットワークを選択してください。または、"
 "<em>作成</em>欄を選択すると新しいネットワークを作成します。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:614
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1023
 msgid "Cipher"
 msgstr "暗号化方式"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:61
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:91
 msgid "Cisco UDP encapsulation"
 msgstr ""
 
@@ -1051,28 +1052,28 @@ msgstr ""
 "指定した mtdblock ファイルをダウンロードするには、 \"mtdblock を保存\" をク"
 "リックしてください。（注: この機能はプロフェッショナル向けです！）"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1950
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:369
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:471
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2189
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:803
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:908
 msgid "Client"
 msgstr "クライアント"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:55
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:52
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:47
 msgid "Client ID to send when requesting DHCP"
 msgstr "DHCPリクエスト時に送信するクライアントID"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:145
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:151
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:155
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:161
 msgid "Close"
 msgstr "閉じる"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:146
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:119
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:125
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:127
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:98
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:119
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:157
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:141
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:115
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:138
 msgid ""
 "Close inactive connection after the given amount of seconds, use 0 to "
 "persist connection"
@@ -1087,12 +1088,9 @@ msgstr "リストを閉じる"
 #: modules/luci-base/luasrc/view/lease_status.htm:77
 #: modules/luci-base/luasrc/view/lease_status.htm:98
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:118
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:37
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:24
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1965
 #: modules/luci-mod-network/luasrc/view/admin_network/iface_status.htm:6
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:40
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:30
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:8
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:398
 #: modules/luci-mod-status/luasrc/view/admin_status/index/30-network.htm:11
 #: modules/luci-mod-status/luasrc/view/admin_status/index/50-dsl.htm:17
@@ -1106,15 +1104,19 @@ msgstr "データ収集中です..."
 msgid "Command"
 msgstr "コマンド"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:193
+msgid "Command OK"
+msgstr "コマンド OK"
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:41
+msgid "Command failed"
+msgstr "コマンド失敗"
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:64
 msgid "Comment"
 msgstr "コメント"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:185
-msgid "Common Configuration"
-msgstr "一般設定"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
 msgid ""
 "Complicates key reinstallation attacks on the client side by disabling "
 "retransmission of EAPOL-Key frames that are used to install keys. This "
@@ -1126,13 +1128,14 @@ msgstr ""
 "この回避策は、相互運用性の問題や、特に高負荷のトラフィック環境下におけるキー "
 "ネゴシエーションの信頼性低下の原因となることがあります。"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1744
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 #: modules/luci-base/luasrc/controller/admin/uci.lua:11
 #: modules/luci-mod-system/luasrc/view/admin_system/backupfiles.htm:9
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:13
 msgid "Configuration"
 msgstr "設定"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:21
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:63
 msgid "Configuration failed"
 msgstr "設定が失敗しました"
@@ -1141,42 +1144,52 @@ msgstr "設定が失敗しました"
 msgid "Configuration files will be kept"
 msgstr "設定ファイルは保持されます"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1915
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2456
 msgid "Configuration has been applied."
 msgstr "設定が適用されました。"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1848
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2395
 msgid "Configuration has been rolled back!"
 msgstr "設定はロールバックされました！"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:43
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:942
+msgid "Confirm disconnect"
+msgstr "切断の確認"
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:50
 msgid "Confirmation"
 msgstr "確認"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:32
-msgid "Connect"
-msgstr "接続"
-
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:72
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:105
 msgid "Connected"
 msgstr "接続中"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:338
-msgid "Connection Limit"
-msgstr "接続制限"
-
 #: modules/luci-base/htdocs/luci-static/resources/network.js:7
 #: modules/luci-base/luasrc/model/network.lua:27
 msgid "Connection attempt failed"
 msgstr "接続の試行が失敗しました"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:203
+msgid "Connection lost"
+msgstr "接続喪失"
+
 #: modules/luci-mod-status/luasrc/controller/admin/status.lua:32
 msgid "Connections"
 msgstr "ネットワーク接続"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1890
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:66
+msgid "Contents have been saved."
+msgstr "内容が保存されました。"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:618
+msgid "Continue"
+msgstr "続行"
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2431
 msgid ""
 "Could not regain access to the device after applying the configuration "
 "changes. You might need to reconnect if you modified network related "
@@ -1186,47 +1199,37 @@ msgstr ""
 "レスや無線のセキュリティ認証情報などのネットワーク関連の設定を変更した場合、"
 "再接続が必要かもしれません。"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:135
 msgid "Country"
 msgstr "国"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:227
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:233
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:337
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:764
 msgid "Country Code"
 msgstr "国コード"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:36
-msgid "Cover the following interface"
-msgstr "インターフェースの指定"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:43
-msgid "Cover the following interfaces"
-msgstr "インターフェースの指定"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:357
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:86
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:443
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1829
 msgid "Create / Assign firewall-zone"
 msgstr "ファイアウォール ゾーンの作成 / 割り当て"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:9
-msgid "Create Interface"
-msgstr "インターフェースの作成"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:735
+msgid "Create interface"
+msgstr "インターフェースを作成"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:33
-msgid "Create a bridge over multiple interfaces"
-msgstr "複数のインタフェースを指定してブリッジを作成します"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:174
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:165
 msgid "Critical"
 msgstr "重大"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:178
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:169
 msgid "Cron Log Level"
 msgstr "Cronのログ出力レベル"
 
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:519
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:521
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:447
+msgid "Current power"
+msgstr "現在の出力"
+
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:552
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:554
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:51
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:53
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:82
@@ -1234,7 +1237,7 @@ msgstr "Cronのログ出力レベル"
 msgid "Custom Interface"
 msgstr "新しいインターフェース"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:36
 msgid "Custom delegated IPv6-prefix"
 msgstr ""
 
@@ -1246,7 +1249,7 @@ msgstr ""
 "カスタム ファイル（証明書, スクリプト）がシステムに残るかもしれません。これを"
 "防ぐには、まず最初に factory-reset を行います。"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:59
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:41
 msgid ""
 "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
 "\">LED</abbr>s if possible."
@@ -1254,46 +1257,47 @@ msgstr ""
 "<abbr title=\"Light Emitting Diode\">LED</abbr> デバイスの挙動をカスタマイズ"
 "します。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:799
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1223
 msgid "DAE-Client"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:807
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1231
 msgid "DAE-Port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:815
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1239
 msgid "DAE-Secret"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:448
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:459
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:279
 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:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:61
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:62
 msgid "DHCP and DNS"
 msgstr "DHCP 及び DNS"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1195
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1385
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:16
 #: modules/luci-base/luasrc/model/network.lua:968
 msgid "DHCP client"
 msgstr "DHCP クライアント"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:571
 msgid "DHCP-Options"
 msgstr "DHCPオプション"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_dhcpv6.lua:7
 msgid "DHCPv6 client"
 msgstr "DHCPv6 クライアント"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:540
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:594
 msgid "DHCPv6-Mode"
 msgstr "DHCPv6-モード"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:529
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:583
 msgid "DHCPv6-Service"
 msgstr "DHCPv6-サービス"
 
@@ -1310,31 +1314,31 @@ msgstr "DHCPv6-サービス"
 msgid "DNS"
 msgstr "DNS"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:183
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
 msgid "DNS forwardings"
 msgstr "DNSフォワーディング"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:30
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:37
 msgid "DNS-Label / FQDN"
 msgstr "DNS-ラベル / FQDN"
 
-#: 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:136
 msgid "DNSSEC"
 msgstr "DNSSEC"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:139
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
 msgid "DNSSEC check unsigned"
 msgstr "DNSSEC 未署名チェック"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:73
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:99
 msgid "DPD Idle Timeout"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:14
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:41
 msgid "DS-Lite AFTR address"
 msgstr "DS-Lite AFTR アドレス"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:92
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:815
 #: modules/luci-mod-status/luasrc/view/admin_status/index/50-dsl.htm:14
 msgid "DSL"
 msgstr "DSL"
@@ -1343,11 +1347,11 @@ msgstr "DSL"
 msgid "DSL Status"
 msgstr "DSL ステータス"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:125
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:848
 msgid "DSL line mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:519
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:963
 msgid "DTIM Interval"
 msgstr "DTIM インターバル"
 
@@ -1359,42 +1363,45 @@ msgstr "DUID"
 msgid "Data Rate"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:169
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:180
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:160
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:171
 msgid "Debug"
 msgstr "デバッグ"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:759
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:783
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:807
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1183
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1207
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1231
 msgid "Default %d"
 msgstr "標準設定 %d"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:82
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:107
 msgid "Default Route"
 msgstr "デフォルト ルート"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:17
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:81
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:51
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:32
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:48
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:85
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:65
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:80
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:108
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:146
 msgid "Default gateway"
 msgstr "デフォルト ゲートウェイ"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:541
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:594
 msgid "Default is stateless + stateful"
 msgstr "デフォルトは ステートレス + ステートフル です。"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:70
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:54
 msgid "Default state"
 msgstr "標準状態"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:503
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:553
 msgid "Define a name for this network."
 msgstr "ネットワーク名を設定してください。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:514
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:571
 msgid ""
 "Define additional DHCP options, for example "
 "\"<code>6,192.168.2.1,192.168.2.2</code>\" which advertises different DNS "
@@ -1403,35 +1410,47 @@ msgstr ""
 "追加のDHCPオプションを設定します。（例：\"<code>6,192.168.2.1,192.168.2.2</"
 "code>\" と設定することで、クライアントに指定のDNSサーバーを通知します。）"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:705
-#: modules/luci-base/htdocs/luci-static/resources/form.js:958
-#: modules/luci-base/htdocs/luci-static/resources/form.js:959
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1271
+#: modules/luci-base/htdocs/luci-static/resources/form.js:966
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1210
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1216
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1524
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1758
 #: modules/luci-base/luasrc/view/cbi/nsection.htm:11
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:162
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:16
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:41
 msgid "Delete"
 msgstr "削除"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:178
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:187
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:193
 msgid "Delete key"
 msgstr "公開鍵を削除"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:45
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1654
+msgid "Delete permission denied"
+msgstr "削除パーミッションが拒否されました"
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1656
+msgid "Delete request failed: %d %s"
+msgstr "削除リクエスト失敗: %d %s"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:723
 msgid "Delete this network"
 msgstr "ネットワークを削除します"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:519
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:963
 msgid "Delivery Traffic Indication Message Interval"
 msgstr "Delivery Traffic Indication Message インターバル"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:102
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:108
 msgid "Description"
 msgstr "詳細"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:224
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1754
+msgid "Deselect"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:215
 msgid "Design"
 msgstr "デザイン"
 
@@ -1443,16 +1462,18 @@ msgstr "宛先"
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:46
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:151
 msgid "Destination zone"
-msgstr ""
+msgstr "宛先ゾーン"
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:54
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:177
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:43
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:13
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:38
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:73
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:33
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:52
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:85
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:86
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:72
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:154
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:253
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:86
@@ -1460,15 +1481,24 @@ msgstr ""
 msgid "Device"
 msgstr "デバイス"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:138
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:737
 msgid "Device Configuration"
 msgstr "デバイス設定"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:81
+msgid "Device is not active"
+msgstr "デバイスがアクティブではありません"
+
 #: modules/luci-mod-system/luasrc/view/admin_system/reboot.htm:23
 msgid "Device is rebooting..."
 msgstr "デバイスを再起動中です..."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1889
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:167
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:513
+msgid "Device is restarting…"
+msgstr "デバイスを再起動中..."
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2430
 msgid "Device unreachable!"
 msgstr "デバイスに到達できません"
 
@@ -1476,26 +1506,26 @@ msgstr "デバイスに到達できません"
 msgid "Device unreachable! Still waiting for device..."
 msgstr "デバイスに到達できません！まだデバイスを待っています..."
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:123
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:78
 #: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:61
 msgid "Diagnostics"
 msgstr "診断機能"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:45
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:60
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:101
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:93
 msgid "Dial number"
 msgstr ""
 
-#: modules/luci-base/luasrc/view/cbi/filebrowser.htm:99
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1554
 msgid "Directory"
 msgstr "ディレクトリ"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:131
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:715
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:754
 msgid "Disable"
 msgstr "無効"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:472
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:531
 msgid ""
 "Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for "
 "this interface."
@@ -1503,71 +1533,66 @@ msgstr ""
 "このインターフェースでは<abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr>機能を使用しません。"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:64
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:93
 msgid "Disable Encryption"
 msgstr "暗号化を無効にする"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:530
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:973
 msgid "Disable Inactivity Polling"
 msgstr "非アクティブ状態ポーリングを無効化"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:713
 msgid "Disable this network"
 msgstr "このネットワークを無効にします"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:44
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:54
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:68
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:37
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:43
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:37
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1534
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:76
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:107
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:99
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:51
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:95
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:82
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:69
 msgid "Disabled"
 msgstr "無効"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1139
-msgid "Disabled (default)"
-msgstr "無効（デフォルト）"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:544
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:987
 msgid "Disassociate On Low Acknowledgement"
 msgstr "低 Acknowledgement 時のアソシエーション解除"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:193
 msgid "Discard upstream RFC1918 responses"
 msgstr "RFC1918の応答を破棄します"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:92
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:114
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:956
 msgid "Disconnect"
 msgstr "切断"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:22
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:64
 msgid "Disconnection attempt failed"
 msgstr "切断の試行が失敗しました"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1121
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1762
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1855
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:17
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1375
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1995
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2314
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2401
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1634
 msgid "Dismiss"
 msgstr "閉じる"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:240
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:334
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:770
 msgid "Distance Optimization"
 msgstr "距離の最適化"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:241
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:770
 msgid "Distance to farthest network member in meters."
 msgstr "最も遠い端末との距離(メートル)を設定してください。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:347
-msgid "Diversity"
-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:61
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
@@ -1579,36 +1604,44 @@ msgstr ""
 "ウォールの為の <abbr title=\"Domain Name System\">DNS</abbr>フォワーダーを複"
 "合したサービスです。"
 
-#: 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:159
 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:123
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:124
 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:118
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
 msgid "Do not forward reverse lookups for local networks"
 msgstr "ローカル ネットワークへの逆引きを転送しません"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:173
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1639
+msgid "Do you really want to delete \"%s\" ?"
+msgstr "本当に \"%s\" を削除しますか？"
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:188
 msgid "Do you really want to delete the following SSH key?"
 msgstr "本当に以下の SSH 公開鍵を削除しますか？"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1637
+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:74
 msgid "Domain required"
 msgstr "ドメイン必須"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:205
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:206
 msgid "Domain whitelist"
 msgstr "ドメイン ホワイトリスト"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:34
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:67
 msgid "Don't Fragment"
 msgstr "非フラグメント化"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:74
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:75
 msgid ""
 "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
 "<abbr title=\"Domain Name System\">DNS</abbr>-Name"
@@ -1628,19 +1661,19 @@ msgstr "バックアップ アーカイブのダウンロード"
 msgid "Download mtdblock"
 msgstr "mtdblock のダウンロード"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:853
 msgid "Downstream SNR offset"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:914
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1169
 msgid "Drag to reorder"
 msgstr "ドラッグして並び替え"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:9
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:11
 msgid "Dropbear Instance"
 msgstr "Dropbear設定"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:6
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 msgid ""
 "Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access "
 "and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
@@ -1649,19 +1682,20 @@ msgstr ""
 "クセスと統合された <abbr title=\"Secure Copy\">SCP</abbr> サーバーを提供しま"
 "す。"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:11
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:14
 msgid "Dual-Stack Lite (RFC6333)"
 msgstr "Dual-Stack Lite (RFC6333)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:493
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:547
 msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 msgstr "動的 <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:60
 msgid "Dynamic tunnel"
 msgstr "動的トンネル機能"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:494
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:547
 msgid ""
 "Dynamically allocate DHCP addresses for clients. If disabled, only clients "
 "having static leases will be served."
@@ -1669,21 +1703,21 @@ msgstr ""
 "クライアントに対して動的にDHCPアドレスを割り振ります。無効に設定した場合、静"
 "的リースのみを行います。"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:67
 msgid "EA-bits length"
 msgstr "EA ビット長"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:990
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1386
 msgid "EAP-Method"
-msgstr "EAPメソッド"
+msgstr "EAP メソッド"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:934
-#: modules/luci-base/htdocs/luci-static/resources/form.js:935
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1199
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1188
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1191
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1450
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:154
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:160
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:38
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:291
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:720
 msgid "Edit"
 msgstr "編集"
 
@@ -1695,24 +1729,24 @@ msgstr ""
 "上記の設定データを直接編集してエラーを修正し、 \"保存\" ボタンを押してこの"
 "ページをリロードします。"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:38
-msgid "Edit this interface"
-msgstr "インターフェースを編集します"
-
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:718
 msgid "Edit this network"
 msgstr "ネットワークを編集"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:669
+msgid "Edit wireless network"
+msgstr "無線ネットワークの編集"
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:167
 msgid "Emergency"
 msgstr "緊急"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:127
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:715
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:754
 msgid "Enable"
 msgstr "有効"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:414
 msgid ""
 "Enable <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> "
 "snooping"
@@ -1720,67 +1754,68 @@ msgstr ""
 "<abbr title=\"Internet Group Management Protocol\">IGMP</abbr> スヌーピングの"
 "有効化"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:271
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:412
 msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 msgstr "<abbr title=\"Spanning Tree Protocol\">STP</abbr>を有効にする"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:41
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:60
 msgid "Enable HE.net dynamic endpoint update"
 msgstr "HE.netの動的endpoint更新を有効にします"
 
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:51
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:89
 msgid "Enable IPv6 negotiation"
 msgstr "IPv6 ネゴシエーションの有効化"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:23
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:35
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:41
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:35
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:37
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:49
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:80
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:54
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:67
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:93
 msgid "Enable IPv6 negotiation on the PPP link"
 msgstr "PPPリンクのIPv6 ネゴシエーションを有効にする"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:143
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:188
 msgid "Enable Jumbo Frame passthrough"
 msgstr "ジャンボフレーム パススルーを有効にする"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:244
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:235
 msgid "Enable NTP client"
 msgstr "NTPクライアント機能を有効にする"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:69
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:96
 msgid "Enable Single DES"
 msgstr "シングルDESの有効化"
 
-#: 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:267
 msgid "Enable TFTP server"
 msgstr "TFTPサーバーを有効にする"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:134
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:180
 msgid "Enable VLAN functionality"
 msgstr "VLAN機能を有効にする"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1595
 msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
 msgstr "WPS プッシュボタンを有効化するには、WPA(2)-PSKが必要です。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1175
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
 msgid "Enable key reinstallation (KRACK) countermeasures"
 msgstr "Key Reinstallation (KRACK) 対策の有効化"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:138
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:183
 msgid "Enable learning and aging"
 msgstr "ラーニング エイジング機能を有効にする"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:194
 msgid "Enable mirroring of incoming packets"
 msgstr "受信パケットのミラーリングを有効化"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:151
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:195
 msgid "Enable mirroring of outgoing packets"
 msgstr "送信パケットのミラーリングを有効化"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:34
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:67
 msgid "Enable the DF (Don't Fragment) flag of the encapsulating packets."
 msgstr "カプセル化されたパケットの DF (Don't Fragment) フラグを有効にします。"
 
@@ -1788,7 +1823,7 @@ msgstr "カプセル化されたパケットの DF (Don't Fragment) フラグを
 msgid "Enable this mount"
 msgstr "マウント設定を有効にする"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:713
 msgid "Enable this network"
 msgstr "このネットワークを有効にします"
 
@@ -1796,21 +1831,21 @@ msgstr "このネットワークを有効にします"
 msgid "Enable this swap"
 msgstr "スワップ設定を有効にする"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:37
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:88
 msgid "Enable/Disable"
 msgstr "有効 / 無効"
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:76
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:152
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:251
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:41
 msgid "Enabled"
 msgstr "有効"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:277
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:414
 msgid "Enables IGMP snooping on this bridge"
 msgstr "ブリッジの IGMP スヌーピングを有効にします"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:892
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1310
 msgid ""
 "Enables fast roaming among access points that belong to the same Mobility "
 "Domain"
@@ -1818,28 +1853,32 @@ msgstr ""
 "同一のモビリティ ドメイン（モビリティ グループ）に属するアクセスポイント間の"
 "高速ローミングを有効にします。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:272
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:412
 msgid "Enables the Spanning Tree Protocol on this bridge"
 msgstr "スパニングツリー プロトコルを有効にする"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:120
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:180
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:59
+msgid "Encapsulation limit"
+msgstr "カプセル化制限"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:843
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:901
 msgid "Encapsulation mode"
 msgstr "カプセル化モード"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:76
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:603
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:129
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:992
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1621
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:177
 msgid "Encryption"
 msgstr "暗号化モード"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:155
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:128
 msgid "Endpoint Host"
 msgstr "エンドポイント ホスト"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:165
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:132
 msgid "Endpoint Port"
 msgstr "エンドポイント ポート"
 
@@ -1851,16 +1890,21 @@ msgstr "カスタム値を入力"
 msgid "Enter custom values"
 msgstr "カスタム値を入力"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:273
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:271
 msgid "Erasing..."
 msgstr "消去中..."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:95
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:96
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:97
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:98
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:99
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:106
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:107
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:108
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:109
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:110
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:173
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:164
 msgid "Error"
 msgstr "エラー"
 
@@ -1868,24 +1912,28 @@ msgstr "エラー"
 msgid "Errored seconds (ES)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1646
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1852
 #: modules/luci-base/luasrc/model/network.lua:1432
 msgid "Ethernet Adapter"
 msgstr "イーサネットアダプタ"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1637
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1843
 #: modules/luci-base/luasrc/model/network.lua:1422
 msgid "Ethernet Switch"
 msgstr "イーサネットスイッチ"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:303
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
 msgid "Exclude interfaces"
 msgstr "除外インターフェース"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:153
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
 msgid "Expand hosts"
 msgstr "拡張ホスト設定"
 
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:195
+msgid "Expecting an hexadecimal assignment hint"
+msgstr "期待される値: 16進数の割り当てヒント"
+
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:59
 msgid "Expecting: %s"
 msgstr "期待される値: %s"
@@ -1894,62 +1942,78 @@ msgstr "期待される値: %s"
 msgid "Expires"
 msgstr "期限切れ"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:488
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:543
 msgid ""
 "Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
 msgstr ""
 "リースアドレスの有効時間を入力します。最小設定値は2分です。 (<code>2m</"
 "code>)."
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:8
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:19
 msgid "External"
 msgstr "外部"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:971
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1377
 msgid "External R0 Key Holder List"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:980
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1381
 msgid "External R1 Key Holder List"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:150
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:141
 msgid "External system log server"
 msgstr "外部システムログ サーバー"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:155
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:146
 msgid "External system log server port"
 msgstr "外部システムログ・サーバー ポート"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:160
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:151
 msgid "External system log server protocol"
 msgstr "外部システムログ・サーバー プロトコル"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:18
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:79
 msgid "Extra SSH command options"
 msgstr "拡張 SSHコマンドオプション"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:940
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1351
 msgid "FT over DS"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:941
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1352
 msgid "FT over the Air"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:938
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1349
 msgid "FT protocol"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1842
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:82
+msgid "Failed to change the system password."
+msgstr "システム パスワードの変更に失敗しました。"
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2389
 msgid "Failed to confirm apply within %ds, waiting for rollback…"
 msgstr "%d 秒以内の適用を確認できませんでした。ロールバック中です..."
 
-#: modules/luci-base/luasrc/view/cbi/filebrowser.htm:106
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:45
+msgid "Failed to execute \"/etc/init.d/%s %s\" action: %s"
+msgstr "\"/etc/init.d/%s %s\" の実行に失敗しました: %s"
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1561
 msgid "File"
 msgstr "ファイル"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:279
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1514
+msgid "File not accessible"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1698
+msgid "Filename"
+msgstr "ファイル名"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:280
 msgid "Filename of the boot image advertised to clients"
 msgstr "クライアントに通知するブートイメージのファイル名"
 
@@ -1959,14 +2023,15 @@ msgstr "クライアントに通知するブートイメージのファイル名
 msgid "Filesystem"
 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:118
 msgid "Filter private"
 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:123
 msgid "Filter useless"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:23
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:65
 msgid "Finalizing failed"
 msgstr ""
@@ -1979,7 +2044,7 @@ msgstr ""
 "現在アタッチされている全てのファイルシステムとスワップを検索し、検出結果に基"
 "づいてデフォルト設定を置き換えます。"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:696
 msgid "Find and join network"
 msgstr "ネットワークの検索と参加"
 
@@ -1991,11 +2056,11 @@ msgstr "終了"
 msgid "Firewall"
 msgstr "ファイアウォール"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:77
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:76
 msgid "Firewall Mark"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:193
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:278
 msgid "Firewall Settings"
 msgstr "ファイアウォール設定"
 
@@ -2003,7 +2068,7 @@ msgstr "ファイアウォール設定"
 msgid "Firewall Status"
 msgstr "ファイアウォール ステータス"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:137
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:860
 msgid "Firmware File"
 msgstr "ファームウェア ファイル"
 
@@ -2011,7 +2076,7 @@ msgstr "ファームウェア ファイル"
 msgid "Firmware Version"
 msgstr "ファームウェア バージョン"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:225
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:226
 msgid "Fixed source port for outbound DNS queries"
 msgstr "DNSクエリを送信する送信元ポートを固定します"
 
@@ -2031,36 +2096,36 @@ msgstr "ファームウェアの更新"
 msgid "Flash operations"
 msgstr "更新機能"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:194
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:192
 msgid "Flashing..."
 msgstr "更新中..."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:498
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:550
 msgid "Force"
 msgstr "強制"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:258
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:782
 msgid "Force 40MHz mode"
 msgstr "強制 40MHz モード"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:622
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1031
 msgid "Force CCMP (AES)"
 msgstr "CCMP (AES) を使用"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:499
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:550
 msgid "Force DHCP on this network even if another server is detected."
 msgstr ""
 "別のDHCPサーバーが検出された場合でも、DHCPサーバー機能を強制的に起動します。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:623
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1032
 msgid "Force TKIP"
 msgstr "TKIP を使用"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:624
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1033
 msgid "Force TKIP and CCMP (AES)"
 msgstr "TKIP 及びCCMP (AES) を使用"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:795
 msgid "Force link"
 msgstr "強制リンク"
 
@@ -2068,7 +2133,7 @@ msgstr "強制リンク"
 msgid "Force upgrade"
 msgstr "強制アップグレード"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:60
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:90
 msgid "Force use of NAT-T"
 msgstr "NAT-Tの強制使用"
 
@@ -2076,7 +2141,7 @@ msgstr "NAT-Tの強制使用"
 msgid "Form token mismatch"
 msgstr "フォーム トークンの不一致"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:34
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:164
 msgid "Forward DHCP traffic"
 msgstr "DHCPトラフィックを転送する"
 
@@ -2084,48 +2149,41 @@ msgstr "DHCPトラフィックを転送する"
 msgid "Forward Error Correction Seconds (FECS)"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:28
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:161
 msgid "Forward broadcast traffic"
 msgstr "ブロードキャスト トラフィックを転送する"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:375
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:809
 msgid "Forward mesh peer traffic"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:186
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:908
 msgid "Forwarding mode"
 msgstr "転送モード"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:255
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:596
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:774
 msgid "Fragmentation Threshold"
 msgstr "フラグメンテーションしきい値"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:332
-msgid "Frame Bursting"
-msgstr "フレームバースト"
-
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:17
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:28
 msgid "Free"
 msgstr "空き"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:91
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:89
 msgid ""
-"Further information about WireGuard interfaces and peers at <a href=\"http://"
-"wireguard.com\">wireguard.com</a>."
+"Further information about WireGuard interfaces and peers at <a href='http://"
+"wireguard.com'>wireguard.com</a>."
 msgstr ""
-"WireGuard インターフェースとピアについての詳細情報: <a href=\"http://"
-"wireguard.com\">wireguard.com</a>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:45
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:130
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:186
 msgid "GHz"
 msgstr "GHz"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:29
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:36
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:91
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:77
 msgid "GPRS only"
 msgstr "GPRSのみ"
 
@@ -2134,28 +2192,28 @@ msgstr "GPRSのみ"
 msgid "Gateway"
 msgstr "ゲートウェイ"
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:35
+msgid "Gateway Ports"
+msgstr "ゲートウェイ ポート"
+
 #: modules/luci-base/htdocs/luci-static/resources/network.js:9
 #: modules/luci-base/luasrc/model/network.lua:29
 msgid "Gateway address is invalid"
 msgstr "無効なゲートウェイ アドレスです"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:46
-msgid "Gateway ports"
-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:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:275
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:23
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:112
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:103
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:49
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:33
 msgid "General Settings"
 msgstr "一般設定"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:188
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:462
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:175
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:141
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:361
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:504
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:895
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:741
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:796
 msgid "General Setup"
 msgstr "一般設定"
 
@@ -2163,7 +2221,7 @@ msgstr "一般設定"
 msgid "Generate Config"
 msgstr "コンフィグ生成"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:945
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1355
 msgid "Generate PMK locally"
 msgstr ""
 
@@ -2171,11 +2229,7 @@ msgstr ""
 msgid "Generate archive"
 msgstr "バックアップ アーカイブを生成"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:63
-msgid "Generic 802.11%s Wireless Controller"
-msgstr "802.11%s 無線LANコントローラ"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:26
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:74
 msgid "Given password confirmation did not match, password not changed!"
 msgstr "入力されたパスワードが一致しません。パスワードは変更されませんでした!"
 
@@ -2183,7 +2237,7 @@ msgstr "入力されたパスワードが一致しません。パスワードは
 msgid "Global Settings"
 msgstr "全体設定"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:806
 msgid "Global network options"
 msgstr "グローバル ネットワークオプション"
 
@@ -2194,33 +2248,29 @@ msgstr "グローバル ネットワークオプション"
 msgid "Go to password configuration..."
 msgstr "パスワード設定へ移動..."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:857
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1369
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1112
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1616
 #: modules/luci-base/luasrc/view/cbi/full_valueheader.htm:4
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:58
 msgid "Go to relevant configuration page"
 msgstr "関連する設定ページへ移動"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:38
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:66
 msgid "Group Password"
 msgstr "グループ パスワード"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:11
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:22
 msgid "Guest"
 msgstr "ゲスト"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:73
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:81
 msgid "HE.net password"
 msgstr "HE.net パスワード"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:60
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:73
 msgid "HE.net username"
 msgstr "HE.net ユーザー名"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:310
-msgid "HT mode (802.11n)"
-msgstr "HT モード (802.11n)"
-
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:16
 msgid "Hang Up"
 msgstr "再起動"
@@ -2229,16 +2279,14 @@ msgstr "再起動"
 msgid "Header Error Code Errors (HEC)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:103
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 msgid ""
 "Here you can configure the basic aspects of your device like its hostname or "
 "the timezone."
 msgstr ""
 "このページではホスト名やタイムゾーンなどの基本的な設定を行うことが出来ます。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:499
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:556
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:579
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:941
 msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>の隠匿"
 
@@ -2249,14 +2297,15 @@ msgstr "空のチェインを非表示"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:92
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1959
 msgid "Host"
 msgstr "ホスト"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:20
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:21
 msgid "Host entries"
 msgstr "ホスト エントリー"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:48
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:171
 msgid "Host expiry timeout"
 msgstr "ホスト終了タイムアウト"
 
@@ -2265,45 +2314,45 @@ msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
 msgstr ""
 "ホスト<abbr title=\"Internet Protocol Address\">IP</abbr> または ネットワーク"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:118
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:102
 msgid "Host-Uniq tag content"
-msgstr ""
+msgstr "Host-Uniq タグ"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:71
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:31
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:316
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:25
+#: 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:317
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:26
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:17
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:125
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:116
 msgid "Hostname"
 msgstr "ホスト名"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:12
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:22
 msgid "Hostname to send when requesting DHCP"
 msgstr "DHCPリクエスト時に送信するホスト名"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:18
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:19
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:67
 msgid "Hostnames"
 msgstr "ホスト名"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:13
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:24
 msgid "Hybrid"
 msgstr "ハイブリッド"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:45
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:75
 msgid "IKE DH Group"
 msgstr "IKE DHグループ"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:41
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:59
 msgid "IP Addresses"
 msgstr "IPアドレス"
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:40
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:80
 msgid "IP Protocol"
 msgstr "IP プロトコル"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:29
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:30
 msgid "IP address"
 msgstr "IPアドレス"
 
@@ -2322,6 +2371,11 @@ msgstr "IP アドレスがありません"
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:20
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:21
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:22
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:79
+#: 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/network.js:89
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:90
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:91
@@ -2329,7 +2383,7 @@ msgstr "IP アドレスがありません"
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:93
 #: 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/luasrc/model/cbi/admin_network/proto_ncm.lua:42
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:82
 msgid "IPv4"
 msgstr "IPv4"
 
@@ -2341,24 +2395,23 @@ msgstr "IPv4 ファイアウォール"
 msgid "IPv4 Upstream"
 msgstr "IPv4 アップストリーム"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:57
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:178
 msgid "IPv4 address"
 msgstr "IPv4 アドレス"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:26
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:33
 msgid "IPv4 assignment length"
 msgstr "IPv4 割り当て長"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:104
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:181
 msgid "IPv4 broadcast"
 msgstr "IPv4 ブロードキャスト"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:100
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:180
 msgid "IPv4 gateway"
 msgstr "IPv4 ゲートウェイ"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:92
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:179
 msgid "IPv4 netmask"
 msgstr "IPv4 ネットマスク"
 
@@ -2366,24 +2419,25 @@ msgstr "IPv4 ネットマスク"
 msgid "IPv4 network in address/netmask notation"
 msgstr "IPv4 ネットワーク（アドレス/ネットマスク 表記）"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:25
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:52
 msgid "IPv4 prefix"
 msgstr "IPv4 プレフィクス"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:42
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:30
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:55
 msgid "IPv4 prefix length"
 msgstr "IPv4 プレフィクス長"
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:43
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:83
 msgid "IPv4+IPv6"
 msgstr "IPv4+IPv6"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:72
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:34
 msgid "IPv4-Address"
 msgstr "IPv4-アドレス"
 
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:10
 #: protocols/luci-proto-ipip/luasrc/model/network/proto_ipip.lua:9
 msgid "IPv4-in-IPv4 (RFC2003)"
 msgstr "IPv4-in-IPv4 (RFC2003)"
@@ -2398,6 +2452,16 @@ msgstr "IPv4-in-IPv4 (RFC2003)"
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:30
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:31
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:32
+#: 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/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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:89
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:90
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:91
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:92
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:95
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:96
@@ -2410,7 +2474,7 @@ msgstr "IPv4-in-IPv4 (RFC2003)"
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:103
 #: 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/luasrc/model/cbi/admin_network/proto_ncm.lua:44
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:84
 msgid "IPv6"
 msgstr "IPv6"
 
@@ -2422,11 +2486,11 @@ msgstr "IPv6 ファイアウォール"
 msgid "IPv6 Neighbours"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:464
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:506
 msgid "IPv6 Settings"
 msgstr "IPv6 設定"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:195
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:810
 msgid "IPv6 ULA-Prefix"
 msgstr "IPv6 ULA-プレフィクス"
 
@@ -2434,21 +2498,21 @@ msgstr "IPv6 ULA-プレフィクス"
 msgid "IPv6 Upstream"
 msgstr "IPv6 アップストリーム"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:202
 msgid "IPv6 address"
 msgstr "IPv6 アドレス"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:23
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:189
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:31
 msgid "IPv6 assignment hint"
-msgstr ""
+msgstr "IPv6 割り当てヒント"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:18
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:184
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:27
 msgid "IPv6 assignment length"
 msgstr "IPv6 割り当て長"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:207
 msgid "IPv6 gateway"
 msgstr "IPv6 ゲートウェイ"
 
@@ -2456,22 +2520,22 @@ msgstr "IPv6 ゲートウェイ"
 msgid "IPv6 network in address/netmask notation"
 msgstr "IPv6 ネットワーク（アドレス/ネットマスク 表記）"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:37
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:59
 msgid "IPv6 prefix"
 msgstr "IPv6 プレフィクス"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:34
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:45
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:63
 msgid "IPv6 prefix length"
 msgstr "IPv6 プレフィクス長"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:33
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:211
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:57
 msgid "IPv6 routed prefix"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:143
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:215
 msgid "IPv6 suffix"
 msgstr "IPv6 サフィックス"
 
@@ -2481,31 +2545,35 @@ msgid "IPv6-Address"
 msgstr "IPv6-アドレス"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:93
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:104
 msgid "IPv6-PD"
 msgstr "IPv6-PD"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:10
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:13
 msgid "IPv6-in-IPv4 (RFC4213)"
 msgstr "IPv6-in-IPv4 (RFC4213)"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:17
 msgid "IPv6-over-IPv4 (6rd)"
 msgstr "IPv6-over-IPv4 (6rd)"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:15
 msgid "IPv6-over-IPv4 (6to4)"
 msgstr "IPv6-over-IPv4 (6to4)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1075
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1478
 msgid "Identity"
 msgstr "識別子"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:70
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:96
 msgid "If checked, 1DES is enabled"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:65
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:93
 msgid "If checked, encryption is disabled"
 msgstr "チェックした場合、暗号化は無効になります。"
 
@@ -2525,36 +2593,36 @@ msgstr ""
 "固定のデバイス ノード名のかわりに、設定されたパーティション ラベルを使用して"
 "マウントします。"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:27
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:71
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:18
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:82
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:52
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:17
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:29
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:33
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:68
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:85
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:32
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:45
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:45
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:24
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:44
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:116
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:48
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:85
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:65
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:33
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:80
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:108
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:146
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:74
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:97
 msgid "If unchecked, no default route is configured"
 msgstr "チェックされていない場合、デフォルト ルートは構成されません"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:34
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:86
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:35
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:99
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:47
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:60
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:60
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:39
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:59
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:124
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:39
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:116
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:59
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:103
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:64
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:77
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:100
 msgid "If unchecked, the advertised DNS server addresses are ignored"
 msgstr "チェックされていない場合、通知されたDNSサーバー アドレスを無視します"
 
@@ -2572,15 +2640,15 @@ msgstr ""
 "Memory\">RAM</abbr>から高速にアクセスすることができないため、データのスワップ"
 "は非常に遅い処理であることに注意します。"
 
-#: 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:102
 msgid "Ignore <code>/etc/hosts</code>"
 msgstr "<code>/etc/hosts</code>を無視"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:471
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:531
 msgid "Ignore interface"
 msgstr "インターフェースを無視する"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:90
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:91
 msgid "Ignore resolve file"
 msgstr "リゾルバ ファイルを無視する"
 
@@ -2600,12 +2668,12 @@ msgstr ""
 "システムへの未認証のアクセスを防ぐために、リクエストはブロックされました。以"
 "下の \"続行\" をクリックして、前のページに戻ります。"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:145
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:118
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:124
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:126
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:97
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:118
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:157
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:141
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:115
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:138
 msgid "Inactivity timeout"
 msgstr "未使用時タイムアウト"
 
@@ -2613,23 +2681,25 @@ msgstr "未使用時タイムアウト"
 msgid "Inbound:"
 msgstr "受信:"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:170
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:161
 msgid "Info"
 msgstr "情報"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:105
 msgid "Information"
 msgstr "情報"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:25
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:67
 msgid "Initialization failure"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:34
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:87
 msgid "Initscript"
 msgstr "起動スクリプト"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:26
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:122
 msgid "Initscripts"
 msgstr "起動スクリプト"
 
@@ -2639,55 +2709,75 @@ msgstr ""
 "IPv6 の traceroute を使用するには、 iputils-traceroute6 をインストールしま"
 "す。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:223
-msgid "Install package %q"
-msgstr "%q パッケージをインストールします"
-
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:220
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:120
 msgid "Install protocol extensions..."
 msgstr "プロトコル拡張機能をインストールします..."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:416
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:423
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:683
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:687
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:26
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:284
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:342
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:47
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:134
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:14
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:16
 msgid "Interface"
 msgstr "インターフェース"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:58
 msgid "Interface %q device auto-migrated from %q to %q."
 msgstr ""
+"インターフェース %q のデバイスは、 %q から %q へ自動的に移行されました。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:356
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:792
 msgid "Interface Configuration"
 msgstr "インターフェース設定"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:51
-msgid "Interface Overview"
-msgstr "インターフェース一覧"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:99
+msgid "Interface has %d pending changes"
+msgstr "インターフェースで %d 個の変更が保留中です"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:57
+msgid "Interface is marked for deletion"
+msgstr "インターフェースは削除のためマークされています"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:162
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:3
 msgid "Interface is reconnecting..."
-msgstr "インターフェース再接続中..."
+msgstr "インターフェースを再接続中..."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:162
+msgid "Interface is shutting down..."
+msgstr "インターフェースをシャットダウン中..."
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:205
+msgid "Interface is starting..."
+msgstr "インターフェースを開始中..."
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:208
+msgid "Interface is stopping..."
+msgstr "インターフェースを停止中..."
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:954
 msgid "Interface name"
 msgstr "インターフェース名"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:34
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:224
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:131
 msgid "Interface not present or not connected yet."
 msgstr "インターフェースが存在しないか、接続していません"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:88
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:16
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:11
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:287
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:54
 msgid "Interfaces"
 msgstr "インターフェース"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:9
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:20
 msgid "Internal"
 msgstr "内部"
 
@@ -2700,20 +2790,36 @@ msgstr "内部サーバー エラー"
 msgid "Invalid"
 msgstr "入力値が不正です"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:311
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:10
+msgid "Invalid Base64 key string"
+msgstr "無効な Base64 キー文字列"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:281
 msgid "Invalid VLAN ID given! Only IDs between %d and %d are allowed."
 msgstr "無効なVLAN IDです! IDは%dから%dまでの値のみ入力可能です。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:307
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:290
 msgid "Invalid VLAN ID given! Only unique IDs are allowed"
 msgstr "無効なVLAN IDです! ユニークなIDを入力してください。"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:195
+msgid "Invalid argument"
+msgstr "無効な引数"
+
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:194
+msgid "Invalid command"
+msgstr "無効なコマンド"
+
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:80
+msgid "Invalid hexadecimal value"
+msgstr "無効な 16 進数値"
+
 #: modules/luci-base/luasrc/view/sysauth.htm:12
 msgid "Invalid username and/or password! Please try again."
 msgstr ""
 "ユーザー名かパスワード、もしくは両方が不正です！もう一度入力してください。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:508
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:950
 msgid "Isolate Clients"
 msgstr "クライアント間の分離"
 
@@ -2732,15 +2838,15 @@ msgstr ""
 msgid "JavaScript required!"
 msgstr "JavaScriptを有効にしてください!"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:52
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1691
 msgid "Join Network"
 msgstr "ネットワークに接続する"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:22
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1628
 msgid "Join Network: Wireless Scan"
 msgstr "ネットワークに接続する: 無線LANスキャン"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:19
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1833
 msgid "Joining Network: %q"
 msgstr "ネットワークに接続: %q"
 
@@ -2757,15 +2863,15 @@ msgstr "カーネル ログ"
 msgid "Kernel Version"
 msgstr "カーネル バージョン"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:823
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1248
 msgid "Key"
 msgstr "暗号キー"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:851
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:852
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:853
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:854
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:870
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1277
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1278
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1279
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1291
 msgid "Key #%d"
 msgstr "キー #%d"
 
@@ -2773,33 +2879,34 @@ msgstr "キー #%d"
 msgid "Kill"
 msgstr "強制終了"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:10
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:21
 msgid "L2TP"
 msgstr "L2TP"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:10
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:40
 msgid "L2TP Server"
 msgstr "L2TP サーバー"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:100
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:74
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:80
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:74
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:53
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:73
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:131
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:102
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:89
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:112
 msgid "LCP echo failure threshold"
 msgstr "LCP echo 失敗数しきい値"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:118
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:89
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:95
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:89
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:68
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:91
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:144
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:102
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:125
 msgid "LCP echo interval"
 msgstr "LCP echo 送信間隔"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:181
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:902
 msgid "LLC"
 msgstr "LLC"
 
@@ -2808,11 +2915,11 @@ msgstr "LLC"
 msgid "Label"
 msgstr "ラベル"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:213
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:204
 msgid "Language"
 msgstr "言語"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:115
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:106
 msgid "Language and Style"
 msgstr "言語とスタイル"
 
@@ -2820,53 +2927,53 @@ msgstr "言語とスタイル"
 msgid "Latency"
 msgstr "レイテンシー"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:10
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:21
 msgid "Leaf"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:369
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:487
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:393
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:543
 msgid "Lease time"
 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:87
 msgid "Leasefile"
 msgstr "リースファイル"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:74
 #: modules/luci-base/luasrc/view/lease_status.htm:95
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:34
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
 msgid "Leasetime remaining"
 msgstr "残りリース時間"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:9
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:20
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:27
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:50
 msgid "Leave empty to autodetect"
 msgstr "空欄の場合、自動検知を行います"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:21
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:45
 msgid "Leave empty to use the current WAN address"
 msgstr "空欄の場合、現在のWANアドレスを使用します"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1746
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2299
 msgid "Legend:"
 msgstr "凡例:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:481
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:538
 msgid "Limit"
 msgstr "割り当て数"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:287
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:288
 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:299
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:300
 msgid "Limit listening to these interfaces, and loopback."
 msgstr "待ち受けをこれらのインターフェースとループバックに制限します。"
 
@@ -2886,11 +2993,11 @@ msgstr ""
 msgid "Line Uptime"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:101
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:88
 msgid "Link On"
 msgstr "リンクオン"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:185
 msgid ""
 "List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
 "requests to"
@@ -2898,7 +3005,7 @@ msgstr ""
 "問い合わせを転送する<abbr title=\"Domain Name System\">DNS</abbr> サーバーの"
 "リストを設定します"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:972
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1377
 msgid ""
 "List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-"
 "Identifier,128-bit key as hex string. <br />This list is used to map R0KH-ID "
@@ -2907,7 +3014,7 @@ msgid ""
 "Association."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:981
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1381
 msgid ""
 "List of R1KHs in the same Mobility Domain. <br />Format: MAC-address,R1KH-ID "
 "as 6 octets with colons,128-bit key as hex string. <br />This list is used "
@@ -2916,33 +3023,33 @@ msgid ""
 "PMK-R1 keys."
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:21
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:82
 msgid "List of SSH key files for auth"
 msgstr "認証用 SSH暗号キー ファイルのリスト"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:206
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:207
 msgid "List of domains to allow RFC1918 responses for"
 msgstr "RFC1918の応答を許可するリスト"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:174
 msgid "List of hosts that supply bogus NX domain results"
 msgstr "NX ドメインの偽の結果として返されるホストのリストです。"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:298
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:299
 msgid "Listen Interfaces"
 msgstr "待ち受けインターフェース"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:30
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:54
 msgid "Listen Port"
 msgstr "待ち受けポート"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:15
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:16
 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:216
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:217
 msgid "Listening port for inbound DNS queries"
 msgstr "DNSクエリを受信するポート"
 
@@ -2961,11 +3068,11 @@ msgstr "システム平均負荷"
 msgid "Loading"
 msgstr "ロード中"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:35
-msgid "Loading SSH keys…"
-msgstr "SSH 鍵をロード中…"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1819
+msgid "Loading directory contents…"
+msgstr "ディレクトリ内を読み込み中..."
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1204
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1296
 #: modules/luci-base/luasrc/view/view.htm:4
 msgid "Loading view…"
 msgstr "ビューを読み込み中…"
@@ -2975,41 +3082,41 @@ msgstr "ビューを読み込み中…"
 msgid "Local IP address is invalid"
 msgstr "無効なローカル IP アドレスです"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:25
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:86
 msgid "Local IP address to assign"
 msgstr "割り当てるローカル IPアドレス"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:10
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:11
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:44
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:39
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:151
 msgid "Local IPv4 address"
 msgstr "ローカル IPv4 アドレス"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:20
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:54
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:45
 msgid "Local IPv6 address"
 msgstr "ローカル IPv6 アドレス"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:286
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:287
 msgid "Local Service Only"
 msgstr "ローカルサービスのみ"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:81
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:126
 msgid "Local Startup"
 msgstr "ローカル スタートアップ"
 
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:25
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:121
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:112
 msgid "Local Time"
 msgstr "時刻"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:149
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
 msgid "Local domain"
 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:147
 msgid ""
 "Local domain specification. Names matching this domain are never forwarded "
 "and are resolved from DHCP or hosts files only"
@@ -3017,17 +3124,17 @@ msgstr ""
 "ローカル ドメインの定義です。このドメインに一致する名前は転送が行われず、 "
 "DHCP または hosts ファイルのみにより解決されます。"
 
-#: 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:151
 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:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
 msgid "Local server"
 msgstr "ローカル サーバー"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:129
 msgid ""
 "Localise hostname depending on the requesting subnet if multiple IPs are "
 "available"
@@ -3035,23 +3142,19 @@ msgstr ""
 "複数の IP が利用可能な場合に、ホスト名をリクエスト中のサブネットによってロー"
 "カライズします"
 
-#: 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:128
 msgid "Localise queries"
 msgstr "ローカライズクエリ"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:175
-msgid "Locked to channel %s used by: %s"
-msgstr "チャネル %s にロックされています。次で使用されています: %s"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:168
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:159
 msgid "Log output level"
 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:181
 msgid "Log queries"
 msgstr "ログ クエリ"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:113
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:104
 msgid "Logging"
 msgstr "ログ"
 
@@ -3059,7 +3162,7 @@ msgstr "ログ"
 msgid "Login"
 msgstr "ログイン"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:95
+#: modules/luci-base/luasrc/controller/admin/index.lua:103
 msgid "Logout"
 msgstr "ログアウト"
 
@@ -3067,12 +3170,14 @@ msgstr "ログアウト"
 msgid "Loss of Signal Seconds (LOSS)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:476
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:533
 msgid "Lowest leased address as offset from the network address."
 msgstr ""
 "ネットワークアドレスをオフセットとして、最小のアドレスを設定してください"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:40
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:75
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:35
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:86
 msgid "MAC"
@@ -3080,32 +3185,32 @@ msgstr "MAC"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:73
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:109
-#: 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:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1958
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:86
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:133
 msgid "MAC-Address"
 msgstr "MAC-アドレス"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:457
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:586
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:886
 msgid "MAC-Address Filter"
 msgstr "MAC-アドレス フィルタ"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:142
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:363
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:798
 msgid "MAC-Filter"
 msgstr "MAC-フィルタ"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:464
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:590
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:893
 msgid "MAC-List"
 msgstr "MAC-リスト"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:13
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:16
 msgid "MAP / LW4over6"
 msgstr "MAP / LW4over6"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:62
 msgid "MAP rule is invalid"
 msgstr "無効な MAP ルールです"
@@ -3123,8 +3228,8 @@ msgid "MHz"
 msgstr "MHz"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:53
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:29
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:66
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:53
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:71
 msgid "MTU"
 msgstr "MTU"
 
@@ -3135,16 +3240,17 @@ msgid ""
 msgstr ""
 "以下のようなコマンドを使用して、ルート ファイルシステムを複製してください:"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:55
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:69
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:26
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:38
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:38
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:108
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:52
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:96
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:83
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:57
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:70
 msgid "Manual"
 msgstr "手動"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1949
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2188
 msgid "Master"
 msgstr "マスター"
 
@@ -3152,50 +3258,46 @@ msgstr "マスター"
 msgid "Max. Attainable Data Rate (ATTNDR)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:539
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:982
 msgid "Maximum allowed Listen Interval"
 msgstr "許容される最大 Listen 間隔"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:234
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
 msgid "Maximum allowed number of active DHCP leases"
 msgstr "DHCPリースの許可される最大数"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:252
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:253
 msgid "Maximum allowed number of concurrent DNS queries"
 msgstr "並列DNSクエリの許可される最大数"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:244
 msgid "Maximum allowed size of EDNS.0 UDP packets"
 msgstr "EDNS.0 UDP パケットサイズの許可される最大数"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:63
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:77
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:57
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:112
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:104
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:93
 msgid "Maximum amount of seconds to wait for the modem to become ready"
 msgstr "モデムが準備完了状態になるまでの最大待ち時間"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:27
-msgid ""
-"Maximum length of the name is 15 characters including the automatic protocol/"
-"bridge prefix (br-, 6in4-, pppoe- etc.)"
-msgstr ""
-"名前の長さは、自動的に含まれるプロトコル/ブリッジ プレフィクス （br-, 6in4-, "
-"pppoe- など）と合わせて最大15文字です。"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:482
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:538
 msgid "Maximum number of leased addresses."
 msgstr "リースされるアドレスの最大数です。"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:761
+msgid "Maximum transmit power"
+msgstr "最大送信出力"
+
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:21
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:49
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:134
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:187
 #: modules/luci-mod-status/luasrc/view/admin_status/bandwidth.htm:79
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:284
 msgid "Mbit/s"
 msgstr "Mbit/s"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:18
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:32
 msgid "Medium"
 msgstr "中"
 
@@ -3207,42 +3309,43 @@ msgstr "メモリー"
 msgid "Memory usage (%)"
 msgstr "メモリ使用率 (%)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1952
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2191
 msgid "Mesh"
 msgstr "メッシュ"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:372
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:806
 msgid "Mesh Id"
 msgstr "メッシュ ID"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:196
+msgid "Method not found"
+msgstr "メソッドが見つかりません"
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:45
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:76
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:104
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:54
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:66
 msgid "Metric"
 msgstr "メトリック"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:154
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:198
 msgid "Mirror monitor port"
 msgstr "ミラー監視ポート"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:153
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:197
 msgid "Mirror source port"
 msgstr "ミラー元ポート"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:408
-msgid "Missing protocol extension for proto %q"
-msgstr "プロトコル %qのプロトコル拡張が見つかりません"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:923
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1337
 msgid "Mobility Domain"
 msgstr "モビリティ ドメイン"
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:154
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:41
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:74
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:366
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:31
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:360
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:801
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1619
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:175
 msgid "Mode"
 msgstr "モード"
@@ -3251,39 +3354,38 @@ msgstr "モード"
 msgid "Model"
 msgstr "モデル"
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:31
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:72
 msgid "Modem default"
 msgstr "モデム デフォルト"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:11
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:19
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:11
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:10
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:73
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:73
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:57
 msgid "Modem device"
 msgstr "モデム デバイス"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:24
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:66
 msgid "Modem information query failed"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:62
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:76
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:56
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:112
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:104
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:93
 msgid "Modem init timeout"
 msgstr "モデム初期化タイムアウト"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1953
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:452
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:554
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:577
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2192
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:880
 msgid "Monitor"
 msgstr "モニター"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:14
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
 msgid "More Characters"
 msgstr "文字数不足"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:802
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1057
 msgid "More…"
 msgstr "さらに表示…"
 
@@ -3296,7 +3398,7 @@ msgstr "マウント機能"
 msgid "Mount Point"
 msgstr "マウントポイント"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:26
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:36
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:137
 msgid "Mount Points"
@@ -3346,46 +3448,44 @@ msgstr "下へ移動"
 msgid "Move up"
 msgstr "上へ移動"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:912
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
 msgid "NAS ID"
 msgstr "NAS ID"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:57
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:87
 msgid "NAT-T Mode"
 msgstr "NAT-T モード"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:9
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 msgid "NAT64 Prefix"
 msgstr "NAT64 プレフィクス"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:31
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:26
 msgid "NCM"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:535
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:589
 msgid "NDP-Proxy"
 msgstr "NDP-プロキシ"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:43
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:72
 msgid "NT Domain"
 msgstr "NT ドメイン"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:273
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:264
 msgid "NTP server candidates"
 msgstr "NTPサーバー候補"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:837
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1092
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:27
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:502
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:65
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:553
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:658
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:49
 msgid "Name"
 msgstr "名前"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:17
-msgid "Name of the new interface"
-msgstr "新しいインターフェースの名前"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1808
 msgid "Name of the new network"
 msgstr "新しいネットワークの名前"
 
@@ -3393,9 +3493,10 @@ msgstr "新しいネットワークの名前"
 msgid "Navigation"
 msgstr "ナビゲーション"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:62
+#: modules/luci-base/luasrc/controller/admin/index.lua:69
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:108
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:402
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:834
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1957
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:389
 #: modules/luci-mod-status/luasrc/view/admin_status/index/30-network.htm:8
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:73
@@ -3407,7 +3508,7 @@ msgstr "ネットワーク"
 msgid "Network Utilities"
 msgstr "ネットワーク ユーティリティ"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:278
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:279
 msgid "Network boot image"
 msgstr "ネットワークブート用イメージ"
 
@@ -3420,53 +3521,59 @@ msgstr "ネットワーク デバイスが存在しません"
 msgid "Network without interfaces."
 msgstr "インターフェースの無いネットワークです。"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:661
+msgid "New interface name…"
+msgstr "新規インターフェース名"
+
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:11
 msgid "Next »"
 msgstr "次 »"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1507
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1754
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:108
 msgid "No"
 msgstr "いいえ"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:453
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:514
 msgid "No DHCP Server configured for this interface"
 msgstr "このインターフェースにはDHCPサーバーが設定されていません"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1162
+msgid "No Encryption"
+msgstr "暗号化無し"
+
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:89
 msgid "No NAT-T"
 msgstr "NAT-Tを使用しない"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:198
+msgid "No data received"
+msgstr "受信データ無し"
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1764
+msgid "No entries in this directory"
+msgstr "ディレクトリ内にエントリーがありません"
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/backupfiles.lua:82
 msgid "No files found"
 msgstr "ファイルが見つかりませんでした"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:550
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:191
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:180
 msgid "No information available"
 msgstr "情報がありません"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:8
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:63
 msgid "No matching prefix delegation"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:157
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
 msgid "No negative cache"
 msgstr "ネガティブキャッシュを行なわない"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:53
-msgid "No network configured on this device"
-msgstr "このデバイスに設定されているネットワークがありません"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:65
-msgid "No network name specified"
-msgstr "ネットワーク名が設定されていません"
-
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:147
-msgid "No networks in range"
-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
@@ -3474,7 +3581,12 @@ msgstr ""
 msgid "No password set!"
 msgstr "パスワードが設定されていません!"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:116
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:104
+msgid "No peers defined yet"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:129
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:271
 msgid "No public keys present yet."
 msgstr "まだ公開鍵はありません。"
 
@@ -3482,19 +3594,19 @@ msgstr "まだ公開鍵はありません。"
 msgid "No rules in this chain."
 msgstr "チェイン内にルールがありません"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:150
-msgid "No scan results available yet..."
-msgstr "利用可能なスキャン結果はまだありません..."
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:53
+msgid "No signal"
+msgstr "無信号"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:7
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:756
 msgid "No zone assigned"
 msgstr "ゾーンが設定されていません"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:111
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:35
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:48
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:133
 msgid "Noise"
 msgstr "ノイズ"
 
@@ -3510,16 +3622,16 @@ msgstr "ノイズ:"
 msgid "Non Pre-emtive CRC errors (CRC_P)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:292
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:293
 msgid "Non-wildcard"
 msgstr "非ワイルドカード"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:129
 msgid "None"
 msgstr "なし"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:181
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:172
 msgid "Normal"
 msgstr "標準"
 
@@ -3527,25 +3639,29 @@ msgstr "標準"
 msgid "Not Found"
 msgstr "見つかりません"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:27
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:5
-msgid "Not associated"
-msgstr "アソシエーションされていません"
-
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:87
 msgid "Not connected"
 msgstr "未接続"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:38
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:139
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:232
+msgid "Not present"
+msgstr "存在しません"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:105
 msgid "Not started on boot"
 msgstr "システム起動時に開始されません"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:26
-msgid "Note: interface name length"
-msgstr "注意: インターフェース名の長さ"
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:201
+msgid "Not supported"
+msgstr "サポートされていません"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:171
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:162
 msgid "Notice"
 msgstr "注意"
 
@@ -3553,65 +3669,52 @@ msgstr "注意"
 msgid "Nslookup"
 msgstr "Nslookup"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:261
 msgid "Number of cached DNS entries (max is 10000, 0 is no caching)"
 msgstr ""
 "キャッシュされる DNS エントリーの数です。（最大 10000 件。 0の場合はキャッ"
 "シュしません）"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:203
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:194
 msgid "Number of parallel threads used for compression"
 msgstr "圧縮に使用される、並列スレッド数です。"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:40
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:69
 msgid "Obfuscated Group Password"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:35
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:61
 msgid "Obfuscated Password"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:22
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:34
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:40
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:105
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:97
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:49
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:80
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:54
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:67
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:93
 msgid "Obtain IPv6-Address"
-msgstr ""
+msgstr "IPv6 アドレスの取得"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:83
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:68
 msgid "Off-State Delay"
 msgstr "消灯時間"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:16
-msgid ""
-"On this page you can configure the network interfaces. You can bridge "
-"several interfaces by ticking the \"bridge interfaces\" field and enter the "
-"names of several network interfaces separated by spaces. You can also use "
-"<abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
-"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
-"<samp>eth0.1</samp>)."
-msgstr ""
-"このページではネットワーク インターフェースの設定を行うことが出来ます。\"ブ"
-"リッジインターフェース\"フィールドにチェックを付け、複数のネットワーク イン"
-"ターフェースをリストから選択することで複数のインターフェースをブリッジするこ"
-"とが出来ます。また、<samp>INTERFACE.VLANNR</samp>という表記により<abbr title="
-"\"Virtual Local Area Network\">VLAN</abbr>も使用することが出来ます。(<abbr "
-"title=\"for example\">例</abbr>: <samp>eth0.1</samp>)"
-
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:95
 msgid "On-Link route"
 msgstr "On-Link ルート"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:80
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:64
 msgid "On-State Delay"
 msgstr "点灯時間"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:360
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:382
 msgid "One of hostname or mac address must be specified!"
 msgstr "1つ以上のホスト名またはMACアドレスを設定してください!"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:456
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:462
 msgid "One of the following: %s"
 msgstr "次のうちいずれか一つ: %s"
 
@@ -3633,56 +3736,61 @@ msgstr "1つ以上のフィールドに値が設定されていません！"
 msgid "Open list..."
 msgstr "リストを開く..."
 
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:61
 #: protocols/luci-proto-openconnect/luasrc/model/network/proto_openconnect.lua:9
 msgid "OpenConnect (CISCO AnyConnect)"
 msgstr "OpenConnect (CISCO AnyConnect)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:757
 msgid "Operating frequency"
 msgstr "動作周波数"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1753
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2306
 msgid "Option changed"
 msgstr "変更されるオプション"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1755
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2308
 msgid "Option removed"
 msgstr "削除されるオプション"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1140
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:55
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1535
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:66
 msgid "Optional"
 msgstr "オプション"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:78
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:76
 msgid ""
 "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, "
 "starting with <code>0x</code>."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:144
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:215
 msgid ""
 "Optional. Allowed values: 'eui64', 'random', fixed value like '::1' or "
 "'::1:2'. When IPv6 prefix (like 'a:b:c:d::') is received from a delegating "
 "server, use the suffix (like '::1') to form the IPv6 address ('a:b:c:d::1') "
 "for the interface."
 msgstr ""
+"IPv6 プレフィクス（例: 'a:b:c:d::'）を委任サーバーから受信する際、インター"
+"フェースの IPv6 アドレス ('a:b:c:d::1') を形成するために使用されるサフィック"
+"ス（例: '::1'）を指定します。（オプション）　使用できる値: 'eui64', "
+"'random', または '::1' や '::1:2' のような固定値"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:123
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:117
 msgid ""
 "Optional. Base64-encoded preshared key. Adds in an additional layer of "
 "symmetric-key cryptography for post-quantum resistance."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:148
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:126
 msgid "Optional. Create routes for Allowed IPs for this peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:103
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:108
 msgid "Optional. Description of peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:156
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:128
 msgid ""
 "Optional. Host of peer. Names are resolved prior to bringing up the "
 "interface."
@@ -3690,15 +3798,15 @@ msgstr ""
 "ピアのホストです。名前はインターフェースの起動前に解決されます。（オプショ"
 "ン）"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:67
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:71
 msgid "Optional. Maximum Transmission Unit of tunnel interface."
 msgstr "トンネル インターフェースのMaximum Transmission Unit（オプション）"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:166
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:132
 msgid "Optional. Port of peer."
 msgstr "ピアのポート（オプション）"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:175
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:136
 msgid ""
 "Optional. Seconds between keep alive messages. Default is 0 (disabled). "
 "Recommended value if this device is behind a NAT is 25."
@@ -3706,7 +3814,7 @@ msgstr ""
 "キープアライブ メッセージの送信間隔（秒）です。既定値: ０。このデバイスがNAT"
 "以下に存在する場合の推奨値は25です。（オプション）"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:31
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:54
 msgid "Optional. UDP port used for outgoing and incoming packets."
 msgstr "発信パケットと受信パケットに使用されるUDPポート（オプション）"
 
@@ -3727,54 +3835,54 @@ msgstr "アウト"
 msgid "Outbound:"
 msgstr "送信:"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:26
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:50
 msgid "Output Interface"
 msgstr "出力インターフェース"
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:46
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:151
 msgid "Output zone"
-msgstr ""
+msgstr "出力ゾーン"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:63
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:155
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:33
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:54
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:54
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:219
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:50
 msgid "Override MAC address"
 msgstr "MACアドレスを上書きする"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:66
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:35
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:56
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:88
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:125
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:131
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:133
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:104
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:61
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:58
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:223
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:44
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:54
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:154
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:71
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:145
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:132
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:110
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:119
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:97
 msgid "Override MTU"
 msgstr "MTUを上書きする"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:30
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:63
 msgid "Override TOS"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:25
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:58
 msgid "Override TTL"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:954
 msgid "Override default interface name"
 msgstr "デフォルトのインターフェース名を上書きします。"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:41
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:167
 msgid "Override the gateway in DHCP responses"
 msgstr "DHCPレスポンス内のゲートウェイアドレスを上書きする"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:507
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:555
 msgid ""
 "Override the netmask sent to clients. Normally it is calculated from the "
 "subnet that is served."
@@ -3782,7 +3890,7 @@ msgstr ""
 "クライアントへ通知するネットマスクを上書きします。通常は、設定されているサブ"
 "ネットから計算されます。"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:65
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:179
 msgid "Override the table used for internal routes"
 msgstr "内部ルートに使用されるテーブルを上書きします。"
 
@@ -3790,29 +3898,33 @@ msgstr "内部ルートに使用されるテーブルを上書きします。"
 msgid "Overview"
 msgstr "概要"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1606
+msgid "Overwrite existing file \"%s\" ?"
+msgstr "既存のファイル \"%s\" を上書きしますか？"
+
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:11
 msgid "Owner"
 msgstr "所有者"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:42
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:56
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:17
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:28
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:34
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:14
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:18
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:43
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:98
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:45
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:44
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:63
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:82
 msgid "PAP/CHAP password"
 msgstr "PAP/CHAP パスワード"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:39
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:53
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:14
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:11
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:15
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:96
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:88
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:43
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:74
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:42
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:61
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:77
 msgid "PAP/CHAP username"
 msgstr "PAP/CHAP ユーザー名"
 
@@ -3820,9 +3932,9 @@ msgstr "PAP/CHAP ユーザー名"
 msgid "PID"
 msgstr "PID"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:36
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:50
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:26
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:95
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:87
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:68
 msgid "PIN"
 msgstr "PIN"
 
@@ -3831,114 +3943,116 @@ msgstr "PIN"
 msgid "PIN code rejected"
 msgstr "PIN コードが拒否されました"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:966
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1372
 msgid "PMK R1 Push"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:43
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:13
 msgid "PPP"
 msgstr "PPP"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:11
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:58
 msgid "PPPoA Encapsulation"
 msgstr "PPPoAカプセル化"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:19
 msgid "PPPoATM"
 msgstr "PPPoATM"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:17
 msgid "PPPoE"
 msgstr "PPPoE"
 
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:28
 #: protocols/luci-proto-pppossh/luasrc/model/network/proto_pppossh.lua:9
 msgid "PPPoSSH"
 msgstr "PPPoSSH"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:15
 msgid "PPtP"
 msgstr "PPtP"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:59
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:73
 msgid "PSID offset"
 msgstr "PSID オフセット"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:56
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:70
 msgid "PSID-bits length"
 msgstr "PSID ビット長"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:123
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:846
 msgid "PTM/EFM (Packet Transfer Mode)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:78
-msgid "Package libiwinfo required!"
-msgstr "libiwinfo パッケージが必要です！"
-
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:45
 msgid "Packets"
 msgstr "パケット"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:7
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:756
 msgid "Part of zone %q"
 msgstr "ゾーン %q の一部"
 
 #: modules/luci-base/luasrc/view/sysauth.htm:29
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1111
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:35
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:42
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1514
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:46
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:104
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:58
 msgid "Password"
 msgstr "パスワード"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:29
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:24
 msgid "Password authentication"
 msgstr "パスワード認証"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1019
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1414
 msgid "Password of Private Key"
 msgstr "秘密鍵のパスワード"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1067
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1471
 msgid "Password of inner Private Key"
 msgstr "秘密鍵のパスワード"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:14
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:16
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:18
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:20
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:32
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:34
 msgid "Password strength"
 msgstr "パスワード強度"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:44
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:107
 msgid "Password2"
 msgstr "パスワード2"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:37
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:244
 msgid "Paste or drag SSH key file…"
 msgstr "貼付けまたは SSH 鍵ファイルをドラッグ…"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1000
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1396
 msgid "Path to CA-Certificate"
 msgstr "CA証明書のパス"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1007
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1402
 msgid "Path to Client-Certificate"
 msgstr "クライアント証明書のパス"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1013
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1408
 msgid "Path to Private Key"
 msgstr "秘密鍵のパス"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1049
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1453
 msgid "Path to inner CA-Certificate"
 msgstr "CA 証明書のパス"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1055
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1459
 msgid "Path to inner Client-Certificate"
 msgstr "クライアント証明書のパス"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1061
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1465
 msgid "Path to inner Private Key"
 msgstr "秘密鍵のパス"
 
@@ -3956,7 +4070,7 @@ msgstr "秘密鍵のパス"
 msgid "Peak:"
 msgstr "ピーク:"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:28
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:89
 msgid "Peer IP address to assign"
 msgstr "割り当てるピア IP アドレス"
 
@@ -3965,11 +4079,11 @@ msgstr "割り当てるピア IP アドレス"
 msgid "Peer address is missing"
 msgstr "ピアのアドレスがありません"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:90
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:89
 msgid "Peers"
 msgstr "ピア"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:50
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:80
 msgid "Perfect Forward Secrecy"
 msgstr ""
 
@@ -3981,7 +4095,11 @@ msgstr "再起動を実行"
 msgid "Perform reset"
 msgstr "設定リセットを実行"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:174
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:199
+msgid "Permission denied"
+msgstr "パーミッション拒否"
+
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:136
 msgid "Persistent Keep Alive"
 msgstr "永続的なキープアライブ"
 
@@ -3989,7 +4107,7 @@ msgstr "永続的なキープアライブ"
 msgid "Phy Rate:"
 msgstr "物理レート:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:190
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:277
 msgid "Physical Settings"
 msgstr "デバイス設定"
 
@@ -4000,6 +4118,10 @@ msgstr "Ping"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:16
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:17
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:41
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:77
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:87
@@ -4017,15 +4139,19 @@ msgstr "ユーザー名とパスワードを入力してください。"
 msgid "Policy"
 msgstr "ポリシー"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:22
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:20
 msgid "Port"
 msgstr "ポート"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:18
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:133
+msgid "Port %s"
+msgstr "ポート %s"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:274
 msgid "Port status:"
 msgstr "ポート ステータス:"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:482
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:488
 msgid "Potential negation of: %s"
 msgstr ""
 
@@ -4037,11 +4163,11 @@ msgstr ""
 msgid "Pre-emtive CRC errors (CRCP_P)"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:32
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:73
 msgid "Prefer LTE"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:33
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:74
 msgid "Prefer UMTS"
 msgstr ""
 
@@ -4049,16 +4175,16 @@ msgstr ""
 msgid "Prefix Delegated"
 msgstr "委任されたプレフィクス (PD)"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:122
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:117
 msgid "Preshared Key"
 msgstr "事前共有鍵"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:101
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:75
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:81
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:75
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:54
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:74
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:131
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:102
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:89
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:112
 msgid ""
 "Presume peer to be dead after given amount of LCP echo failures, use 0 to "
 "ignore failures"
@@ -4066,16 +4192,15 @@ msgstr ""
 "設定回数のLCP echo 確認失敗後、ピアノードがダウンしているものと見なします。0"
 "を設定した場合、失敗しても無視します"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:305
 msgid "Prevent listening on these interfaces."
 msgstr "これらのインターフェースでの待ち受けを停止します。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:509
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:562
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:950
 msgid "Prevents client-to-client communication"
 msgstr "クライアント同士の通信を制限します"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:18
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:49
 msgid "Private Key"
 msgstr "秘密鍵"
 
@@ -4096,39 +4221,33 @@ msgstr "プロファイル"
 msgid "Prot."
 msgstr "プロトコル"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:72
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:349
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:675
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:84
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:216
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:87
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:390
 msgid "Protocol"
 msgstr "プロトコル"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:31
-msgid "Protocol of the new interface"
-msgstr "新しいインターフェースのプロトコル"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:222
-msgid "Protocol support is not installed"
-msgstr "プロトコル サポートがインストールされていません"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:269
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:260
 msgid "Provide NTP server"
 msgstr "NTPサーバー機能を有効にする"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:701
 msgid "Provide new network"
 msgstr "新しいネットワークを設定します"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:451
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:879
 msgid "Pseudo Ad-Hoc (ahdemo)"
 msgstr "擬似アドホック (ahdemo)"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:112
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:113
 msgid "Public Key"
 msgstr "公開鍵"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:278
 msgid ""
 "Public keys allow for the passwordless SSH logins with a higher security "
 "compared to the use of plain passwords. In order to upload a new key to the "
@@ -4140,20 +4259,20 @@ msgstr ""
 "力欄に OpenSSH 互換の公開鍵（1行）を貼り付けるか、 <code>.pub</code> ファイル"
 "をドラッグしてください。"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:139
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:211
 msgid "Public prefix routed to this device for distribution to clients."
 msgstr ""
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:27
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:9
 msgid "QMI Cellular"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:173
 msgid "Quality"
 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:171
 msgid ""
 "Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> "
 "servers"
@@ -4161,28 +4280,29 @@ msgstr ""
 "アップストリームの利用可能な全 <abbr title=\"Domain Name System\">DNS</abbr> "
 "サーバを問い合わせます"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:952
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1360
 msgid "R0 Key Lifetime"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:959
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1366
 msgid "R1 Key Holder"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:58
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:88
 msgid "RFC3947 NAT-T mode"
 msgstr "RFC3947 NAT-Tモード"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:381
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:814
 msgid "RSSI threshold for joining"
 msgstr "ネットワーク参加の RSSI しきい値"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:256
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:597
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:778
 msgid "RTS/CTS Threshold"
 msgstr "RTS/CTSしきい値"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:41
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:76
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:87
 msgid "RX"
@@ -4192,35 +4312,41 @@ msgstr "RX"
 msgid "RX Rate"
 msgstr "受信レート"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:783
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1961
+msgid "RX Rate / TX Rate"
+msgstr "受信レート / 送信レート"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1207
 msgid "Radius-Accounting-Port"
 msgstr "Radiusアカウントサーバー ポート番号"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:791
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1215
 msgid "Radius-Accounting-Secret"
 msgstr "Radiusアカウント秘密鍵"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:775
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1199
 msgid "Radius-Accounting-Server"
 msgstr "Radiusアカウントサーバー"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:759
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1183
 msgid "Radius-Authentication-Port"
 msgstr "Radius認証サーバー ポート番号"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:767
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1191
 msgid "Radius-Authentication-Secret"
 msgstr "Radius認証秘密鍵"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:751
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1175
 msgid "Radius-Authentication-Server"
 msgstr "Radius認証サーバー"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:119
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:102
 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:83
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:84
 msgid ""
 "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-Server"
@@ -4237,21 +4363,11 @@ msgstr ""
 "ません！もしこのインターフェースを経由して接続している場合、このデバイスにア"
 "クセスできなくなる場合があります"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2
-msgid ""
-"Really delete this wireless network? The deletion cannot be undone! You "
-"might lose access to this device if you are connected via this network."
-msgstr ""
-"本当にこの無線ネットワークを削除しますか?一度削除すると、元に戻すことはできま"
-"せん!\n"
-"このネットワークを経由して接続している場合、デバイスにアクセスできなくなる場"
-"合があります。"
-
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:40
 msgid "Really reset all changes?"
 msgstr "本当に全ての変更をリセットしますか?"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:237
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:354
 msgid "Really switch protocol?"
 msgstr "本当にプロトコルを切り替えますか?"
 
@@ -4275,15 +4391,15 @@ msgstr "リアルタイム・トラフィック"
 msgid "Realtime Wireless"
 msgstr "リアルタイム・無線LAN"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:931
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1343
 msgid "Reassociation Deadline"
 msgstr "再アソシエーション制限時間"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:191
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
 msgid "Rebind protection"
 msgstr "DNSリバインディング・プロテクション"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:48
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:46
 #: modules/luci-mod-system/luasrc/view/admin_system/reboot.htm:9
 msgid "Reboot"
 msgstr "再起動"
@@ -4297,21 +4413,15 @@ msgstr "再起動中..."
 msgid "Reboots the operating system of your device"
 msgstr "デバイスのオペレーティングシステムを再起動します。"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:103
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:90
 msgid "Receive"
 msgstr "受信"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:325
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:350
-msgid "Receiver Antenna"
-msgstr "受信アンテナ"
-
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:42
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:59
 msgid "Recommended. IP addresses of the WireGuard interface."
 msgstr "WireGuard インターフェースのIPアドレスです。（推奨）"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:28
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:300
 msgid "Reconnect this interface"
 msgstr "インターフェースを再接続します"
 
@@ -4319,80 +4429,98 @@ msgstr "インターフェースを再接続します"
 msgid "References"
 msgstr "参照カウンタ"
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:39
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:153
 msgid "Relay"
 msgstr "リレー"
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:36
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:157
 msgid "Relay Bridge"
 msgstr "リレーブリッジ"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:17
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:154
 msgid "Relay between networks"
 msgstr "ネットワーク間のリレー設定"
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:64
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:12
 msgid "Relay bridge"
 msgstr "リレーブリッジ"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:18
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:50
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:49
 msgid "Remote IPv4 address"
 msgstr "リモート IPv4アドレス"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:8
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:40
 msgid "Remote IPv4 address or FQDN"
 msgstr "リモート IPv4アドレス または FQDN"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:45
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:725
 msgid "Remove"
 msgstr "削除"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:53
-msgid "Repeat scan"
-msgstr "再スキャン"
-
-#: modules/luci-base/luasrc/view/cbi/upload.htm:11
-msgid "Replace entry"
-msgstr "エントリーの置換"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:46
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:51
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1806
 msgid "Replace wireless configuration"
 msgstr "無線設定を置換する"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:8
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:17
 msgid "Request IPv6-address"
 msgstr "IPv6-アドレスのリクエスト"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:16
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:23
 msgid "Request IPv6-prefix of length"
 msgstr "リクエストするIPv6-プレフィクス長"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1141
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:200
+msgid "Request timeout"
+msgstr "リクエスト タイムアウト"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1536
 msgid "Required"
 msgstr "必須"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:20
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:31
 msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3"
 msgstr "DOCSIS 3.0を使用するいくつかのISPでは必要になります"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:19
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:49
 msgid "Required. Base64-encoded private key for this interface."
 msgstr "このインターフェースに使用するBase64-エンコード 秘密鍵（必須）"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:113
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:113
 msgid "Required. Base64-encoded public key of peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:136
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:122
 msgid ""
 "Required. IP addresses and prefixes that this peer is allowed to use inside "
 "the tunnel. Usually the peer's tunnel IP addresses and the networks the peer "
 "routes through the tunnel."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1134
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1095
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1096
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1097
+msgid "Requires hostapd"
+msgstr "hostapd が必要"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1101
+msgid "Requires hostapd with EAP support"
+msgstr "EAP サポートを含む hostapd が必要"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1102
+msgid "Requires hostapd with OWE support"
+msgstr "OWE サポートを含む hostapd が必要"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1098
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1099
+msgid "Requires hostapd with SAE support"
+msgstr "SAE サポートを含む hostapd が必要"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1533
 msgid ""
 "Requires the 'full' version of wpad/hostapd and support from the wifi driver "
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
@@ -4400,7 +4528,7 @@ msgstr ""
 "'フル' バージョンの wpad/hostapd と、無線LANドライバーによるサポートが必要で"
 "す。<br />（2019年1月現在: ath9k、ath10k、mwlwifi 及び mt76）"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:141
 msgid ""
 "Requires upstream supports DNSSEC; verify unsigned domain responses really "
 "come from unsigned domains"
@@ -4408,7 +4536,31 @@ msgstr ""
 "未署名のドメイン レスポンスが、本当にその未署名のドメインから来たものであるか"
 "検証します。上位サーバが DNSSEC をサポートしている必要があります。"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1268
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1109
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1119
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1120
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1121
+msgid "Requires wpa-supplicant"
+msgstr "wpa-supplicant が必要"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1113
+msgid "Requires wpa-supplicant with EAP support"
+msgstr "EAP サポートを含む wpa-supplicant が必要"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1114
+msgid "Requires wpa-supplicant with OWE support"
+msgstr "OWE サポートを含む wpa-supplicant が必要"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1111
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1124
+msgid "Requires wpa-supplicant with SAE support"
+msgstr "SAE サポートを含む wpa-supplicant が必要"
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1355
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:17
 #: modules/luci-base/luasrc/view/cbi/footer.htm:30
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:66
@@ -4424,17 +4576,22 @@ msgstr "カウンタをリセット"
 msgid "Reset to defaults"
 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:68
 msgid "Resolv and Hosts Files"
 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:94
 msgid "Resolve file"
 msgstr "リゾルバファイル"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:28
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:14
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:71
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:197
+msgid "Resource not found"
+msgstr "リソースが見つかりません"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:302
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:693
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:90
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:112
 msgid "Restart"
 msgstr "再起動"
 
@@ -4442,7 +4599,7 @@ msgstr "再起動"
 msgid "Restart Firewall"
 msgstr "ファイアウォールを再起動"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:14
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:691
 msgid "Restart radio interface"
 msgstr "無線インターフェースを再起動します"
 
@@ -4454,26 +4611,24 @@ msgstr "復元"
 msgid "Restore backup"
 msgstr "バックアップから復元する"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:113
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:114
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:38
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:46
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:119
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:120
 msgid "Reveal/hide password"
 msgstr "パスワードを表示する/隠す"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1774
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2322
 msgid "Revert"
 msgstr "元に戻す"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1861
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2405
 msgid "Revert changes"
 msgstr "変更の取り消し"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2013
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2554
 msgid "Revert request failed with status <code>%h</code>"
 msgstr "取り消しのリクエストはステータス <code>%h</code> で失敗しました"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1993
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2534
 msgid "Reverting configuration…"
 msgstr "設定を元に戻しています..."
 
@@ -4481,7 +4636,7 @@ msgstr "設定を元に戻しています..."
 msgid "Root"
 msgstr "ルート"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:271
 msgid "Root directory for files served via TFTP"
 msgstr "TFTP経由でファイルを取り扱う際のルートディレクトリ"
 
@@ -4489,7 +4644,7 @@ msgstr "TFTP経由でファイルを取り扱う際のルートディレクト
 msgid "Root preparation"
 msgstr "ルートの準備"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:147
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:126
 msgid "Route Allowed IPs"
 msgstr ""
 
@@ -4501,12 +4656,12 @@ msgstr "ルート テーブル"
 msgid "Route type"
 msgstr "ルート タイプ"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:523
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:577
 msgid "Router Advertisement-Service"
 msgstr "ルーター アドバタイズメント-サービス"
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:43
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:15
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:27
 msgid "Router Password"
 msgstr "ルーター パスワード"
 
@@ -4536,7 +4691,7 @@ msgstr "デバイスのマウントを行う前にファイルシステムチェ
 msgid "Run filesystem check"
 msgstr "ファイルシステムチェックを行う"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:651
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:669
 msgid "Runtime error"
 msgstr "ランタイム エラー"
 
@@ -4548,31 +4703,31 @@ msgstr "SHA256"
 msgid "SNR"
 msgstr "SNR"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:5
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:18
 msgid "SSH Access"
 msgstr "SSH アクセス"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:10
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:70
 msgid "SSH server address"
 msgstr "SSH サーバーアドレス"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:13
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:74
 msgid "SSH server port"
 msgstr "SSH サーバーポート"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:8
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:58
 msgid "SSH username"
 msgstr "SSH ユーザー名"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:27
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:277
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
 msgid "SSH-Keys"
 msgstr "SSH キー"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:42
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:73
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:29
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1617
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:174
 msgid "SSID"
 msgstr "SSID"
@@ -4581,17 +4736,17 @@ msgstr "SSID"
 msgid "SWAP"
 msgstr "スワップ"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1127
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1262
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1379
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1351
 #: modules/luci-base/luasrc/view/cbi/error.htm:17
 #: modules/luci-base/luasrc/view/cbi/footer.htm:26
 #: modules/luci-base/luasrc/view/cbi/header.htm:17
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:54
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:133
 msgid "Save"
 msgstr "保存"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1256
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1768
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1347
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2318
 #: modules/luci-base/luasrc/view/cbi/footer.htm:22
 msgid "Save & Apply"
 msgstr "保存 & 適用"
@@ -4604,28 +4759,20 @@ msgstr "mtdblock を保存"
 msgid "Save mtdblock contents"
 msgstr "mtdblock の保存"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
-msgid "Saving keys…"
-msgstr "公開鍵を保存中…"
-
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:698
 msgid "Scan"
 msgstr "スキャン"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:109
-msgid "Scan request failed"
-msgstr "スキャン要求が失敗しました"
-
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:8
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:39
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:23
 msgid "Scheduled Tasks"
 msgstr "スケジュールタスク"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1749
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2302
 msgid "Section added"
 msgstr "追加されるセクション"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1751
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2304
 msgid "Section removed"
 msgstr "削除されるセクション"
 
@@ -4643,12 +4790,18 @@ msgstr ""
 "を選択してください。ファームウェアが正しいこと、デバイスに適していることを確"
 "認できている場合にのみ使用してください！"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:119
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:90
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:96
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:90
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:69
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:92
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1516
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1646
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1809
+msgid "Select file…"
+msgstr "ファイルを選択..."
+
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:144
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:102
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:125
 msgid ""
 "Send LCP echo requests at the given interval in seconds, only effective in "
 "conjunction with failure threshold"
@@ -4656,50 +4809,49 @@ msgstr ""
 "設定された秒間隔でLCP echoリクエストを送信します。失敗数しきい値を設定した場"
 "合のみ、機能が有効になります。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:561
-msgid "Separate Clients"
-msgstr "クライアントの分離"
-
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:62
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:63
 msgid "Server Settings"
 msgstr "サーバー設定"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:26
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:50
 msgid "Service Name"
 msgstr "サービス名"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:25
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:30
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:87
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:71
 msgid "Service Type"
 msgstr "サービスタイプ"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:55
+#: modules/luci-base/luasrc/controller/admin/index.lua:62
 msgid "Services"
 msgstr "サービス"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:815
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:861
 msgid "Session expired"
 msgstr "セッションの期限切れ"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:83
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:107
 msgid "Set VPN as Default Route"
 msgstr "VPN をデフォルト ルートとして設定します。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:258
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:795
 msgid ""
 "Set interface properties regardless of the link carrier (If set, carrier "
 "sense events do not invoke hotplug handlers)."
 msgstr ""
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:23
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:55
 msgid "Setting PLMN failed"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:26
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:68
 msgid "Setting operation mode failed"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:454
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:517
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:527
 msgid "Setup DHCP Server"
 msgstr "DHCPサーバーを設定"
 
@@ -4711,7 +4863,7 @@ msgstr ""
 msgid "Short GI"
 msgstr "Short GI"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:516
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:960
 msgid "Short Preamble"
 msgstr "Short Preamble"
 
@@ -4723,21 +4875,23 @@ msgstr "現在のバックアップファイルのリストを表示する"
 msgid "Show empty chains"
 msgstr "空のチェインを表示"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:306
 msgid "Shutdown this interface"
 msgstr "インターフェースを終了します"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:111
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:34
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:47
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:132
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1616
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:173
 msgid "Signal"
 msgstr "信号強度"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1960
+msgid "Signal / Noise"
+msgstr "信号強度 / ノイズ"
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:125
 msgid "Signal Attenuation (SATN)"
 msgstr ""
@@ -4750,11 +4904,11 @@ msgstr "信号:"
 msgid "Size"
 msgstr "サイズ"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:259
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:260
 msgid "Size of DNS query cache"
 msgstr "DNS クエリ キャッシュのサイズ"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:191
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
 msgid "Size of the ZRam device in megabytes"
 msgstr "ZRam デバイスのサイズ (MB) です。"
 
@@ -4771,11 +4925,7 @@ msgstr "コンテンツへ移動"
 msgid "Skip to navigation"
 msgstr "ナビゲーションへ移動"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:335
-msgid "Slot time"
-msgstr "スロット時間"
-
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1640
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1846
 #: modules/luci-base/luasrc/model/network.lua:1427
 msgid "Software VLAN"
 msgstr "ソフトウェア VLAN"
@@ -4816,28 +4966,33 @@ msgstr "アクセス元アドレス"
 msgid "Specifies the directory the device is attached to"
 msgstr "デバイスが接続するディレクトリを設定します"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:23
-msgid "Specifies the listening port of this <em>Dropbear</em> instance"
-msgstr "<em>Dropbear</em> の待ち受けポートを設定してください。"
-
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:57
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:175
 msgid ""
 "Specifies the maximum amount of failed ARP requests until hosts are presumed "
 "to be dead"
 msgstr ""
 "ホストが死亡しているとみなされるまでの ARP リクエスト失敗回数を指定します。"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:49
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:171
 msgid ""
 "Specifies the maximum amount of seconds after which hosts are presumed to be "
 "dead"
 msgstr "ホストが死亡しているとみなされるまでの秒数を指定します。"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:761
+msgid ""
+"Specifies the maximum transmit power the wireless radio may use. Depending "
+"on regulatory requirements and wireless usage, the actual transmit power may "
+"be reduced by the driver."
+msgstr ""
+"無線電波が使用する最大の送信出力を指定します。法的要件や無線の使用方法によっ"
+"て、実際の送信出力はドライバーにより低減されることがあります。"
+
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:63
 msgid "Specify a TOS (Type of Service)."
 msgstr "TOS (Type of Service) を指定します。"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:25
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:58
 msgid ""
 "Specify a TTL (Time to Live) for the encapsulating packet other than the "
 "default (64)."
@@ -4845,7 +5000,7 @@ msgstr ""
 "デフォルト値 (64) 以外のカプセル化パケットの TTL (Time to Live) を指定しま"
 "す。"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:53
 msgid ""
 "Specify an MTU (Maximum Transmission Unit) other than the default (1280 "
 "bytes)."
@@ -4853,29 +5008,30 @@ msgstr ""
 "デフォルト値 (1280 bytes) 以外の MTU (Maximum Transmission Unit) を指定しま"
 "す。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:60
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "Specify the secret encryption key here."
 msgstr "暗号鍵を設定します。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:475
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:64
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:533
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:89
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:111
 msgid "Start"
 msgstr "開始"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:33
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:86
 msgid "Start priority"
 msgstr "優先順位"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1958
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2499
 msgid "Starting configuration apply…"
 msgstr "設定の適用を開始しています..."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1626
 msgid "Starting wireless scan..."
 msgstr "無線LANのスキャンを開始しています..."
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:24
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:120
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
 msgid "Startup"
 msgstr "スタートアップ"
 
@@ -4887,20 +5043,21 @@ msgstr "IPv4 静的ルーティング"
 msgid "Static IPv6 Routes"
 msgstr "IPv6 静的ルーティング"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:70
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:71
 msgid "Static Leases"
 msgstr "静的リース"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:118
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:73
 msgid "Static Routes"
 msgstr "静的ルーティング"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1194
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1384
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:172
 #: modules/luci-base/luasrc/model/network.lua:966
 msgid "Static address"
 msgstr "静的アドレス"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:308
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:309
 msgid ""
 "Static leases are used to assign fixed IP addresses and symbolic hostnames "
 "to DHCP clients. They are also required for non-dynamic interface "
@@ -4910,39 +5067,41 @@ msgstr ""
 "名をアサインします。また、クライアントは対応するリースを使用するホストがその1"
 "台のみで、かつ静的なインターフェース設定にする必要があります。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:534
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:977
 msgid "Station inactivity limit"
 msgstr "非アクティブなステーションの制限"
 
 #: modules/luci-base/luasrc/controller/admin/index.lua:40
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:197
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:337
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:746
 #: modules/luci-mod-status/luasrc/view/admin_status/index.htm:128
 msgid "Status"
 msgstr "ステータス"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:35
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:75
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:308
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:91
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:113
 msgid "Stop"
 msgstr "停止"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:165
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Strict order"
 msgstr "問い合わせの制限"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:16
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:30
 msgid "Strong"
 msgstr "å¼·"
 
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1843
 msgid "Submit"
 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:108
 msgid "Suppress logging"
 msgstr "ログの抑制"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:109
 msgid "Suppress logging of the routine operation of these protocols"
 msgstr "これらのプロトコルの、ルーチン的操作についてのログを抑制します。"
 
@@ -4954,44 +5113,46 @@ msgstr "スワップ"
 msgid "Swap Entry"
 msgstr "スワップ機能"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:23
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:5
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:135
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:21
 msgid "Switch"
 msgstr "スイッチ"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:129
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:168
 msgid "Switch %q"
 msgstr "スイッチ %q"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:128
-msgid "Switch %q (%s)"
-msgstr "スイッチ %q (%s)"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:66
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:146
 msgid ""
 "Switch %q has an unknown topology - the VLAN settings might not be accurate."
 msgstr ""
 "スイッチ %q は不明なトポロジを持っています - VLAN 設定は正確ではないかもしれ"
 "ません。"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:146
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:142
 msgid "Switch Port Mask"
 msgstr "スイッチポート マスク"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1640
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1846
 #: modules/luci-base/luasrc/model/network.lua:1425
 msgid "Switch VLAN"
 msgstr "スイッチ VLAN"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:238
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:355
 msgid "Switch protocol"
 msgstr "プロトコルの切り替え"
 
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:103
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:104
 #: modules/luci-base/luasrc/view/cbi/ipaddr.htm:26
 msgid "Switch to CIDR list notation"
 msgstr "CIDR リスト表記へ切替"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:77
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1547
+msgid "Symbolic link"
+msgstr "シンボリックリンク"
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:71
 msgid "Sync with NTP-Server"
 msgstr "NTP サーバーと同期"
 
@@ -5001,7 +5162,7 @@ msgstr "ブラウザの時刻と同期"
 
 #: modules/luci-base/luasrc/controller/admin/index.lua:47
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:14
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:102
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:94
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
 #: modules/luci-mod-system/luasrc/view/admin_system/applyreboot.htm:39
 msgid "System"
@@ -5012,11 +5173,11 @@ msgstr "システム"
 msgid "System Log"
 msgstr "システムログ"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:108
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:99
 msgid "System Properties"
 msgstr "システム プロパティ"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:145
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:136
 msgid "System log buffer size"
 msgstr "システムログ バッファサイズ"
 
@@ -5024,15 +5185,17 @@ msgstr "システムログ バッファサイズ"
 msgid "TCP:"
 msgstr "TCP:"
 
-#: 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:69
 msgid "TFTP Settings"
 msgstr "TFTP設定"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:269
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
 msgid "TFTP server root"
 msgstr "TFTPサーバー・ルート"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:17
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:77
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:88
 msgid "TX"
@@ -5055,7 +5218,7 @@ msgstr "テーブル"
 msgid "Target"
 msgstr "ターゲット"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:77
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:103
 msgid "Target network"
 msgstr "対象ネットワーク"
 
@@ -5063,49 +5226,26 @@ msgstr "対象ネットワーク"
 msgid "Terminate"
 msgstr "停止"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:27
-msgid ""
-"The <em>Device Configuration</em> section covers physical settings of the "
-"radio hardware such as channel, transmit power or antenna selection which "
-"are shared among all defined wireless networks (if the radio hardware is "
-"multi-SSID capable). Per network settings like encryption or operation mode "
-"are grouped in the <em>Interface Configuration</em>."
-msgstr ""
-"<em>デバイス設定</em>セクションでは、チャネル、送信出力、アンテナ設定などの無"
-"線ハードウェアの設定を行います。また、無線ハードウェアがマルチSSID機能をサ"
-"ポートしている場合、これらの設定は全て共通の設定として扱われます。暗号化設定"
-"や無線モードなどのネットワーク毎の設定は、<em>インターフェース設定</em>で設定"
-"を行います。"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:79
-msgid ""
-"The <em>libiwinfo-lua</em> package is not installed. You must install this "
-"component for working wireless configuration!"
-msgstr ""
-"<em>libiwinfo-lua</em> パッケージがインストールされていません。無線設定機能を"
-"正しく動作させるために、このパッケージをインストールする必要があります。"
-
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:66
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:77
 msgid ""
 "The HE.net endpoint update configuration changed, you must now use the plain "
 "username instead of the user ID!"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:8
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:40
 msgid ""
 "The IPv4 address or the fully-qualified domain name of the remote tunnel end."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:27
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:38
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:59
 msgid ""
 "The IPv6 prefix assigned to the provider, usually ends with <code>::</code>"
 msgstr ""
 "プロバイダに割り当てられる IPv6 プレフィクスです。通常、 <code>::</code> で終"
 "わります。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:18
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1808
 msgid ""
 "The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
 "code> and <code>_</code>"
@@ -5121,7 +5261,7 @@ msgstr ""
 msgid "The configuration file could not be loaded due to the following error:"
 msgstr "設定ファイルは以下のエラーにより読み込めませんでした:"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1849
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2396
 msgid ""
 "The device could not be reached within %d seconds after applying the pending "
 "changes, which caused the configuration to be rolled back for safety "
@@ -5147,6 +5287,12 @@ msgstr ""
 "デバイスファイルまたはパーティション(<abbr title=\"for example\">例</abbr> "
 "<code>/dev/sda1</code>)"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:612
+msgid ""
+"The existing wireless configuration needs to be changed for LuCI to function "
+"properly."
+msgstr "LuCIで正しく機能させるには、既存の無線設定を変更する必要があります。"
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:127
 msgid ""
 "The filesystem that was used to format the memory (<abbr title=\"for example"
@@ -5171,11 +5317,15 @@ msgstr ""
 msgid "The following rules are currently active on this system."
 msgstr "このシステムでは、現在以下のルールが有効になっています。"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:144
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:154
+msgid "The gateway address must not be a local IP address"
+msgstr "ゲートウェイ アドレスは非ローカル IP アドレスでなければなりません"
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:154
 msgid "The given SSH public key has already been added."
 msgstr "入力された SSH 公開鍵は既に追加されています。"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:150
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:160
 msgid ""
 "The given SSH public key is invalid. Please supply proper public RSA or "
 "ECDSA keys."
@@ -5183,36 +5333,36 @@ msgstr ""
 "入力された SSH 公開鍵は無効です。正しい RSA または ECDSA 鍵を入力してくださ"
 "い。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:67
-msgid "The given network name is not unique"
-msgstr "設定されたネットワーク名はユニークなものではありません"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:664
+msgid "The interface name is already used"
+msgstr "インターフェース名は既に使用されています"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:52
-msgid ""
-"The hardware is not multi-SSID capable and the existing configuration will "
-"be replaced if you proceed."
-msgstr ""
-"このハードウェアでは複数のESSIDを設定することができないため、続行した場合、設"
-"定は既存の設定と置き換えられます。"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:670
+msgid "The interface name is too long"
+msgstr "インターフェース名が長すぎます"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:43
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:31
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:55
 msgid ""
 "The length of the IPv4 prefix in bits, the remainder is used in the IPv6 "
 "addresses."
 msgstr ""
 "IPv4 プレフィクスの長さ (bit) です。残りは IPv6 アドレスで使用されます。"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:35
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:46
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:63
 msgid "The length of the IPv6 prefix in bits"
 msgstr "IPv6 プレフィクスの長さ (bit) です。"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:12
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:44
 msgid "The local IPv4 address over which the tunnel is created (optional)."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:5
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1814
+msgid "The network name is already used"
+msgstr "ネットワーク名は既に使用されています"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:135
 msgid ""
 "The network ports on this device can be combined to several <abbr title="
 "\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
@@ -5228,22 +5378,21 @@ msgstr ""
 "位のネットワークへの接続に使用するアップリンク ポートと、ローカル ネットワー"
 "ク用のその他のポートが存在します。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:77
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:395
-msgid "The selected protocol needs a device assigned"
-msgstr "選択中のプロトコルを使用する場合、デバイスを設定する必要があります"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1149
+msgid "The selected %s mode is incompatible with %s encryption"
+msgstr "選択された %s モードは、 %s 暗号化と非互換です"
 
 #: modules/luci-base/luasrc/view/csrftoken.htm:11
 msgid "The submitted security token is invalid or already expired!"
 msgstr "送信されたセキュリティ トークンは無効もしくは期限切れです！"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:274
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:272
 msgid ""
 "The system is erasing the configuration partition now and will reboot itself "
 "when finished."
 msgstr "システムは設定領域を消去中です。完了後、自動的に再起動します。"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:195
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:193
 msgid ""
 "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
 "few minutes before you try to reconnect. It might be necessary to renew the "
@@ -5255,7 +5404,7 @@ msgstr ""
 "わる可能性があるため、再接続時にあなたのコンピュータのIPアドレスを変更しなけ"
 "ればならない場合があります。"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:15
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:80
 msgid "The system password has been successfully changed."
 msgstr "システム パスワードの変更に成功しました。"
 
@@ -5268,7 +5417,7 @@ msgstr ""
 "マットではありません。このプラットフォームに適合したイメージファイルかどう"
 "か、確認してください。"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:427
 msgid "There are no active leases"
 msgstr "アクティブなリースはありません"
 
@@ -5277,18 +5426,10 @@ msgstr "アクティブなリースはありません"
 msgid "There are no active leases."
 msgstr "リース中のIPアドレスはありません。"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1973
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2514
 msgid "There are no changes to apply"
 msgstr "適用する変更はありません"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:204
-msgid ""
-"There is no device assigned yet, please attach a network device in the "
-"\"Physical Settings\" tab"
-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
@@ -5300,11 +5441,19 @@ msgstr ""
 "ルーターにパスワードが設定されていません。Webインターフェースの保護及びSSH"
 "サービスを有効にするために、管理者パスワードを設定してください。"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:19
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:49
 msgid "This IPv4 address of the relay"
 msgstr "リレーの IPv4 アドレス"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1448
+msgid "This authentication type is not applicable to the selected EAP method."
+msgstr "この認証タイプは、選択された EAP メソッドに適用できません。"
+
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:54
+msgid "This does not look like a valid PEM file"
+msgstr "これは有効な PEM ファイルではないようです"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
 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 "
@@ -5324,13 +5473,13 @@ msgstr ""
 "ンリストです。/etc/config/内の設定ファイル及びその他特定の設定ファイルは自動"
 "的に保持されます。"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:74
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:81
 msgid ""
 "This is either the \"Update Key\" configured for the tunnel or the account "
 "password if no update key has been configured"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:82
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:127
 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."
@@ -5338,7 +5487,7 @@ msgstr ""
 "/etc/rc.localを表示しています。実行したいコマンドを'exit 0'行より上に入力して"
 "ください。これらのコマンドはブートプロセスの最後に実行されます。"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:27
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:54
 msgid ""
 "This is the local endpoint address assigned by the tunnel broker, it usually "
 "ends with <code>...:2/64</code>"
@@ -5346,30 +5495,30 @@ msgstr ""
 "プロバイダからアサインされた、ローカルのエンドポイント アドレスです。通常、"
 "<code>...:2/64</code>が終端に設定されます。"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:79
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> in the local network"
 msgstr ""
-"これはローカル ネットワーク内のみの <abbr title=\"Dynamic Host Configuration "
-"Protocol\">DHCP</abbr> です。"
+"これはローカル ネットワーク内で唯一の <abbr title=\"Dynamic Host "
+"Configuration Protocol\">DHCP</abbr> です。"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:73
 msgid "This is the plain username for logging into the account"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:34
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:57
 msgid ""
 "This is the prefix routed to you by the tunnel broker for use by clients"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:9
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:41
 msgid "This is the system crontab in which scheduled tasks can be defined."
 msgstr ""
 "スケジュールタスク システムを使用することで、定期的に特定のタスクの実行を行う"
 "ことが可能です。"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:19
+#: 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 ""
@@ -5386,26 +5535,26 @@ msgstr ""
 msgid "This page gives an overview over currently active network connections."
 msgstr "このページでは、現在アクティブなネットワーク接続を表示します。"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:726
-#: modules/luci-base/htdocs/luci-static/resources/form.js:809
+#: modules/luci-base/htdocs/luci-static/resources/form.js:936
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1064
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:172
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:32
 msgid "This section contains no values yet"
 msgstr "このセクションは未設定です。"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:114
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:105
 msgid "Time Synchronization"
 msgstr "時刻設定"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:525
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:968
 msgid "Time interval for rekeying GTK"
 msgstr "Group Temporal Key (GTK) 再生成間隔"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:128
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:119
 msgid "Timezone"
 msgstr "タイムゾーン"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:825
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:871
 msgid "To login…"
 msgstr "ログイン…"
 
@@ -5419,7 +5568,7 @@ msgstr ""
 "ださい。設定のリセットを行う場合、\"設定リセット\"をクリックしてください。(た"
 "だし、squashfsをお使いの場合のみ使用可能です)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:835
 msgid "Tone"
 msgstr ""
 
@@ -5443,55 +5592,41 @@ msgstr "トラフィック"
 msgid "Transfer"
 msgstr "転送"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:595
-msgid "Transmission Rate"
-msgstr "転送レート"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:102
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:89
 msgid "Transmit"
 msgstr "送信"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:211
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:273
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:345
-msgid "Transmit Power"
-msgstr "電波出力"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:318
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:349
-msgid "Transmitter Antenna"
-msgstr "送信アンテナ"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:73
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:57
 msgid "Trigger"
 msgstr "トリガー"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:98
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:84
 msgid "Trigger Mode"
 msgstr "トリガーモード"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:54
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:69
 msgid "Tunnel ID"
 msgstr "トンネル ID"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1643
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1849
 #: modules/luci-base/luasrc/model/network.lua:1430
 msgid "Tunnel Interface"
 msgstr "トンネルインターフェース"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:44
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:55
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:76
 msgid "Tunnel Link"
 msgstr "トンネルリンク"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:46
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:131
 msgid "Tx-Power"
 msgstr "送信電力"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:32
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:185
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:11
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:43
 msgid "Type"
 msgstr "タイプ"
 
@@ -5499,19 +5634,20 @@ msgstr "タイプ"
 msgid "UDP:"
 msgstr "UDP:"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:28
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:90
 msgid "UMTS only"
 msgstr "UMTSのみ"
 
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:43
 #: protocols/luci-proto-3g/luasrc/model/network/proto_3g.lua:10
 msgid "UMTS/GPRS/EV-DO"
 msgstr "UMTS/GPRS/EV-DO"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:106
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:93
 msgid "USB Device"
 msgstr "USBデバイス"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:122
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:110
 msgid "USB Ports"
 msgstr "USB ポート"
 
@@ -5541,10 +5677,12 @@ msgstr "アップストリーム インターフェースを確定できませ
 msgid "Unable to dispatch"
 msgstr "ディスパッチできません"
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:22
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:54
 msgid "Unable to obtain client ID"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:61
 msgid "Unable to resolve AFTR host name"
 msgstr "AFTR ホスト名を解決できません"
@@ -5554,21 +5692,31 @@ msgstr "AFTR ホスト名を解決できません"
 msgid "Unable to resolve peer host name"
 msgstr "ピアのホスト名を解決できません"
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:33
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:68
+msgid "Unable to save contents: %s"
+msgstr "内容を保存できません: %s"
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:132
 msgid "Unavailable Seconds (UAS)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1196
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1386
 #: modules/luci-base/luasrc/model/network.lua:970
 msgid "Unknown"
 msgstr "不明"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1349
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1539
 #: modules/luci-base/luasrc/model/network.lua:1137
 msgid "Unknown error (%s)"
 msgstr "不明なエラー (%s)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1193
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:204
+msgid "Unknown error code"
+msgstr "不明なエラーコード"
+
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1383
+#: modules/luci-base/htdocs/luci-static/resources/protocol/none.js:6
 #: modules/luci-base/luasrc/model/network.lua:964
 msgid "Unmanaged"
 msgstr "Unmanaged"
@@ -5578,22 +5726,30 @@ msgstr "Unmanaged"
 msgid "Unmount"
 msgstr "アンマウント"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:107
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:262
 msgid "Unnamed key"
 msgstr "名称未設定の公開鍵"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1708
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2261
 msgid "Unsaved Changes"
 msgstr "保存されていない変更"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:202
+msgid "Unspecified error"
+msgstr "未指定エラー"
+
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:64
 msgid "Unsupported MAP type"
 msgstr "非対応の MAP タイプです"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:27
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:69
 msgid "Unsupported modem"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:219
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:119
 msgid "Unsupported protocol type."
 msgstr "サポートされていないプロトコルタイプ"
@@ -5617,56 +5773,72 @@ msgstr ""
 msgid "Upload archive..."
 msgstr "アーカイブをアップロード..."
 
-#: modules/luci-base/luasrc/view/cbi/upload.htm:8
-msgid "Uploaded File"
-msgstr "アップロード完了"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1703
+msgid "Upload file"
+msgstr "ファイルのアップロード"
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1678
+msgid "Upload file…"
+msgstr "ファイルをアップロード…"
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1623
+msgid "Upload request failed: %s"
+msgstr "アップロード リクエスト失敗: %s"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:613
+msgid ""
+"Upon pressing \"Continue\", anonymous \"wifi-iface\" sections will be "
+"assigned with a name in the form <em>wifinet#</em> and the network will be "
+"restarted to apply the updated configuration."
+msgstr ""
+"\"続行\" を押下すると、当該の \"wifi-iface\" セクションは <em>wifinet#</em> "
+"形式の名前で割り当てられ、更新された設定を適用するために再起動されます。"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:14
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:74
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:85
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:26
 msgid "Uptime"
 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:83
 msgid "Use <code>/etc/ethers</code>"
 msgstr "<code>/etc/ethers</code> を使用する"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:40
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:167
 msgid "Use DHCP gateway"
 msgstr "DHCPゲートウェイを使用する"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:33
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:85
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:34
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:98
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:46
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:65
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:38
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:58
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:124
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:39
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:116
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:59
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:103
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:64
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:77
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:100
 msgid "Use DNS servers advertised by peer"
 msgstr "ピアから通知されたDNSサーバーを使用する"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:227
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:233
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:479
 msgid "Use ISO/IEC 3166 alpha2 country codes."
 msgstr "ISO/IEC 3166 alpha2の国コードを使用します。"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:31
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:100
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:70
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:35
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:51
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:86
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:56
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:97
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:77
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:75
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:92
 msgid "Use MTU on tunnel interface"
 msgstr "トンネル インターフェースのMTUを設定"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:95
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:65
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:30
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:46
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:81
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:93
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:73
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:88
 msgid "Use TTL on tunnel interface"
 msgstr "トンネル インターフェースのTTLを設定"
 
@@ -5678,68 +5850,65 @@ msgstr "外部オーバーレイとして使用する (/overlay)"
 msgid "Use as root filesystem (/)"
 msgstr "ルート ファイルシステムとして使用する (/)"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:19
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:31
 msgid "Use broadcast flag"
 msgstr "ブロードキャスト フラグを使用する"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:253
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:791
 msgid "Use builtin IPv6-management"
 msgstr "ビルトインのIPv6-マネジメントを使用する"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:40
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:109
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:92
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:45
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:105
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:53
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:72
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:45
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:65
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:40
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:182
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:127
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:42
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:119
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:62
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:67
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:80
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:103
 msgid "Use custom DNS servers"
 msgstr "DNSサーバーを手動で設定"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:26
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:70
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:16
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:28
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:84
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:24
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:50
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:23
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:43
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:116
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:33
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:74
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:97
 msgid "Use default gateway"
 msgstr "デフォルト ゲートウェイを使用する"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:48
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:164
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:77
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:24
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:88
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:58
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:23
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:39
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:74
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:90
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:38
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:57
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:30
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:50
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:45
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:227
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:119
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:51
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:88
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:68
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:52
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:70
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:83
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:111
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:149
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:67
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:111
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:98
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:72
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:85
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:108
 msgid "Use gateway metric"
 msgstr "ゲートウェイ メトリックを使用する"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:64
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:179
 msgid "Use routing table"
 msgstr "ルーティング テーブルの使用"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:309
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:310
 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 "
@@ -5756,77 +5925,78 @@ msgstr ""
 msgid "Used"
 msgstr "使用"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:848
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1273
 msgid "Used Key Slot"
 msgstr "使用するキースロット"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:913
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
 msgid ""
 "Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not "
 "needed with normal WPA(2)-PSK."
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:48
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:110
 msgid "User certificate (PEM encoded)"
 msgstr "ユーザー証明書（PEM エンコード）"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:61
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:122
 msgid "User key (PEM encoded)"
 msgstr "ユーザー秘密鍵（PEM エンコード）"
 
 #: modules/luci-base/luasrc/view/sysauth.htm:23
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:41
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:32
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:102
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:56
 msgid "Username"
 msgstr "ユーザー名"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:182
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:903
 msgid "VC-Mux"
 msgstr "VC-Mux"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:851
 msgid "VDSL"
 msgstr "VDSL"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:172
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:169
 msgid "VLANs on %q"
 msgstr "%q上のVLAN"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:171
-msgid "VLANs on %q (%s)"
-msgstr "%q上のVLAN (%s)"
+#: modules/luci-base/luasrc/controller/admin/index.lua:55
+msgid "VPN"
+msgstr "VPN"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:18
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:42
 msgid "VPN Local address"
 msgstr "VPN ローカルアドレス"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:22
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:46
 msgid "VPN Local port"
 msgstr "VPN ローカルポート"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:15
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:11
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:15
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:58
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:39
 msgid "VPN Server"
 msgstr "VPN サーバー"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:18
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:96
 msgid "VPN Server port"
 msgstr "VPN サーバーポート"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:37
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:100
 msgid "VPN Server's certificate SHA1 hash"
 msgstr "VPN サーバー証明書 SHA1ハッシュ"
 
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:9
 #: protocols/luci-proto-vpnc/luasrc/model/network/proto_vpnc.lua:9
 msgid "VPNC (CISCO 3000 (and others) VPN)"
 msgstr "VPNC (CISCO 3000 (またはその他の) VPN)"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:44
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:73
 msgid "Vendor"
 msgstr "ベンダー"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:60
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:52
 msgid "Vendor Class to send when requesting DHCP"
 msgstr "DHCPリクエスト送信時のベンダークラスを設定"
 
@@ -5834,41 +6004,37 @@ msgstr "DHCPリクエスト送信時のベンダークラスを設定"
 msgid "Verify"
 msgstr "確認"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:52
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:76
 msgid "Virtual dynamic interface"
 msgstr "仮想ダイナミックインターフェース"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:470
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:471
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:553
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:576
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:908
 msgid "WDS"
 msgstr "WDS"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:667
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1160
 msgid "WEP Open System"
 msgstr "WEP オープンシステム"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:668
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1161
 msgid "WEP Shared Key"
 msgstr "WEP 共有キー"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "WEP passphrase"
 msgstr "WEP 暗号フレーズ"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:503
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:566
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:945
 msgid "WMM Mode"
 msgstr "WMM モード"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "WPA passphrase"
 msgstr "WPA 暗号フレーズ"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:716
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:735
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:740
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1074
 msgid ""
 "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
 "and ad-hoc mode) to be installed."
@@ -5885,7 +6051,7 @@ msgstr "変更を適用中です..."
 msgid "Waiting for command to complete..."
 msgstr "コマンド実行中です..."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1940
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2481
 msgid "Waiting for configuration to get applied… %ds"
 msgstr "設定を適用中です… %d 秒"
 
@@ -5893,8 +6059,8 @@ msgstr "設定を適用中です… %d 秒"
 msgid "Waiting for device..."
 msgstr "デバイスを起動中です..."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:172
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:163
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:173
 msgid "Warning"
 msgstr "警告"
 
@@ -5902,11 +6068,11 @@ msgstr "警告"
 msgid "Warning: There are unsaved changes that will get lost on reboot!"
 msgstr "警告: 再起動すると消えてしまう、保存されていない設定があります！"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:20
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:34
 msgid "Weak"
 msgstr "å¼±"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:946
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1355
 msgid ""
 "When using a PSK, the PMK can be automatically generated. When enabled, the "
 "R0/R1 key options below are not applied. Disable this to use the R0 and R1 "
@@ -5917,78 +6083,87 @@ msgstr ""
 "プションを使用するには、これを無効化してください。"
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:383
 msgid "Width"
 msgstr "帯域幅"
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:17
 #: protocols/luci-proto-wireguard/luasrc/model/network/proto_wireguard.lua:9
 msgid "WireGuard VPN"
 msgstr "WireGuard VPN"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:58
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:40
 #: modules/luci-mod-status/luasrc/controller/admin/status.lua:28
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:14
 msgid "Wireless"
 msgstr "無線"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1631
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1837
 #: modules/luci-base/luasrc/model/network.lua:1418
 msgid "Wireless Adapter"
 msgstr "無線アダプタ"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1617
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2052
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1823
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2288
 #: modules/luci-base/luasrc/model/network.lua:1404
 #: modules/luci-base/luasrc/model/network.lua:1865
 msgid "Wireless Network"
 msgstr "無線ネットワーク"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:629
 msgid "Wireless Overview"
 msgstr "無線LANデバイス一覧"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:362
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:797
 msgid "Wireless Security"
 msgstr "無線LANセキュリティ"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:54
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:611
+msgid "Wireless configuration migration"
+msgstr "無線設定マイグレーション"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:139
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:179
 msgid "Wireless is disabled"
 msgstr "無線LAN機能は無効になっています"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:54
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:139
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:179
 msgid "Wireless is not associated"
 msgstr "無線LAN機能がアソシエーションされていません"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:15
-msgid "Wireless is restarting..."
-msgstr "無線LAN機能再起動中..."
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:752
 msgid "Wireless network is disabled"
 msgstr "無線LAN機能は無効になっています"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:752
 msgid "Wireless network is enabled"
 msgstr "無線LAN機能は有効になっています"
 
-#: 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:182
 msgid "Write received DNS requests to syslog"
 msgstr "受信したDNSリクエストをsyslogへ記録します"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:164
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:155
 msgid "Write system log to file"
 msgstr "システムログをファイルに書き込む"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1507
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:85
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1754
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:109
 msgid "Yes"
 msgstr "はい"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:26
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:943
+msgid ""
+"You appear to be currently connected to the device via the \"%h\" interface. "
+"Do you really want to shut down the interface?"
+msgstr ""
+"デバイスに現在接続されている \"%h\" インターフェースを通してログインしていま"
+"す。本当にインターフェースをシャットダウンしますか？"
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:123
 msgid ""
 "You can enable or disable installed init scripts here. Changes will applied "
 "after a device reboot.<br /><strong>Warning: If you disable essential init "
@@ -6007,38 +6182,34 @@ msgid ""
 "You must enable JavaScript in your browser or LuCI will not work properly."
 msgstr "JavaScriptを有効にしない場合、LuCIは正しく動作しません。"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:196
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:187
 msgid "ZRam Compression Algorithm"
 msgstr "ZRam 圧縮アルゴリズム"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:203
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:194
 msgid "ZRam Compression Streams"
 msgstr "ZRam 圧縮ストリーム"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:189
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:180
 msgid "ZRam Settings"
 msgstr "ZRam 設定"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:191
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
 msgid "ZRam Size"
 msgstr "ZRam サイズ"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:229
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:230
 msgid "any"
 msgstr "全て"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:113
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:121
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:126
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:218
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:282
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:321
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:328
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:621
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:37
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:22
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:29
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:121
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:836
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:844
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:849
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1030
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:78
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:48
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:51
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:103
 msgid "auto"
 msgstr "自動"
 
@@ -6046,11 +6217,11 @@ msgstr "自動"
 msgid "automatic"
 msgstr "自動"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:45
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:78
 msgid "baseT"
 msgstr "baseT"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:909
 msgid "bridged"
 msgstr "ブリッジ"
 
@@ -6066,22 +6237,21 @@ msgstr "作成"
 msgid "create:"
 msgstr "作成:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:264
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:368
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:678
 msgid "creates a bridge over specified interface(s)"
 msgstr "指定したインターフェースでブリッジを作成します"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:277
 msgid "dB"
 msgstr "dB"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:34
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:35
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:46
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:47
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:48
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:131
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:132
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:133
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:277
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:279
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:331
@@ -6093,26 +6263,30 @@ msgstr "dB"
 msgid "dBm"
 msgstr "dBm"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:460
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:587
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:889
 msgid "disable"
 msgstr "無効"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:119
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:524
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:530
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:536
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:18
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:578
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:584
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:590
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:25
 msgid "disabled"
 msgstr "無効"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:433
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:467
+msgid "driver default"
+msgstr "ドライバーのデフォルト"
+
 #: modules/luci-base/luasrc/view/lease_status.htm:17
 #: modules/luci-base/luasrc/view/lease_status.htm:46
-#: 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:416
 msgid "expired"
 msgstr "期限切れ"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:88
 msgid ""
 "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr>-leases will be stored"
@@ -6126,25 +6300,21 @@ msgstr ""
 msgid "forward"
 msgstr "転送"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:80
 msgid "full-duplex"
 msgstr "全二重"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:80
 msgid "half-duplex"
 msgstr "半二重"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:559
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:565
 msgid "hexadecimal encoded value"
 msgstr "エンコードされた値（16進数）"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:138
-msgid "hidden"
-msgstr "(不明)"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:527
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:533
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:538
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:581
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:587
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:592
 msgid "hybrid mode"
 msgstr "ハイブリッド モード"
 
@@ -6152,6 +6322,10 @@ msgstr "ハイブリッド モード"
 msgid "if target is a network"
 msgstr "ターゲットがネットワークの場合"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:63
+msgid "ignore"
+msgstr "無視"
+
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:177
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
@@ -6186,25 +6360,26 @@ 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:94
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:95
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr "ローカル <abbr title=\"Domain Name System\">DNS</abbr>ファイル"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:952
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1168
+msgid "medium security"
+msgstr "セキュリティ: 中"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1360
 msgid "minutes"
 msgstr "分"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:43
-msgid "mixed WPA/WPA2"
-msgstr "mixed WPA/WPA2"
-
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:225
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:232
 msgid "no"
 msgstr "いいえ"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:54
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:72
 msgid "no link"
 msgstr "リンクなし"
 
@@ -6212,7 +6387,7 @@ msgstr "リンクなし"
 msgid "non-empty value"
 msgstr "空ではない値"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1195
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1446
 msgid "none"
 msgstr "なし"
 
@@ -6220,9 +6395,11 @@ msgstr "なし"
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:176
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:186
 msgid "not present"
-msgstr ""
+msgstr "存在しません"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:363
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:341
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:776
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:780
 #: 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
@@ -6237,9 +6414,9 @@ msgstr "オフ"
 msgid "on"
 msgstr "オン"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
-msgid "open"
-msgstr "オープン"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1169
+msgid "open network"
+msgstr "オープン ネットワーク"
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
@@ -6258,73 +6435,77 @@ msgstr "正の値（10進数）"
 msgid "positive integer value"
 msgstr "正の整数値"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:34
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:56
 msgid "random"
 msgstr "ランダム"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:526
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:532
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:537
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:580
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:586
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:591
 msgid "relay mode"
 msgstr "リレー モード"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:910
 msgid "routed"
 msgstr "routed"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:525
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:534
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:968
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:977
 msgid "sec"
 msgstr "秒"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:525
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:531
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:579
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:585
 msgid "server mode"
 msgstr "サーバー モード"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:544
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:597
 msgid "stateful-only"
 msgstr "ステートフルのみ"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:542
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:595
 msgid "stateless"
 msgstr "ステートレス"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:543
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:596
 msgid "stateless + stateful"
 msgstr "ステートレス + ステートフル"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:369
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1167
+msgid "strong security"
+msgstr "セキュリティ: 強"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:346
 msgid "tagged"
 msgstr "tagged"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:932
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1343
 msgid "time units (TUs / 1.024 ms) [1000-65535]"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:549
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:555
 msgid "unique value"
 msgstr "ユニークな値"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:448
 msgid "unknown"
 msgstr "不明"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:15
 #: modules/luci-base/luasrc/view/lease_status.htm:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:238
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:390
+#: 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:414
 msgid "unlimited"
 msgstr "無期限"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1401
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1648
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:63
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:355
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:378
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:413
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:446
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:512
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:450
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:545
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:53
 #: modules/luci-base/luasrc/view/cbi/network_netlist.htm:38
 msgid "unspecified"
@@ -6334,7 +6515,7 @@ msgstr "設定しない"
 msgid "unspecified -or- create:"
 msgstr "設定しない -又は- 作成:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:366
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:344
 msgid "untagged"
 msgstr "untagged"
 
@@ -6415,8 +6596,8 @@ msgstr "有効な UCI 識別子またはホスト名、 IP アドレス"
 msgid "valid address:port"
 msgstr "有効なアドレス:ポート"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:523
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:527
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:529
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:533
 msgid "valid date (YYYY-MM-DD)"
 msgstr "有効な日付 (YYYY-MM-DD)"
 
@@ -6453,7 +6634,7 @@ msgstr "有効な整数値"
 msgid "valid network in address/netmask notation"
 msgstr "有効なネットワーク（アドレス/ネットマスク 表記）"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:498
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:504
 msgid "valid phone digit (0-9, \"*\", \"#\", \"!\" or \".\")"
 msgstr "有効な電話番号 （0-9 や \"*\"、 \"#\"、 \"!\"、 \".\"）"
 
@@ -6466,11 +6647,11 @@ msgstr "有効なポートまたはポート範囲（port1-port2)"
 msgid "valid port value"
 msgstr "有効なポート番号"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:503
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:509
 msgid "valid time (HH:MM:SS)"
 msgstr "有効な時刻 (HH:MM:SS)"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:425
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:431
 msgid "value between %d and %d characters"
 msgstr "%d 以上 %d 文字以下の値"
 
@@ -6486,14 +6667,23 @@ msgstr "%f 以上の値"
 msgid "value smaller or equal to %f"
 msgstr "%f 以下の値"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:430
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:425
+msgid "value with %d characters"
+msgstr "%d 文字の値"
+
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:436
 msgid "value with at least %d characters"
 msgstr " %d 文字以上の値"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:435
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:441
 msgid "value with at most %d characters"
 msgstr "%d 文字以下の値"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1169
+msgid "weak security"
+msgstr "セキュリティ: 弱"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:221
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:232
diff --git a/modules/luci-base/po/ko/base.po b/modules/luci-base/po/ko/base.po
index 9d647a5b7..f484089bb 100644
--- a/modules/luci-base/po/ko/base.po
+++ b/modules/luci-base/po/ko/base.po
@@ -13,19 +13,20 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.4\n"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:133
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:857
 msgid "%.1f dB"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:109
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:122
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 msgid "%d Bit"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1641
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2194
 msgid "%d invalid field(s)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:281
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:31
 msgid "%s is untagged in multiple VLANs!"
 msgstr ""
 
@@ -63,19 +64,19 @@ msgid "-- Additional Field --"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:258
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1401
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1533
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:250
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:350
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1114
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1648
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1780
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:314
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:414
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1178
 #: modules/luci-base/luasrc/view/cbi/header.htm:5
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:26
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:88
 msgid "-- Please choose --"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:259
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:351
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1115
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:415
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1179
 #: modules/luci-base/luasrc/view/cbi/header.htm:6
 msgid "-- custom --"
 msgstr ""
@@ -98,7 +99,7 @@ msgstr ""
 msgid "-- please select --"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:382
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:814
 msgid "0 = not using RSSI threshold, 1 = do not change driver default"
 msgstr ""
 
@@ -110,10 +111,11 @@ msgstr "1 분 부하:"
 msgid "15 Minute Load:"
 msgstr "15 분 부하:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:924
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1337
 msgid "4-character hexadecimal ID"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:11
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:18
 msgid "464XLAT (CLAT)"
 msgstr ""
@@ -122,57 +124,57 @@ msgstr ""
 msgid "5 Minute Load:"
 msgstr "5 분 부하:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:960
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1366
 msgid "6-octet identifier as a hex string - no colons"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:891
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1310
 msgid "802.11r Fast Transition"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1157
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1567
 msgid "802.11w Association SA Query maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1574
 msgid "802.11w Association SA Query retry timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1133
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1533
 msgid "802.11w Management Frame Protection"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1156
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1567
 msgid "802.11w maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1165
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1574
 msgid "802.11w retry timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:399
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:831
 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:224
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:225
 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:215
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:216
 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:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
 msgid ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
 "order of the resolvfile"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:388
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:820
 msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:351
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:373
 #: 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>-주소"
@@ -182,8 +184,8 @@ msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-주소"
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:555
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:35
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:506
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr ""
 
@@ -197,29 +199,29 @@ msgstr ""
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 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:402
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:58
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:35
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:33
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> 설정"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:67
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:51
 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:328
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:329
 #: 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:372
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:233
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:234
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> leases"
@@ -227,7 +229,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:242
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> packet size"
@@ -235,73 +237,77 @@ 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:251
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:252
 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
 msgstr "<abbr title=\"maximal\">최대</abbr> 동시 처리 query 수"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:10
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:42
 msgid ""
 "<br/>Note: you need to manually restart the cron service if the crontab file "
 "was empty before editing."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:817
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1605
+msgid "A directory with the same name already exists."
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:863
 msgid "A new login is required since the authentication session expired."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:114
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:837
 msgid "A43C + J43 + A43"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:838
 msgid "A43C + J43 + A43 + V43"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:850
 msgid "ADSL"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:826
 msgid "ANSI T1.413"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:33
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:47
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:23
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:94
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:86
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:67
 msgid "APN"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:56
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:175
 msgid "ARP retry threshold"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:122
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:845
 msgid "ATM (Asynchronous Transfer Mode)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:144
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:866
 msgid "ATM Bridges"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:178
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:21
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:898
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:66
 msgid "ATM Virtual Channel Identifier (VCI)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:179
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:26
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:899
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:70
 msgid "ATM Virtual Path Identifier (VPI)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:866
 msgid ""
 "ATM bridges expose encapsulated ethernet in AAL5 connections as virtual "
 "Linux network interfaces which can be used in conjunction with DHCP or PPP "
 "to dial into the provider network."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:184
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:905
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:62
 msgid "ATM device number"
 msgstr ""
 
@@ -310,17 +316,17 @@ msgid "ATU-C System Vendor ID"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:251
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:495
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:499
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:528
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:532
 msgid "Absent Interface"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:19
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
 msgid "Access Concentrator"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:368
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:470
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:802
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
 msgid "Access Point"
 msgstr ""
 
@@ -345,7 +351,7 @@ msgid "Active Connections"
 msgstr "Active 연결수"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:68
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:30
 msgid "Active DHCP Leases"
 msgstr "Active DHCP 임대 목록"
 
@@ -353,55 +359,75 @@ msgstr "Active DHCP 임대 목록"
 msgid "Active DHCPv6 Leases"
 msgstr "Active DHCPv6 임대 목록"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1951
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:370
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:12
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2190
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:804
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:23
 msgid "Ad-Hoc"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:650
-#: modules/luci-base/htdocs/luci-static/resources/form.js:651
-#: modules/luci-base/htdocs/luci-static/resources/form.js:666
-#: modules/luci-base/htdocs/luci-static/resources/form.js:667
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1290
+#: modules/luci-base/htdocs/luci-static/resources/form.js:902
+#: modules/luci-base/htdocs/luci-static/resources/form.js:904
+#: modules/luci-base/htdocs/luci-static/resources/form.js:917
+#: modules/luci-base/htdocs/luci-static/resources/form.js:918
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1539
 #: modules/luci-base/luasrc/view/cbi/nsection.htm:25
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:189
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:197
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:39
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:47
 #: modules/luci-base/luasrc/view/cbi/ucisection.htm:54
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:703
 msgid "Add"
 msgstr "추가"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:60
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:870
+msgid "Add ATM Bridge"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:92
 msgid "Add IPv4 address…"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:129
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:204
 msgid "Add IPv6 address…"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:143
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:149
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:38
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:47
+msgid "Add LED action"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:215
+msgid "Add VLAN"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:14
+msgid "Add instance"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:153
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:159
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:250
 msgid "Add key"
 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:155
 msgid "Add local domain suffix to names served from hosts files"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:705
 msgid "Add new interface..."
 msgstr "새로운 인터페이스 추가..."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:104
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:99
+msgid "Add peer"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:105
 msgid "Additional Hosts files"
 msgstr "추가적인 Hosts 파일들"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:161
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
 msgid "Additional servers file"
 msgstr ""
 
@@ -428,7 +454,7 @@ msgstr ""
 msgid "Address"
 msgstr "주소"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:12
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:151
 msgid "Address to access local relay bridge"
 msgstr ""
 
@@ -437,13 +463,13 @@ msgstr ""
 msgid "Administration"
 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:70
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:505
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:896
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:24
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:189
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:463
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:176
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:143
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:364
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:742
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:799
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:50
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:34
 msgid "Advanced Settings"
@@ -453,165 +479,165 @@ msgstr "고급 설정"
 msgid "Aggregate Transmit Power(ACTATP)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:175
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:166
 msgid "Alert"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1628
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1834
 #: modules/luci-base/luasrc/model/network.lua:1416
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:54
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:78
 msgid "Alias Interface"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:138
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:66
 msgid "Alias of \"%s\""
 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:170
 msgid "All Servers"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:114
 msgid ""
 "Allocate IP addresses sequentially, starting from the lowest available "
 "address"
 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:113
 msgid "Allocate IP sequentially"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:24
 msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
 msgstr "<abbr title=\"Secure Shell\">SSH</abbr> 암호 인증을 허용합니다"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:545
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:987
 msgid "Allow AP mode to disconnect STAs based on low ACK condition"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:462
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:589
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:891
 msgid "Allow all except listed"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:236
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:767
 msgid "Allow legacy 802.11b rates"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:461
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:588
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:890
 msgid "Allow listed only"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:198
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:199
 msgid "Allow localhost"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:47
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:35
 msgid "Allow remote hosts to connect to local SSH forwarded ports"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:38
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:30
 msgid "Allow root logins with password"
 msgstr "암호를 이용한 root 접근 허용"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:39
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:30
 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:199
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:200
 msgid ""
 "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:135
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:122
 msgid "Allowed IPs"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:549
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:602
 msgid "Always announce default router"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:259
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:782
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
 "option does not comply with IEEE 802.11n-2009!"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:95
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:818
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:119
 msgid "Annex"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:96
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:819
 msgid "Annex A + L + M (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:827
 msgid "Annex A G.992.1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:828
 msgid "Annex A G.992.2"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:829
 msgid "Annex A G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:830
 msgid "Annex A G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:97
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:820
 msgid "Annex B (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:823
 msgid "Annex B G.992.1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:824
 msgid "Annex B G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:102
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:825
 msgid "Annex B G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:98
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:821
 msgid "Annex J (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:831
 msgid "Annex L G.992.3 POTS 1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:99
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:822
 msgid "Annex M (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:109
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:832
 msgid "Annex M G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:833
 msgid "Annex M G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:550
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:602
 msgid "Announce as default router even if no public prefix is available."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:555
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:607
 msgid "Announced DNS domains"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:554
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:606
 msgid "Announced DNS servers"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1093
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1496
 msgid "Anonymous Identity"
 msgstr ""
 
@@ -623,20 +649,6 @@ msgstr ""
 msgid "Anonymous Swap"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:322
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:329
-msgid "Antenna 1"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:323
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:330
-msgid "Antenna 2"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:246
-msgid "Antenna Configuration"
-msgstr ""
-
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:71
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:160
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:181
@@ -644,11 +656,11 @@ msgstr ""
 msgid "Any zone"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1981
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2522
 msgid "Apply request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1867
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2409
 msgid "Apply unchecked"
 msgstr ""
 
@@ -656,8 +668,8 @@ msgstr ""
 msgid "Architecture"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:19
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:184
+#: 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 ""
@@ -666,13 +678,13 @@ msgstr ""
 msgid "Assign interfaces..."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:124
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:24
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:189
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:31
 msgid ""
 "Assign prefix parts using this hexadecimal subprefix ID for this interface."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:148
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1967
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:22
 msgid "Associated Stations"
 msgstr "연결된 station 들"
@@ -681,20 +693,20 @@ msgstr "연결된 station 들"
 msgid "Associations"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:39
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:37
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:101
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:64
 msgid "Auth Group"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1027
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1421
 msgid "Authentication"
 msgstr ""
 
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:29
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:70
 msgid "Authentication Type"
 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:78
 msgid "Authoritative"
 msgstr ""
 
@@ -712,17 +724,19 @@ msgstr "인증이 필요합니다"
 msgid "Auto Refresh"
 msgstr "자동 Refresh"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:53
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:7
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:17
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:67
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:24
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:36
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:42
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:36
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:106
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:24
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:98
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:50
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:94
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:81
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:55
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:68
 msgid "Automatic"
 msgstr ""
 
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:7
 #: protocols/luci-proto-hnet/luasrc/model/network/proto_hnet.lua:7
 msgid "Automatic Homenet (HNCP)"
 msgstr ""
@@ -765,21 +779,21 @@ msgstr ""
 msgid "Average:"
 msgstr "평균:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:116
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:839
 msgid "B43 + B43C"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:840
 msgid "B43 + B43C + V43"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:48
 msgid "BR / DMR / AFTR"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:43
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:75
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1620
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:176
 msgid "BSSID"
 msgstr ""
@@ -793,19 +807,11 @@ msgstr "개요로 이동"
 msgid "Back to configuration"
 msgstr "설정으로 돌아가기"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:48
-msgid "Back to overview"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:20
-msgid "Back to scan results"
-msgstr ""
-
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:17
 msgid "Backup"
 msgstr "백업"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:38
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:36
 msgid "Backup / Flash Firmware"
 msgstr "Firmware 백업 / Flash"
 
@@ -818,11 +824,11 @@ msgid "Bad address specified!"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:158
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:288
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:368
 msgid "Band"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:261
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:785
 msgid "Beacon Interval"
 msgstr ""
 
@@ -836,79 +842,85 @@ msgstr ""
 "필수 기본 파일 그리고 사용자가 패턴 정의로 백업하도록 지정한 것로 이루어져 있"
 "습니다."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:293
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:294
 msgid ""
 "Bind dynamically to interfaces rather than wildcard address (recommended as "
 "linux default)"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:16
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:48
 msgid "Bind interface"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:16
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:48
 msgid "Bind the tunnel to this interface (optional)."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:49
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:134
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:187
 msgid "Bitrate"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:172
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
 msgid "Bogus NX Domain Override"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1634
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1840
 #: modules/luci-base/luasrc/model/network.lua:1420
 msgid "Bridge"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:264
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:368
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:678
 msgid "Bridge interfaces"
 msgstr "Bridge 인터페이스"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:906
 msgid "Bridge unit number"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:250
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:364
 msgid "Bring up on boot"
 msgstr "부팅시 활성화"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:35
-msgid "Broadcom 802.11%s Wireless Controller"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:45
-msgid "Broadcom BCM%04x 802.11 Wireless Controller"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1697
+msgid "Browse…"
 msgstr ""
 
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:18
 msgid "Buffered"
 msgstr "버퍼된 양"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:75
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:134
 msgid "CA certificate; if empty it will be saved after the first connection."
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:7
+msgid "CLAT configuration failed"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:13
 msgid "CPU usage (%)"
 msgstr "CPU 사용량 (%)"
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:21
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:53
 msgid "Call failed"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1789
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:14
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:52
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:711
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:948
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1839
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:191
 #: modules/luci-mod-system/luasrc/view/admin_system/upgrade.htm:60
 msgid "Cancel"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:6
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:17
 msgid "Category"
 msgstr ""
 
@@ -926,13 +938,7 @@ msgstr ""
 msgid "Chain"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:9
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:14
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:24
-msgid "Change login password"
-msgstr ""
-
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1744
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 msgid "Changes"
 msgstr "변경 사항"
 
@@ -940,33 +946,23 @@ msgstr "변경 사항"
 msgid "Changes applied."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2004
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2545
 msgid "Changes have been reverted."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:43
 msgid "Changes the administrator password for accessing the device"
 msgstr "장비 접근을 위한 관리자 암호를 변경합니다"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:10
-msgid "Changing password…"
-msgstr ""
-
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:162
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:45
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:87
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:174
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:376
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1618
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:186
 msgid "Channel"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:119
-msgid ""
-"Channel %d is not available in the %s regulatory domain and has been auto-"
-"adjusted to %d."
-msgstr ""
-
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:229
 msgid "Check"
 msgstr ""
@@ -975,7 +971,7 @@ msgstr ""
 msgid "Check filesystems before mount"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1806
 msgid "Check this option to delete the existing networks from this radio."
 msgstr ""
 
@@ -987,8 +983,8 @@ msgstr ""
 msgid "Choose mtdblock"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:358
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:443
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1829
 msgid ""
 "Choose the firewall zone you want to assign to this interface. Select "
 "<em>unspecified</em> to remove the interface from the associated zone or "
@@ -1000,7 +996,7 @@ msgstr ""
 "운 zone 을 정의하고 인터페이스 연결을 원한다면 <em>create</em> 항목을 입력하"
 "세요."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:834
 msgid ""
 "Choose the network(s) you want to attach to this wireless interface or fill "
 "out the <em>create</em> field to define a new network."
@@ -1008,11 +1004,11 @@ msgstr ""
 "이 무선랜 인터페이스와 연결하고자 하는 네트워크(들)을 선택하세요. 혹은 새로"
 "운 네트워크를 정의할려면 <em>create</em> 을 작성하세요."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:614
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1023
 msgid "Cipher"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:61
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:91
 msgid "Cisco UDP encapsulation"
 msgstr ""
 
@@ -1030,28 +1026,28 @@ msgid ""
 "FEATURE IS FOR PROFESSIONALS! )"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1950
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:369
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:471
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2189
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:803
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:908
 msgid "Client"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:55
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:52
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:47
 msgid "Client ID to send when requesting DHCP"
 msgstr "DHCP 요청시 전송할 Client ID"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:145
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:151
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:155
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:161
 msgid "Close"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:146
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:119
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:125
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:127
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:98
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:119
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:157
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:141
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:115
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:138
 msgid ""
 "Close inactive connection after the given amount of seconds, use 0 to "
 "persist connection"
@@ -1064,12 +1060,9 @@ msgstr "목록 닫기..."
 #: modules/luci-base/luasrc/view/lease_status.htm:77
 #: modules/luci-base/luasrc/view/lease_status.htm:98
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:118
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:37
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:24
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1965
 #: modules/luci-mod-network/luasrc/view/admin_network/iface_status.htm:6
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:40
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:30
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:8
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:398
 #: modules/luci-mod-status/luasrc/view/admin_status/index/30-network.htm:11
 #: modules/luci-mod-status/luasrc/view/admin_status/index/50-dsl.htm:17
@@ -1083,15 +1076,19 @@ msgstr "Data 를 수집중입니다..."
 msgid "Command"
 msgstr "명령어"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:193
+msgid "Command OK"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:41
+msgid "Command failed"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:64
 msgid "Comment"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:185
-msgid "Common Configuration"
-msgstr "공통 설정"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
 msgid ""
 "Complicates key reinstallation attacks on the client side by disabling "
 "retransmission of EAPOL-Key frames that are used to install keys. This "
@@ -1099,13 +1096,14 @@ msgid ""
 "negotiation especially in environments with heavy traffic load."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1744
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 #: modules/luci-base/luasrc/controller/admin/uci.lua:11
 #: modules/luci-mod-system/luasrc/view/admin_system/backupfiles.htm:9
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:13
 msgid "Configuration"
 msgstr "설정"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:21
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:63
 msgid "Configuration failed"
 msgstr ""
@@ -1114,89 +1112,89 @@ msgstr ""
 msgid "Configuration files will be kept"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1915
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2456
 msgid "Configuration has been applied."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1848
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2395
 msgid "Configuration has been rolled back!"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:43
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:942
+msgid "Confirm disconnect"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:50
 msgid "Confirmation"
 msgstr "다시 확인"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:32
-msgid "Connect"
-msgstr "연결"
-
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:72
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:105
 msgid "Connected"
 msgstr "연결 시간"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:338
-msgid "Connection Limit"
-msgstr ""
-
 #: modules/luci-base/htdocs/luci-static/resources/network.js:7
 #: modules/luci-base/luasrc/model/network.lua:27
 msgid "Connection attempt failed"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:203
+msgid "Connection lost"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/controller/admin/status.lua:32
 msgid "Connections"
 msgstr "연결"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1890
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:66
+msgid "Contents have been saved."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:618
+msgid "Continue"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2431
 msgid ""
 "Could not regain access to the device after applying the configuration "
 "changes. You might need to reconnect if you modified network related "
 "settings such as the IP address or wireless security credentials."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:135
 msgid "Country"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:227
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:233
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:337
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:764
 msgid "Country Code"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:36
-msgid "Cover the following interface"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:43
-msgid "Cover the following interfaces"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:357
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:86
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:443
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1829
 msgid "Create / Assign firewall-zone"
 msgstr "Firewall-zone 생성 / 할당"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:9
-msgid "Create Interface"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:33
-msgid "Create a bridge over multiple interfaces"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:735
+msgid "Create interface"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:174
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:165
 msgid "Critical"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:178
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:169
 msgid "Cron Log Level"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:519
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:521
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:447
+msgid "Current power"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:552
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:554
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:51
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:53
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:82
@@ -1204,7 +1202,7 @@ msgstr ""
 msgid "Custom Interface"
 msgstr "임의의 인터페이스"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:36
 msgid "Custom delegated IPv6-prefix"
 msgstr ""
 
@@ -1214,7 +1212,7 @@ msgid ""
 "this, perform a factory-reset first."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:59
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:41
 msgid ""
 "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
 "\">LED</abbr>s if possible."
@@ -1222,46 +1220,47 @@ msgstr ""
 "원한다면 장치에 부착된 <abbr title=\"Light Emitting Diode\">LED</abbr> 들의 "
 "행동을 마음대로 변경할 수 있습니다."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:799
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1223
 msgid "DAE-Client"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:807
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1231
 msgid "DAE-Port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:815
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1239
 msgid "DAE-Secret"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:448
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:459
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:279
 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:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:61
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:62
 msgid "DHCP and DNS"
 msgstr "DHCP 와 DNS"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1195
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1385
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:16
 #: modules/luci-base/luasrc/model/network.lua:968
 msgid "DHCP client"
 msgstr "DHCP client"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:571
 msgid "DHCP-Options"
 msgstr "DHCP-옵션들"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_dhcpv6.lua:7
 msgid "DHCPv6 client"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:540
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:594
 msgid "DHCPv6-Mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:529
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:583
 msgid "DHCPv6-Service"
 msgstr ""
 
@@ -1278,31 +1277,31 @@ msgstr ""
 msgid "DNS"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:183
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
 msgid "DNS forwardings"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:30
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:37
 msgid "DNS-Label / FQDN"
 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:136
 msgid "DNSSEC"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:139
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
 msgid "DNSSEC check unsigned"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:73
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:99
 msgid "DPD Idle Timeout"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:14
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:41
 msgid "DS-Lite AFTR address"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:92
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:815
 #: modules/luci-mod-status/luasrc/view/admin_status/index/50-dsl.htm:14
 msgid "DSL"
 msgstr ""
@@ -1311,11 +1310,11 @@ msgstr ""
 msgid "DSL Status"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:125
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:848
 msgid "DSL line mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:519
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:963
 msgid "DTIM Interval"
 msgstr ""
 
@@ -1327,42 +1326,45 @@ msgstr ""
 msgid "Data Rate"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:169
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:180
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:160
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:171
 msgid "Debug"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:759
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:783
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:807
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1183
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1207
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1231
 msgid "Default %d"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:82
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:107
 msgid "Default Route"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:17
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:81
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:51
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:32
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:48
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:85
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:65
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:80
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:108
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:146
 msgid "Default gateway"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:541
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:594
 msgid "Default is stateless + stateful"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:70
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:54
 msgid "Default state"
 msgstr "기본 상태"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:503
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:553
 msgid "Define a name for this network."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:514
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:571
 msgid ""
 "Define additional DHCP options, for example "
 "\"<code>6,192.168.2.1,192.168.2.2</code>\" which advertises different DNS "
@@ -1372,35 +1374,47 @@ msgstr ""
 "\"<code>6,192.168.2.1,192.168.2.2</code>\" 는 client 에게 다른 DNS 서버를 세"
 "팅하도록 권고할 수 있습니다."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:705
-#: modules/luci-base/htdocs/luci-static/resources/form.js:958
-#: modules/luci-base/htdocs/luci-static/resources/form.js:959
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1271
+#: modules/luci-base/htdocs/luci-static/resources/form.js:966
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1210
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1216
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1524
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1758
 #: modules/luci-base/luasrc/view/cbi/nsection.htm:11
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:162
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:16
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:41
 msgid "Delete"
 msgstr "삭제"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:178
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:187
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:193
 msgid "Delete key"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:45
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1654
+msgid "Delete permission denied"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1656
+msgid "Delete request failed: %d %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:723
 msgid "Delete this network"
 msgstr "이 네트워크를 삭제합니다"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:519
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:963
 msgid "Delivery Traffic Indication Message Interval"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:102
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:108
 msgid "Description"
 msgstr "설명"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:224
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1754
+msgid "Deselect"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:215
 msgid "Design"
 msgstr "디자인"
 
@@ -1418,10 +1432,12 @@ msgstr ""
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:177
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:43
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:13
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:38
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:73
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:33
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:52
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:85
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:86
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:72
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:154
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:253
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:86
@@ -1429,15 +1445,24 @@ msgstr ""
 msgid "Device"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:138
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:737
 msgid "Device Configuration"
 msgstr "장치 설정"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:81
+msgid "Device is not active"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/reboot.htm:23
 msgid "Device is rebooting..."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1889
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:167
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:513
+msgid "Device is restarting…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2430
 msgid "Device unreachable!"
 msgstr ""
 
@@ -1445,26 +1470,26 @@ msgstr ""
 msgid "Device unreachable! Still waiting for device..."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:123
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:78
 #: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:61
 msgid "Diagnostics"
 msgstr "진단"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:45
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:60
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:101
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:93
 msgid "Dial number"
 msgstr ""
 
-#: modules/luci-base/luasrc/view/cbi/filebrowser.htm:99
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1554
 msgid "Directory"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:131
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:715
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:754
 msgid "Disable"
 msgstr "비활성화"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:472
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:531
 msgid ""
 "Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for "
 "this interface."
@@ -1472,71 +1497,66 @@ msgstr ""
 "이 인터페이스에 대해 <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr> 기능을 비활성합니다."
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:64
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:93
 msgid "Disable Encryption"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:530
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:973
 msgid "Disable Inactivity Polling"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:713
 msgid "Disable this network"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:44
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:54
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:68
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:37
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:43
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:37
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1534
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:76
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:107
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:99
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:51
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:95
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:82
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:69
 msgid "Disabled"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1139
-msgid "Disabled (default)"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:544
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:987
 msgid "Disassociate On Low Acknowledgement"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:193
 msgid "Discard upstream RFC1918 responses"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:92
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:114
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:956
 msgid "Disconnect"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:22
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:64
 msgid "Disconnection attempt failed"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1121
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1762
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1855
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:17
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1375
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1995
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2314
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2401
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1634
 msgid "Dismiss"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:240
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:334
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:770
 msgid "Distance Optimization"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:241
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:770
 msgid "Distance to farthest network member in meters."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:347
-msgid "Diversity"
-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:61
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
@@ -1547,35 +1567,43 @@ 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:158
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:159
 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:123
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:124
 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:118
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
 msgid "Do not forward reverse lookups for local networks"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:173
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1639
+msgid "Do you really want to delete \"%s\" ?"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:188
 msgid "Do you really want to delete the following SSH key?"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1637
+msgid "Do you really want to recursively delete the directory \"%s\" ?"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:74
 msgid "Domain required"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:205
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:206
 msgid "Domain whitelist"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:34
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:67
 msgid "Don't Fragment"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:74
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:75
 msgid ""
 "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
 "<abbr title=\"Domain Name System\">DNS</abbr>-Name"
@@ -1593,19 +1621,19 @@ msgstr "백업 다운로드"
 msgid "Download mtdblock"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:853
 msgid "Downstream SNR offset"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:914
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1169
 msgid "Drag to reorder"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:9
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:11
 msgid "Dropbear Instance"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:6
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 msgid ""
 "Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access "
 "and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
@@ -1613,19 +1641,20 @@ msgstr ""
 "Dropbear 는 <abbr title=\"Secure Shell\">SSH</abbr> network shell 접근과 "
 "<abbr title=\"Secure Copy\">SCP</abbr> 서버 기능을 제공합니다"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:11
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:14
 msgid "Dual-Stack Lite (RFC6333)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:493
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:547
 msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:60
 msgid "Dynamic tunnel"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:494
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:547
 msgid ""
 "Dynamically allocate DHCP addresses for clients. If disabled, only clients "
 "having static leases will be served."
@@ -1633,21 +1662,21 @@ msgstr ""
 "동적으로 DHCP 주소를 client 에게 할당합니다.  만약 비활성화시, static lease "
 "가 설정된 client 만 주소 제공이 이루어집니다."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:67
 msgid "EA-bits length"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:990
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1386
 msgid "EAP-Method"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:934
-#: modules/luci-base/htdocs/luci-static/resources/form.js:935
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1199
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1188
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1191
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1450
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:154
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:160
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:38
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:291
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:720
 msgid "Edit"
 msgstr "수정"
 
@@ -1657,90 +1686,91 @@ msgid ""
 "reload the page."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:38
-msgid "Edit this interface"
-msgstr "이 인터페이스를 수정합니다"
-
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:718
 msgid "Edit this network"
 msgstr "이 네트워크를 수정합니다"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:669
+msgid "Edit wireless network"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:167
 msgid "Emergency"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:127
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:715
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:754
 msgid "Enable"
 msgstr "활성화"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:414
 msgid ""
 "Enable <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> "
 "snooping"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:271
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:412
 msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 msgstr "<abbr title=\"Spanning Tree Protocol\">STP</abbr> 활성화"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:41
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:60
 msgid "Enable HE.net dynamic endpoint update"
 msgstr ""
 
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:51
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:89
 msgid "Enable IPv6 negotiation"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:23
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:35
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:41
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:35
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:37
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:49
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:80
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:54
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:67
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:93
 msgid "Enable IPv6 negotiation on the PPP link"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:143
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:188
 msgid "Enable Jumbo Frame passthrough"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:244
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:235
 msgid "Enable NTP client"
 msgstr "NTP client 활성화"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:69
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:96
 msgid "Enable Single DES"
 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:267
 msgid "Enable TFTP server"
 msgstr "TFTP 서버 활성화"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:134
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:180
 msgid "Enable VLAN functionality"
 msgstr "VLAN 기능 활성화"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1595
 msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1175
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
 msgid "Enable key reinstallation (KRACK) countermeasures"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:138
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:183
 msgid "Enable learning and aging"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:194
 msgid "Enable mirroring of incoming packets"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:151
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:195
 msgid "Enable mirroring of outgoing packets"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:34
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:67
 msgid "Enable the DF (Don't Fragment) flag of the encapsulating packets."
 msgstr ""
 
@@ -1748,7 +1778,7 @@ msgstr ""
 msgid "Enable this mount"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:713
 msgid "Enable this network"
 msgstr ""
 
@@ -1756,48 +1786,52 @@ msgstr ""
 msgid "Enable this swap"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:37
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:88
 msgid "Enable/Disable"
 msgstr "활성/비활성"
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:76
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:152
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:251
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:41
 msgid "Enabled"
 msgstr "활성화됨"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:277
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:414
 msgid "Enables IGMP snooping on this bridge"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:892
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1310
 msgid ""
 "Enables fast roaming among access points that belong to the same Mobility "
 "Domain"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:272
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:412
 msgid "Enables the Spanning Tree Protocol on this bridge"
 msgstr "이 bridge 에 Spanning Tree Protocol 활성화합니다"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:120
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:180
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:59
+msgid "Encapsulation limit"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:843
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:901
 msgid "Encapsulation mode"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:76
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:603
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:129
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:992
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1621
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:177
 msgid "Encryption"
 msgstr "암호화"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:155
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:128
 msgid "Endpoint Host"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:165
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:132
 msgid "Endpoint Port"
 msgstr ""
 
@@ -1809,16 +1843,21 @@ msgstr ""
 msgid "Enter custom values"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:273
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:271
 msgid "Erasing..."
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:95
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:96
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:97
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:98
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:99
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:106
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:107
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:108
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:109
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:110
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:173
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:164
 msgid "Error"
 msgstr ""
 
@@ -1826,24 +1865,28 @@ msgstr ""
 msgid "Errored seconds (ES)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1646
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1852
 #: modules/luci-base/luasrc/model/network.lua:1432
 msgid "Ethernet Adapter"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1637
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1843
 #: modules/luci-base/luasrc/model/network.lua:1422
 msgid "Ethernet Switch"
 msgstr "Ethernet 스위치"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:303
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
 msgid "Exclude interfaces"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:153
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
 msgid "Expand hosts"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:195
+msgid "Expecting an hexadecimal assignment hint"
+msgstr ""
+
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:59
 msgid "Expecting: %s"
 msgstr ""
@@ -1852,60 +1895,76 @@ msgstr ""
 msgid "Expires"
 msgstr "만료 시간"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:488
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:543
 msgid ""
 "Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
 msgstr "임대한 주소의 유효 시간.  최소값은  2 분 (<code>2m</code>) 입니다."
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:8
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:19
 msgid "External"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:971
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1377
 msgid "External R0 Key Holder List"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:980
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1381
 msgid "External R1 Key Holder List"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:150
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:141
 msgid "External system log server"
 msgstr "외부 system log 서버"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:155
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:146
 msgid "External system log server port"
 msgstr "외부 system log 서버 포트"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:160
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:151
 msgid "External system log server protocol"
 msgstr "외부 system log 서버 프로토콜"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:18
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:79
 msgid "Extra SSH command options"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:940
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1351
 msgid "FT over DS"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:941
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1352
 msgid "FT over the Air"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:938
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1349
 msgid "FT protocol"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1842
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:82
+msgid "Failed to change the system password."
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2389
 msgid "Failed to confirm apply within %ds, waiting for rollback…"
 msgstr ""
 
-#: modules/luci-base/luasrc/view/cbi/filebrowser.htm:106
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:45
+msgid "Failed to execute \"/etc/init.d/%s %s\" action: %s"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1561
 msgid "File"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:279
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1514
+msgid "File not accessible"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1698
+msgid "Filename"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:280
 msgid "Filename of the boot image advertised to clients"
 msgstr ""
 
@@ -1915,14 +1974,15 @@ msgstr ""
 msgid "Filesystem"
 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:118
 msgid "Filter private"
 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:123
 msgid "Filter useless"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:23
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:65
 msgid "Finalizing failed"
 msgstr ""
@@ -1933,7 +1993,7 @@ msgid ""
 "with defaults based on what was detected"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:696
 msgid "Find and join network"
 msgstr "네트워크 검색 및 연결합니다"
 
@@ -1945,11 +2005,11 @@ msgstr ""
 msgid "Firewall"
 msgstr "방화벽"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:77
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:76
 msgid "Firewall Mark"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:193
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:278
 msgid "Firewall Settings"
 msgstr "방화벽 설정"
 
@@ -1957,7 +2017,7 @@ msgstr "방화벽 설정"
 msgid "Firewall Status"
 msgstr "방화벽 상태"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:137
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:860
 msgid "Firmware File"
 msgstr ""
 
@@ -1965,7 +2025,7 @@ msgstr ""
 msgid "Firmware Version"
 msgstr "Firmware 버전"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:225
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:226
 msgid "Fixed source port for outbound DNS queries"
 msgstr ""
 
@@ -1985,35 +2045,35 @@ msgstr "새로운 firmware 이미지로 flash"
 msgid "Flash operations"
 msgstr "Flash 작업"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:194
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:192
 msgid "Flashing..."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:498
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:550
 msgid "Force"
 msgstr "강제하기"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:258
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:782
 msgid "Force 40MHz mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:622
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1031
 msgid "Force CCMP (AES)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:499
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:550
 msgid "Force DHCP on this network even if another server is detected."
 msgstr "다른 DHCP 서버가 탐지되더라도 이 네트워크에 DHCP 를 강제합니다."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:623
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1032
 msgid "Force TKIP"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:624
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1033
 msgid "Force TKIP and CCMP (AES)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:795
 msgid "Force link"
 msgstr ""
 
@@ -2021,7 +2081,7 @@ msgstr ""
 msgid "Force upgrade"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:60
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:90
 msgid "Force use of NAT-T"
 msgstr ""
 
@@ -2029,7 +2089,7 @@ msgstr ""
 msgid "Form token mismatch"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:34
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:164
 msgid "Forward DHCP traffic"
 msgstr ""
 
@@ -2037,46 +2097,41 @@ msgstr ""
 msgid "Forward Error Correction Seconds (FECS)"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:28
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:161
 msgid "Forward broadcast traffic"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:375
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:809
 msgid "Forward mesh peer traffic"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:186
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:908
 msgid "Forwarding mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:255
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:596
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:774
 msgid "Fragmentation Threshold"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:332
-msgid "Frame Bursting"
-msgstr ""
-
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:17
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:28
 msgid "Free"
 msgstr "이용 가능한 양"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:91
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:89
 msgid ""
-"Further information about WireGuard interfaces and peers at <a href=\"http://"
-"wireguard.com\">wireguard.com</a>."
+"Further information about WireGuard interfaces and peers at <a href='http://"
+"wireguard.com'>wireguard.com</a>."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:45
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:130
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:186
 msgid "GHz"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:29
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:36
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:91
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:77
 msgid "GPRS only"
 msgstr ""
 
@@ -2085,28 +2140,28 @@ msgstr ""
 msgid "Gateway"
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:35
+msgid "Gateway Ports"
+msgstr ""
+
 #: modules/luci-base/htdocs/luci-static/resources/network.js:9
 #: modules/luci-base/luasrc/model/network.lua:29
 msgid "Gateway address is invalid"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:46
-msgid "Gateway ports"
-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:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:275
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:23
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:112
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:103
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:49
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:33
 msgid "General Settings"
 msgstr "기본 설정"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:188
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:462
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:175
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:141
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:361
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:504
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:895
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:741
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:796
 msgid "General Setup"
 msgstr "기본 설정"
 
@@ -2114,7 +2169,7 @@ msgstr "기본 설정"
 msgid "Generate Config"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:945
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1355
 msgid "Generate PMK locally"
 msgstr ""
 
@@ -2122,11 +2177,7 @@ msgstr ""
 msgid "Generate archive"
 msgstr "아카이브 생성"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:63
-msgid "Generic 802.11%s Wireless Controller"
-msgstr ""
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:26
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:74
 msgid "Given password confirmation did not match, password not changed!"
 msgstr ""
 
@@ -2134,7 +2185,7 @@ msgstr ""
 msgid "Global Settings"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:806
 msgid "Global network options"
 msgstr ""
 
@@ -2145,33 +2196,29 @@ msgstr ""
 msgid "Go to password configuration..."
 msgstr "암호 설정 하기"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:857
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1369
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1112
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1616
 #: modules/luci-base/luasrc/view/cbi/full_valueheader.htm:4
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:58
 msgid "Go to relevant configuration page"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:38
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:66
 msgid "Group Password"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:11
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:22
 msgid "Guest"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:73
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:81
 msgid "HE.net password"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:60
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:73
 msgid "HE.net username"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:310
-msgid "HT mode (802.11n)"
-msgstr ""
-
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:16
 msgid "Hang Up"
 msgstr ""
@@ -2180,16 +2227,14 @@ msgstr ""
 msgid "Header Error Code Errors (HEC)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:103
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 msgid ""
 "Here you can configure the basic aspects of your device like its hostname or "
 "the timezone."
 msgstr ""
 "여기서 호스트이름이나 시간대와 같은 기본적인 장비 설정을 할 수 있습니다."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:499
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:556
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:579
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:941
 msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr> 숨기기"
 
@@ -2200,14 +2245,15 @@ msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:92
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1959
 msgid "Host"
 msgstr "호스트"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:20
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:21
 msgid "Host entries"
 msgstr "호스트 목록들"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:48
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:171
 msgid "Host expiry timeout"
 msgstr ""
 
@@ -2215,45 +2261,45 @@ msgstr ""
 msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
 msgstr "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> 혹은 Network"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:118
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:102
 msgid "Host-Uniq tag content"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:71
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:31
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:316
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:25
+#: 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:317
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:26
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:17
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:125
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:116
 msgid "Hostname"
 msgstr "호스트이름"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:12
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:22
 msgid "Hostname to send when requesting DHCP"
 msgstr "DHCP 요청시 전달할 호스트이름"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:18
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:19
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:67
 msgid "Hostnames"
 msgstr "호스트이름"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:13
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:24
 msgid "Hybrid"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:45
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:75
 msgid "IKE DH Group"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:41
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:59
 msgid "IP Addresses"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:40
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:80
 msgid "IP Protocol"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:29
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:30
 msgid "IP address"
 msgstr "IP 주소"
 
@@ -2272,6 +2318,11 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:20
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:21
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:22
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:79
+#: 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/network.js:89
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:90
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:91
@@ -2279,7 +2330,7 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:93
 #: 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/luasrc/model/cbi/admin_network/proto_ncm.lua:42
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:82
 msgid "IPv4"
 msgstr ""
 
@@ -2291,24 +2342,23 @@ msgstr "IPv4 방화벽"
 msgid "IPv4 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:57
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:178
 msgid "IPv4 address"
 msgstr "IPv4 주소"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:26
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:33
 msgid "IPv4 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:104
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:181
 msgid "IPv4 broadcast"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:100
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:180
 msgid "IPv4 gateway"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:92
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:179
 msgid "IPv4 netmask"
 msgstr ""
 
@@ -2316,24 +2366,25 @@ msgstr ""
 msgid "IPv4 network in address/netmask notation"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:25
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:52
 msgid "IPv4 prefix"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:42
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:30
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:55
 msgid "IPv4 prefix length"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:43
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:83
 msgid "IPv4+IPv6"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:72
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:34
 msgid "IPv4-Address"
 msgstr "IPv4-주소"
 
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:10
 #: protocols/luci-proto-ipip/luasrc/model/network/proto_ipip.lua:9
 msgid "IPv4-in-IPv4 (RFC2003)"
 msgstr ""
@@ -2348,6 +2399,16 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:30
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:31
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:32
+#: 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/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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:89
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:90
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:91
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:92
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:95
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:96
@@ -2360,7 +2421,7 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:103
 #: 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/luasrc/model/cbi/admin_network/proto_ncm.lua:44
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:84
 msgid "IPv6"
 msgstr "IPv6"
 
@@ -2372,11 +2433,11 @@ msgstr "IPv6 방화벽"
 msgid "IPv6 Neighbours"
 msgstr "IPv6 Neighbour 들"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:464
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:506
 msgid "IPv6 Settings"
 msgstr "IPv6 설정"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:195
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:810
 msgid "IPv6 ULA-Prefix"
 msgstr ""
 
@@ -2384,21 +2445,21 @@ msgstr ""
 msgid "IPv6 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:202
 msgid "IPv6 address"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:23
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:189
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:31
 msgid "IPv6 assignment hint"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:18
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:184
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:27
 msgid "IPv6 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:207
 msgid "IPv6 gateway"
 msgstr ""
 
@@ -2406,22 +2467,22 @@ msgstr ""
 msgid "IPv6 network in address/netmask notation"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:37
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:59
 msgid "IPv6 prefix"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:34
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:45
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:63
 msgid "IPv6 prefix length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:33
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:211
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:57
 msgid "IPv6 routed prefix"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:143
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:215
 msgid "IPv6 suffix"
 msgstr ""
 
@@ -2431,31 +2492,35 @@ msgid "IPv6-Address"
 msgstr "IPv6-주소"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:93
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:104
 msgid "IPv6-PD"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:10
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:13
 msgid "IPv6-in-IPv4 (RFC4213)"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:17
 msgid "IPv6-over-IPv4 (6rd)"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:15
 msgid "IPv6-over-IPv4 (6to4)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1075
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1478
 msgid "Identity"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:70
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:96
 msgid "If checked, 1DES is enabled"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:65
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:93
 msgid "If checked, encryption is disabled"
 msgstr ""
 
@@ -2472,36 +2537,36 @@ msgid ""
 "device node"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:27
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:71
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:18
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:82
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:52
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:17
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:29
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:33
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:68
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:85
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:32
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:45
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:45
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:24
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:44
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:116
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:48
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:85
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:65
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:33
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:80
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:108
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:146
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:74
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:97
 msgid "If unchecked, no default route is configured"
 msgstr "체크하지 않을 경우, 기본 route 가 설정되지 않습니다"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:34
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:86
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:35
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:99
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:47
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:60
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:60
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:39
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:59
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:124
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:39
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:116
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:59
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:103
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:64
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:77
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:100
 msgid "If unchecked, the advertised DNS server addresses are ignored"
 msgstr "체크하지 않을 경우, 사용하도록 권장된 DNS 주소는 무시됩니다"
 
@@ -2514,15 +2579,15 @@ msgid ""
 "of the <abbr title=\"Random Access Memory\">RAM</abbr>."
 msgstr ""
 
-#: 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:102
 msgid "Ignore <code>/etc/hosts</code>"
 msgstr "<code>/etc/hosts</code> 파일 무시"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:471
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:531
 msgid "Ignore interface"
 msgstr "인터페이스 무시"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:90
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:91
 msgid "Ignore resolve file"
 msgstr "resolve 파일 무시"
 
@@ -2540,12 +2605,12 @@ msgid ""
 "blocked. Click \"Continue »\" below to return to the previous page."
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:145
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:118
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:124
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:126
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:97
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:118
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:157
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:141
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:115
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:138
 msgid "Inactivity timeout"
 msgstr ""
 
@@ -2553,23 +2618,25 @@ msgstr ""
 msgid "Inbound:"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:170
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:161
 msgid "Info"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:105
 msgid "Information"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:25
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:67
 msgid "Initialization failure"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:34
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:87
 msgid "Initscript"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:26
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:122
 msgid "Initscripts"
 msgstr "Initscript 들"
 
@@ -2577,55 +2644,74 @@ msgstr "Initscript 들"
 msgid "Install iputils-traceroute6 for IPv6 traceroute"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:223
-msgid "Install package %q"
-msgstr ""
-
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:220
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:120
 msgid "Install protocol extensions..."
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:416
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:423
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:683
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:687
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:26
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:284
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:342
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:47
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:134
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:14
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:16
 msgid "Interface"
 msgstr "인터페이스"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:58
 msgid "Interface %q device auto-migrated from %q to %q."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:356
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:792
 msgid "Interface Configuration"
 msgstr "인터페이스 설정"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:51
-msgid "Interface Overview"
-msgstr "인터페이스 개요"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:99
+msgid "Interface has %d pending changes"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:57
+msgid "Interface is marked for deletion"
+msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:162
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:3
 msgid "Interface is reconnecting..."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:162
+msgid "Interface is shutting down..."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:205
+msgid "Interface is starting..."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:208
+msgid "Interface is stopping..."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:954
 msgid "Interface name"
 msgstr "인터페이스 이름"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:34
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:224
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:131
 msgid "Interface not present or not connected yet."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:88
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:16
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:11
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:287
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:54
 msgid "Interfaces"
 msgstr "인터페이스"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:9
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:20
 msgid "Internal"
 msgstr ""
 
@@ -2638,19 +2724,35 @@ msgstr ""
 msgid "Invalid"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:311
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:10
+msgid "Invalid Base64 key string"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:281
 msgid "Invalid VLAN ID given! Only IDs between %d and %d are allowed."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:307
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:290
 msgid "Invalid VLAN ID given! Only unique IDs are allowed"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:195
+msgid "Invalid argument"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:194
+msgid "Invalid command"
+msgstr ""
+
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:80
+msgid "Invalid hexadecimal value"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/sysauth.htm:12
 msgid "Invalid username and/or password! Please try again."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:508
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:950
 msgid "Isolate Clients"
 msgstr ""
 
@@ -2667,15 +2769,15 @@ msgstr ""
 msgid "JavaScript required!"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:52
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1691
 msgid "Join Network"
 msgstr "네트워크 연결"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:22
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1628
 msgid "Join Network: Wireless Scan"
 msgstr "네트워크 연결: 무선랜 스캔 결과"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:19
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1833
 msgid "Joining Network: %q"
 msgstr "네트워크 연결중: %q"
 
@@ -2692,15 +2794,15 @@ msgstr "Kernel 로그"
 msgid "Kernel Version"
 msgstr "Kernel 버전"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:823
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1248
 msgid "Key"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:851
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:852
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:853
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:854
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:870
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1277
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1278
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1279
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1291
 msgid "Key #%d"
 msgstr ""
 
@@ -2708,33 +2810,34 @@ msgstr ""
 msgid "Kill"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:10
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:21
 msgid "L2TP"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:10
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:40
 msgid "L2TP Server"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:100
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:74
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:80
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:74
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:53
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:73
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:131
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:102
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:89
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:112
 msgid "LCP echo failure threshold"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:118
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:89
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:95
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:89
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:68
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:91
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:144
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:102
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:125
 msgid "LCP echo interval"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:181
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:902
 msgid "LLC"
 msgstr ""
 
@@ -2743,11 +2846,11 @@ msgstr ""
 msgid "Label"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:213
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:204
 msgid "Language"
 msgstr "언어"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:115
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:106
 msgid "Language and Style"
 msgstr "언어와 스타일"
 
@@ -2755,52 +2858,52 @@ msgstr "언어와 스타일"
 msgid "Latency"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:10
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:21
 msgid "Leaf"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:369
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:487
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:393
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:543
 msgid "Lease time"
 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:87
 msgid "Leasefile"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:74
 #: modules/luci-base/luasrc/view/lease_status.htm:95
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:34
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
 msgid "Leasetime remaining"
 msgstr "남아있는 임대 시간"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:9
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:20
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:27
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:50
 msgid "Leave empty to autodetect"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:21
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:45
 msgid "Leave empty to use the current WAN address"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1746
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2299
 msgid "Legend:"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:481
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:538
 msgid "Limit"
 msgstr "제한"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:287
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:288
 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:299
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:300
 msgid "Limit listening to these interfaces, and loopback."
 msgstr ""
 
@@ -2820,17 +2923,17 @@ msgstr ""
 msgid "Line Uptime"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:101
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:88
 msgid "Link On"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:185
 msgid ""
 "List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
 "requests to"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:972
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1377
 msgid ""
 "List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-"
 "Identifier,128-bit key as hex string. <br />This list is used to map R0KH-ID "
@@ -2839,7 +2942,7 @@ msgid ""
 "Association."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:981
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1381
 msgid ""
 "List of R1KHs in the same Mobility Domain. <br />Format: MAC-address,R1KH-ID "
 "as 6 octets with colons,128-bit key as hex string. <br />This list is used "
@@ -2848,32 +2951,32 @@ msgid ""
 "PMK-R1 keys."
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:21
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:82
 msgid "List of SSH key files for auth"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:206
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:207
 msgid "List of domains to allow RFC1918 responses for"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:174
 msgid "List of hosts that supply bogus NX domain results"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:298
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:299
 msgid "Listen Interfaces"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:30
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:54
 msgid "Listen Port"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:15
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:16
 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:216
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:217
 msgid "Listening port for inbound DNS queries"
 msgstr ""
 
@@ -2892,11 +2995,11 @@ msgstr "부하 평균"
 msgid "Loading"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:35
-msgid "Loading SSH keys…"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1819
+msgid "Loading directory contents…"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1204
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1296
 #: modules/luci-base/luasrc/view/view.htm:4
 msgid "Loading view…"
 msgstr ""
@@ -2906,77 +3009,73 @@ msgstr ""
 msgid "Local IP address is invalid"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:25
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:86
 msgid "Local IP address to assign"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:10
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:11
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:44
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:39
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:151
 msgid "Local IPv4 address"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:20
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:54
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:45
 msgid "Local IPv6 address"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:286
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:287
 msgid "Local Service Only"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:81
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:126
 msgid "Local Startup"
 msgstr "Local 시작 프로그램"
 
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:25
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:121
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:112
 msgid "Local Time"
 msgstr "지역 시간"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:149
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
 msgid "Local domain"
 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:147
 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:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:151
 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:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
 msgid "Local server"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:129
 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:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:128
 msgid "Localise queries"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:175
-msgid "Locked to channel %s used by: %s"
-msgstr ""
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:168
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:159
 msgid "Log output level"
 msgstr "Log output 레벨"
 
-#: 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:181
 msgid "Log queries"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:113
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:104
 msgid "Logging"
 msgstr ""
 
@@ -2984,7 +3083,7 @@ msgstr ""
 msgid "Login"
 msgstr "로그인"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:95
+#: modules/luci-base/luasrc/controller/admin/index.lua:103
 msgid "Logout"
 msgstr "로그아웃"
 
@@ -2992,11 +3091,13 @@ msgstr "로그아웃"
 msgid "Loss of Signal Seconds (LOSS)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:476
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:533
 msgid "Lowest leased address as offset from the network address."
 msgstr "임대되는 주소의 최소 시작점. (네트워크 주소로 부터의 offset)"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:40
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:75
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:35
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:86
 msgid "MAC"
@@ -3004,32 +3105,32 @@ msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:73
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:109
-#: 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:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1958
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:86
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:133
 msgid "MAC-Address"
 msgstr "MAC-주소"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:457
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:586
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:886
 msgid "MAC-Address Filter"
 msgstr "MAC-주소 필터"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:142
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:363
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:798
 msgid "MAC-Filter"
 msgstr "MAC-필터"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:464
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:590
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:893
 msgid "MAC-List"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:13
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:16
 msgid "MAP / LW4over6"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:62
 msgid "MAP rule is invalid"
 msgstr ""
@@ -3047,8 +3148,8 @@ msgid "MHz"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:53
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:29
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:66
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:53
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:71
 msgid "MTU"
 msgstr ""
 
@@ -3058,16 +3159,17 @@ msgid ""
 "below:"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:55
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:69
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:26
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:38
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:38
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:108
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:52
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:96
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:83
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:57
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:70
 msgid "Manual"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1949
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2188
 msgid "Master"
 msgstr ""
 
@@ -3075,48 +3177,46 @@ msgstr ""
 msgid "Max. Attainable Data Rate (ATTNDR)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:539
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:982
 msgid "Maximum allowed Listen Interval"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:234
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
 msgid "Maximum allowed number of active DHCP leases"
 msgstr "Active DHCP lease 건의 최대 허용 숫자"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:252
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:253
 msgid "Maximum allowed number of concurrent DNS queries"
 msgstr "허용되는 최대 동시 DNS query 수"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:244
 msgid "Maximum allowed size of EDNS.0 UDP packets"
 msgstr "허용된 최대 EDNS.0 UDP 패킷 크기"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:63
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:77
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:57
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:112
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:104
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:93
 msgid "Maximum amount of seconds to wait for the modem to become ready"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:27
-msgid ""
-"Maximum length of the name is 15 characters including the automatic protocol/"
-"bridge prefix (br-, 6in4-, pppoe- etc.)"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:482
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:538
 msgid "Maximum number of leased addresses."
 msgstr "임대될 수 있는 주소의 최대 숫자."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:761
+msgid "Maximum transmit power"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:21
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:49
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:134
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:187
 #: modules/luci-mod-status/luasrc/view/admin_status/bandwidth.htm:79
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:284
 msgid "Mbit/s"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:18
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:32
 msgid "Medium"
 msgstr ""
 
@@ -3128,42 +3228,43 @@ msgstr "메모리"
 msgid "Memory usage (%)"
 msgstr "메모리 사용량 (%)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1952
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2191
 msgid "Mesh"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:372
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:806
 msgid "Mesh Id"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:196
+msgid "Method not found"
+msgstr ""
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:45
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:76
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:104
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:54
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:66
 msgid "Metric"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:154
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:198
 msgid "Mirror monitor port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:153
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:197
 msgid "Mirror source port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:408
-msgid "Missing protocol extension for proto %q"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:923
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1337
 msgid "Mobility Domain"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:154
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:41
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:74
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:366
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:31
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:360
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:801
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1619
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:175
 msgid "Mode"
 msgstr ""
@@ -3172,39 +3273,38 @@ msgstr ""
 msgid "Model"
 msgstr "모델"
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:31
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:72
 msgid "Modem default"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:11
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:19
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:11
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:10
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:73
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:73
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:57
 msgid "Modem device"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:24
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:66
 msgid "Modem information query failed"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:62
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:76
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:56
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:112
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:104
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:93
 msgid "Modem init timeout"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1953
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:452
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:554
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:577
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2192
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:880
 msgid "Monitor"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:14
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
 msgid "More Characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:802
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1057
 msgid "More…"
 msgstr ""
 
@@ -3217,7 +3317,7 @@ msgstr ""
 msgid "Mount Point"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:26
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:36
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:137
 msgid "Mount Points"
@@ -3265,46 +3365,44 @@ msgstr ""
 msgid "Move up"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:912
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
 msgid "NAS ID"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:57
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:87
 msgid "NAT-T Mode"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:9
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 msgid "NAT64 Prefix"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:31
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:26
 msgid "NCM"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:535
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:589
 msgid "NDP-Proxy"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:43
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:72
 msgid "NT Domain"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:273
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:264
 msgid "NTP server candidates"
 msgstr "NTP 서버 목록"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:837
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1092
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:27
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:502
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:65
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:553
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:658
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:49
 msgid "Name"
 msgstr "이름"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:17
-msgid "Name of the new interface"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1808
 msgid "Name of the new network"
 msgstr ""
 
@@ -3312,9 +3410,10 @@ msgstr ""
 msgid "Navigation"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:62
+#: modules/luci-base/luasrc/controller/admin/index.lua:69
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:108
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:402
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:834
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1957
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:389
 #: modules/luci-mod-status/luasrc/view/admin_status/index/30-network.htm:8
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:73
@@ -3326,7 +3425,7 @@ msgstr "네트워크"
 msgid "Network Utilities"
 msgstr "네트워크 유틸리티"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:278
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:279
 msgid "Network boot image"
 msgstr "네트워크 boot 이미지"
 
@@ -3339,53 +3438,59 @@ msgstr ""
 msgid "Network without interfaces."
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:661
+msgid "New interface name…"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:11
 msgid "Next »"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1507
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1754
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:108
 msgid "No"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:453
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:514
 msgid "No DHCP Server configured for this interface"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1162
+msgid "No Encryption"
+msgstr ""
+
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:89
 msgid "No NAT-T"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:198
+msgid "No data received"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1764
+msgid "No entries in this directory"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/backupfiles.lua:82
 msgid "No files found"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:550
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:191
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:180
 msgid "No information available"
 msgstr "이용 가능한 정보가 없습니다"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:8
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:63
 msgid "No matching prefix delegation"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:157
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
 msgid "No negative cache"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:53
-msgid "No network configured on this device"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:65
-msgid "No network name specified"
-msgstr ""
-
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:147
-msgid "No networks in range"
-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
@@ -3393,7 +3498,12 @@ msgstr ""
 msgid "No password set!"
 msgstr "암호 설정을 해주세요!"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:116
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:104
+msgid "No peers defined yet"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:129
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:271
 msgid "No public keys present yet."
 msgstr ""
 
@@ -3401,19 +3511,19 @@ msgstr ""
 msgid "No rules in this chain."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:150
-msgid "No scan results available yet..."
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:53
+msgid "No signal"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:7
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:756
 msgid "No zone assigned"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:111
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:35
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:48
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:133
 msgid "Noise"
 msgstr "노이즈"
 
@@ -3429,16 +3539,16 @@ msgstr ""
 msgid "Non Pre-emtive CRC errors (CRC_P)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:292
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:293
 msgid "Non-wildcard"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:129
 msgid "None"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:181
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:172
 msgid "Normal"
 msgstr ""
 
@@ -3446,25 +3556,29 @@ msgstr ""
 msgid "Not Found"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:27
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:5
-msgid "Not associated"
-msgstr ""
-
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:87
 msgid "Not connected"
 msgstr "연결되지 않음"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:38
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:139
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:232
+msgid "Not present"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:105
 msgid "Not started on boot"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:26
-msgid "Note: interface name length"
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:201
+msgid "Not supported"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:171
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:162
 msgid "Notice"
 msgstr ""
 
@@ -3472,63 +3586,50 @@ msgstr ""
 msgid "Nslookup"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:261
 msgid "Number of cached DNS entries (max is 10000, 0 is no caching)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:203
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:194
 msgid "Number of parallel threads used for compression"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:40
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:69
 msgid "Obfuscated Group Password"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:35
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:61
 msgid "Obfuscated Password"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:22
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:34
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:40
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:105
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:97
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:49
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:80
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:54
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:67
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:93
 msgid "Obtain IPv6-Address"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:83
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:68
 msgid "Off-State Delay"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:16
-msgid ""
-"On this page you can configure the network interfaces. You can bridge "
-"several interfaces by ticking the \"bridge interfaces\" field and enter the "
-"names of several network interfaces separated by spaces. You can also use "
-"<abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
-"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
-"<samp>eth0.1</samp>)."
-msgstr ""
-"이 페이지에서는 네트워크 인터페이스를 설정할 수 있습니다. \"Bridge 인터페이스"
-"\" 항목을 클릭하고, 공백으로 구분된 네트워크 인터페이스들의 이름을 적는 방식"
-"으로 여러 인터페이스들을 bridge 할 수 있습니다.  또한 <abbr title=\"Virtual "
-"Local Area Network\">VLAN</abbr> 표기법인 <samp>INTERFACE.VLANNR</samp> "
-"(<abbr title=\"for example\">예</abbr>: <samp>eth0.1</samp>) 를 사용하실 수 "
-"있습니다."
-
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:95
 msgid "On-Link route"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:80
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:64
 msgid "On-State Delay"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:360
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:382
 msgid "One of hostname or mac address must be specified!"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:456
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:462
 msgid "One of the following: %s"
 msgstr ""
 
@@ -3550,34 +3651,35 @@ msgstr ""
 msgid "Open list..."
 msgstr "목록 열람..."
 
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:61
 #: protocols/luci-proto-openconnect/luasrc/model/network/proto_openconnect.lua:9
 msgid "OpenConnect (CISCO AnyConnect)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:757
 msgid "Operating frequency"
 msgstr "동작 주파수"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1753
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2306
 msgid "Option changed"
 msgstr "변경된 option"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1755
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2308
 msgid "Option removed"
 msgstr "삭제된 option"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1140
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:55
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1535
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:66
 msgid "Optional"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:78
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:76
 msgid ""
 "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, "
 "starting with <code>0x</code>."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:144
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:215
 msgid ""
 "Optional. Allowed values: 'eui64', 'random', fixed value like '::1' or "
 "'::1:2'. When IPv6 prefix (like 'a:b:c:d::') is received from a delegating "
@@ -3585,41 +3687,41 @@ msgid ""
 "for the interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:123
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:117
 msgid ""
 "Optional. Base64-encoded preshared key. Adds in an additional layer of "
 "symmetric-key cryptography for post-quantum resistance."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:148
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:126
 msgid "Optional. Create routes for Allowed IPs for this peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:103
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:108
 msgid "Optional. Description of peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:156
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:128
 msgid ""
 "Optional. Host of peer. Names are resolved prior to bringing up the "
 "interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:67
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:71
 msgid "Optional. Maximum Transmission Unit of tunnel interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:166
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:132
 msgid "Optional. Port of peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:175
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:136
 msgid ""
 "Optional. Seconds between keep alive messages. Default is 0 (disabled). "
 "Recommended value if this device is behind a NAT is 25."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:31
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:54
 msgid "Optional. UDP port used for outgoing and incoming packets."
 msgstr ""
 
@@ -3640,7 +3742,7 @@ msgstr ""
 msgid "Outbound:"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:26
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:50
 msgid "Output Interface"
 msgstr ""
 
@@ -3649,45 +3751,45 @@ msgstr ""
 msgid "Output zone"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:63
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:155
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:33
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:54
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:54
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:219
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:50
 msgid "Override MAC address"
 msgstr "MAC 주소 덮어쓰기"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:66
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:35
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:56
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:88
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:125
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:131
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:133
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:104
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:61
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:58
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:223
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:44
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:54
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:154
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:71
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:145
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:132
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:110
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:119
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:97
 msgid "Override MTU"
 msgstr "MTU 덮어쓰기"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:30
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:63
 msgid "Override TOS"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:25
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:58
 msgid "Override TTL"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:954
 msgid "Override default interface name"
 msgstr "기본 인터페이스 이름을 덮어씁니다"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:41
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:167
 msgid "Override the gateway in DHCP responses"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:507
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:555
 msgid ""
 "Override the netmask sent to clients. Normally it is calculated from the "
 "subnet that is served."
@@ -3695,7 +3797,7 @@ msgstr ""
 "Client 에 전달될 netmask 를 덮어 쓸 수 있습니다.  보통 해당 값은 제공되는 "
 "subnet 에 따라 자동 계산됩니다."
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:65
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:179
 msgid "Override the table used for internal routes"
 msgstr ""
 
@@ -3703,29 +3805,33 @@ msgstr ""
 msgid "Overview"
 msgstr "개요"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1606
+msgid "Overwrite existing file \"%s\" ?"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:11
 msgid "Owner"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:42
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:56
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:17
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:28
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:34
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:14
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:18
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:43
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:98
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:45
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:44
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:63
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:82
 msgid "PAP/CHAP password"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:39
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:53
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:14
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:11
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:15
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:96
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:88
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:43
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:74
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:42
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:61
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:77
 msgid "PAP/CHAP username"
 msgstr ""
 
@@ -3733,9 +3839,9 @@ msgstr ""
 msgid "PID"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:36
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:50
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:26
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:95
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:87
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:68
 msgid "PIN"
 msgstr ""
 
@@ -3744,114 +3850,116 @@ msgstr ""
 msgid "PIN code rejected"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:966
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1372
 msgid "PMK R1 Push"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:43
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:13
 msgid "PPP"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:11
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:58
 msgid "PPPoA Encapsulation"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:19
 msgid "PPPoATM"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:17
 msgid "PPPoE"
 msgstr ""
 
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:28
 #: protocols/luci-proto-pppossh/luasrc/model/network/proto_pppossh.lua:9
 msgid "PPPoSSH"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:15
 msgid "PPtP"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:59
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:73
 msgid "PSID offset"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:56
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:70
 msgid "PSID-bits length"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:123
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:846
 msgid "PTM/EFM (Packet Transfer Mode)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:78
-msgid "Package libiwinfo required!"
-msgstr ""
-
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:45
 msgid "Packets"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:7
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:756
 msgid "Part of zone %q"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/sysauth.htm:29
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1111
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:35
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:42
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1514
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:46
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:104
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:58
 msgid "Password"
 msgstr "암호"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:29
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:24
 msgid "Password authentication"
 msgstr "암호 인증"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1019
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1414
 msgid "Password of Private Key"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1067
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1471
 msgid "Password of inner Private Key"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:14
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:16
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:18
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:20
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:32
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:34
 msgid "Password strength"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:44
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:107
 msgid "Password2"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:37
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:244
 msgid "Paste or drag SSH key file…"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1000
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1396
 msgid "Path to CA-Certificate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1007
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1402
 msgid "Path to Client-Certificate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1013
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1408
 msgid "Path to Private Key"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1049
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1453
 msgid "Path to inner CA-Certificate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1055
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1459
 msgid "Path to inner Client-Certificate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1061
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1465
 msgid "Path to inner Private Key"
 msgstr ""
 
@@ -3869,7 +3977,7 @@ msgstr ""
 msgid "Peak:"
 msgstr "최고치:"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:28
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:89
 msgid "Peer IP address to assign"
 msgstr ""
 
@@ -3878,11 +3986,11 @@ msgstr ""
 msgid "Peer address is missing"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:90
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:89
 msgid "Peers"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:50
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:80
 msgid "Perfect Forward Secrecy"
 msgstr ""
 
@@ -3894,7 +4002,11 @@ msgstr "재부팅하기"
 msgid "Perform reset"
 msgstr "Reset 하기"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:174
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:199
+msgid "Permission denied"
+msgstr ""
+
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:136
 msgid "Persistent Keep Alive"
 msgstr ""
 
@@ -3902,7 +4014,7 @@ msgstr ""
 msgid "Phy Rate:"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:190
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:277
 msgid "Physical Settings"
 msgstr "Physical 설정"
 
@@ -3913,6 +4025,10 @@ msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:16
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:17
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:41
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:77
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:87
@@ -3930,15 +4046,19 @@ msgstr "사용자이름과 암호를 입력해 주세요."
 msgid "Policy"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:22
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:20
 msgid "Port"
 msgstr "포트"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:18
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:133
+msgid "Port %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:274
 msgid "Port status:"
 msgstr "포트 상태:"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:482
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:488
 msgid "Potential negation of: %s"
 msgstr ""
 
@@ -3950,11 +4070,11 @@ msgstr ""
 msgid "Pre-emtive CRC errors (CRCP_P)"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:32
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:73
 msgid "Prefer LTE"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:33
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:74
 msgid "Prefer UMTS"
 msgstr ""
 
@@ -3962,31 +4082,30 @@ msgstr ""
 msgid "Prefix Delegated"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:122
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:117
 msgid "Preshared Key"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:101
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:75
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:81
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:75
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:54
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:74
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:131
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:102
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:89
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:112
 msgid ""
 "Presume peer to be dead after given amount of LCP echo failures, use 0 to "
 "ignore failures"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:305
 msgid "Prevent listening on these interfaces."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:509
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:562
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:950
 msgid "Prevents client-to-client communication"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:18
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:49
 msgid "Private Key"
 msgstr ""
 
@@ -4007,39 +4126,33 @@ msgstr ""
 msgid "Prot."
 msgstr "Prot."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:72
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:349
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:675
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:84
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:216
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:87
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:390
 msgid "Protocol"
 msgstr "프로토콜"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:31
-msgid "Protocol of the new interface"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:222
-msgid "Protocol support is not installed"
-msgstr ""
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:269
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:260
 msgid "Provide NTP server"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:701
 msgid "Provide new network"
 msgstr "새로운 네트워크를 추가합니다"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:451
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:879
 msgid "Pseudo Ad-Hoc (ahdemo)"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:112
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:113
 msgid "Public Key"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:278
 msgid ""
 "Public keys allow for the passwordless SSH logins with a higher security "
 "compared to the use of plain passwords. In order to upload a new key to the "
@@ -4047,47 +4160,48 @@ msgid ""
 "code> file into the input field."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:139
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:211
 msgid "Public prefix routed to this device for distribution to clients."
 msgstr ""
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:27
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:9
 msgid "QMI Cellular"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:173
 msgid "Quality"
 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:171
 msgid ""
 "Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> "
 "servers"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:952
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1360
 msgid "R0 Key Lifetime"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:959
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1366
 msgid "R1 Key Holder"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:58
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:88
 msgid "RFC3947 NAT-T mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:381
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:814
 msgid "RSSI threshold for joining"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:256
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:597
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:778
 msgid "RTS/CTS Threshold"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:41
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:76
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:87
 msgid "RX"
@@ -4097,35 +4211,39 @@ msgstr ""
 msgid "RX Rate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:783
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1961
+msgid "RX Rate / TX Rate"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1207
 msgid "Radius-Accounting-Port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:791
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1215
 msgid "Radius-Accounting-Secret"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:775
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1199
 msgid "Radius-Accounting-Server"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:759
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1183
 msgid "Radius-Authentication-Port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:767
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1191
 msgid "Radius-Authentication-Secret"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:751
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1175
 msgid "Radius-Authentication-Server"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:119
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:102
 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:83
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:84
 msgid ""
 "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-Server"
@@ -4139,17 +4257,11 @@ msgid ""
 "access to this device if you are connected via this interface"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2
-msgid ""
-"Really delete this wireless network? The deletion cannot be undone! You "
-"might lose access to this device if you are connected via this network."
-msgstr ""
-
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:40
 msgid "Really reset all changes?"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:237
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:354
 msgid "Really switch protocol?"
 msgstr "정말 프로토콜 변경을 원하세요?"
 
@@ -4173,15 +4285,15 @@ msgstr "실시간 트래픽"
 msgid "Realtime Wireless"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:931
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1343
 msgid "Reassociation Deadline"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:191
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
 msgid "Rebind protection"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:48
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:46
 #: modules/luci-mod-system/luasrc/view/admin_system/reboot.htm:9
 msgid "Reboot"
 msgstr "재부팅"
@@ -4195,21 +4307,15 @@ msgstr ""
 msgid "Reboots the operating system of your device"
 msgstr "장치의 운영체제를 재부팅합니다"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:103
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:90
 msgid "Receive"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:325
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:350
-msgid "Receiver Antenna"
-msgstr ""
-
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:42
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:59
 msgid "Recommended. IP addresses of the WireGuard interface."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:28
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:300
 msgid "Reconnect this interface"
 msgstr "이 인터페이스를 재연결합니다"
 
@@ -4217,92 +4323,134 @@ msgstr "이 인터페이스를 재연결합니다"
 msgid "References"
 msgstr ""
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:39
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:153
 msgid "Relay"
 msgstr ""
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:36
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:157
 msgid "Relay Bridge"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:17
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:154
 msgid "Relay between networks"
 msgstr ""
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:64
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:12
 msgid "Relay bridge"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:18
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:50
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:49
 msgid "Remote IPv4 address"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:8
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:40
 msgid "Remote IPv4 address or FQDN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:45
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:725
 msgid "Remove"
 msgstr "제거"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:53
-msgid "Repeat scan"
-msgstr ""
-
-#: modules/luci-base/luasrc/view/cbi/upload.htm:11
-msgid "Replace entry"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:46
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:51
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1806
 msgid "Replace wireless configuration"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:8
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:17
 msgid "Request IPv6-address"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:16
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:23
 msgid "Request IPv6-prefix of length"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1141
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:200
+msgid "Request timeout"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1536
 msgid "Required"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:20
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:31
 msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3"
 msgstr "특정 ISP 들에 요구됨.  예: Charter (DOCSIS 3 기반)"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:19
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:49
 msgid "Required. Base64-encoded private key for this interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:113
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:113
 msgid "Required. Base64-encoded public key of peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:136
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:122
 msgid ""
 "Required. IP addresses and prefixes that this peer is allowed to use inside "
 "the tunnel. Usually the peer's tunnel IP addresses and the networks the peer "
 "routes through the tunnel."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1134
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1095
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1096
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1097
+msgid "Requires hostapd"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1101
+msgid "Requires hostapd with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1102
+msgid "Requires hostapd with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1098
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1099
+msgid "Requires hostapd with SAE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1533
 msgid ""
 "Requires the 'full' version of wpad/hostapd and support from the wifi driver "
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:141
 msgid ""
 "Requires upstream supports DNSSEC; verify unsigned domain responses really "
 "come from unsigned domains"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1268
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1109
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1119
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1120
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1121
+msgid "Requires wpa-supplicant"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1113
+msgid "Requires wpa-supplicant with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1114
+msgid "Requires wpa-supplicant with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1111
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1124
+msgid "Requires wpa-supplicant with SAE support"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1355
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:17
 #: modules/luci-base/luasrc/view/cbi/footer.htm:30
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:66
@@ -4318,17 +4466,22 @@ msgstr "Counter 초기화"
 msgid "Reset to defaults"
 msgstr "초기값으로 reset"
 
-#: 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:68
 msgid "Resolv and Hosts Files"
 msgstr "Resolv 와 Hosts 파일"
 
-#: 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:94
 msgid "Resolve file"
 msgstr "Resolve 파일"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:28
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:14
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:71
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:197
+msgid "Resource not found"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:302
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:693
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:90
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:112
 msgid "Restart"
 msgstr "재시작"
 
@@ -4336,7 +4489,7 @@ msgstr "재시작"
 msgid "Restart Firewall"
 msgstr "방화벽 재시작"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:14
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:691
 msgid "Restart radio interface"
 msgstr ""
 
@@ -4348,26 +4501,24 @@ msgstr "복구"
 msgid "Restore backup"
 msgstr "백업 복구"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:113
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:114
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:38
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:46
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:119
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:120
 msgid "Reveal/hide password"
 msgstr "암호 보이기/숨기기"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1774
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2322
 msgid "Revert"
 msgstr "변경 취소"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1861
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2405
 msgid "Revert changes"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2013
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2554
 msgid "Revert request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1993
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2534
 msgid "Reverting configuration…"
 msgstr ""
 
@@ -4375,7 +4526,7 @@ msgstr ""
 msgid "Root"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:271
 msgid "Root directory for files served via TFTP"
 msgstr "TFTP 를 통해 제공되는 파일들의 root 디렉토리"
 
@@ -4383,7 +4534,7 @@ msgstr "TFTP 를 통해 제공되는 파일들의 root 디렉토리"
 msgid "Root preparation"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:147
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:126
 msgid "Route Allowed IPs"
 msgstr ""
 
@@ -4395,12 +4546,12 @@ msgstr ""
 msgid "Route type"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:523
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:577
 msgid "Router Advertisement-Service"
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:43
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:15
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:27
 msgid "Router Password"
 msgstr "라우터 암호"
 
@@ -4430,7 +4581,7 @@ msgstr ""
 msgid "Run filesystem check"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:651
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:669
 msgid "Runtime error"
 msgstr ""
 
@@ -4442,31 +4593,31 @@ msgstr ""
 msgid "SNR"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:5
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:18
 msgid "SSH Access"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:10
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:70
 msgid "SSH server address"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:13
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:74
 msgid "SSH server port"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:8
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:58
 msgid "SSH username"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:27
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:277
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
 msgid "SSH-Keys"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:42
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:73
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:29
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1617
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:174
 msgid "SSID"
 msgstr "SSID"
@@ -4475,17 +4626,17 @@ msgstr "SSID"
 msgid "SWAP"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1127
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1262
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1379
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1351
 #: modules/luci-base/luasrc/view/cbi/error.htm:17
 #: modules/luci-base/luasrc/view/cbi/footer.htm:26
 #: modules/luci-base/luasrc/view/cbi/header.htm:17
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:54
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:133
 msgid "Save"
 msgstr "저장"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1256
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1768
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1347
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2318
 #: modules/luci-base/luasrc/view/cbi/footer.htm:22
 msgid "Save & Apply"
 msgstr "저장 & 적용"
@@ -4498,28 +4649,20 @@ msgstr ""
 msgid "Save mtdblock contents"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
-msgid "Saving keys…"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:698
 msgid "Scan"
 msgstr "Scan 하기"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:109
-msgid "Scan request failed"
-msgstr ""
-
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:8
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:39
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:23
 msgid "Scheduled Tasks"
 msgstr "작업 관리"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1749
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2302
 msgid "Section added"
 msgstr "추가된 section"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1751
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2304
 msgid "Section removed"
 msgstr "삭제된 section"
 
@@ -4534,61 +4677,66 @@ msgid ""
 "your device!"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:119
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:90
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:96
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:90
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:69
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:92
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1516
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1646
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1809
+msgid "Select file…"
+msgstr ""
+
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:144
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:102
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:125
 msgid ""
 "Send LCP echo requests at the given interval in seconds, only effective in "
 "conjunction with failure threshold"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:561
-msgid "Separate Clients"
-msgstr ""
-
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:62
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:63
 msgid "Server Settings"
 msgstr "서버 설정"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:26
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:50
 msgid "Service Name"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:25
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:30
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:87
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:71
 msgid "Service Type"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:55
+#: modules/luci-base/luasrc/controller/admin/index.lua:62
 msgid "Services"
 msgstr "서비스"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:815
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:861
 msgid "Session expired"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:83
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:107
 msgid "Set VPN as Default Route"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:258
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:795
 msgid ""
 "Set interface properties regardless of the link carrier (If set, carrier "
 "sense events do not invoke hotplug handlers)."
 msgstr ""
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:23
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:55
 msgid "Setting PLMN failed"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:26
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:68
 msgid "Setting operation mode failed"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:454
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:517
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:527
 msgid "Setup DHCP Server"
 msgstr ""
 
@@ -4600,7 +4748,7 @@ msgstr ""
 msgid "Short GI"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:516
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:960
 msgid "Short Preamble"
 msgstr ""
 
@@ -4612,21 +4760,23 @@ msgstr "현재 백업 파일 목록 보기"
 msgid "Show empty chains"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:306
 msgid "Shutdown this interface"
 msgstr "이 인터페이스를 정지합니다"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:111
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:34
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:47
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:132
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1616
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:173
 msgid "Signal"
 msgstr "신호"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1960
+msgid "Signal / Noise"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:125
 msgid "Signal Attenuation (SATN)"
 msgstr ""
@@ -4639,11 +4789,11 @@ msgstr ""
 msgid "Size"
 msgstr "Size"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:259
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:260
 msgid "Size of DNS query cache"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:191
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
 msgid "Size of the ZRam device in megabytes"
 msgstr ""
 
@@ -4660,11 +4810,7 @@ msgstr ""
 msgid "Skip to navigation"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:335
-msgid "Slot time"
-msgstr ""
-
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1640
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1846
 #: modules/luci-base/luasrc/model/network.lua:1427
 msgid "Software VLAN"
 msgstr ""
@@ -4702,61 +4848,65 @@ msgstr ""
 msgid "Specifies the directory the device is attached to"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:23
-msgid "Specifies the listening port of this <em>Dropbear</em> instance"
-msgstr "<em>Dropbear</em> instance 의 listening 포트를 지정합니다"
-
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:57
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:175
 msgid ""
 "Specifies the maximum amount of failed ARP requests until hosts are presumed "
 "to be dead"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:49
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:171
 msgid ""
 "Specifies the maximum amount of seconds after which hosts are presumed to be "
 "dead"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:761
+msgid ""
+"Specifies the maximum transmit power the wireless radio may use. Depending "
+"on regulatory requirements and wireless usage, the actual transmit power may "
+"be reduced by the driver."
+msgstr ""
+
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:63
 msgid "Specify a TOS (Type of Service)."
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:25
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:58
 msgid ""
 "Specify a TTL (Time to Live) for the encapsulating packet other than the "
 "default (64)."
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:53
 msgid ""
 "Specify an MTU (Maximum Transmission Unit) other than the default (1280 "
 "bytes)."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:60
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "Specify the secret encryption key here."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:475
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:64
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:533
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:89
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:111
 msgid "Start"
 msgstr "시작"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:33
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:86
 msgid "Start priority"
 msgstr "시작 우선순위"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1958
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2499
 msgid "Starting configuration apply…"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1626
 msgid "Starting wireless scan..."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:24
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:120
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
 msgid "Startup"
 msgstr "시작 프로그램"
 
@@ -4768,20 +4918,21 @@ msgstr "Static IPv4 Route 경로"
 msgid "Static IPv6 Routes"
 msgstr "Static IPv6 Route 경로"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:70
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:71
 msgid "Static Leases"
 msgstr "Static Lease 들"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:118
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:73
 msgid "Static Routes"
 msgstr "Static Route 경로"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1194
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1384
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:172
 #: modules/luci-base/luasrc/model/network.lua:966
 msgid "Static address"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:308
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:309
 msgid ""
 "Static leases are used to assign fixed IP addresses and symbolic hostnames "
 "to DHCP clients. They are also required for non-dynamic interface "
@@ -4791,39 +4942,41 @@ msgstr ""
 "할 때 사용됩니다.  이 기능은 또한 지정된 host 에 대해서만 주소 임대를 하도록 "
 "하는 non-dynamic 인터페이스 설정에도 사용됩니다."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:534
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:977
 msgid "Station inactivity limit"
 msgstr ""
 
 #: modules/luci-base/luasrc/controller/admin/index.lua:40
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:197
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:337
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:746
 #: modules/luci-mod-status/luasrc/view/admin_status/index.htm:128
 msgid "Status"
 msgstr "상태"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:35
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:75
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:308
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:91
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:113
 msgid "Stop"
 msgstr "정지"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:165
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Strict order"
 msgstr "Strict order"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:16
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:30
 msgid "Strong"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1843
 msgid "Submit"
 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:108
 msgid "Suppress logging"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:109
 msgid "Suppress logging of the routine operation of these protocols"
 msgstr ""
 
@@ -4835,42 +4988,44 @@ msgstr ""
 msgid "Swap Entry"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:23
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:5
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:135
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:21
 msgid "Switch"
 msgstr "스위치"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:129
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:168
 msgid "Switch %q"
 msgstr "스위치 %q"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:128
-msgid "Switch %q (%s)"
-msgstr "스위치 %q (%s)"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:66
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:146
 msgid ""
 "Switch %q has an unknown topology - the VLAN settings might not be accurate."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:146
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:142
 msgid "Switch Port Mask"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1640
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1846
 #: modules/luci-base/luasrc/model/network.lua:1425
 msgid "Switch VLAN"
 msgstr "스위치 VLAN"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:238
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:355
 msgid "Switch protocol"
 msgstr "프로토콜 변경"
 
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:103
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:104
 #: modules/luci-base/luasrc/view/cbi/ipaddr.htm:26
 msgid "Switch to CIDR list notation"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:77
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1547
+msgid "Symbolic link"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:71
 msgid "Sync with NTP-Server"
 msgstr ""
 
@@ -4880,7 +5035,7 @@ msgstr "브라우저 시간대로 동기화"
 
 #: modules/luci-base/luasrc/controller/admin/index.lua:47
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:14
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:102
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:94
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
 #: modules/luci-mod-system/luasrc/view/admin_system/applyreboot.htm:39
 msgid "System"
@@ -4891,11 +5046,11 @@ msgstr "시스템"
 msgid "System Log"
 msgstr "시스템 로그"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:108
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:99
 msgid "System Properties"
 msgstr "시스템 등록 정보"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:145
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:136
 msgid "System log buffer size"
 msgstr "System log 버퍼 크기"
 
@@ -4903,15 +5058,17 @@ msgstr "System log 버퍼 크기"
 msgid "TCP:"
 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:69
 msgid "TFTP Settings"
 msgstr "TFTP 설정"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:269
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
 msgid "TFTP server root"
 msgstr "TFTP 서버 root"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:17
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:77
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:88
 msgid "TX"
@@ -4934,7 +5091,7 @@ msgstr ""
 msgid "Target"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:77
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:103
 msgid "Target network"
 msgstr ""
 
@@ -4942,45 +5099,24 @@ msgstr ""
 msgid "Terminate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:27
-msgid ""
-"The <em>Device Configuration</em> section covers physical settings of the "
-"radio hardware such as channel, transmit power or antenna selection which "
-"are shared among all defined wireless networks (if the radio hardware is "
-"multi-SSID capable). Per network settings like encryption or operation mode "
-"are grouped in the <em>Interface Configuration</em>."
-msgstr ""
-"<em>장치 설정<em> 섹션은 channel, transmit power 혹은 antenna 선택과 같은 물"
-"리적인 설정 내용을 다룹니다.  이 설정은 (만약 radio 하드웨어가 multi-SSID 지"
-"원이 가능하다면) 정의된 모든 무선 네트워크에 공통적으로 적용됩니다. 암호화 혹"
-"은 operation mode 와 같은 각 네트워크 설정들은 <em>인터페이스 설정</em>에서 "
-"다루어집니다."
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:79
-msgid ""
-"The <em>libiwinfo-lua</em> package is not installed. You must install this "
-"component for working wireless configuration!"
-msgstr ""
-
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:66
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:77
 msgid ""
 "The HE.net endpoint update configuration changed, you must now use the plain "
 "username instead of the user ID!"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:8
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:40
 msgid ""
 "The IPv4 address or the fully-qualified domain name of the remote tunnel end."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:27
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:38
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:59
 msgid ""
 "The IPv6 prefix assigned to the provider, usually ends with <code>::</code>"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:18
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1808
 msgid ""
 "The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
 "code> and <code>_</code>"
@@ -4994,7 +5130,7 @@ msgstr ""
 msgid "The configuration file could not be loaded due to the following error:"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1849
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2396
 msgid ""
 "The device could not be reached within %d seconds after applying the pending "
 "changes, which caused the configuration to be rolled back for safety "
@@ -5012,6 +5148,12 @@ msgid ""
 "</abbr> <code>/dev/sda1</code>)"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:612
+msgid ""
+"The existing wireless configuration needs to be changed for LuCI to function "
+"properly."
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:127
 msgid ""
 "The filesystem that was used to format the memory (<abbr title=\"for example"
@@ -5030,43 +5172,49 @@ msgstr ""
 msgid "The following rules are currently active on this system."
 msgstr "다음의 rule 들이 현재 이 시스템에 적용 중입니다."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:144
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:154
+msgid "The gateway address must not be a local IP address"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:154
 msgid "The given SSH public key has already been added."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:150
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:160
 msgid ""
 "The given SSH public key is invalid. Please supply proper public RSA or "
 "ECDSA keys."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:67
-msgid "The given network name is not unique"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:664
+msgid "The interface name is already used"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:52
-msgid ""
-"The hardware is not multi-SSID capable and the existing configuration will "
-"be replaced if you proceed."
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:670
+msgid "The interface name is too long"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:43
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:31
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:55
 msgid ""
 "The length of the IPv4 prefix in bits, the remainder is used in the IPv6 "
 "addresses."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:35
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:46
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:63
 msgid "The length of the IPv6 prefix in bits"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:12
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:44
 msgid "The local IPv4 address over which the tunnel is created (optional)."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:5
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1814
+msgid "The network name is already used"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:135
 msgid ""
 "The network ports on this device can be combined to several <abbr title="
 "\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
@@ -5081,22 +5229,21 @@ msgstr ""
 "segment 들을 분리하는데 사용되기도 합니다. 한 개의 uplink 포트가 인터넷에 연"
 "결되어 있고 나머지 포트들은 local 네트워크로 연결되는 구성에 자주 사용됩니다."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:77
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:395
-msgid "The selected protocol needs a device assigned"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1149
+msgid "The selected %s mode is incompatible with %s encryption"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/csrftoken.htm:11
 msgid "The submitted security token is invalid or already expired!"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:274
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:272
 msgid ""
 "The system is erasing the configuration partition now and will reboot itself "
 "when finished."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:195
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:193
 msgid ""
 "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
 "few minutes before you try to reconnect. It might be necessary to renew the "
@@ -5104,7 +5251,7 @@ msgid ""
 "settings."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:15
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:80
 msgid "The system password has been successfully changed."
 msgstr ""
 
@@ -5114,7 +5261,7 @@ msgid ""
 "you choose the generic image format for your platform."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:427
 msgid "There are no active leases"
 msgstr ""
 
@@ -5123,16 +5270,10 @@ msgstr ""
 msgid "There are no active leases."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1973
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2514
 msgid "There are no changes to apply"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:204
-msgid ""
-"There is no device assigned yet, please attach a network device in the "
-"\"Physical Settings\" tab"
-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
@@ -5144,11 +5285,19 @@ msgstr ""
 "이 공유기에 암호 설정이 되지 않았습니다. 웹 UI 와 SSH 부분을 보호하기 위해서 "
 "꼭 root 암호를 설정해 주세요."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:19
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:49
 msgid "This IPv4 address of the relay"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1448
+msgid "This authentication type is not applicable to the selected EAP method."
+msgstr ""
+
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:54
+msgid "This does not look like a valid PEM file"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
 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 "
@@ -5165,13 +5314,13 @@ msgstr ""
 "패턴들입니다.  /etc/config/ 하위의 수정된 파일이나 특정 다른 설정들은 자동적"
 "으로 변경 사항이 보존됩니다."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:74
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:81
 msgid ""
 "This is either the \"Update Key\" configured for the tunnel or the account "
 "password if no update key has been configured"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:82
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:127
 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."
@@ -5179,32 +5328,32 @@ msgstr ""
 "이것은 /etc/rc.local 파일의 내용입니다.  여기에 ('exit 0' 앞에) 부팅 절차가 "
 "끝날 때 실행하고자 하는 명령들을 삽입하세요."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:27
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:54
 msgid ""
 "This is the local endpoint address assigned by the tunnel broker, it usually "
 "ends with <code>...:2/64</code>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:79
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> in the local network"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:73
 msgid "This is the plain username for logging into the account"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:34
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:57
 msgid ""
 "This is the prefix routed to you by the tunnel broker for use by clients"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:9
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:41
 msgid "This is the system crontab in which scheduled tasks can be defined."
 msgstr "아래는 예정된 작업들이 정의된 시스템 crontab 내용입니다."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:19
+#: 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 ""
@@ -5220,26 +5369,26 @@ msgstr ""
 msgid "This page gives an overview over currently active network connections."
 msgstr "이 페이지는 현재 active 상태인 네트워크 연결을 보여줍니다."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:726
-#: modules/luci-base/htdocs/luci-static/resources/form.js:809
+#: modules/luci-base/htdocs/luci-static/resources/form.js:936
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1064
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:172
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:32
 msgid "This section contains no values yet"
 msgstr "이 section 은 아직 입력된 값이 없습니다"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:114
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:105
 msgid "Time Synchronization"
 msgstr "시간 동기화"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:525
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:968
 msgid "Time interval for rekeying GTK"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:128
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:119
 msgid "Timezone"
 msgstr "시간대"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:825
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:871
 msgid "To login…"
 msgstr ""
 
@@ -5253,7 +5402,7 @@ msgstr ""
 "할 수 있습니다.  Firmware 의 초기 설정 reset 을 원한다면 \"Reset 하기\" 를 클"
 "릭하세요. (squashfs 이미지들만 가능)."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:835
 msgid "Tone"
 msgstr ""
 
@@ -5277,55 +5426,41 @@ msgstr "트래픽"
 msgid "Transfer"
 msgstr "전송량"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:595
-msgid "Transmission Rate"
-msgstr ""
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:102
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:89
 msgid "Transmit"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:211
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:273
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:345
-msgid "Transmit Power"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:318
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:349
-msgid "Transmitter Antenna"
-msgstr ""
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:73
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:57
 msgid "Trigger"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:98
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:84
 msgid "Trigger Mode"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:54
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:69
 msgid "Tunnel ID"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1643
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1849
 #: modules/luci-base/luasrc/model/network.lua:1430
 msgid "Tunnel Interface"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:44
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:55
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:76
 msgid "Tunnel Link"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:46
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:131
 msgid "Tx-Power"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:32
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:185
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:11
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:43
 msgid "Type"
 msgstr "유형"
 
@@ -5333,19 +5468,20 @@ msgstr "유형"
 msgid "UDP:"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:28
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:90
 msgid "UMTS only"
 msgstr ""
 
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:43
 #: protocols/luci-proto-3g/luasrc/model/network/proto_3g.lua:10
 msgid "UMTS/GPRS/EV-DO"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:106
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:93
 msgid "USB Device"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:122
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:110
 msgid "USB Ports"
 msgstr ""
 
@@ -5375,10 +5511,12 @@ msgstr ""
 msgid "Unable to dispatch"
 msgstr ""
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:22
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:54
 msgid "Unable to obtain client ID"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:61
 msgid "Unable to resolve AFTR host name"
 msgstr ""
@@ -5388,21 +5526,31 @@ msgstr ""
 msgid "Unable to resolve peer host name"
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:33
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:68
+msgid "Unable to save contents: %s"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:132
 msgid "Unavailable Seconds (UAS)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1196
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1386
 #: modules/luci-base/luasrc/model/network.lua:970
 msgid "Unknown"
 msgstr "알수없음"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1349
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1539
 #: modules/luci-base/luasrc/model/network.lua:1137
 msgid "Unknown error (%s)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1193
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:204
+msgid "Unknown error code"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1383
+#: modules/luci-base/htdocs/luci-static/resources/protocol/none.js:6
 #: modules/luci-base/luasrc/model/network.lua:964
 msgid "Unmanaged"
 msgstr ""
@@ -5412,22 +5560,30 @@ msgstr ""
 msgid "Unmount"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:107
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:262
 msgid "Unnamed key"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1708
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2261
 msgid "Unsaved Changes"
 msgstr "적용 안된 변경 사항"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:202
+msgid "Unspecified error"
+msgstr ""
+
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:64
 msgid "Unsupported MAP type"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:27
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:69
 msgid "Unsupported modem"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:219
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:119
 msgid "Unsupported protocol type."
 msgstr ""
@@ -5450,56 +5606,70 @@ msgstr ""
 msgid "Upload archive..."
 msgstr "아카이브 업로드..."
 
-#: modules/luci-base/luasrc/view/cbi/upload.htm:8
-msgid "Uploaded File"
-msgstr "Uploaded File"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1703
+msgid "Upload file"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1678
+msgid "Upload file…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1623
+msgid "Upload request failed: %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:613
+msgid ""
+"Upon pressing \"Continue\", anonymous \"wifi-iface\" sections will be "
+"assigned with a name in the form <em>wifinet#</em> and the network will be "
+"restarted to apply the updated configuration."
+msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:14
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:74
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:85
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:26
 msgid "Uptime"
 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:83
 msgid "Use <code>/etc/ethers</code>"
 msgstr "<code>/etc/ethers</code> 사용"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:40
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:167
 msgid "Use DHCP gateway"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:33
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:85
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:34
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:98
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:46
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:65
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:38
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:58
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:124
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:39
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:116
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:59
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:103
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:64
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:77
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:100
 msgid "Use DNS servers advertised by peer"
 msgstr "Peer 가 권장한 DNS 서버 사용"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:227
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:233
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:479
 msgid "Use ISO/IEC 3166 alpha2 country codes."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:31
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:100
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:70
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:35
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:51
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:86
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:56
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:97
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:77
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:75
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:92
 msgid "Use MTU on tunnel interface"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:95
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:65
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:30
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:46
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:81
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:93
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:73
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:88
 msgid "Use TTL on tunnel interface"
 msgstr ""
 
@@ -5511,68 +5681,65 @@ msgstr ""
 msgid "Use as root filesystem (/)"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:19
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:31
 msgid "Use broadcast flag"
 msgstr "Broadcast flag 사용"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:253
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:791
 msgid "Use builtin IPv6-management"
 msgstr "자체 내장 IPv6-관리 기능 사용"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:40
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:109
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:92
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:45
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:105
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:53
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:72
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:45
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:65
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:40
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:182
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:127
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:42
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:119
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:62
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:67
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:80
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:103
 msgid "Use custom DNS servers"
 msgstr "임의의 DNS 서버 사용"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:26
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:70
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:16
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:28
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:84
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:24
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:50
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:23
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:43
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:116
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:33
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:74
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:97
 msgid "Use default gateway"
 msgstr "Default gateway 사용"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:48
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:164
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:77
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:24
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:88
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:58
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:23
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:39
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:74
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:90
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:38
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:57
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:30
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:50
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:45
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:227
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:119
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:51
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:88
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:68
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:52
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:70
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:83
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:111
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:149
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:67
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:111
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:98
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:72
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:85
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:108
 msgid "Use gateway metric"
 msgstr "Gateway metric 사용"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:64
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:179
 msgid "Use routing table"
 msgstr "Routing table 사용"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:309
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:310
 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 "
@@ -5590,77 +5757,78 @@ msgstr ""
 msgid "Used"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:848
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1273
 msgid "Used Key Slot"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:913
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
 msgid ""
 "Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not "
 "needed with normal WPA(2)-PSK."
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:48
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:110
 msgid "User certificate (PEM encoded)"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:61
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:122
 msgid "User key (PEM encoded)"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/sysauth.htm:23
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:41
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:32
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:102
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:56
 msgid "Username"
 msgstr "사용자이름"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:182
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:903
 msgid "VC-Mux"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:851
 msgid "VDSL"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:172
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:169
 msgid "VLANs on %q"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:171
-msgid "VLANs on %q (%s)"
-msgstr "VLAN 설정: %q (%s)"
+#: modules/luci-base/luasrc/controller/admin/index.lua:55
+msgid "VPN"
+msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:18
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:42
 msgid "VPN Local address"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:22
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:46
 msgid "VPN Local port"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:15
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:11
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:15
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:58
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:39
 msgid "VPN Server"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:18
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:96
 msgid "VPN Server port"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:37
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:100
 msgid "VPN Server's certificate SHA1 hash"
 msgstr ""
 
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:9
 #: protocols/luci-proto-vpnc/luasrc/model/network/proto_vpnc.lua:9
 msgid "VPNC (CISCO 3000 (and others) VPN)"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:44
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:73
 msgid "Vendor"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:60
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:52
 msgid "Vendor Class to send when requesting DHCP"
 msgstr "DHCP 요청시 전송할 Vendor Class"
 
@@ -5668,41 +5836,37 @@ msgstr "DHCP 요청시 전송할 Vendor Class"
 msgid "Verify"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:52
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:76
 msgid "Virtual dynamic interface"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:470
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:471
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:553
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:576
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:908
 msgid "WDS"
 msgstr "WDS"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:667
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1160
 msgid "WEP Open System"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:668
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1161
 msgid "WEP Shared Key"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "WEP passphrase"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:503
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:566
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:945
 msgid "WMM Mode"
 msgstr "WMM Mode"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "WPA passphrase"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:716
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:735
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:740
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1074
 msgid ""
 "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
 "and ad-hoc mode) to be installed."
@@ -5716,7 +5880,7 @@ msgstr "변경 사항이 적용되기를 기다리는 중입니다..."
 msgid "Waiting for command to complete..."
 msgstr "실행한 명령이 끝나기를 기다리는 중입니다..."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1940
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2481
 msgid "Waiting for configuration to get applied… %ds"
 msgstr ""
 
@@ -5724,8 +5888,8 @@ msgstr ""
 msgid "Waiting for device..."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:172
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:163
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:173
 msgid "Warning"
 msgstr ""
 
@@ -5733,11 +5897,11 @@ msgstr ""
 msgid "Warning: There are unsaved changes that will get lost on reboot!"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:20
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:34
 msgid "Weak"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:946
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1355
 msgid ""
 "When using a PSK, the PMK can be automatically generated. When enabled, the "
 "R0/R1 key options below are not applied. Disable this to use the R0 and R1 "
@@ -5745,78 +5909,85 @@ msgid ""
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:383
 msgid "Width"
 msgstr ""
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:17
 #: protocols/luci-proto-wireguard/luasrc/model/network/proto_wireguard.lua:9
 msgid "WireGuard VPN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:58
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:40
 #: modules/luci-mod-status/luasrc/controller/admin/status.lua:28
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:14
 msgid "Wireless"
 msgstr "무선"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1631
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1837
 #: modules/luci-base/luasrc/model/network.lua:1418
 msgid "Wireless Adapter"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1617
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2052
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1823
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2288
 #: modules/luci-base/luasrc/model/network.lua:1404
 #: modules/luci-base/luasrc/model/network.lua:1865
 msgid "Wireless Network"
 msgstr "무선랜 네트워크"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:629
 msgid "Wireless Overview"
 msgstr "무선랜 개요"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:362
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:797
 msgid "Wireless Security"
 msgstr "무선랜 보안"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:54
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:611
+msgid "Wireless configuration migration"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:139
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:179
 msgid "Wireless is disabled"
 msgstr "무선이 비활성화되어"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:54
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:139
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:179
 msgid "Wireless is not associated"
 msgstr "무선이 연결되어 있지 않습니다"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:15
-msgid "Wireless is restarting..."
-msgstr "무선랜이 재시작중입니다..."
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:752
 msgid "Wireless network is disabled"
 msgstr "무선 네트워크가 꺼져 있음"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:752
 msgid "Wireless network is enabled"
 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:182
 msgid "Write received DNS requests to syslog"
 msgstr "받은 DNS 요청 내용을 systlog 에 기록합니다"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:164
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:155
 msgid "Write system log to file"
 msgstr "System log 출력 파일 경로"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1507
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:85
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1754
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:109
 msgid "Yes"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:26
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:943
+msgid ""
+"You appear to be currently connected to the device via the \"%h\" interface. "
+"Do you really want to shut down the interface?"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:123
 msgid ""
 "You can enable or disable installed init scripts here. Changes will applied "
 "after a device reboot.<br /><strong>Warning: If you disable essential init "
@@ -5835,38 +6006,34 @@ msgid ""
 "You must enable JavaScript in your browser or LuCI will not work properly."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:196
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:187
 msgid "ZRam Compression Algorithm"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:203
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:194
 msgid "ZRam Compression Streams"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:189
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:180
 msgid "ZRam Settings"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:191
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
 msgid "ZRam Size"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:229
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:230
 msgid "any"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:113
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:121
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:126
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:218
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:282
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:321
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:328
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:621
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:37
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:22
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:29
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:121
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:836
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:844
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:849
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1030
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:78
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:48
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:51
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:103
 msgid "auto"
 msgstr ""
 
@@ -5874,11 +6041,11 @@ msgstr ""
 msgid "automatic"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:45
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:78
 msgid "baseT"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:909
 msgid "bridged"
 msgstr ""
 
@@ -5894,22 +6061,21 @@ msgstr ""
 msgid "create:"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:264
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:368
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:678
 msgid "creates a bridge over specified interface(s)"
 msgstr "지정한 인터페이스(들)로 구성된 bridge 를 생성합니다"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:277
 msgid "dB"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:34
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:35
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:46
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:47
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:48
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:131
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:132
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:133
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:277
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:279
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:331
@@ -5921,26 +6087,30 @@ msgstr ""
 msgid "dBm"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:460
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:587
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:889
 msgid "disable"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:119
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:524
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:530
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:536
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:18
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:578
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:584
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:590
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:25
 msgid "disabled"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:433
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:467
+msgid "driver default"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/lease_status.htm:17
 #: modules/luci-base/luasrc/view/lease_status.htm:46
-#: 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:416
 msgid "expired"
 msgstr "만료됨"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:88
 msgid ""
 "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr>-leases will be stored"
@@ -5954,25 +6124,21 @@ msgstr ""
 msgid "forward"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:80
 msgid "full-duplex"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:80
 msgid "half-duplex"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:559
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:565
 msgid "hexadecimal encoded value"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:138
-msgid "hidden"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:527
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:533
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:538
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:581
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:587
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:592
 msgid "hybrid mode"
 msgstr ""
 
@@ -5980,6 +6146,10 @@ msgstr ""
 msgid "if target is a network"
 msgstr "Target 이 네트워크일 경우"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:63
+msgid "ignore"
+msgstr ""
+
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:177
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
@@ -6014,25 +6184,26 @@ msgstr ""
 msgid "key with either 5 or 13 characters"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:94
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:95
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr "local <abbr title=\"Domain Name System\">DNS</abbr> 파일"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:952
-msgid "minutes"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1168
+msgid "medium security"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:43
-msgid "mixed WPA/WPA2"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1360
+msgid "minutes"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:225
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:232
 msgid "no"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:54
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:72
 msgid "no link"
 msgstr "link 없음"
 
@@ -6040,7 +6211,7 @@ msgstr "link 없음"
 msgid "non-empty value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1195
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1446
 msgid "none"
 msgstr ""
 
@@ -6050,7 +6221,9 @@ msgstr ""
 msgid "not present"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:363
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:341
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:776
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:780
 #: 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
@@ -6065,8 +6238,8 @@ msgstr ""
 msgid "on"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
-msgid "open"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1169
+msgid "open network"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
@@ -6086,73 +6259,77 @@ msgstr ""
 msgid "positive integer value"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:34
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:56
 msgid "random"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:526
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:532
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:537
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:580
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:586
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:591
 msgid "relay mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:910
 msgid "routed"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:525
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:534
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:968
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:977
 msgid "sec"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:525
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:531
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:579
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:585
 msgid "server mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:544
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:597
 msgid "stateful-only"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:542
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:595
 msgid "stateless"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:543
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:596
 msgid "stateless + stateful"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:369
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1167
+msgid "strong security"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:346
 msgid "tagged"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:932
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1343
 msgid "time units (TUs / 1.024 ms) [1000-65535]"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:549
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:555
 msgid "unique value"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:448
 msgid "unknown"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:15
 #: modules/luci-base/luasrc/view/lease_status.htm:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:238
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:390
+#: 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:414
 msgid "unlimited"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1401
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1648
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:63
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:355
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:378
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:413
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:446
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:512
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:450
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:545
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:53
 #: modules/luci-base/luasrc/view/cbi/network_netlist.htm:38
 msgid "unspecified"
@@ -6162,7 +6339,7 @@ msgstr ""
 msgid "unspecified -or- create:"
 msgstr "unspecified -혹은- create:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:366
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:344
 msgid "untagged"
 msgstr ""
 
@@ -6243,8 +6420,8 @@ msgstr ""
 msgid "valid address:port"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:523
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:527
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:529
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:533
 msgid "valid date (YYYY-MM-DD)"
 msgstr ""
 
@@ -6281,7 +6458,7 @@ msgstr ""
 msgid "valid network in address/netmask notation"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:498
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:504
 msgid "valid phone digit (0-9, \"*\", \"#\", \"!\" or \".\")"
 msgstr ""
 
@@ -6294,11 +6471,11 @@ msgstr ""
 msgid "valid port value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:503
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:509
 msgid "valid time (HH:MM:SS)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:425
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:431
 msgid "value between %d and %d characters"
 msgstr ""
 
@@ -6314,14 +6491,23 @@ msgstr ""
 msgid "value smaller or equal to %f"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:430
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:425
+msgid "value with %d characters"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:436
 msgid "value with at least %d characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:435
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:441
 msgid "value with at most %d characters"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1169
+msgid "weak security"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:221
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:232
@@ -6332,6 +6518,61 @@ msgstr ""
 msgid "« Back"
 msgstr ""
 
+#~ msgid "Specifies the listening port of this <em>Dropbear</em> instance"
+#~ msgstr "<em>Dropbear</em> instance 의 listening 포트를 지정합니다"
+
+#~ msgid "Switch %q (%s)"
+#~ msgstr "스위치 %q (%s)"
+
+#~ msgid "VLANs on %q (%s)"
+#~ msgstr "VLAN 설정: %q (%s)"
+
+#~ msgid "Common Configuration"
+#~ msgstr "공통 설정"
+
+#~ msgid "Connect"
+#~ msgstr "연결"
+
+#~ msgid "Edit this interface"
+#~ msgstr "이 인터페이스를 수정합니다"
+
+#~ msgid "Interface Overview"
+#~ msgstr "인터페이스 개요"
+
+#~ msgid ""
+#~ "On this page you can configure the network interfaces. You can bridge "
+#~ "several interfaces by ticking the \"bridge interfaces\" field and enter "
+#~ "the names of several network interfaces separated by spaces. You can also "
+#~ "use <abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
+#~ "<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
+#~ "<samp>eth0.1</samp>)."
+#~ msgstr ""
+#~ "이 페이지에서는 네트워크 인터페이스를 설정할 수 있습니다. \"Bridge 인터페"
+#~ "이스\" 항목을 클릭하고, 공백으로 구분된 네트워크 인터페이스들의 이름을 적"
+#~ "는 방식으로 여러 인터페이스들을 bridge 할 수 있습니다.  또한 <abbr title="
+#~ "\"Virtual Local Area Network\">VLAN</abbr> 표기법인 <samp>INTERFACE."
+#~ "VLANNR</samp> (<abbr title=\"for example\">예</abbr>: <samp>eth0.1</"
+#~ "samp>) 를 사용하실 수 있습니다."
+
+#~ msgid ""
+#~ "The <em>Device Configuration</em> section covers physical settings of the "
+#~ "radio hardware such as channel, transmit power or antenna selection which "
+#~ "are shared among all defined wireless networks (if the radio hardware is "
+#~ "multi-SSID capable). Per network settings like encryption or operation "
+#~ "mode are grouped in the <em>Interface Configuration</em>."
+#~ msgstr ""
+#~ "<em>장치 설정<em> 섹션은 channel, transmit power 혹은 antenna 선택과 같은 "
+#~ "물리적인 설정 내용을 다룹니다.  이 설정은 (만약 radio 하드웨어가 multi-"
+#~ "SSID 지원이 가능하다면) 정의된 모든 무선 네트워크에 공통적으로 적용됩니"
+#~ "다. 암호화 혹은 operation mode 와 같은 각 네트워크 설정들은 <em>인터페이"
+#~ "스 설정</em>에서 다루어집니다."
+
+#~ msgid "Uploaded File"
+#~ msgstr "Uploaded File"
+
+#~ msgid "Wireless is restarting..."
+#~ msgstr "무선랜이 재시작중입니다..."
+
 #~ msgid "Back"
 #~ msgstr "뒤로"
 
diff --git a/modules/luci-base/po/ms/base.po b/modules/luci-base/po/ms/base.po
index b190704a4..274ce33ba 100644
--- a/modules/luci-base/po/ms/base.po
+++ b/modules/luci-base/po/ms/base.po
@@ -13,19 +13,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:133
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:857
 msgid "%.1f dB"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:109
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:122
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 msgid "%d Bit"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1641
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2194
 msgid "%d invalid field(s)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:281
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:31
 msgid "%s is untagged in multiple VLANs!"
 msgstr ""
 
@@ -63,19 +64,19 @@ msgid "-- Additional Field --"
 msgstr "-- Gelanggang Tambahan --"
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:258
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1401
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1533
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:250
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:350
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1114
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1648
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1780
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:314
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:414
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1178
 #: modules/luci-base/luasrc/view/cbi/header.htm:5
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:26
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:88
 msgid "-- Please choose --"
 msgstr "-- Sila pilih --"
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:259
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:351
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1115
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:415
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1179
 #: modules/luci-base/luasrc/view/cbi/header.htm:6
 msgid "-- custom --"
 msgstr "-- memperibadi --"
@@ -98,7 +99,7 @@ msgstr ""
 msgid "-- please select --"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:382
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:814
 msgid "0 = not using RSSI threshold, 1 = do not change driver default"
 msgstr ""
 
@@ -110,10 +111,11 @@ msgstr ""
 msgid "15 Minute Load:"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:924
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1337
 msgid "4-character hexadecimal ID"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:11
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:18
 msgid "464XLAT (CLAT)"
 msgstr ""
@@ -122,58 +124,58 @@ msgstr ""
 msgid "5 Minute Load:"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:960
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1366
 msgid "6-octet identifier as a hex string - no colons"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:891
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1310
 msgid "802.11r Fast Transition"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1157
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1567
 msgid "802.11w Association SA Query maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1574
 msgid "802.11w Association SA Query retry timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1133
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1533
 msgid "802.11w Management Frame Protection"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1156
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1567
 msgid "802.11w maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1165
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1574
 msgid "802.11w retry timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:399
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:831
 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:224
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:225
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:215
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:216
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
 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:167
 msgid ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
 "order of the resolvfile"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:388
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:820
 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:351
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:373
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:45
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
 msgstr "IPv4-Alamat"
@@ -183,8 +185,8 @@ msgstr "IPv4-Alamat"
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
 msgstr "IPv4-Pintu gerbang"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:555
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:35
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:506
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr "IPv4-Netmask"
 
@@ -198,107 +200,111 @@ 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:378
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:402
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:58
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:35
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:33
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "Konfigurasi lampu LED"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:67
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:51
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:328
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:329
 #: 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:372
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:233
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:234
 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:242
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
 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:251
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:252
 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:10
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:42
 msgid ""
 "<br/>Note: you need to manually restart the cron service if the crontab file "
 "was empty before editing."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:817
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1605
+msgid "A directory with the same name already exists."
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:863
 msgid "A new login is required since the authentication session expired."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:114
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:837
 msgid "A43C + J43 + A43"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:838
 msgid "A43C + J43 + A43 + V43"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:850
 msgid "ADSL"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:826
 msgid "ANSI T1.413"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:33
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:47
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:23
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:94
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:86
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:67
 msgid "APN"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:56
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:175
 msgid "ARP retry threshold"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:122
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:845
 msgid "ATM (Asynchronous Transfer Mode)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:144
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:866
 msgid "ATM Bridges"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:178
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:21
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:898
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:66
 msgid "ATM Virtual Channel Identifier (VCI)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:179
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:26
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:899
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:70
 msgid "ATM Virtual Path Identifier (VPI)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:866
 msgid ""
 "ATM bridges expose encapsulated ethernet in AAL5 connections as virtual "
 "Linux network interfaces which can be used in conjunction with DHCP or PPP "
 "to dial into the provider network."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:184
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:905
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:62
 msgid "ATM device number"
 msgstr ""
 
@@ -307,17 +313,17 @@ msgid "ATU-C System Vendor ID"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:251
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:495
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:499
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:528
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:532
 msgid "Absent Interface"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:19
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
 msgid "Access Concentrator"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:368
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:470
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:802
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
 msgid "Access Point"
 msgstr "Pusat akses"
 
@@ -340,7 +346,7 @@ msgid "Active Connections"
 msgstr "Sambungan Aktif"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:68
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:30
 msgid "Active DHCP Leases"
 msgstr ""
 
@@ -348,55 +354,75 @@ msgstr ""
 msgid "Active DHCPv6 Leases"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1951
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:370
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:12
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2190
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:804
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:23
 msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:650
-#: modules/luci-base/htdocs/luci-static/resources/form.js:651
-#: modules/luci-base/htdocs/luci-static/resources/form.js:666
-#: modules/luci-base/htdocs/luci-static/resources/form.js:667
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1290
+#: modules/luci-base/htdocs/luci-static/resources/form.js:902
+#: modules/luci-base/htdocs/luci-static/resources/form.js:904
+#: modules/luci-base/htdocs/luci-static/resources/form.js:917
+#: modules/luci-base/htdocs/luci-static/resources/form.js:918
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1539
 #: modules/luci-base/luasrc/view/cbi/nsection.htm:25
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:189
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:197
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:39
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:47
 #: modules/luci-base/luasrc/view/cbi/ucisection.htm:54
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:703
 msgid "Add"
 msgstr "Tambah"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:60
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:870
+msgid "Add ATM Bridge"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:92
 msgid "Add IPv4 address…"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:129
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:204
 msgid "Add IPv6 address…"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:143
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:149
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:38
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:47
+msgid "Add LED action"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:215
+msgid "Add VLAN"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:14
+msgid "Add instance"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:153
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:159
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:250
 msgid "Add key"
 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:155
 msgid "Add local domain suffix to names served from hosts files"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:705
 msgid "Add new interface..."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:104
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:99
+msgid "Add peer"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:105
 msgid "Additional Hosts files"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:161
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
 msgid "Additional servers file"
 msgstr ""
 
@@ -423,7 +449,7 @@ msgstr ""
 msgid "Address"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:12
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:151
 msgid "Address to access local relay bridge"
 msgstr ""
 
@@ -432,13 +458,13 @@ msgstr ""
 msgid "Administration"
 msgstr "Pentadbiran"
 
-#: 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:70
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:505
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:896
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:24
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:189
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:463
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:176
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:143
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:364
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:742
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:799
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:50
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:34
 msgid "Advanced Settings"
@@ -448,165 +474,165 @@ msgstr "Tetapan Lanjutan"
 msgid "Aggregate Transmit Power(ACTATP)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:175
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:166
 msgid "Alert"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1628
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1834
 #: modules/luci-base/luasrc/model/network.lua:1416
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:54
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:78
 msgid "Alias Interface"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:138
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:66
 msgid "Alias of \"%s\""
 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:170
 msgid "All Servers"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:114
 msgid ""
 "Allocate IP addresses sequentially, starting from the lowest available "
 "address"
 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:113
 msgid "Allocate IP sequentially"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:24
 msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
 msgstr "Membenarkan pengesahan kata laluan SSH"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:545
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:987
 msgid "Allow AP mode to disconnect STAs based on low ACK condition"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:462
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:589
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:891
 msgid "Allow all except listed"
 msgstr "Izinkan semua kecualian yang disenaraikan"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:236
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:767
 msgid "Allow legacy 802.11b rates"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:461
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:588
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:890
 msgid "Allow listed only"
 msgstr "Izinkan senarai saja"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:198
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:199
 msgid "Allow localhost"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:47
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:35
 msgid "Allow remote hosts to connect to local SSH forwarded ports"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:38
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:30
 msgid "Allow root logins with password"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:39
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:30
 msgid "Allow the <em>root</em> user to login with password"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:199
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:200
 msgid ""
 "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:135
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:122
 msgid "Allowed IPs"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:549
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:602
 msgid "Always announce default router"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:259
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:782
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
 "option does not comply with IEEE 802.11n-2009!"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:95
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:818
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:119
 msgid "Annex"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:96
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:819
 msgid "Annex A + L + M (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:827
 msgid "Annex A G.992.1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:828
 msgid "Annex A G.992.2"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:829
 msgid "Annex A G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:830
 msgid "Annex A G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:97
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:820
 msgid "Annex B (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:823
 msgid "Annex B G.992.1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:824
 msgid "Annex B G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:102
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:825
 msgid "Annex B G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:98
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:821
 msgid "Annex J (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:831
 msgid "Annex L G.992.3 POTS 1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:99
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:822
 msgid "Annex M (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:109
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:832
 msgid "Annex M G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:833
 msgid "Annex M G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:550
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:602
 msgid "Announce as default router even if no public prefix is available."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:555
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:607
 msgid "Announced DNS domains"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:554
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:606
 msgid "Announced DNS servers"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1093
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1496
 msgid "Anonymous Identity"
 msgstr ""
 
@@ -618,20 +644,6 @@ msgstr ""
 msgid "Anonymous Swap"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:322
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:329
-msgid "Antenna 1"
-msgstr "Antena 1"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:323
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:330
-msgid "Antenna 2"
-msgstr "Antena 2"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:246
-msgid "Antenna Configuration"
-msgstr ""
-
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:71
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:160
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:181
@@ -639,11 +651,11 @@ msgstr ""
 msgid "Any zone"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1981
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2522
 msgid "Apply request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1867
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2409
 msgid "Apply unchecked"
 msgstr ""
 
@@ -651,8 +663,8 @@ msgstr ""
 msgid "Architecture"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:19
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:184
+#: 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 ""
@@ -661,13 +673,13 @@ msgstr ""
 msgid "Assign interfaces..."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:124
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:24
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:189
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:31
 msgid ""
 "Assign prefix parts using this hexadecimal subprefix ID for this interface."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:148
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1967
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:22
 msgid "Associated Stations"
 msgstr "Associated Stesen"
@@ -676,20 +688,20 @@ msgstr "Associated Stesen"
 msgid "Associations"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:39
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:37
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:101
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:64
 msgid "Auth Group"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1027
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1421
 msgid "Authentication"
 msgstr "Authentifizierung"
 
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:29
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:70
 msgid "Authentication Type"
 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:78
 msgid "Authoritative"
 msgstr "Pengesahan"
 
@@ -707,17 +719,19 @@ msgstr "Otorisasi Diperlukan"
 msgid "Auto Refresh"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:53
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:7
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:17
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:67
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:24
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:36
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:42
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:36
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:106
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:24
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:98
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:50
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:94
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:81
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:55
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:68
 msgid "Automatic"
 msgstr ""
 
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:7
 #: protocols/luci-proto-hnet/luasrc/model/network/proto_hnet.lua:7
 msgid "Automatic Homenet (HNCP)"
 msgstr ""
@@ -760,21 +774,21 @@ msgstr "Boleh didapati"
 msgid "Average:"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:116
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:839
 msgid "B43 + B43C"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:840
 msgid "B43 + B43C + V43"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:48
 msgid "BR / DMR / AFTR"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:43
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:75
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1620
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:176
 msgid "BSSID"
 msgstr ""
@@ -788,19 +802,11 @@ msgstr ""
 msgid "Back to configuration"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:48
-msgid "Back to overview"
-msgstr "Kembali ke ikhtisar"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:20
-msgid "Back to scan results"
-msgstr "Kembali ke keputusan scan"
-
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:17
 msgid "Backup"
 msgstr "Sandaran"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:38
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:36
 msgid "Backup / Flash Firmware"
 msgstr ""
 
@@ -813,11 +819,11 @@ msgid "Bad address specified!"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:158
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:288
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:368
 msgid "Band"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:261
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:785
 msgid "Beacon Interval"
 msgstr ""
 
@@ -828,79 +834,85 @@ msgid ""
 "defined backup patterns."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:293
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:294
 msgid ""
 "Bind dynamically to interfaces rather than wildcard address (recommended as "
 "linux default)"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:16
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:48
 msgid "Bind interface"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:16
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:48
 msgid "Bind the tunnel to this interface (optional)."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:49
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:134
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:187
 msgid "Bitrate"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:172
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
 msgid "Bogus NX Domain Override"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1634
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1840
 #: modules/luci-base/luasrc/model/network.lua:1420
 msgid "Bridge"
 msgstr "Bridge"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:264
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:368
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:678
 msgid "Bridge interfaces"
 msgstr "Antara Muka Bridge"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:906
 msgid "Bridge unit number"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:250
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:364
 msgid "Bring up on boot"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:35
-msgid "Broadcom 802.11%s Wireless Controller"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:45
-msgid "Broadcom BCM%04x 802.11 Wireless Controller"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1697
+msgid "Browse…"
 msgstr ""
 
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:18
 msgid "Buffered"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:75
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:134
 msgid "CA certificate; if empty it will be saved after the first connection."
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:7
+msgid "CLAT configuration failed"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:13
 msgid "CPU usage (%)"
 msgstr "Penggunaan CPU (%)"
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:21
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:53
 msgid "Call failed"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1789
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:14
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:52
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:711
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:948
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1839
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:191
 #: modules/luci-mod-system/luasrc/view/admin_system/upgrade.htm:60
 msgid "Cancel"
 msgstr "Batal"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:6
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:17
 msgid "Category"
 msgstr ""
 
@@ -918,13 +930,7 @@ msgstr ""
 msgid "Chain"
 msgstr "Rantai"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:9
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:14
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:24
-msgid "Change login password"
-msgstr ""
-
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1744
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 msgid "Changes"
 msgstr "Laman"
 
@@ -932,33 +938,23 @@ msgstr "Laman"
 msgid "Changes applied."
 msgstr "Laman diterapkan."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2004
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2545
 msgid "Changes have been reverted."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:43
 msgid "Changes the administrator password for accessing the device"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:10
-msgid "Changing password…"
-msgstr ""
-
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:162
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:45
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:87
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:174
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:376
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1618
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:186
 msgid "Channel"
 msgstr "Saluran"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:119
-msgid ""
-"Channel %d is not available in the %s regulatory domain and has been auto-"
-"adjusted to %d."
-msgstr ""
-
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:229
 msgid "Check"
 msgstr ""
@@ -967,7 +963,7 @@ msgstr ""
 msgid "Check filesystems before mount"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1806
 msgid "Check this option to delete the existing networks from this radio."
 msgstr ""
 
@@ -979,8 +975,8 @@ msgstr "Jumlah disemak "
 msgid "Choose mtdblock"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:358
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:443
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1829
 msgid ""
 "Choose the firewall zone you want to assign to this interface. Select "
 "<em>unspecified</em> to remove the interface from the associated zone or "
@@ -988,17 +984,17 @@ msgid ""
 "interface to it."
 msgstr "Pilih zon firewall yang anda ingin tetapkan untuk antar muka ini."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:834
 msgid ""
 "Choose the network(s) you want to attach to this wireless interface or fill "
 "out the <em>create</em> field to define a new network."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:614
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1023
 msgid "Cipher"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:61
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:91
 msgid "Cisco UDP encapsulation"
 msgstr ""
 
@@ -1014,29 +1010,29 @@ msgid ""
 "FEATURE IS FOR PROFESSIONALS! )"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1950
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:369
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:471
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2189
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:803
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:908
 #, fuzzy
 msgid "Client"
 msgstr "Pelanggan"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:55
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:52
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:47
 msgid "Client ID to send when requesting DHCP"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:145
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:151
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:155
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:161
 msgid "Close"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:146
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:119
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:125
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:127
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:98
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:119
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:157
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:141
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:115
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:138
 msgid ""
 "Close inactive connection after the given amount of seconds, use 0 to "
 "persist connection"
@@ -1049,12 +1045,9 @@ msgstr ""
 #: modules/luci-base/luasrc/view/lease_status.htm:77
 #: modules/luci-base/luasrc/view/lease_status.htm:98
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:118
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:37
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:24
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1965
 #: modules/luci-mod-network/luasrc/view/admin_network/iface_status.htm:6
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:40
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:30
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:8
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:398
 #: modules/luci-mod-status/luasrc/view/admin_status/index/30-network.htm:11
 #: modules/luci-mod-status/luasrc/view/admin_status/index/50-dsl.htm:17
@@ -1068,15 +1061,19 @@ msgstr ""
 msgid "Command"
 msgstr "Perintah"
 
-#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:64
-msgid "Comment"
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:193
+msgid "Command OK"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:185
-msgid "Common Configuration"
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:41
+msgid "Command failed"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1176
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:64
+msgid "Comment"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
 msgid ""
 "Complicates key reinstallation attacks on the client side by disabling "
 "retransmission of EAPOL-Key frames that are used to install keys. This "
@@ -1084,13 +1081,14 @@ msgid ""
 "negotiation especially in environments with heavy traffic load."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1744
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 #: modules/luci-base/luasrc/controller/admin/uci.lua:11
 #: modules/luci-mod-system/luasrc/view/admin_system/backupfiles.htm:9
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:13
 msgid "Configuration"
 msgstr "Konfigurasi"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:21
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:63
 msgid "Configuration failed"
 msgstr ""
@@ -1099,89 +1097,89 @@ msgstr ""
 msgid "Configuration files will be kept"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1915
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2456
 msgid "Configuration has been applied."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1848
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2395
 msgid "Configuration has been rolled back!"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:43
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:942
+msgid "Confirm disconnect"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:50
 msgid "Confirmation"
 msgstr "Pengesahan"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:32
-msgid "Connect"
-msgstr ""
-
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:72
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:105
 msgid "Connected"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:338
-msgid "Connection Limit"
-msgstr "Sambungan Batas"
-
 #: modules/luci-base/htdocs/luci-static/resources/network.js:7
 #: modules/luci-base/luasrc/model/network.lua:27
 msgid "Connection attempt failed"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:203
+msgid "Connection lost"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/controller/admin/status.lua:32
 msgid "Connections"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1890
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:66
+msgid "Contents have been saved."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:618
+msgid "Continue"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2431
 msgid ""
 "Could not regain access to the device after applying the configuration "
 "changes. You might need to reconnect if you modified network related "
 "settings such as the IP address or wireless security credentials."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:135
 msgid "Country"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:227
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:233
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:337
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:764
 msgid "Country Code"
 msgstr "Kod negara"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:36
-msgid "Cover the following interface"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:43
-msgid "Cover the following interfaces"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:357
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:86
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:443
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1829
 msgid "Create / Assign firewall-zone"
 msgstr "Buat / Menetapkan dinding api-zon"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:9
-msgid "Create Interface"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:735
+msgid "Create interface"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:33
-msgid "Create a bridge over multiple interfaces"
-msgstr ""
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:174
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:165
 msgid "Critical"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:178
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:169
 msgid "Cron Log Level"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:519
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:521
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:447
+msgid "Current power"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:552
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:554
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:51
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:53
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:82
@@ -1189,7 +1187,7 @@ msgstr ""
 msgid "Custom Interface"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:36
 msgid "Custom delegated IPv6-prefix"
 msgstr ""
 
@@ -1199,52 +1197,53 @@ msgid ""
 "this, perform a factory-reset first."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:59
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:41
 msgid ""
 "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
 "\">LED</abbr>s if possible."
 msgstr "Mengkustomisasi perilaku peranti LED jika mungkin."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:799
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1223
 msgid "DAE-Client"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:807
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1231
 msgid "DAE-Port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:815
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1239
 msgid "DAE-Secret"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:448
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:459
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:279
 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:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:61
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:62
 msgid "DHCP and DNS"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1195
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1385
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:16
 #: modules/luci-base/luasrc/model/network.lua:968
 msgid "DHCP client"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:571
 msgid "DHCP-Options"
 msgstr "DHCP-Pilihan"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_dhcpv6.lua:7
 msgid "DHCPv6 client"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:540
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:594
 msgid "DHCPv6-Mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:529
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:583
 msgid "DHCPv6-Service"
 msgstr ""
 
@@ -1261,31 +1260,31 @@ msgstr ""
 msgid "DNS"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:183
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
 msgid "DNS forwardings"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:30
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:37
 msgid "DNS-Label / FQDN"
 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:136
 msgid "DNSSEC"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:139
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
 msgid "DNSSEC check unsigned"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:73
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:99
 msgid "DPD Idle Timeout"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:14
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:41
 msgid "DS-Lite AFTR address"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:92
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:815
 #: modules/luci-mod-status/luasrc/view/admin_status/index/50-dsl.htm:14
 msgid "DSL"
 msgstr ""
@@ -1294,11 +1293,11 @@ msgstr ""
 msgid "DSL Status"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:125
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:848
 msgid "DSL line mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:519
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:963
 msgid "DTIM Interval"
 msgstr ""
 
@@ -1310,77 +1309,92 @@ msgstr ""
 msgid "Data Rate"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:169
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:180
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:160
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:171
 msgid "Debug"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:759
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:783
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:807
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1183
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1207
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1231
 msgid "Default %d"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:82
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:107
 msgid "Default Route"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:17
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:81
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:51
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:32
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:48
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:85
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:65
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:80
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:108
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:146
 msgid "Default gateway"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:541
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:594
 msgid "Default is stateless + stateful"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:70
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:54
 msgid "Default state"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:503
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:553
 msgid "Define a name for this network."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:514
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:571
 msgid ""
 "Define additional DHCP options, for example "
 "\"<code>6,192.168.2.1,192.168.2.2</code>\" which advertises different DNS "
 "servers to clients."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:705
-#: modules/luci-base/htdocs/luci-static/resources/form.js:958
-#: modules/luci-base/htdocs/luci-static/resources/form.js:959
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1271
+#: modules/luci-base/htdocs/luci-static/resources/form.js:966
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1210
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1216
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1524
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1758
 #: modules/luci-base/luasrc/view/cbi/nsection.htm:11
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:162
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:16
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:41
 msgid "Delete"
 msgstr "Padam"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:178
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:187
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:193
 msgid "Delete key"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:45
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1654
+msgid "Delete permission denied"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1656
+msgid "Delete request failed: %d %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:723
 msgid "Delete this network"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:519
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:963
 msgid "Delivery Traffic Indication Message Interval"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:102
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:108
 msgid "Description"
 msgstr "Keterangan"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:224
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1754
+msgid "Deselect"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:215
 msgid "Design"
 msgstr "Disain"
 
@@ -1398,10 +1412,12 @@ msgstr ""
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:177
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:43
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:13
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:38
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:73
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:33
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:52
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:85
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:86
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:72
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:154
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:253
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:86
@@ -1409,15 +1425,24 @@ msgstr ""
 msgid "Device"
 msgstr "Alat"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:138
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:737
 msgid "Device Configuration"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:81
+msgid "Device is not active"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/reboot.htm:23
 msgid "Device is rebooting..."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1889
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:167
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:513
+msgid "Device is restarting…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2430
 msgid "Device unreachable!"
 msgstr ""
 
@@ -1425,97 +1450,92 @@ msgstr ""
 msgid "Device unreachable! Still waiting for device..."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:123
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:78
 #: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:61
 msgid "Diagnostics"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:45
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:60
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:101
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:93
 msgid "Dial number"
 msgstr ""
 
-#: modules/luci-base/luasrc/view/cbi/filebrowser.htm:99
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1554
 msgid "Directory"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:131
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:715
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:754
 msgid "Disable"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:472
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:531
 msgid ""
 "Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for "
 "this interface."
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:64
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:93
 msgid "Disable Encryption"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:530
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:973
 msgid "Disable Inactivity Polling"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:713
 msgid "Disable this network"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:44
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:54
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:68
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:37
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:43
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:37
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1534
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:76
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:107
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:99
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:51
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:95
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:82
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:69
 msgid "Disabled"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1139
-msgid "Disabled (default)"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:544
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:987
 msgid "Disassociate On Low Acknowledgement"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:193
 msgid "Discard upstream RFC1918 responses"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:92
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:114
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:956
 msgid "Disconnect"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:22
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:64
 msgid "Disconnection attempt failed"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1121
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1762
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1855
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:17
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1375
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1995
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2314
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2401
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1634
 msgid "Dismiss"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:240
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:334
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:770
 msgid "Distance Optimization"
 msgstr "Jarak Optimasi"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:241
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:770
 msgid "Distance to farthest network member in meters."
 msgstr "Jarak ke rangkaian terjauh ahli dalam meter."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:347
-msgid "Diversity"
-msgstr "Keanekaragaman"
-
 # 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:61
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
@@ -1527,35 +1547,43 @@ msgstr ""
 "Forwarder untuk <abbr title=\"Network Address Translation\">NAT</abbr> "
 "firewall"
 
-#: 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:159
 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:123
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:124
 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:118
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
 msgid "Do not forward reverse lookups for local networks"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:173
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1639
+msgid "Do you really want to delete \"%s\" ?"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:188
 msgid "Do you really want to delete the following SSH key?"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1637
+msgid "Do you really want to recursively delete the directory \"%s\" ?"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:74
 msgid "Domain required"
 msgstr "Domain diperlukan"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:205
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:206
 msgid "Domain whitelist"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:34
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:67
 msgid "Don't Fragment"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:74
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:75
 msgid ""
 "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
 "<abbr title=\"Domain Name System\">DNS</abbr>-Name"
@@ -1573,58 +1601,59 @@ msgstr ""
 msgid "Download mtdblock"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:853
 msgid "Downstream SNR offset"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:914
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1169
 msgid "Drag to reorder"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:9
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:11
 msgid "Dropbear Instance"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:6
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 msgid ""
 "Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access "
 "and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
 msgstr ""
 "Dropbear menawarkan SSH kulit rangkaian aksesdan pelayan yang terintegrasi."
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:11
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:14
 msgid "Dual-Stack Lite (RFC6333)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:493
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:547
 msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 msgstr "Dinamik DHCP"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:60
 msgid "Dynamic tunnel"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:494
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:547
 msgid ""
 "Dynamically allocate DHCP addresses for clients. If disabled, only clients "
 "having static leases will be served."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:67
 msgid "EA-bits length"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:990
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1386
 msgid "EAP-Method"
 msgstr "EAP-Kaedah"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:934
-#: modules/luci-base/htdocs/luci-static/resources/form.js:935
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1199
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1188
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1191
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1450
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:154
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:160
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:38
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:291
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:720
 msgid "Edit"
 msgstr "Sunting"
 
@@ -1634,90 +1663,91 @@ msgid ""
 "reload the page."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:38
-msgid "Edit this interface"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:718
+msgid "Edit this network"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:42
-msgid "Edit this network"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:669
+msgid "Edit wireless network"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:176
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:167
 msgid "Emergency"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:127
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:715
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:754
 msgid "Enable"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:414
 msgid ""
 "Enable <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> "
 "snooping"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:271
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:412
 msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 msgstr "Mengaktifkan <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:41
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:60
 msgid "Enable HE.net dynamic endpoint update"
 msgstr ""
 
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:51
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:89
 msgid "Enable IPv6 negotiation"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:23
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:35
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:41
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:35
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:37
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:49
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:80
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:54
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:67
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:93
 msgid "Enable IPv6 negotiation on the PPP link"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:143
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:188
 msgid "Enable Jumbo Frame passthrough"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:244
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:235
 msgid "Enable NTP client"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:69
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:96
 msgid "Enable Single DES"
 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:267
 msgid "Enable TFTP server"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:134
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:180
 msgid "Enable VLAN functionality"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1595
 msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1175
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
 msgid "Enable key reinstallation (KRACK) countermeasures"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:138
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:183
 msgid "Enable learning and aging"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:194
 msgid "Enable mirroring of incoming packets"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:151
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:195
 msgid "Enable mirroring of outgoing packets"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:34
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:67
 msgid "Enable the DF (Don't Fragment) flag of the encapsulating packets."
 msgstr ""
 
@@ -1725,7 +1755,7 @@ msgstr ""
 msgid "Enable this mount"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:713
 msgid "Enable this network"
 msgstr ""
 
@@ -1733,48 +1763,52 @@ msgstr ""
 msgid "Enable this swap"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:37
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:88
 msgid "Enable/Disable"
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:76
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:152
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:251
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:41
 msgid "Enabled"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:277
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:414
 msgid "Enables IGMP snooping on this bridge"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:892
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1310
 msgid ""
 "Enables fast roaming among access points that belong to the same Mobility "
 "Domain"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:272
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:412
 msgid "Enables the Spanning Tree Protocol on this bridge"
 msgstr "Aktifkan spanning Tree Protokol di jambatan ini"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:120
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:180
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:59
+msgid "Encapsulation limit"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:843
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:901
 msgid "Encapsulation mode"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:76
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:603
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:129
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:992
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1621
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:177
 msgid "Encryption"
 msgstr "Enkripsi"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:155
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:128
 msgid "Endpoint Host"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:165
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:132
 msgid "Endpoint Port"
 msgstr ""
 
@@ -1786,16 +1820,21 @@ msgstr ""
 msgid "Enter custom values"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:273
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:271
 msgid "Erasing..."
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:95
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:96
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:97
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:98
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:99
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:106
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:107
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:108
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:109
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:110
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:173
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:164
 msgid "Error"
 msgstr "Kesalahan"
 
@@ -1803,24 +1842,28 @@ msgstr "Kesalahan"
 msgid "Errored seconds (ES)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1646
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1852
 #: modules/luci-base/luasrc/model/network.lua:1432
 msgid "Ethernet Adapter"
 msgstr "Ethernet Adapter"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1637
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1843
 #: modules/luci-base/luasrc/model/network.lua:1422
 msgid "Ethernet Switch"
 msgstr "Ethernet Beralih"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:303
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
 msgid "Exclude interfaces"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:153
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
 msgid "Expand hosts"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:195
+msgid "Expecting an hexadecimal assignment hint"
+msgstr ""
+
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:59
 msgid "Expecting: %s"
 msgstr ""
@@ -1829,60 +1872,76 @@ msgstr ""
 msgid "Expires"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:488
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:543
 msgid ""
 "Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:8
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:19
 msgid "External"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:971
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1377
 msgid "External R0 Key Holder List"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:980
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1381
 msgid "External R1 Key Holder List"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:150
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:141
 msgid "External system log server"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:155
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:146
 msgid "External system log server port"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:160
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:151
 msgid "External system log server protocol"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:18
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:79
 msgid "Extra SSH command options"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:940
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1351
 msgid "FT over DS"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:941
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1352
 msgid "FT over the Air"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:938
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1349
 msgid "FT protocol"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1842
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:82
+msgid "Failed to change the system password."
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2389
 msgid "Failed to confirm apply within %ds, waiting for rollback…"
 msgstr ""
 
-#: modules/luci-base/luasrc/view/cbi/filebrowser.htm:106
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:45
+msgid "Failed to execute \"/etc/init.d/%s %s\" action: %s"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1561
 msgid "File"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:279
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1514
+msgid "File not accessible"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1698
+msgid "Filename"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:280
 msgid "Filename of the boot image advertised to clients"
 msgstr ""
 
@@ -1892,14 +1951,15 @@ msgstr ""
 msgid "Filesystem"
 msgstr "Fail Sistem"
 
-#: 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:118
 msgid "Filter private"
 msgstr "Penapis swasta"
 
-#: 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:123
 msgid "Filter useless"
 msgstr "Penapis tak berguna"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:23
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:65
 msgid "Finalizing failed"
 msgstr ""
@@ -1910,7 +1970,7 @@ msgid ""
 "with defaults based on what was detected"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:696
 msgid "Find and join network"
 msgstr ""
 
@@ -1922,11 +1982,11 @@ msgstr "Selesai"
 msgid "Firewall"
 msgstr "Firewall"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:77
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:76
 msgid "Firewall Mark"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:193
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:278
 msgid "Firewall Settings"
 msgstr "Tetapan Firewall"
 
@@ -1934,7 +1994,7 @@ msgstr "Tetapan Firewall"
 msgid "Firewall Status"
 msgstr "Status Firewall"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:137
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:860
 msgid "Firmware File"
 msgstr ""
 
@@ -1942,7 +2002,7 @@ msgstr ""
 msgid "Firmware Version"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:225
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:226
 msgid "Fixed source port for outbound DNS queries"
 msgstr ""
 
@@ -1962,35 +2022,35 @@ msgstr ""
 msgid "Flash operations"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:194
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:192
 msgid "Flashing..."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:498
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:550
 msgid "Force"
 msgstr "Paksa"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:258
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:782
 msgid "Force 40MHz mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:622
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1031
 msgid "Force CCMP (AES)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:499
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:550
 msgid "Force DHCP on this network even if another server is detected."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:623
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1032
 msgid "Force TKIP"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:624
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1033
 msgid "Force TKIP and CCMP (AES)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:795
 msgid "Force link"
 msgstr ""
 
@@ -1998,7 +2058,7 @@ msgstr ""
 msgid "Force upgrade"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:60
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:90
 msgid "Force use of NAT-T"
 msgstr ""
 
@@ -2006,7 +2066,7 @@ msgstr ""
 msgid "Form token mismatch"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:34
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:164
 msgid "Forward DHCP traffic"
 msgstr ""
 
@@ -2014,46 +2074,41 @@ msgstr ""
 msgid "Forward Error Correction Seconds (FECS)"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:28
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:161
 msgid "Forward broadcast traffic"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:375
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:809
 msgid "Forward mesh peer traffic"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:186
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:908
 msgid "Forwarding mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:255
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:596
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:774
 msgid "Fragmentation Threshold"
 msgstr "Fragmentasi Ambang"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:332
-msgid "Frame Bursting"
-msgstr "Bingkai Meletup"
-
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:17
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:28
 msgid "Free"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:91
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:89
 msgid ""
-"Further information about WireGuard interfaces and peers at <a href=\"http://"
-"wireguard.com\">wireguard.com</a>."
+"Further information about WireGuard interfaces and peers at <a href='http://"
+"wireguard.com'>wireguard.com</a>."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:45
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:130
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:186
 msgid "GHz"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:29
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:36
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:91
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:77
 msgid "GPRS only"
 msgstr ""
 
@@ -2062,28 +2117,28 @@ msgstr ""
 msgid "Gateway"
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:35
+msgid "Gateway Ports"
+msgstr ""
+
 #: modules/luci-base/htdocs/luci-static/resources/network.js:9
 #: modules/luci-base/luasrc/model/network.lua:29
 msgid "Gateway address is invalid"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:46
-msgid "Gateway ports"
-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:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:275
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:23
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:112
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:103
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:49
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:33
 msgid "General Settings"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:188
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:462
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:175
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:141
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:361
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:504
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:895
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:741
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:796
 msgid "General Setup"
 msgstr "Setup Umum"
 
@@ -2091,7 +2146,7 @@ msgstr "Setup Umum"
 msgid "Generate Config"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:945
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1355
 msgid "Generate PMK locally"
 msgstr ""
 
@@ -2099,11 +2154,7 @@ msgstr ""
 msgid "Generate archive"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:63
-msgid "Generic 802.11%s Wireless Controller"
-msgstr ""
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:26
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:74
 msgid "Given password confirmation did not match, password not changed!"
 msgstr ""
 
@@ -2111,7 +2162,7 @@ msgstr ""
 msgid "Global Settings"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:806
 msgid "Global network options"
 msgstr ""
 
@@ -2122,33 +2173,29 @@ msgstr ""
 msgid "Go to password configuration..."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:857
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1369
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1112
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1616
 #: modules/luci-base/luasrc/view/cbi/full_valueheader.htm:4
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:58
 msgid "Go to relevant configuration page"
 msgstr "Menuju ke halaman konfigurasi yang relevan"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:38
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:66
 msgid "Group Password"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:11
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:22
 msgid "Guest"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:73
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:81
 msgid "HE.net password"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:60
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:73
 msgid "HE.net username"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:310
-msgid "HT mode (802.11n)"
-msgstr ""
-
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:16
 msgid "Hang Up"
 msgstr "Menutup"
@@ -2157,7 +2204,7 @@ msgstr "Menutup"
 msgid "Header Error Code Errors (HEC)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:103
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 msgid ""
 "Here you can configure the basic aspects of your device like its hostname or "
 "the timezone."
@@ -2165,9 +2212,7 @@ msgstr ""
 "Di sini anda boleh mengkonfigurasi aspek asas peranti anda seperti nama host "
 "atau zon."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:499
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:556
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:579
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:941
 msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "Menyembunyikan ESSID"
 
@@ -2178,14 +2223,15 @@ msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:92
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1959
 msgid "Host"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:20
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:21
 msgid "Host entries"
 msgstr "Entri host"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:48
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:171
 msgid "Host expiry timeout"
 msgstr ""
 
@@ -2193,45 +2239,45 @@ msgstr ""
 msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
 msgstr "IP host atau rangkaian"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:118
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:102
 msgid "Host-Uniq tag content"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:71
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:31
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:316
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:25
+#: 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:317
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:26
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:17
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:125
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:116
 msgid "Hostname"
 msgstr "Nama Host"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:12
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:22
 msgid "Hostname to send when requesting DHCP"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:18
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:19
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:67
 msgid "Hostnames"
 msgstr "Nama Host"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:13
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:24
 msgid "Hybrid"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:45
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:75
 msgid "IKE DH Group"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:41
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:59
 msgid "IP Addresses"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:40
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:80
 msgid "IP Protocol"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:29
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:30
 msgid "IP address"
 msgstr "Alamat IP"
 
@@ -2250,6 +2296,11 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:20
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:21
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:22
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:79
+#: 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/network.js:89
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:90
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:91
@@ -2257,7 +2308,7 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:93
 #: 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/luasrc/model/cbi/admin_network/proto_ncm.lua:42
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:82
 msgid "IPv4"
 msgstr ""
 
@@ -2269,24 +2320,23 @@ msgstr ""
 msgid "IPv4 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:57
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:178
 msgid "IPv4 address"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:26
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:33
 msgid "IPv4 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:104
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:181
 msgid "IPv4 broadcast"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:100
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:180
 msgid "IPv4 gateway"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:92
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:179
 msgid "IPv4 netmask"
 msgstr ""
 
@@ -2294,24 +2344,25 @@ msgstr ""
 msgid "IPv4 network in address/netmask notation"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:25
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:52
 msgid "IPv4 prefix"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:42
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:30
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:55
 msgid "IPv4 prefix length"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:43
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:83
 msgid "IPv4+IPv6"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:72
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:34
 msgid "IPv4-Address"
 msgstr ""
 
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:10
 #: protocols/luci-proto-ipip/luasrc/model/network/proto_ipip.lua:9
 msgid "IPv4-in-IPv4 (RFC2003)"
 msgstr ""
@@ -2326,6 +2377,16 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:30
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:31
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:32
+#: 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/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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:89
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:90
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:91
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:92
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:95
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:96
@@ -2338,7 +2399,7 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:103
 #: 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/luasrc/model/cbi/admin_network/proto_ncm.lua:44
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:84
 msgid "IPv6"
 msgstr "Konfigurasi IPv6"
 
@@ -2350,11 +2411,11 @@ msgstr ""
 msgid "IPv6 Neighbours"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:464
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:506
 msgid "IPv6 Settings"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:195
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:810
 msgid "IPv6 ULA-Prefix"
 msgstr ""
 
@@ -2362,21 +2423,21 @@ msgstr ""
 msgid "IPv6 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:202
 msgid "IPv6 address"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:23
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:189
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:31
 msgid "IPv6 assignment hint"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:18
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:184
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:27
 msgid "IPv6 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:207
 msgid "IPv6 gateway"
 msgstr ""
 
@@ -2384,22 +2445,22 @@ msgstr ""
 msgid "IPv6 network in address/netmask notation"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:37
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:59
 msgid "IPv6 prefix"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:34
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:45
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:63
 msgid "IPv6 prefix length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:33
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:211
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:57
 msgid "IPv6 routed prefix"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:143
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:215
 msgid "IPv6 suffix"
 msgstr ""
 
@@ -2409,31 +2470,35 @@ msgid "IPv6-Address"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:93
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:104
 msgid "IPv6-PD"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:10
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:13
 msgid "IPv6-in-IPv4 (RFC4213)"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:17
 msgid "IPv6-over-IPv4 (6rd)"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:15
 msgid "IPv6-over-IPv4 (6to4)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1075
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1478
 msgid "Identity"
 msgstr "Identiti"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:70
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:96
 msgid "If checked, 1DES is enabled"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:65
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:93
 msgid "If checked, encryption is disabled"
 msgstr ""
 
@@ -2450,36 +2515,36 @@ msgid ""
 "device node"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:27
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:71
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:18
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:82
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:52
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:17
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:29
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:33
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:68
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:85
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:32
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:45
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:45
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:24
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:44
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:116
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:48
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:85
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:65
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:33
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:80
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:108
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:146
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:74
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:97
 msgid "If unchecked, no default route is configured"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:34
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:86
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:35
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:99
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:47
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:60
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:60
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:39
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:59
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:124
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:39
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:116
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:59
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:103
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:64
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:77
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:100
 msgid "If unchecked, the advertised DNS server addresses are ignored"
 msgstr ""
 
@@ -2497,15 +2562,15 @@ 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:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:102
 msgid "Ignore <code>/etc/hosts</code>"
 msgstr "Mengabaikan /etc/hosts"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:471
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:531
 msgid "Ignore interface"
 msgstr "Abaikan antara muka"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:90
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:91
 msgid "Ignore resolve file"
 msgstr "Abaikan fail yang selesai"
 
@@ -2523,12 +2588,12 @@ msgid ""
 "blocked. Click \"Continue »\" below to return to the previous page."
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:145
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:118
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:124
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:126
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:97
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:118
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:157
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:141
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:115
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:138
 msgid "Inactivity timeout"
 msgstr ""
 
@@ -2536,23 +2601,25 @@ msgstr ""
 msgid "Inbound:"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:170
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:161
 msgid "Info"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:105
 msgid "Information"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:25
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:67
 msgid "Initialization failure"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:34
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:87
 msgid "Initscript"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:26
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:122
 msgid "Initscripts"
 msgstr ""
 
@@ -2560,55 +2627,74 @@ msgstr ""
 msgid "Install iputils-traceroute6 for IPv6 traceroute"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:223
-msgid "Install package %q"
-msgstr ""
-
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:220
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:120
 msgid "Install protocol extensions..."
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:416
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:423
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:683
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:687
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:26
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:284
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:342
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:47
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:134
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:14
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:16
 msgid "Interface"
 msgstr "Interface"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:58
 msgid "Interface %q device auto-migrated from %q to %q."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:356
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:792
 msgid "Interface Configuration"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:51
-msgid "Interface Overview"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:99
+msgid "Interface has %d pending changes"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:57
+msgid "Interface is marked for deletion"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:162
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:3
 msgid "Interface is reconnecting..."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:162
+msgid "Interface is shutting down..."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:205
+msgid "Interface is starting..."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:208
+msgid "Interface is stopping..."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:954
 msgid "Interface name"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:34
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:224
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:131
 msgid "Interface not present or not connected yet."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:88
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:16
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:11
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:287
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:54
 msgid "Interfaces"
 msgstr "Interface"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:9
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:20
 msgid "Internal"
 msgstr ""
 
@@ -2621,19 +2707,35 @@ msgstr ""
 msgid "Invalid"
 msgstr "Tak Sah"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:311
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:10
+msgid "Invalid Base64 key string"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:281
 msgid "Invalid VLAN ID given! Only IDs between %d and %d are allowed."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:307
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:290
 msgid "Invalid VLAN ID given! Only unique IDs are allowed"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:195
+msgid "Invalid argument"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:194
+msgid "Invalid command"
+msgstr ""
+
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:80
+msgid "Invalid hexadecimal value"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/sysauth.htm:12
 msgid "Invalid username and/or password! Please try again."
 msgstr "Username dan / atau password tak sah! Sila cuba lagi."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:508
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:950
 msgid "Isolate Clients"
 msgstr ""
 
@@ -2653,16 +2755,16 @@ msgstr ""
 msgid "JavaScript required!"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:52
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1691
 #, fuzzy
 msgid "Join Network"
 msgstr "Gabung Rangkaian"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:22
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1628
 msgid "Join Network: Wireless Scan"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:19
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1833
 msgid "Joining Network: %q"
 msgstr ""
 
@@ -2679,15 +2781,15 @@ msgstr "Log Kernel"
 msgid "Kernel Version"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:823
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1248
 msgid "Key"
 msgstr "Kunci"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:851
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:852
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:853
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:854
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:870
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1277
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1278
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1279
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1291
 msgid "Key #%d"
 msgstr ""
 
@@ -2695,33 +2797,34 @@ msgstr ""
 msgid "Kill"
 msgstr "Tamatkan"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:10
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:21
 msgid "L2TP"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:10
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:40
 msgid "L2TP Server"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:100
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:74
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:80
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:74
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:53
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:73
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:131
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:102
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:89
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:112
 msgid "LCP echo failure threshold"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:118
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:89
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:95
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:89
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:68
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:91
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:144
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:102
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:125
 msgid "LCP echo interval"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:181
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:902
 msgid "LLC"
 msgstr ""
 
@@ -2730,11 +2833,11 @@ msgstr ""
 msgid "Label"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:213
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:204
 msgid "Language"
 msgstr "Bahasa"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:115
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:106
 msgid "Language and Style"
 msgstr ""
 
@@ -2742,51 +2845,51 @@ msgstr ""
 msgid "Latency"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:10
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:21
 msgid "Leaf"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:369
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:487
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:393
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:543
 msgid "Lease time"
 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:87
 msgid "Leasefile"
 msgstr "Sewa fail"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:74
 #: modules/luci-base/luasrc/view/lease_status.htm:95
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:34
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
 msgid "Leasetime remaining"
 msgstr "Sisa masa penyewaan"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:9
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:20
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:27
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:50
 msgid "Leave empty to autodetect"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:21
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:45
 msgid "Leave empty to use the current WAN address"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1746
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2299
 msgid "Legend:"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:481
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:538
 msgid "Limit"
 msgstr "Batas"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:287
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:288
 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:299
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:300
 msgid "Limit listening to these interfaces, and loopback."
 msgstr ""
 
@@ -2806,17 +2909,17 @@ msgstr ""
 msgid "Line Uptime"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:101
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:88
 msgid "Link On"
 msgstr "Link Pada"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:185
 msgid ""
 "List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
 "requests to"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:972
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1377
 msgid ""
 "List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-"
 "Identifier,128-bit key as hex string. <br />This list is used to map R0KH-ID "
@@ -2825,7 +2928,7 @@ msgid ""
 "Association."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:981
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1381
 msgid ""
 "List of R1KHs in the same Mobility Domain. <br />Format: MAC-address,R1KH-ID "
 "as 6 octets with colons,128-bit key as hex string. <br />This list is used "
@@ -2834,31 +2937,31 @@ msgid ""
 "PMK-R1 keys."
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:21
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:82
 msgid "List of SSH key files for auth"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:206
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:207
 msgid "List of domains to allow RFC1918 responses for"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:174
 msgid "List of hosts that supply bogus NX domain results"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:298
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:299
 msgid "Listen Interfaces"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:30
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:54
 msgid "Listen Port"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:15
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:16
 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:216
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:217
 msgid "Listening port for inbound DNS queries"
 msgstr ""
 
@@ -2877,11 +2980,11 @@ msgstr ""
 msgid "Loading"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:35
-msgid "Loading SSH keys…"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1819
+msgid "Loading directory contents…"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1204
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1296
 #: modules/luci-base/luasrc/view/view.htm:4
 msgid "Loading view…"
 msgstr ""
@@ -2891,77 +2994,73 @@ msgstr ""
 msgid "Local IP address is invalid"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:25
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:86
 msgid "Local IP address to assign"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:10
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:11
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:44
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:39
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:151
 msgid "Local IPv4 address"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:20
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:54
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:45
 msgid "Local IPv6 address"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:286
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:287
 msgid "Local Service Only"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:81
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:126
 msgid "Local Startup"
 msgstr ""
 
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:25
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:121
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:112
 msgid "Local Time"
 msgstr "Masa Tempatan"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:149
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
 msgid "Local domain"
 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:147
 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:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:151
 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:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
 msgid "Local server"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:129
 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:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:128
 msgid "Localise queries"
 msgstr "Soalan tempatan"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:175
-msgid "Locked to channel %s used by: %s"
-msgstr ""
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:168
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:159
 msgid "Log output level"
 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:181
 msgid "Log queries"
 msgstr "Log soalan"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:113
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:104
 msgid "Logging"
 msgstr ""
 
@@ -2969,7 +3068,7 @@ msgstr ""
 msgid "Login"
 msgstr "Login"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:95
+#: modules/luci-base/luasrc/controller/admin/index.lua:103
 msgid "Logout"
 msgstr "Logout"
 
@@ -2977,11 +3076,13 @@ msgstr "Logout"
 msgid "Loss of Signal Seconds (LOSS)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:476
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:533
 msgid "Lowest leased address as offset from the network address."
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:40
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:75
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:35
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:86
 msgid "MAC"
@@ -2989,32 +3090,32 @@ msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:73
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:109
-#: 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:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1958
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:86
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:133
 msgid "MAC-Address"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:457
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:586
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:886
 msgid "MAC-Address Filter"
 msgstr "Penapis alamat MAC"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:142
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:363
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:798
 msgid "MAC-Filter"
 msgstr "Penapis MAC"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:464
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:590
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:893
 msgid "MAC-List"
 msgstr "Senarai MAC"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:13
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:16
 msgid "MAP / LW4over6"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:62
 msgid "MAP rule is invalid"
 msgstr ""
@@ -3032,8 +3133,8 @@ msgid "MHz"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:53
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:29
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:66
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:53
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:71
 msgid "MTU"
 msgstr ""
 
@@ -3043,16 +3144,17 @@ msgid ""
 "below:"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:55
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:69
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:26
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:38
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:38
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:108
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:52
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:96
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:83
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:57
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:70
 msgid "Manual"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1949
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2188
 msgid "Master"
 msgstr ""
 
@@ -3060,48 +3162,46 @@ msgstr ""
 msgid "Max. Attainable Data Rate (ATTNDR)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:539
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:982
 msgid "Maximum allowed Listen Interval"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:234
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
 msgid "Maximum allowed number of active DHCP leases"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:252
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:253
 msgid "Maximum allowed number of concurrent DNS queries"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:244
 msgid "Maximum allowed size of EDNS.0 UDP packets"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:63
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:77
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:57
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:112
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:104
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:93
 msgid "Maximum amount of seconds to wait for the modem to become ready"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:27
-msgid ""
-"Maximum length of the name is 15 characters including the automatic protocol/"
-"bridge prefix (br-, 6in4-, pppoe- etc.)"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:538
+msgid "Maximum number of leased addresses."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:482
-msgid "Maximum number of leased addresses."
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:761
+msgid "Maximum transmit power"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:21
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:49
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:134
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:187
 #: modules/luci-mod-status/luasrc/view/admin_status/bandwidth.htm:79
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:284
 msgid "Mbit/s"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:18
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:32
 msgid "Medium"
 msgstr ""
 
@@ -3113,42 +3213,43 @@ msgstr "Memori"
 msgid "Memory usage (%)"
 msgstr "Penggunaan Memori (%)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1952
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2191
 msgid "Mesh"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:372
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:806
 msgid "Mesh Id"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:196
+msgid "Method not found"
+msgstr ""
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:45
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:76
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:104
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:54
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:66
 msgid "Metric"
 msgstr "Metrik"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:154
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:198
 msgid "Mirror monitor port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:153
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:197
 msgid "Mirror source port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:408
-msgid "Missing protocol extension for proto %q"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:923
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1337
 msgid "Mobility Domain"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:154
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:41
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:74
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:366
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:31
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:360
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:801
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1619
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:175
 msgid "Mode"
 msgstr "Mode"
@@ -3157,39 +3258,38 @@ msgstr "Mode"
 msgid "Model"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:31
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:72
 msgid "Modem default"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:11
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:19
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:11
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:10
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:73
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:73
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:57
 msgid "Modem device"
 msgstr "Alat modem"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:24
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:66
 msgid "Modem information query failed"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:62
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:76
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:56
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:112
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:104
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:93
 msgid "Modem init timeout"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1953
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:452
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:554
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:577
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2192
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:880
 msgid "Monitor"
 msgstr "Monitor"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:14
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
 msgid "More Characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:802
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1057
 msgid "More…"
 msgstr ""
 
@@ -3202,7 +3302,7 @@ msgstr ""
 msgid "Mount Point"
 msgstr "Mount Point"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:26
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:36
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:137
 msgid "Mount Points"
@@ -3252,46 +3352,44 @@ msgstr ""
 msgid "Move up"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:912
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
 msgid "NAS ID"
 msgstr "NAS ID"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:57
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:87
 msgid "NAT-T Mode"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:9
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 msgid "NAT64 Prefix"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:31
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:26
 msgid "NCM"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:535
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:589
 msgid "NDP-Proxy"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:43
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:72
 msgid "NT Domain"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:273
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:264
 msgid "NTP server candidates"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:837
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1092
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:27
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:502
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:65
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:553
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:658
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:49
 msgid "Name"
 msgstr "Nama"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:17
-msgid "Name of the new interface"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1808
 msgid "Name of the new network"
 msgstr "Nama rangkaian baru"
 
@@ -3299,9 +3397,10 @@ msgstr "Nama rangkaian baru"
 msgid "Navigation"
 msgstr "Navigation"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:62
+#: modules/luci-base/luasrc/controller/admin/index.lua:69
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:108
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:402
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:834
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1957
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:389
 #: modules/luci-mod-status/luasrc/view/admin_status/index/30-network.htm:8
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:73
@@ -3313,7 +3412,7 @@ msgstr "Rangkaian"
 msgid "Network Utilities"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:278
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:279
 msgid "Network boot image"
 msgstr ""
 
@@ -3326,53 +3425,59 @@ msgstr ""
 msgid "Network without interfaces."
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:661
+msgid "New interface name…"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:11
 msgid "Next »"
 msgstr "Kemudian »"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1507
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1754
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:108
 msgid "No"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:453
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:514
 msgid "No DHCP Server configured for this interface"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1162
+msgid "No Encryption"
+msgstr ""
+
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:89
 msgid "No NAT-T"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:198
+msgid "No data received"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1764
+msgid "No entries in this directory"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/backupfiles.lua:82
 msgid "No files found"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:550
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:191
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:180
 msgid "No information available"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:8
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:63
 msgid "No matching prefix delegation"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:157
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
 msgid "No negative cache"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:53
-msgid "No network configured on this device"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:65
-msgid "No network name specified"
-msgstr ""
-
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:147
-msgid "No networks in range"
-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
@@ -3380,7 +3485,12 @@ msgstr ""
 msgid "No password set!"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:116
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:104
+msgid "No peers defined yet"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:129
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:271
 msgid "No public keys present yet."
 msgstr ""
 
@@ -3388,19 +3498,19 @@ msgstr ""
 msgid "No rules in this chain."
 msgstr "Tidak ada peraturan dalam rantai ini"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:150
-msgid "No scan results available yet..."
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:53
+msgid "No signal"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:7
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:756
 msgid "No zone assigned"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:111
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:35
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:48
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:133
 msgid "Noise"
 msgstr "Kebisingan"
 
@@ -3416,16 +3526,16 @@ msgstr ""
 msgid "Non Pre-emtive CRC errors (CRC_P)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:292
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:293
 msgid "Non-wildcard"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:129
 msgid "None"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:181
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:172
 msgid "Normal"
 msgstr ""
 
@@ -3433,25 +3543,29 @@ msgstr ""
 msgid "Not Found"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:27
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:5
-msgid "Not associated"
-msgstr ""
-
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:87
 msgid "Not connected"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:38
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:139
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:232
+msgid "Not present"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:105
 msgid "Not started on boot"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:26
-msgid "Note: interface name length"
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:201
+msgid "Not supported"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:171
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:162
 msgid "Notice"
 msgstr ""
 
@@ -3459,62 +3573,50 @@ msgstr ""
 msgid "Nslookup"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:261
 msgid "Number of cached DNS entries (max is 10000, 0 is no caching)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:203
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:194
 msgid "Number of parallel threads used for compression"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:40
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:69
 msgid "Obfuscated Group Password"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:35
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:61
 msgid "Obfuscated Password"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:22
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:34
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:40
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:105
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:97
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:49
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:80
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:54
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:67
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:93
 msgid "Obtain IPv6-Address"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:83
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:68
 msgid "Off-State Delay"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:16
-msgid ""
-"On this page you can configure the network interfaces. You can bridge "
-"several interfaces by ticking the \"bridge interfaces\" field and enter the "
-"names of several network interfaces separated by spaces. You can also use "
-"<abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
-"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
-"<samp>eth0.1</samp>)."
-msgstr ""
-"Pada halaman ini anda boleh mengkonfigurasi antara muka rangkaian. Anda "
-"boleh menjembatani beberapa antara muka dengan menanda jambatan antara muka "
-"gelanggang dan masukkan beberapa nama antara muka rangkaian dipisahkan "
-"dengan ruang. Anda juga boleh menggunakan antara muka VLAN notasi. Seperti "
-"eth0.1."
-
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:95
 msgid "On-Link route"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:80
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:64
 msgid "On-State Delay"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:360
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:382
 msgid "One of hostname or mac address must be specified!"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:456
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:462
 msgid "One of the following: %s"
 msgstr ""
 
@@ -3536,34 +3638,35 @@ msgstr ""
 msgid "Open list..."
 msgstr ""
 
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:61
 #: protocols/luci-proto-openconnect/luasrc/model/network/proto_openconnect.lua:9
 msgid "OpenConnect (CISCO AnyConnect)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:757
 msgid "Operating frequency"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1753
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2306
 msgid "Option changed"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1755
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2308
 msgid "Option removed"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1140
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:55
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1535
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:66
 msgid "Optional"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:78
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:76
 msgid ""
 "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, "
 "starting with <code>0x</code>."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:144
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:215
 msgid ""
 "Optional. Allowed values: 'eui64', 'random', fixed value like '::1' or "
 "'::1:2'. When IPv6 prefix (like 'a:b:c:d::') is received from a delegating "
@@ -3571,41 +3674,41 @@ msgid ""
 "for the interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:123
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:117
 msgid ""
 "Optional. Base64-encoded preshared key. Adds in an additional layer of "
 "symmetric-key cryptography for post-quantum resistance."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:148
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:126
 msgid "Optional. Create routes for Allowed IPs for this peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:103
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:108
 msgid "Optional. Description of peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:156
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:128
 msgid ""
 "Optional. Host of peer. Names are resolved prior to bringing up the "
 "interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:67
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:71
 msgid "Optional. Maximum Transmission Unit of tunnel interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:166
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:132
 msgid "Optional. Port of peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:175
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:136
 msgid ""
 "Optional. Seconds between keep alive messages. Default is 0 (disabled). "
 "Recommended value if this device is behind a NAT is 25."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:31
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:54
 msgid "Optional. UDP port used for outgoing and incoming packets."
 msgstr ""
 
@@ -3626,7 +3729,7 @@ msgstr "Keluar"
 msgid "Outbound:"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:26
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:50
 msgid "Output Interface"
 msgstr ""
 
@@ -3635,51 +3738,51 @@ msgstr ""
 msgid "Output zone"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:63
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:155
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:33
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:54
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:54
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:219
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:50
 msgid "Override MAC address"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:66
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:35
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:56
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:88
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:125
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:131
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:133
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:104
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:61
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:58
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:223
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:44
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:54
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:154
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:71
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:145
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:132
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:110
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:119
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:97
 msgid "Override MTU"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:30
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:63
 msgid "Override TOS"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:25
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:58
 msgid "Override TTL"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:954
 msgid "Override default interface name"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:41
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:167
 msgid "Override the gateway in DHCP responses"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:507
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:555
 msgid ""
 "Override the netmask sent to clients. Normally it is calculated from the "
 "subnet that is served."
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:65
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:179
 msgid "Override the table used for internal routes"
 msgstr ""
 
@@ -3687,29 +3790,33 @@ msgstr ""
 msgid "Overview"
 msgstr "Keseluruhan"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1606
+msgid "Overwrite existing file \"%s\" ?"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:11
 msgid "Owner"
 msgstr "Pemilik"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:42
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:56
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:17
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:28
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:34
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:14
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:18
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:43
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:98
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:45
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:44
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:63
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:82
 msgid "PAP/CHAP password"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:39
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:53
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:14
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:11
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:15
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:96
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:88
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:43
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:74
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:42
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:61
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:77
 msgid "PAP/CHAP username"
 msgstr ""
 
@@ -3717,9 +3824,9 @@ msgstr ""
 msgid "PID"
 msgstr "PID"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:36
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:50
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:26
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:95
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:87
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:68
 msgid "PIN"
 msgstr ""
 
@@ -3728,114 +3835,116 @@ msgstr ""
 msgid "PIN code rejected"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:966
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1372
 msgid "PMK R1 Push"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:43
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:13
 msgid "PPP"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:11
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:58
 msgid "PPPoA Encapsulation"
 msgstr "Pengkapsulan PPPoA"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:19
 msgid "PPPoATM"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:17
 msgid "PPPoE"
 msgstr ""
 
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:28
 #: protocols/luci-proto-pppossh/luasrc/model/network/proto_pppossh.lua:9
 msgid "PPPoSSH"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:15
 msgid "PPtP"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:59
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:73
 msgid "PSID offset"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:56
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:70
 msgid "PSID-bits length"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:123
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:846
 msgid "PTM/EFM (Packet Transfer Mode)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:78
-msgid "Package libiwinfo required!"
-msgstr ""
-
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:45
 msgid "Packets"
 msgstr "Paket"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:7
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:756
 msgid "Part of zone %q"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/sysauth.htm:29
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1111
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:35
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:42
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1514
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:46
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:104
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:58
 msgid "Password"
 msgstr "Kata laluan"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:29
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:24
 msgid "Password authentication"
 msgstr "Kata laluan pengesahan"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1019
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1414
 msgid "Password of Private Key"
 msgstr "Kata Laluan Kunci Swasta"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1067
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1471
 msgid "Password of inner Private Key"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:14
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:16
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:18
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:20
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:32
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:34
 msgid "Password strength"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:44
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:107
 msgid "Password2"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:37
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:244
 msgid "Paste or drag SSH key file…"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1000
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1396
 msgid "Path to CA-Certificate"
 msgstr "Path ke CA-Sijil"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1007
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1402
 msgid "Path to Client-Certificate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1013
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1408
 msgid "Path to Private Key"
 msgstr "Path ke Kunci Swasta"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1049
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1453
 msgid "Path to inner CA-Certificate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1055
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1459
 msgid "Path to inner Client-Certificate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1061
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1465
 msgid "Path to inner Private Key"
 msgstr ""
 
@@ -3853,7 +3962,7 @@ msgstr ""
 msgid "Peak:"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:28
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:89
 msgid "Peer IP address to assign"
 msgstr ""
 
@@ -3862,11 +3971,11 @@ msgstr ""
 msgid "Peer address is missing"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:90
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:89
 msgid "Peers"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:50
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:80
 msgid "Perfect Forward Secrecy"
 msgstr ""
 
@@ -3878,7 +3987,11 @@ msgstr "Lakukan reboot"
 msgid "Perform reset"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:174
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:199
+msgid "Permission denied"
+msgstr ""
+
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:136
 msgid "Persistent Keep Alive"
 msgstr ""
 
@@ -3886,7 +3999,7 @@ msgstr ""
 msgid "Phy Rate:"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:190
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:277
 msgid "Physical Settings"
 msgstr "Tetapan Fizikal"
 
@@ -3897,6 +4010,10 @@ msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:16
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:17
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:41
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:77
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:87
@@ -3914,15 +4031,19 @@ msgstr "Sila masukkan username dan kata laluan anda."
 msgid "Policy"
 msgstr "Dasar"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:22
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:20
 msgid "Port"
 msgstr "Port"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:18
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:133
+msgid "Port %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:274
 msgid "Port status:"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:482
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:488
 msgid "Potential negation of: %s"
 msgstr ""
 
@@ -3934,11 +4055,11 @@ msgstr ""
 msgid "Pre-emtive CRC errors (CRCP_P)"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:32
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:73
 msgid "Prefer LTE"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:33
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:74
 msgid "Prefer UMTS"
 msgstr ""
 
@@ -3946,31 +4067,30 @@ msgstr ""
 msgid "Prefix Delegated"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:122
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:117
 msgid "Preshared Key"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:101
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:75
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:81
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:75
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:54
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:74
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:131
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:102
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:89
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:112
 msgid ""
 "Presume peer to be dead after given amount of LCP echo failures, use 0 to "
 "ignore failures"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:305
 msgid "Prevent listening on these interfaces."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:509
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:562
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:950
 msgid "Prevents client-to-client communication"
 msgstr "Mencegah komunikasi sesama Pelanggan"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:18
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:49
 msgid "Private Key"
 msgstr ""
 
@@ -3991,39 +4111,33 @@ msgstr ""
 msgid "Prot."
 msgstr "Prot."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:72
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:349
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:675
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:84
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:216
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:87
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:390
 msgid "Protocol"
 msgstr "Protokol"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:31
-msgid "Protocol of the new interface"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:222
-msgid "Protocol support is not installed"
-msgstr ""
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:269
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:260
 msgid "Provide NTP server"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:701
 msgid "Provide new network"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:451
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:879
 msgid "Pseudo Ad-Hoc (ahdemo)"
 msgstr "Pseudo Ad-Hoc (ahdemo)"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:112
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:113
 msgid "Public Key"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:278
 msgid ""
 "Public keys allow for the passwordless SSH logins with a higher security "
 "compared to the use of plain passwords. In order to upload a new key to the "
@@ -4031,48 +4145,49 @@ msgid ""
 "code> file into the input field."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:139
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:211
 msgid "Public prefix routed to this device for distribution to clients."
 msgstr ""
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:27
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:9
 msgid "QMI Cellular"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:173
 msgid "Quality"
 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:171
 msgid ""
 "Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> "
 "servers"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:952
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1360
 msgid "R0 Key Lifetime"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:959
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1366
 msgid "R1 Key Holder"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:58
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:88
 msgid "RFC3947 NAT-T mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:381
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:814
 msgid "RSSI threshold for joining"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:256
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:597
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:778
 msgid "RTS/CTS Threshold"
 msgstr "RTS/CTS-Ambang"
 
 # Ein / Aus, eingehend / ausgehend?
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:41
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:76
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:87
 msgid "RX"
@@ -4082,35 +4197,39 @@ msgstr "RX"
 msgid "RX Rate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:783
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1961
+msgid "RX Rate / TX Rate"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1207
 msgid "Radius-Accounting-Port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:791
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1215
 msgid "Radius-Accounting-Secret"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:775
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1199
 msgid "Radius-Accounting-Server"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:759
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1183
 msgid "Radius-Authentication-Port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:767
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1191
 msgid "Radius-Authentication-Secret"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:751
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1175
 msgid "Radius-Authentication-Server"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:119
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:102
 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:83
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:84
 msgid ""
 "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-Server"
@@ -4122,17 +4241,11 @@ msgid ""
 "access to this device if you are connected via this interface"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2
-msgid ""
-"Really delete this wireless network? The deletion cannot be undone! You "
-"might lose access to this device if you are connected via this network."
-msgstr ""
-
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:40
 msgid "Really reset all changes?"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:237
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:354
 msgid "Really switch protocol?"
 msgstr ""
 
@@ -4156,15 +4269,15 @@ msgstr ""
 msgid "Realtime Wireless"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:931
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1343
 msgid "Reassociation Deadline"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:191
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
 msgid "Rebind protection"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:48
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:46
 #: modules/luci-mod-system/luasrc/view/admin_system/reboot.htm:9
 msgid "Reboot"
 msgstr "Reboot"
@@ -4178,21 +4291,15 @@ msgstr ""
 msgid "Reboots the operating system of your device"
 msgstr "Reboot sistem operasi peranti anda"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:103
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:90
 msgid "Receive"
 msgstr "Menerima"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:325
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:350
-msgid "Receiver Antenna"
-msgstr "Antena Penerima"
-
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:42
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:59
 msgid "Recommended. IP addresses of the WireGuard interface."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:28
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:300
 msgid "Reconnect this interface"
 msgstr ""
 
@@ -4200,92 +4307,134 @@ msgstr ""
 msgid "References"
 msgstr "Rujukan"
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:39
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:153
 msgid "Relay"
 msgstr ""
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:36
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:157
 msgid "Relay Bridge"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:17
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:154
 msgid "Relay between networks"
 msgstr ""
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:64
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:12
 msgid "Relay bridge"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:18
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:50
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:49
 msgid "Remote IPv4 address"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:8
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:40
 msgid "Remote IPv4 address or FQDN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:45
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:725
 msgid "Remove"
 msgstr "Menghapuskan"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:53
-msgid "Repeat scan"
-msgstr "Ulangi scan"
-
-#: modules/luci-base/luasrc/view/cbi/upload.htm:11
-msgid "Replace entry"
-msgstr "Tukar entri"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:46
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:51
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1806
 msgid "Replace wireless configuration"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:8
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:17
 msgid "Request IPv6-address"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:16
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:23
 msgid "Request IPv6-prefix of length"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1141
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:200
+msgid "Request timeout"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1536
 msgid "Required"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:20
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:31
 msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:19
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:49
 msgid "Required. Base64-encoded private key for this interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:113
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:113
 msgid "Required. Base64-encoded public key of peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:136
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:122
 msgid ""
 "Required. IP addresses and prefixes that this peer is allowed to use inside "
 "the tunnel. Usually the peer's tunnel IP addresses and the networks the peer "
 "routes through the tunnel."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1134
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1095
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1096
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1097
+msgid "Requires hostapd"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1101
+msgid "Requires hostapd with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1102
+msgid "Requires hostapd with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1098
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1099
+msgid "Requires hostapd with SAE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1533
 msgid ""
 "Requires the 'full' version of wpad/hostapd and support from the wifi driver "
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:141
 msgid ""
 "Requires upstream supports DNSSEC; verify unsigned domain responses really "
 "come from unsigned domains"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1268
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1109
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1119
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1120
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1121
+msgid "Requires wpa-supplicant"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1113
+msgid "Requires wpa-supplicant with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1114
+msgid "Requires wpa-supplicant with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1111
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1124
+msgid "Requires wpa-supplicant with SAE support"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1355
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:17
 #: modules/luci-base/luasrc/view/cbi/footer.htm:30
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:66
@@ -4301,17 +4450,22 @@ msgstr "Reset Loket"
 msgid "Reset to defaults"
 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:68
 msgid "Resolv and Hosts Files"
 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:94
 msgid "Resolve file"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:28
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:14
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:71
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:197
+msgid "Resource not found"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:302
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:693
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:90
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:112
 msgid "Restart"
 msgstr ""
 
@@ -4319,7 +4473,7 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr "Restart Firewall"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:14
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:691
 msgid "Restart radio interface"
 msgstr ""
 
@@ -4331,26 +4485,24 @@ msgstr "Mengembalikan"
 msgid "Restore backup"
 msgstr "Kembalikan sandaran"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:113
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:114
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:38
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:46
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:119
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:120
 msgid "Reveal/hide password"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1774
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2322
 msgid "Revert"
 msgstr "Kembali"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1861
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2405
 msgid "Revert changes"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2013
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2554
 msgid "Revert request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1993
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2534
 msgid "Reverting configuration…"
 msgstr ""
 
@@ -4358,7 +4510,7 @@ msgstr ""
 msgid "Root"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:271
 msgid "Root directory for files served via TFTP"
 msgstr ""
 
@@ -4366,7 +4518,7 @@ msgstr ""
 msgid "Root preparation"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:147
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:126
 msgid "Route Allowed IPs"
 msgstr ""
 
@@ -4378,12 +4530,12 @@ msgstr ""
 msgid "Route type"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:523
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:577
 msgid "Router Advertisement-Service"
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:43
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:15
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:27
 msgid "Router Password"
 msgstr ""
 
@@ -4413,7 +4565,7 @@ msgstr ""
 msgid "Run filesystem check"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:651
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:669
 msgid "Runtime error"
 msgstr ""
 
@@ -4425,31 +4577,31 @@ msgstr ""
 msgid "SNR"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:5
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:18
 msgid "SSH Access"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:10
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:70
 msgid "SSH server address"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:13
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:74
 msgid "SSH server port"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:8
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:58
 msgid "SSH username"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:27
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:277
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
 msgid "SSH-Keys"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:42
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:73
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:29
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1617
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:174
 msgid "SSID"
 msgstr "SSID"
@@ -4458,17 +4610,17 @@ msgstr "SSID"
 msgid "SWAP"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1127
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1262
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1379
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1351
 #: modules/luci-base/luasrc/view/cbi/error.htm:17
 #: modules/luci-base/luasrc/view/cbi/footer.htm:26
 #: modules/luci-base/luasrc/view/cbi/header.htm:17
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:54
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:133
 msgid "Save"
 msgstr "Simpan"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1256
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1768
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1347
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2318
 #: modules/luci-base/luasrc/view/cbi/footer.htm:22
 msgid "Save & Apply"
 msgstr "Simpan & Melaksanakan"
@@ -4481,28 +4633,20 @@ msgstr ""
 msgid "Save mtdblock contents"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
-msgid "Saving keys…"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:698
 msgid "Scan"
 msgstr "Scan"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:109
-msgid "Scan request failed"
-msgstr ""
-
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:8
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:39
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:23
 msgid "Scheduled Tasks"
 msgstr "Tugas Jadual"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1749
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2302
 msgid "Section added"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1751
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2304
 msgid "Section removed"
 msgstr ""
 
@@ -4517,61 +4661,66 @@ msgid ""
 "your device!"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:119
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:90
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:96
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:90
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:69
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:92
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1516
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1646
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1809
+msgid "Select file…"
+msgstr ""
+
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:144
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:102
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:125
 msgid ""
 "Send LCP echo requests at the given interval in seconds, only effective in "
 "conjunction with failure threshold"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:561
-msgid "Separate Clients"
-msgstr "Pisahkan Pelanggan"
-
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:62
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:63
 msgid "Server Settings"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:26
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:50
 msgid "Service Name"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:25
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:30
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:87
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:71
 msgid "Service Type"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:55
+#: modules/luci-base/luasrc/controller/admin/index.lua:62
 msgid "Services"
 msgstr "Perkhidmatan"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:815
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:861
 msgid "Session expired"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:83
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:107
 msgid "Set VPN as Default Route"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:258
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:795
 msgid ""
 "Set interface properties regardless of the link carrier (If set, carrier "
 "sense events do not invoke hotplug handlers)."
 msgstr ""
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:23
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:55
 msgid "Setting PLMN failed"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:26
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:68
 msgid "Setting operation mode failed"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:454
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:517
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:527
 msgid "Setup DHCP Server"
 msgstr ""
 
@@ -4583,7 +4732,7 @@ msgstr ""
 msgid "Short GI"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:516
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:960
 msgid "Short Preamble"
 msgstr ""
 
@@ -4595,21 +4744,23 @@ msgstr ""
 msgid "Show empty chains"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:306
 msgid "Shutdown this interface"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:111
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:34
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:47
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:132
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1616
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:173
 msgid "Signal"
 msgstr "Isyarat"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1960
+msgid "Signal / Noise"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:125
 msgid "Signal Attenuation (SATN)"
 msgstr ""
@@ -4622,11 +4773,11 @@ msgstr ""
 msgid "Size"
 msgstr "Saiz"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:259
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:260
 msgid "Size of DNS query cache"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:191
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
 msgid "Size of the ZRam device in megabytes"
 msgstr ""
 
@@ -4643,11 +4794,7 @@ msgstr "Skip ke kadar"
 msgid "Skip to navigation"
 msgstr "Skip ke navigation"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:335
-msgid "Slot time"
-msgstr "Slot masa"
-
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1640
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1846
 #: modules/luci-base/luasrc/model/network.lua:1427
 msgid "Software VLAN"
 msgstr ""
@@ -4685,61 +4832,65 @@ msgstr ""
 msgid "Specifies the directory the device is attached to"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:23
-msgid "Specifies the listening port of this <em>Dropbear</em> instance"
-msgstr ""
-
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:57
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:175
 msgid ""
 "Specifies the maximum amount of failed ARP requests until hosts are presumed "
 "to be dead"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:49
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:171
 msgid ""
 "Specifies the maximum amount of seconds after which hosts are presumed to be "
 "dead"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:761
+msgid ""
+"Specifies the maximum transmit power the wireless radio may use. Depending "
+"on regulatory requirements and wireless usage, the actual transmit power may "
+"be reduced by the driver."
+msgstr ""
+
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:63
 msgid "Specify a TOS (Type of Service)."
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:25
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:58
 msgid ""
 "Specify a TTL (Time to Live) for the encapsulating packet other than the "
 "default (64)."
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:53
 msgid ""
 "Specify an MTU (Maximum Transmission Unit) other than the default (1280 "
 "bytes)."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:60
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "Specify the secret encryption key here."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:475
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:64
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:533
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:89
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:111
 msgid "Start"
 msgstr "Mula"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:33
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:86
 msgid "Start priority"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1958
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2499
 msgid "Starting configuration apply…"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1626
 msgid "Starting wireless scan..."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:24
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:120
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
 msgid "Startup"
 msgstr ""
 
@@ -4751,59 +4902,62 @@ msgstr "Laluan IPv4 Statik"
 msgid "Static IPv6 Routes"
 msgstr "Laluan IPv6 Statik"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:70
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:71
 msgid "Static Leases"
 msgstr "Statische Einträge"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:118
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:73
 msgid "Static Routes"
 msgstr "Laluan Statik"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1194
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1384
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:172
 #: modules/luci-base/luasrc/model/network.lua:966
 msgid "Static address"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:308
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:309
 msgid ""
 "Static leases are used to assign fixed IP addresses and symbolic hostnames "
 "to DHCP clients. They are also required for non-dynamic interface "
 "configurations where only hosts with a corresponding lease are served."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:534
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:977
 msgid "Station inactivity limit"
 msgstr ""
 
 #: modules/luci-base/luasrc/controller/admin/index.lua:40
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:197
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:337
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:746
 #: modules/luci-mod-status/luasrc/view/admin_status/index.htm:128
 msgid "Status"
 msgstr "Status"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:35
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:75
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:308
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:91
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:113
 msgid "Stop"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:165
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Strict order"
 msgstr "Order Ketat"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:16
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:30
 msgid "Strong"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1843
 msgid "Submit"
 msgstr "Menyerahkan"
 
-#: 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:108
 msgid "Suppress logging"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:109
 msgid "Suppress logging of the routine operation of these protocols"
 msgstr ""
 
@@ -4815,42 +4969,44 @@ msgstr ""
 msgid "Swap Entry"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:23
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:5
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:135
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:21
 msgid "Switch"
 msgstr "Beralih"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:129
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:168
 msgid "Switch %q"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:128
-msgid "Switch %q (%s)"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:66
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:146
 msgid ""
 "Switch %q has an unknown topology - the VLAN settings might not be accurate."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:146
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:142
 msgid "Switch Port Mask"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1640
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1846
 #: modules/luci-base/luasrc/model/network.lua:1425
 msgid "Switch VLAN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:238
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:355
 msgid "Switch protocol"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:103
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:104
 #: modules/luci-base/luasrc/view/cbi/ipaddr.htm:26
 msgid "Switch to CIDR list notation"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:77
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1547
+msgid "Symbolic link"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:71
 msgid "Sync with NTP-Server"
 msgstr ""
 
@@ -4860,7 +5016,7 @@ msgstr ""
 
 #: modules/luci-base/luasrc/controller/admin/index.lua:47
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:14
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:102
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:94
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
 #: modules/luci-mod-system/luasrc/view/admin_system/applyreboot.htm:39
 msgid "System"
@@ -4871,11 +5027,11 @@ msgstr "Sistem"
 msgid "System Log"
 msgstr "Log Sistem"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:108
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:99
 msgid "System Properties"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:145
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:136
 msgid "System log buffer size"
 msgstr ""
 
@@ -4883,16 +5039,18 @@ msgstr ""
 msgid "TCP:"
 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:69
 msgid "TFTP Settings"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:269
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
 msgid "TFTP server root"
 msgstr ""
 
 # same as RX
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:17
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:77
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:88
 msgid "TX"
@@ -4915,7 +5073,7 @@ msgstr "Meja"
 msgid "Target"
 msgstr "Sasaran"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:77
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:103
 msgid "Target network"
 msgstr ""
 
@@ -4923,40 +5081,24 @@ msgstr ""
 msgid "Terminate"
 msgstr "Menamatkan"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:27
-msgid ""
-"The <em>Device Configuration</em> section covers physical settings of the "
-"radio hardware such as channel, transmit power or antenna selection which "
-"are shared among all defined wireless networks (if the radio hardware is "
-"multi-SSID capable). Per network settings like encryption or operation mode "
-"are grouped in the <em>Interface Configuration</em>."
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:79
-msgid ""
-"The <em>libiwinfo-lua</em> package is not installed. You must install this "
-"component for working wireless configuration!"
-msgstr ""
-
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:66
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:77
 msgid ""
 "The HE.net endpoint update configuration changed, you must now use the plain "
 "username instead of the user ID!"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:8
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:40
 msgid ""
 "The IPv4 address or the fully-qualified domain name of the remote tunnel end."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:27
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:38
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:59
 msgid ""
 "The IPv6 prefix assigned to the provider, usually ends with <code>::</code>"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:18
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1808
 msgid ""
 "The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
 "code> and <code>_</code>"
@@ -4972,7 +5114,7 @@ msgstr ""
 msgid "The configuration file could not be loaded due to the following error:"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1849
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2396
 msgid ""
 "The device could not be reached within %d seconds after applying the pending "
 "changes, which caused the configuration to be rolled back for safety "
@@ -4990,6 +5132,12 @@ msgid ""
 "</abbr> <code>/dev/sda1</code>)"
 msgstr "Fail peranti memori atau partisyen, (contohnya: /dev/sda)"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:612
+msgid ""
+"The existing wireless configuration needs to be changed for LuCI to function "
+"properly."
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:127
 msgid ""
 "The filesystem that was used to format the memory (<abbr title=\"for example"
@@ -5012,43 +5160,49 @@ msgstr ""
 msgid "The following rules are currently active on this system."
 msgstr "Peraturan berikut sedang aktif pada sistem ini."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:144
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:154
+msgid "The gateway address must not be a local IP address"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:154
 msgid "The given SSH public key has already been added."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:150
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:160
 msgid ""
 "The given SSH public key is invalid. Please supply proper public RSA or "
 "ECDSA keys."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:67
-msgid "The given network name is not unique"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:664
+msgid "The interface name is already used"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:52
-msgid ""
-"The hardware is not multi-SSID capable and the existing configuration will "
-"be replaced if you proceed."
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:670
+msgid "The interface name is too long"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:43
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:31
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:55
 msgid ""
 "The length of the IPv4 prefix in bits, the remainder is used in the IPv6 "
 "addresses."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:35
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:46
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:63
 msgid "The length of the IPv6 prefix in bits"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:12
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:44
 msgid "The local IPv4 address over which the tunnel is created (optional)."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:5
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1814
+msgid "The network name is already used"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:135
 msgid ""
 "The network ports on this device can be combined to several <abbr title="
 "\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
@@ -5058,22 +5212,21 @@ msgid ""
 "next greater network like the internet and other ports for a local network."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:77
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:395
-msgid "The selected protocol needs a device assigned"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1149
+msgid "The selected %s mode is incompatible with %s encryption"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/csrftoken.htm:11
 msgid "The submitted security token is invalid or already expired!"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:274
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:272
 msgid ""
 "The system is erasing the configuration partition now and will reboot itself "
 "when finished."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:195
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:193
 #, fuzzy
 msgid ""
 "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
@@ -5086,7 +5239,7 @@ msgstr ""
 "anda perlu mengemas kini alamat komputer anda untuk mencapai peranti lagi, "
 "bergantung pada tetapan anda."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:15
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:80
 msgid "The system password has been successfully changed."
 msgstr ""
 
@@ -5098,7 +5251,7 @@ 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:403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:427
 msgid "There are no active leases"
 msgstr ""
 
@@ -5107,16 +5260,10 @@ msgstr ""
 msgid "There are no active leases."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1973
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2514
 msgid "There are no changes to apply"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:204
-msgid ""
-"There is no device assigned yet, please attach a network device in the "
-"\"Physical Settings\" tab"
-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
@@ -5126,11 +5273,19 @@ msgid ""
 "protect the web interface and enable SSH."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:19
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:49
 msgid "This IPv4 address of the relay"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1448
+msgid "This authentication type is not applicable to the selected EAP method."
+msgstr ""
+
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:54
+msgid "This does not look like a valid PEM file"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
 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 "
@@ -5144,46 +5299,46 @@ msgid ""
 "configurations are automatically preserved."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:74
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:81
 msgid ""
 "This is either the \"Update Key\" configured for the tunnel or the account "
 "password if no update key has been configured"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:82
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:127
 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 ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:27
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:54
 msgid ""
 "This is the local endpoint address assigned by the tunnel broker, it usually "
 "ends with <code>...:2/64</code>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:79
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> in the local network"
 msgstr "Ini adalah DHCP hanya dalam rangkaian tempatan."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:73
 msgid "This is the plain username for logging into the account"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:34
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:57
 msgid ""
 "This is the prefix routed to you by the tunnel broker for use by clients"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:9
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:41
 msgid "This is the system crontab in which scheduled tasks can be defined."
 msgstr ""
 "Ini adalah crontab sistem di mana tugas-tugas yang dijadualkan boleh "
 "ditakrifkan."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:19
+#: 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 ""
@@ -5202,26 +5357,26 @@ msgstr ""
 "Laman ini memberikan gambaran lebih dari saat ini sambungan rangkaian yang "
 "aktif."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:726
-#: modules/luci-base/htdocs/luci-static/resources/form.js:809
+#: modules/luci-base/htdocs/luci-static/resources/form.js:936
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1064
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:172
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:32
 msgid "This section contains no values yet"
 msgstr "Bahagian ini belum mengandungi nilai-nilai lagi"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:114
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:105
 msgid "Time Synchronization"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:525
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:968
 msgid "Time interval for rekeying GTK"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:128
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:119
 msgid "Timezone"
 msgstr "Zon masa"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:825
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:871
 msgid "To login…"
 msgstr ""
 
@@ -5232,7 +5387,7 @@ msgid ""
 "reset\" (only possible with squashfs images)."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:835
 msgid "Tone"
 msgstr ""
 
@@ -5256,55 +5411,41 @@ msgstr "Lalu lintas"
 msgid "Transfer"
 msgstr "Pemindahan"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:595
-msgid "Transmission Rate"
-msgstr "Kelajuan Penghantaran"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:102
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:89
 msgid "Transmit"
 msgstr "Pancar"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:211
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:273
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:345
-msgid "Transmit Power"
-msgstr "Daya Pancar"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:318
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:349
-msgid "Transmitter Antenna"
-msgstr "Antena Pemancar"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:73
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:57
 msgid "Trigger"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:98
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:84
 msgid "Trigger Mode"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:54
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:69
 msgid "Tunnel ID"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1643
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1849
 #: modules/luci-base/luasrc/model/network.lua:1430
 msgid "Tunnel Interface"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:44
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:55
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:76
 msgid "Tunnel Link"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:46
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:131
 msgid "Tx-Power"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:32
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:185
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:11
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:43
 msgid "Type"
 msgstr "Jenis"
 
@@ -5312,19 +5453,20 @@ msgstr "Jenis"
 msgid "UDP:"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:28
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:90
 msgid "UMTS only"
 msgstr ""
 
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:43
 #: protocols/luci-proto-3g/luasrc/model/network/proto_3g.lua:10
 msgid "UMTS/GPRS/EV-DO"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:106
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:93
 msgid "USB Device"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:122
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:110
 msgid "USB Ports"
 msgstr ""
 
@@ -5354,10 +5496,12 @@ msgstr ""
 msgid "Unable to dispatch"
 msgstr ""
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:22
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:54
 msgid "Unable to obtain client ID"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:61
 msgid "Unable to resolve AFTR host name"
 msgstr ""
@@ -5367,21 +5511,31 @@ msgstr ""
 msgid "Unable to resolve peer host name"
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:33
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:68
+msgid "Unable to save contents: %s"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:132
 msgid "Unavailable Seconds (UAS)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1196
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1386
 #: modules/luci-base/luasrc/model/network.lua:970
 msgid "Unknown"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1349
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1539
 #: modules/luci-base/luasrc/model/network.lua:1137
 msgid "Unknown error (%s)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1193
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:204
+msgid "Unknown error code"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1383
+#: modules/luci-base/htdocs/luci-static/resources/protocol/none.js:6
 #: modules/luci-base/luasrc/model/network.lua:964
 msgid "Unmanaged"
 msgstr ""
@@ -5391,22 +5545,30 @@ msgstr ""
 msgid "Unmount"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:107
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:262
 msgid "Unnamed key"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1708
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2261
 msgid "Unsaved Changes"
 msgstr "Perubahan yang belum disimpan"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:202
+msgid "Unspecified error"
+msgstr ""
+
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:64
 msgid "Unsupported MAP type"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:27
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:69
 msgid "Unsupported modem"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:219
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:119
 msgid "Unsupported protocol type."
 msgstr ""
@@ -5426,56 +5588,70 @@ msgstr ""
 msgid "Upload archive..."
 msgstr ""
 
-#: modules/luci-base/luasrc/view/cbi/upload.htm:8
-msgid "Uploaded File"
-msgstr "Uploaded Fail"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1703
+msgid "Upload file"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1678
+msgid "Upload file…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1623
+msgid "Upload request failed: %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:613
+msgid ""
+"Upon pressing \"Continue\", anonymous \"wifi-iface\" sections will be "
+"assigned with a name in the form <em>wifinet#</em> and the network will be "
+"restarted to apply the updated configuration."
+msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:14
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:74
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:85
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:26
 msgid "Uptime"
 msgstr "Masa Aktif"
 
-#: 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:83
 msgid "Use <code>/etc/ethers</code>"
 msgstr "Guna /etc/ethers"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:40
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:167
 msgid "Use DHCP gateway"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:33
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:85
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:34
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:98
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:46
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:65
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:38
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:58
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:124
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:39
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:116
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:59
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:103
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:64
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:77
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:100
 msgid "Use DNS servers advertised by peer"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:227
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:233
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:479
 msgid "Use ISO/IEC 3166 alpha2 country codes."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:31
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:100
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:70
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:35
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:51
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:86
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:56
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:97
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:77
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:75
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:92
 msgid "Use MTU on tunnel interface"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:95
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:65
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:30
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:46
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:81
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:93
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:73
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:88
 msgid "Use TTL on tunnel interface"
 msgstr ""
 
@@ -5487,68 +5663,65 @@ msgstr ""
 msgid "Use as root filesystem (/)"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:19
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:31
 msgid "Use broadcast flag"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:253
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:791
 msgid "Use builtin IPv6-management"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:40
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:109
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:92
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:45
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:105
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:53
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:72
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:45
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:65
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:40
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:182
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:127
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:42
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:119
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:62
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:67
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:80
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:103
 msgid "Use custom DNS servers"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:26
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:70
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:16
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:28
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:84
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:24
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:50
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:23
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:43
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:116
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:33
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:74
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:97
 msgid "Use default gateway"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:48
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:164
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:77
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:24
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:88
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:58
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:23
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:39
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:74
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:90
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:38
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:57
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:30
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:50
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:45
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:227
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:119
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:51
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:88
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:68
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:52
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:70
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:83
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:111
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:149
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:67
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:111
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:98
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:72
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:85
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:108
 msgid "Use gateway metric"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:64
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:179
 msgid "Use routing table"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:309
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:310
 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 "
@@ -5561,77 +5734,78 @@ msgstr ""
 msgid "Used"
 msgstr "Diguna"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:848
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1273
 msgid "Used Key Slot"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:913
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
 msgid ""
 "Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not "
 "needed with normal WPA(2)-PSK."
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:48
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:110
 msgid "User certificate (PEM encoded)"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:61
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:122
 msgid "User key (PEM encoded)"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/sysauth.htm:23
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:41
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:32
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:102
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:56
 msgid "Username"
 msgstr "Username"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:182
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:903
 msgid "VC-Mux"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:851
 msgid "VDSL"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:172
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:169
 msgid "VLANs on %q"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:171
-msgid "VLANs on %q (%s)"
+#: modules/luci-base/luasrc/controller/admin/index.lua:55
+msgid "VPN"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:18
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:42
 msgid "VPN Local address"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:22
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:46
 msgid "VPN Local port"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:15
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:11
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:15
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:58
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:39
 msgid "VPN Server"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:18
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:96
 msgid "VPN Server port"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:37
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:100
 msgid "VPN Server's certificate SHA1 hash"
 msgstr ""
 
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:9
 #: protocols/luci-proto-vpnc/luasrc/model/network/proto_vpnc.lua:9
 msgid "VPNC (CISCO 3000 (and others) VPN)"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:44
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:73
 msgid "Vendor"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:60
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:52
 msgid "Vendor Class to send when requesting DHCP"
 msgstr ""
 
@@ -5639,41 +5813,37 @@ msgstr ""
 msgid "Verify"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:52
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:76
 msgid "Virtual dynamic interface"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:470
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:471
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:553
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:576
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:908
 msgid "WDS"
 msgstr "WDS"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:667
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1160
 msgid "WEP Open System"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:668
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1161
 msgid "WEP Shared Key"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "WEP passphrase"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:503
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:566
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:945
 msgid "WMM Mode"
 msgstr "WMM Mod"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "WPA passphrase"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:716
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:735
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:740
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1074
 msgid ""
 "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
 "and ad-hoc mode) to be installed."
@@ -5689,7 +5859,7 @@ msgstr ""
 msgid "Waiting for command to complete..."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1940
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2481
 msgid "Waiting for configuration to get applied… %ds"
 msgstr ""
 
@@ -5697,8 +5867,8 @@ msgstr ""
 msgid "Waiting for device..."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:172
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:163
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:173
 msgid "Warning"
 msgstr ""
 
@@ -5706,11 +5876,11 @@ msgstr ""
 msgid "Warning: There are unsaved changes that will get lost on reboot!"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:20
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:34
 msgid "Weak"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:946
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1355
 msgid ""
 "When using a PSK, the PMK can be automatically generated. When enabled, the "
 "R0/R1 key options below are not applied. Disable this to use the R0 and R1 "
@@ -5718,78 +5888,85 @@ msgid ""
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:383
 msgid "Width"
 msgstr ""
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:17
 #: protocols/luci-proto-wireguard/luasrc/model/network/proto_wireguard.lua:9
 msgid "WireGuard VPN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:58
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:40
 #: modules/luci-mod-status/luasrc/controller/admin/status.lua:28
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:14
 msgid "Wireless"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1631
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1837
 #: modules/luci-base/luasrc/model/network.lua:1418
 msgid "Wireless Adapter"
 msgstr "Adapter Wayarles"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1617
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2052
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1823
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2288
 #: modules/luci-base/luasrc/model/network.lua:1404
 #: modules/luci-base/luasrc/model/network.lua:1865
 msgid "Wireless Network"
 msgstr "Rangkaian Wayarles"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:629
 msgid "Wireless Overview"
 msgstr "Gambaran keseluruhan Wayarles"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:362
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:797
 msgid "Wireless Security"
 msgstr "Keselamatan WLAN"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:54
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:611
+msgid "Wireless configuration migration"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:139
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:179
 msgid "Wireless is disabled"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:54
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:139
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:179
 msgid "Wireless is not associated"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:15
-msgid "Wireless is restarting..."
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:752
 msgid "Wireless network is disabled"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:752
 msgid "Wireless network is enabled"
 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:182
 msgid "Write received DNS requests to syslog"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:164
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:155
 msgid "Write system log to file"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1507
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:85
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1754
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:109
 msgid "Yes"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:26
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:943
+msgid ""
+"You appear to be currently connected to the device via the \"%h\" interface. "
+"Do you really want to shut down the interface?"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:123
 msgid ""
 "You can enable or disable installed init scripts here. Changes will applied "
 "after a device reboot.<br /><strong>Warning: If you disable essential init "
@@ -5804,38 +5981,34 @@ msgid ""
 "You must enable JavaScript in your browser or LuCI will not work properly."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:196
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:187
 msgid "ZRam Compression Algorithm"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:203
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:194
 msgid "ZRam Compression Streams"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:189
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:180
 msgid "ZRam Settings"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:191
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
 msgid "ZRam Size"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:229
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:230
 msgid "any"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:113
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:121
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:126
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:218
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:282
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:321
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:328
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:621
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:37
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:22
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:29
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:121
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:836
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:844
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:849
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1030
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:78
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:48
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:51
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:103
 msgid "auto"
 msgstr "auto"
 
@@ -5843,11 +6016,11 @@ msgstr "auto"
 msgid "automatic"
 msgstr "automatik"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:45
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:78
 msgid "baseT"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:909
 msgid "bridged"
 msgstr ""
 
@@ -5863,22 +6036,21 @@ msgstr ""
 msgid "create:"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:264
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:368
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:678
 msgid "creates a bridge over specified interface(s)"
 msgstr "mencipta jambatan di antara muka tertentu"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:277
 msgid "dB"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:34
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:35
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:46
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:47
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:48
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:131
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:132
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:133
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:277
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:279
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:331
@@ -5890,26 +6062,30 @@ msgstr ""
 msgid "dBm"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:460
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:587
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:889
 msgid "disable"
 msgstr "mematikan"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:119
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:524
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:530
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:536
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:18
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:578
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:584
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:590
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:25
 msgid "disabled"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:433
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:467
+msgid "driver default"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/lease_status.htm:17
 #: modules/luci-base/luasrc/view/lease_status.htm:46
-#: 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:416
 msgid "expired"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:88
 msgid ""
 "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr>-leases will be stored"
@@ -5921,25 +6097,21 @@ msgstr "fail dimana DHCP-sewa akan disimpan"
 msgid "forward"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:80
 msgid "full-duplex"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:80
 msgid "half-duplex"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:559
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:565
 msgid "hexadecimal encoded value"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:138
-msgid "hidden"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:527
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:533
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:538
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:581
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:587
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:592
 msgid "hybrid mode"
 msgstr ""
 
@@ -5947,6 +6119,10 @@ msgstr ""
 msgid "if target is a network"
 msgstr "jika target itu ialah rangkaian"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:63
+msgid "ignore"
+msgstr ""
+
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:177
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
@@ -5981,25 +6157,26 @@ msgstr ""
 msgid "key with either 5 or 13 characters"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:94
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:95
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr "Fail DNS tempatan"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:952
-msgid "minutes"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1168
+msgid "medium security"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:43
-msgid "mixed WPA/WPA2"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1360
+msgid "minutes"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:225
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:232
 msgid "no"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:54
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:72
 msgid "no link"
 msgstr ""
 
@@ -6007,7 +6184,7 @@ msgstr ""
 msgid "non-empty value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1195
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1446
 msgid "none"
 msgstr "tidak ada"
 
@@ -6017,7 +6194,9 @@ msgstr "tidak ada"
 msgid "not present"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:363
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:341
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:776
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:780
 #: 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
@@ -6032,8 +6211,8 @@ msgstr ""
 msgid "on"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
-msgid "open"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1169
+msgid "open network"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
@@ -6053,73 +6232,77 @@ msgstr ""
 msgid "positive integer value"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:34
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:56
 msgid "random"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:526
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:532
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:537
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:580
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:586
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:591
 msgid "relay mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:910
 msgid "routed"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:525
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:534
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:968
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:977
 msgid "sec"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:525
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:531
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:579
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:585
 msgid "server mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:544
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:597
 msgid "stateful-only"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:542
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:595
 msgid "stateless"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:543
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:596
 msgid "stateless + stateful"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:369
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1167
+msgid "strong security"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:346
 msgid "tagged"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:932
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1343
 msgid "time units (TUs / 1.024 ms) [1000-65535]"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:549
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:555
 msgid "unique value"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:448
 msgid "unknown"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:15
 #: modules/luci-base/luasrc/view/lease_status.htm:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:238
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:390
+#: 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:414
 msgid "unlimited"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1401
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1648
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:63
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:355
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:378
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:413
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:446
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:512
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:450
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:545
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:53
 #: modules/luci-base/luasrc/view/cbi/network_netlist.htm:38
 msgid "unspecified"
@@ -6129,7 +6312,7 @@ msgstr ""
 msgid "unspecified -or- create:"
 msgstr "Tidak dirinci -atau- buat:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:366
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:344
 msgid "untagged"
 msgstr ""
 
@@ -6210,8 +6393,8 @@ msgstr ""
 msgid "valid address:port"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:523
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:527
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:529
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:533
 msgid "valid date (YYYY-MM-DD)"
 msgstr ""
 
@@ -6248,7 +6431,7 @@ msgstr ""
 msgid "valid network in address/netmask notation"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:498
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:504
 msgid "valid phone digit (0-9, \"*\", \"#\", \"!\" or \".\")"
 msgstr ""
 
@@ -6261,11 +6444,11 @@ msgstr ""
 msgid "valid port value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:503
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:509
 msgid "valid time (HH:MM:SS)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:425
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:431
 msgid "value between %d and %d characters"
 msgstr ""
 
@@ -6281,14 +6464,23 @@ msgstr ""
 msgid "value smaller or equal to %f"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:430
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:425
+msgid "value with %d characters"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:436
 msgid "value with at least %d characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:435
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:441
 msgid "value with at most %d characters"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1169
+msgid "weak security"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:221
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:232
@@ -6299,6 +6491,68 @@ msgstr ""
 msgid "« Back"
 msgstr "« Kembali"
 
+#~ msgid "Antenna 1"
+#~ msgstr "Antena 1"
+
+#~ msgid "Antenna 2"
+#~ msgstr "Antena 2"
+
+#~ msgid "Back to overview"
+#~ msgstr "Kembali ke ikhtisar"
+
+#~ msgid "Back to scan results"
+#~ msgstr "Kembali ke keputusan scan"
+
+#~ msgid "Connection Limit"
+#~ msgstr "Sambungan Batas"
+
+#~ msgid "Diversity"
+#~ msgstr "Keanekaragaman"
+
+#~ msgid "Frame Bursting"
+#~ msgstr "Bingkai Meletup"
+
+#~ msgid ""
+#~ "On this page you can configure the network interfaces. You can bridge "
+#~ "several interfaces by ticking the \"bridge interfaces\" field and enter "
+#~ "the names of several network interfaces separated by spaces. You can also "
+#~ "use <abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
+#~ "<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
+#~ "<samp>eth0.1</samp>)."
+#~ msgstr ""
+#~ "Pada halaman ini anda boleh mengkonfigurasi antara muka rangkaian. Anda "
+#~ "boleh menjembatani beberapa antara muka dengan menanda jambatan antara "
+#~ "muka gelanggang dan masukkan beberapa nama antara muka rangkaian "
+#~ "dipisahkan dengan ruang. Anda juga boleh menggunakan antara muka VLAN "
+#~ "notasi. Seperti eth0.1."
+
+#~ msgid "Receiver Antenna"
+#~ msgstr "Antena Penerima"
+
+#~ msgid "Repeat scan"
+#~ msgstr "Ulangi scan"
+
+#~ msgid "Replace entry"
+#~ msgstr "Tukar entri"
+
+#~ msgid "Separate Clients"
+#~ msgstr "Pisahkan Pelanggan"
+
+#~ msgid "Slot time"
+#~ msgstr "Slot masa"
+
+#~ msgid "Transmission Rate"
+#~ msgstr "Kelajuan Penghantaran"
+
+#~ msgid "Transmit Power"
+#~ msgstr "Daya Pancar"
+
+#~ msgid "Transmitter Antenna"
+#~ msgstr "Antena Pemancar"
+
+#~ msgid "Uploaded File"
+#~ msgstr "Uploaded Fail"
+
 #~ msgid "The following changes have been reverted"
 #~ msgstr "Laman berikut telah kembali"
 
diff --git a/modules/luci-base/po/no/base.po b/modules/luci-base/po/no/base.po
index 23678914d..3622c942f 100644
--- a/modules/luci-base/po/no/base.po
+++ b/modules/luci-base/po/no/base.po
@@ -8,19 +8,20 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.6\n"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:133
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:857
 msgid "%.1f dB"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:109
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:122
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 msgid "%d Bit"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1641
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2194
 msgid "%d invalid field(s)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:281
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:31
 msgid "%s is untagged in multiple VLANs!"
 msgstr ""
 
@@ -58,19 +59,19 @@ msgid "-- Additional Field --"
 msgstr "-- Tilleggs Felt --"
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:258
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1401
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1533
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:250
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:350
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1114
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1648
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1780
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:314
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:414
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1178
 #: modules/luci-base/luasrc/view/cbi/header.htm:5
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:26
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:88
 msgid "-- Please choose --"
 msgstr "-- Vennligst velg --"
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:259
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:351
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1115
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:415
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1179
 #: modules/luci-base/luasrc/view/cbi/header.htm:6
 msgid "-- custom --"
 msgstr "-- egendefinert --"
@@ -93,7 +94,7 @@ msgstr ""
 msgid "-- please select --"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:382
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:814
 msgid "0 = not using RSSI threshold, 1 = do not change driver default"
 msgstr ""
 
@@ -105,10 +106,11 @@ msgstr "1 minutts belastning:"
 msgid "15 Minute Load:"
 msgstr "15 minutters belastning:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:924
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1337
 msgid "4-character hexadecimal ID"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:11
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:18
 msgid "464XLAT (CLAT)"
 msgstr ""
@@ -117,47 +119,47 @@ msgstr ""
 msgid "5 Minute Load:"
 msgstr "5 minutters belastning:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:960
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1366
 msgid "6-octet identifier as a hex string - no colons"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:891
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1310
 msgid "802.11r Fast Transition"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1157
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1567
 msgid "802.11w Association SA Query maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1574
 msgid "802.11w Association SA Query retry timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1133
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1533
 msgid "802.11w Management Frame Protection"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1156
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1567
 msgid "802.11w maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1165
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1574
 msgid "802.11w retry timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:399
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:831
 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:224
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:225
 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:215
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:216
 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:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
 msgid ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
 "order of the resolvfile"
@@ -165,11 +167,11 @@ msgstr ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servere skal følge rekkefølgen "
 "i oppslagsfilen ved spørringer"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:388
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:820
 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:351
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:373
 #: 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"
@@ -179,8 +181,8 @@ msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Adresse"
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
 msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:555
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:35
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:506
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Nettmaske"
 
@@ -196,29 +198,29 @@ 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:378
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:402
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:58
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:35
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:33
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> Konfigurasjon"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:67
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:51
 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:328
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:329
 #: 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:372
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:233
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:234
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> leases"
@@ -226,7 +228,7 @@ msgstr ""
 "Maksimalt antall <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> leier"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:242
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> packet size"
@@ -234,69 +236,73 @@ 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:251
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:252
 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
 msgstr "<abbr title=\"Maksimal\">Maks.</abbr> samtidige spørringer"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:10
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:42
 msgid ""
 "<br/>Note: you need to manually restart the cron service if the crontab file "
 "was empty before editing."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:817
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1605
+msgid "A directory with the same name already exists."
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:863
 msgid "A new login is required since the authentication session expired."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:114
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:837
 msgid "A43C + J43 + A43"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:838
 msgid "A43C + J43 + A43 + V43"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:850
 msgid "ADSL"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:826
 msgid "ANSI T1.413"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:33
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:47
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:23
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:94
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:86
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:67
 msgid "APN"
 msgstr "<abbr title=\"Aksesspunkt Navn\">APN</abbr>"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:56
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:175
 msgid "ARP retry threshold"
 msgstr "APR terskel for nytt forsøk"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:122
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:845
 msgid "ATM (Asynchronous Transfer Mode)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:144
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:866
 msgid "ATM Bridges"
 msgstr "<abbr title=\"Asynchronous Transfer Mode\">ATM</abbr> Broer"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:178
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:21
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:898
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:66
 msgid "ATM Virtual Channel Identifier (VCI)"
 msgstr ""
 "<abbr title=\"Asynchronous Transfer Mode\">ATM</abbr> Virtuell kanal "
 "identifikator <abbr title=\"Virtual Channel Identifier\">(VCI)</abbr>"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:179
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:26
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:899
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:70
 msgid "ATM Virtual Path Identifier (VPI)"
 msgstr ""
 "<abbr title=\"Asynchronous Transfer Mode\">ATM</abbr> Virtuell plasserings "
 "identifikator <abbr title=\"Virtual Path Identifier\">(VPI)</abbr>"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:866
 msgid ""
 "ATM bridges expose encapsulated ethernet in AAL5 connections as virtual "
 "Linux network interfaces which can be used in conjunction with DHCP or PPP "
@@ -306,8 +312,8 @@ msgstr ""
 "nettverk grensesnitt, dette kan brukes sammen med DHCP eller PPP for å koble "
 "seg mot en leverandørs nettverk."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:184
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:905
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:62
 msgid "ATM device number"
 msgstr "<abbr title=\"Asynchronous Transfer Mode\">ATM</abbr> enhetsnummer"
 
@@ -316,17 +322,17 @@ msgid "ATU-C System Vendor ID"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:251
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:495
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:499
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:528
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:532
 msgid "Absent Interface"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:19
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
 msgid "Access Concentrator"
 msgstr "Tilgangskonsentrator"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:368
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:470
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:802
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
 msgid "Access Point"
 msgstr "Aksesspunkt"
 
@@ -349,7 +355,7 @@ msgid "Active Connections"
 msgstr "Aktive Tilkoblinger"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:68
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:30
 msgid "Active DHCP Leases"
 msgstr "Aktive DHCP Leier"
 
@@ -357,55 +363,75 @@ msgstr "Aktive DHCP Leier"
 msgid "Active DHCPv6 Leases"
 msgstr "Aktive DHCPv6 Leier"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1951
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:370
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:12
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2190
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:804
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:23
 msgid "Ad-Hoc"
 msgstr "Ad-Hoc (Uavhengig)"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:650
-#: modules/luci-base/htdocs/luci-static/resources/form.js:651
-#: modules/luci-base/htdocs/luci-static/resources/form.js:666
-#: modules/luci-base/htdocs/luci-static/resources/form.js:667
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1290
+#: modules/luci-base/htdocs/luci-static/resources/form.js:902
+#: modules/luci-base/htdocs/luci-static/resources/form.js:904
+#: modules/luci-base/htdocs/luci-static/resources/form.js:917
+#: modules/luci-base/htdocs/luci-static/resources/form.js:918
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1539
 #: modules/luci-base/luasrc/view/cbi/nsection.htm:25
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:189
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:197
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:39
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:47
 #: modules/luci-base/luasrc/view/cbi/ucisection.htm:54
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:703
 msgid "Add"
 msgstr "Legg til"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:60
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:870
+msgid "Add ATM Bridge"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:92
 msgid "Add IPv4 address…"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:129
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:204
 msgid "Add IPv6 address…"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:143
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:149
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:38
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:47
+msgid "Add LED action"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:215
+msgid "Add VLAN"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:14
+msgid "Add instance"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:153
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:159
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:250
 msgid "Add key"
 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:155
 msgid "Add local domain suffix to names served from hosts files"
 msgstr "Legg det lokale domenesuffikset til navn utgitt fra vertsfiler"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:705
 msgid "Add new interface..."
 msgstr "Legg til grensesnitt..."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:104
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:99
+msgid "Add peer"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:105
 msgid "Additional Hosts files"
 msgstr "Tilleggs vertsfiler"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:161
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
 msgid "Additional servers file"
 msgstr ""
 
@@ -432,7 +458,7 @@ msgstr ""
 msgid "Address"
 msgstr "Adresse"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:12
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:151
 msgid "Address to access local relay bridge"
 msgstr "Adresse for tilgang til lokal relébro"
 
@@ -441,13 +467,13 @@ msgstr "Adresse for tilgang til lokal relébro"
 msgid "Administration"
 msgstr "Administrasjon"
 
-#: 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:70
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:505
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:896
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:24
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:189
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:463
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:176
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:143
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:364
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:742
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:799
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:50
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:34
 msgid "Advanced Settings"
@@ -457,165 +483,165 @@ msgstr "Avanserte Innstillinger"
 msgid "Aggregate Transmit Power(ACTATP)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:175
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:166
 msgid "Alert"
 msgstr "Varsle"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1628
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1834
 #: modules/luci-base/luasrc/model/network.lua:1416
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:54
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:78
 msgid "Alias Interface"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:138
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:66
 msgid "Alias of \"%s\""
 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:170
 msgid "All Servers"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:114
 msgid ""
 "Allocate IP addresses sequentially, starting from the lowest available "
 "address"
 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:113
 msgid "Allocate IP sequentially"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:24
 msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
 msgstr "Tillat <abbr title=\"Secure Shell\">SSH</abbr> passord godkjenning"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:545
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:987
 msgid "Allow AP mode to disconnect STAs based on low ACK condition"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:462
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:589
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:891
 msgid "Allow all except listed"
 msgstr "Tillat alle unntatt oppførte"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:236
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:767
 msgid "Allow legacy 802.11b rates"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:461
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:588
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:890
 msgid "Allow listed only"
 msgstr "Tillat kun oppførte"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:198
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:199
 msgid "Allow localhost"
 msgstr "Tillat lokalvert"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:47
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:35
 msgid "Allow remote hosts to connect to local SSH forwarded ports"
 msgstr "Tillat eksterne verter å koble til lokale SSH videresendt porter"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:38
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:30
 msgid "Allow root logins with password"
 msgstr "Tillat root pålogginger med passord"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:39
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:30
 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:199
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:200
 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"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:135
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:122
 msgid "Allowed IPs"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:549
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:602
 msgid "Always announce default router"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:259
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:782
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
 "option does not comply with IEEE 802.11n-2009!"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:95
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:818
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:119
 msgid "Annex"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:96
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:819
 msgid "Annex A + L + M (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:827
 msgid "Annex A G.992.1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:828
 msgid "Annex A G.992.2"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:829
 msgid "Annex A G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:830
 msgid "Annex A G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:97
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:820
 msgid "Annex B (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:823
 msgid "Annex B G.992.1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:824
 msgid "Annex B G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:102
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:825
 msgid "Annex B G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:98
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:821
 msgid "Annex J (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:831
 msgid "Annex L G.992.3 POTS 1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:99
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:822
 msgid "Annex M (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:109
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:832
 msgid "Annex M G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:833
 msgid "Annex M G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:550
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:602
 msgid "Announce as default router even if no public prefix is available."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:555
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:607
 msgid "Announced DNS domains"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:554
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:606
 msgid "Announced DNS servers"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1093
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1496
 msgid "Anonymous Identity"
 msgstr ""
 
@@ -627,20 +653,6 @@ msgstr ""
 msgid "Anonymous Swap"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:322
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:329
-msgid "Antenna 1"
-msgstr "Antenne 1"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:323
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:330
-msgid "Antenna 2"
-msgstr "Antenne 2"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:246
-msgid "Antenna Configuration"
-msgstr "Antennekonfigurasjon"
-
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:71
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:160
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:181
@@ -648,11 +660,11 @@ msgstr "Antennekonfigurasjon"
 msgid "Any zone"
 msgstr "Alle soner"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1981
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2522
 msgid "Apply request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1867
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2409
 msgid "Apply unchecked"
 msgstr ""
 
@@ -660,8 +672,8 @@ msgstr ""
 msgid "Architecture"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:19
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:184
+#: 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 ""
@@ -670,13 +682,13 @@ msgstr ""
 msgid "Assign interfaces..."
 msgstr "Tilknytt grensesnitt..."
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:124
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:24
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:189
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:31
 msgid ""
 "Assign prefix parts using this hexadecimal subprefix ID for this interface."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:148
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1967
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:22
 msgid "Associated Stations"
 msgstr "Tilkoblede Klienter"
@@ -685,20 +697,20 @@ msgstr "Tilkoblede Klienter"
 msgid "Associations"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:39
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:37
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:101
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:64
 msgid "Auth Group"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1027
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1421
 msgid "Authentication"
 msgstr "Godkjenning"
 
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:29
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:70
 msgid "Authentication Type"
 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:78
 msgid "Authoritative"
 msgstr "Autoritativ"
 
@@ -716,17 +728,19 @@ msgstr "Autorisasjon er nødvendig"
 msgid "Auto Refresh"
 msgstr "Automatisk oppdatering"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:53
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:7
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:17
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:67
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:24
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:36
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:42
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:36
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:106
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:24
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:98
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:50
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:94
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:81
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:55
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:68
 msgid "Automatic"
 msgstr ""
 
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:7
 #: protocols/luci-proto-hnet/luasrc/model/network/proto_hnet.lua:7
 msgid "Automatic Homenet (HNCP)"
 msgstr ""
@@ -769,21 +783,21 @@ msgstr "Tilgjengelig"
 msgid "Average:"
 msgstr "Gjennomsnitt:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:116
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:839
 msgid "B43 + B43C"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:840
 msgid "B43 + B43C + V43"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:48
 msgid "BR / DMR / AFTR"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:43
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:75
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1620
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:176
 msgid "BSSID"
 msgstr "BSSID"
@@ -797,19 +811,11 @@ msgstr "Tilbake til oversikt"
 msgid "Back to configuration"
 msgstr "Tilbake til konfigurasjon"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:48
-msgid "Back to overview"
-msgstr "Tilbake til oversikt"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:20
-msgid "Back to scan results"
-msgstr "Tilbake til skanne resultat"
-
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:17
 msgid "Backup"
 msgstr "Sikkerhetskopi"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:38
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:36
 msgid "Backup / Flash Firmware"
 msgstr "Sikkerhetskopiering/Firmware oppgradering"
 
@@ -822,11 +828,11 @@ msgid "Bad address specified!"
 msgstr "Ugyldig adresse oppgitt!"
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:158
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:288
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:368
 msgid "Band"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:261
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:785
 msgid "Beacon Interval"
 msgstr ""
 
@@ -840,79 +846,85 @@ 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:293
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:294
 msgid ""
 "Bind dynamically to interfaces rather than wildcard address (recommended as "
 "linux default)"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:16
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:48
 msgid "Bind interface"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:16
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:48
 msgid "Bind the tunnel to this interface (optional)."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:49
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:134
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:187
 msgid "Bitrate"
 msgstr "Bitrate"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:172
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
 msgid "Bogus NX Domain Override"
 msgstr "Overstyr falske NX Domener"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1634
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1840
 #: modules/luci-base/luasrc/model/network.lua:1420
 msgid "Bridge"
 msgstr "Bro"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:264
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:368
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:678
 msgid "Bridge interfaces"
 msgstr "Sammenkoble grensesnitt"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:906
 msgid "Bridge unit number"
 msgstr "Bro enhetsnummer"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:250
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:364
 msgid "Bring up on boot"
 msgstr "Slå på ved oppstart"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:35
-msgid "Broadcom 802.11%s Wireless Controller"
-msgstr "Broadcom 802.11%s Trådløs Kontroller"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:45
-msgid "Broadcom BCM%04x 802.11 Wireless Controller"
-msgstr "Broadcom BCM%04x 802.11 Trådløs Kontroller"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1697
+msgid "Browse…"
+msgstr ""
 
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:18
 msgid "Buffered"
 msgstr "Bufret"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:75
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:134
 msgid "CA certificate; if empty it will be saved after the first connection."
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:7
+msgid "CLAT configuration failed"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:13
 msgid "CPU usage (%)"
 msgstr "CPU forbruk (%)"
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:21
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:53
 msgid "Call failed"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1789
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:14
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:52
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:711
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:948
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1839
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:191
 #: modules/luci-mod-system/luasrc/view/admin_system/upgrade.htm:60
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:6
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:17
 msgid "Category"
 msgstr ""
 
@@ -930,13 +942,7 @@ msgstr ""
 msgid "Chain"
 msgstr "Lenke"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:9
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:14
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:24
-msgid "Change login password"
-msgstr ""
-
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1744
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 msgid "Changes"
 msgstr "Endringer"
 
@@ -944,33 +950,23 @@ msgstr "Endringer"
 msgid "Changes applied."
 msgstr "Endringer utført."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2004
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2545
 msgid "Changes have been reverted."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:43
 msgid "Changes the administrator password for accessing the device"
 msgstr "Endrer administrator passordet for tilgang til enheten"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:10
-msgid "Changing password…"
-msgstr ""
-
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:162
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:45
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:87
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:174
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:376
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1618
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:186
 msgid "Channel"
 msgstr "Kanal"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:119
-msgid ""
-"Channel %d is not available in the %s regulatory domain and has been auto-"
-"adjusted to %d."
-msgstr ""
-
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:229
 msgid "Check"
 msgstr "Kontroller"
@@ -979,7 +975,7 @@ msgstr "Kontroller"
 msgid "Check filesystems before mount"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1806
 msgid "Check this option to delete the existing networks from this radio."
 msgstr ""
 
@@ -991,8 +987,8 @@ msgstr "Kontrollsum"
 msgid "Choose mtdblock"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:358
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:443
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1829
 msgid ""
 "Choose the firewall zone you want to assign to this interface. Select "
 "<em>unspecified</em> to remove the interface from the associated zone or "
@@ -1004,7 +1000,7 @@ msgstr ""
 "Eller fyll ut <em>Opprett</em> feltet for å definere en ny sone og tilknytte "
 "grensesnittet til det."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:834
 msgid ""
 "Choose the network(s) you want to attach to this wireless interface or fill "
 "out the <em>create</em> field to define a new network."
@@ -1012,11 +1008,11 @@ msgstr ""
 "Velg det eller de nettverk du vil legge til dette trådløse grensesnittet, "
 "eller fyll ut <em>Opprett</em> feltet for å definere et nytt nettverk."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:614
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1023
 msgid "Cipher"
 msgstr "Krypteringsmetode"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:61
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:91
 msgid "Cisco UDP encapsulation"
 msgstr ""
 
@@ -1034,28 +1030,28 @@ msgid ""
 "FEATURE IS FOR PROFESSIONALS! )"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1950
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:369
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:471
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2189
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:803
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:908
 msgid "Client"
 msgstr "Klient"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:55
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:52
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:47
 msgid "Client ID to send when requesting DHCP"
 msgstr "Klient ID som sendes ved DHCP spørring"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:145
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:151
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:155
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:161
 msgid "Close"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:146
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:119
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:125
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:127
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:98
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:119
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:157
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:141
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:115
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:138
 msgid ""
 "Close inactive connection after the given amount of seconds, use 0 to "
 "persist connection"
@@ -1070,12 +1066,9 @@ msgstr "Lukk liste..."
 #: modules/luci-base/luasrc/view/lease_status.htm:77
 #: modules/luci-base/luasrc/view/lease_status.htm:98
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:118
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:37
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:24
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1965
 #: modules/luci-mod-network/luasrc/view/admin_network/iface_status.htm:6
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:40
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:30
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:8
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:398
 #: modules/luci-mod-status/luasrc/view/admin_status/index/30-network.htm:11
 #: modules/luci-mod-status/luasrc/view/admin_status/index/50-dsl.htm:17
@@ -1089,15 +1082,19 @@ msgstr "Henter data..."
 msgid "Command"
 msgstr "Kommando"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:193
+msgid "Command OK"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:41
+msgid "Command failed"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:64
 msgid "Comment"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:185
-msgid "Common Configuration"
-msgstr "Vanlige Innstillinger"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
 msgid ""
 "Complicates key reinstallation attacks on the client side by disabling "
 "retransmission of EAPOL-Key frames that are used to install keys. This "
@@ -1105,13 +1102,14 @@ msgid ""
 "negotiation especially in environments with heavy traffic load."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1744
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 #: modules/luci-base/luasrc/controller/admin/uci.lua:11
 #: modules/luci-mod-system/luasrc/view/admin_system/backupfiles.htm:9
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:13
 msgid "Configuration"
 msgstr "Konfigurasjon"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:21
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:63
 msgid "Configuration failed"
 msgstr ""
@@ -1120,89 +1118,89 @@ msgstr ""
 msgid "Configuration files will be kept"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1915
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2456
 msgid "Configuration has been applied."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1848
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2395
 msgid "Configuration has been rolled back!"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:43
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:942
+msgid "Confirm disconnect"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:50
 msgid "Confirmation"
 msgstr "Bekreftelse"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:32
-msgid "Connect"
-msgstr "Koble til"
-
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:72
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:105
 msgid "Connected"
 msgstr "Tilkoblet"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:338
-msgid "Connection Limit"
-msgstr "Tilkoblingsgrense (antall)"
-
 #: modules/luci-base/htdocs/luci-static/resources/network.js:7
 #: modules/luci-base/luasrc/model/network.lua:27
 msgid "Connection attempt failed"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:203
+msgid "Connection lost"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/controller/admin/status.lua:32
 msgid "Connections"
 msgstr "Tilkoblinger"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1890
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:66
+msgid "Contents have been saved."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:618
+msgid "Continue"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2431
 msgid ""
 "Could not regain access to the device after applying the configuration "
 "changes. You might need to reconnect if you modified network related "
 "settings such as the IP address or wireless security credentials."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:135
 msgid "Country"
 msgstr "Land"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:227
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:233
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:337
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:764
 msgid "Country Code"
 msgstr "Landskode"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:36
-msgid "Cover the following interface"
-msgstr "Gjelder det følgende grensesnitt"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:43
-msgid "Cover the following interfaces"
-msgstr "Gjelder de følgende grensesnitt"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:357
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:86
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:443
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1829
 msgid "Create / Assign firewall-zone"
 msgstr "Opprett/Tildel brannmur sone"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:9
-msgid "Create Interface"
-msgstr "Opprett Grensesnitt"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:33
-msgid "Create a bridge over multiple interfaces"
-msgstr "Opprett en bro over flere grensesnitt"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:735
+msgid "Create interface"
+msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:174
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:165
 msgid "Critical"
 msgstr "Kritisk"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:178
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:169
 msgid "Cron Log Level"
 msgstr "Cron logg nivå"
 
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:519
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:521
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:447
+msgid "Current power"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:552
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:554
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:51
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:53
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:82
@@ -1210,7 +1208,7 @@ msgstr "Cron logg nivå"
 msgid "Custom Interface"
 msgstr "Egendefinerte Grensesnitt"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:36
 msgid "Custom delegated IPv6-prefix"
 msgstr ""
 
@@ -1220,7 +1218,7 @@ msgid ""
 "this, perform a factory-reset first."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:59
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:41
 msgid ""
 "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
 "\">LED</abbr>s if possible."
@@ -1228,46 +1226,47 @@ msgstr ""
 "Tilpasser oppførselen til enhetens <abbr title=\"Light Emitting Diode\">LED</"
 "abbr>s om mulig."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:799
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1223
 msgid "DAE-Client"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:807
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1231
 msgid "DAE-Port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:815
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1239
 msgid "DAE-Secret"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:448
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:459
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:279
 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:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:61
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:62
 msgid "DHCP and DNS"
 msgstr "DHCP og DNS"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1195
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1385
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:16
 #: modules/luci-base/luasrc/model/network.lua:968
 msgid "DHCP client"
 msgstr "DHCP klient"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:571
 msgid "DHCP-Options"
 msgstr "DHCP-Alternativer"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_dhcpv6.lua:7
 msgid "DHCPv6 client"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:540
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:594
 msgid "DHCPv6-Mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:529
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:583
 msgid "DHCPv6-Service"
 msgstr ""
 
@@ -1284,31 +1283,31 @@ msgstr ""
 msgid "DNS"
 msgstr "DNS"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:183
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
 msgid "DNS forwardings"
 msgstr "DNS videresendinger"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:30
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:37
 msgid "DNS-Label / FQDN"
 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:136
 msgid "DNSSEC"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:139
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
 msgid "DNSSEC check unsigned"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:73
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:99
 msgid "DPD Idle Timeout"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:14
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:41
 msgid "DS-Lite AFTR address"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:92
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:815
 #: modules/luci-mod-status/luasrc/view/admin_status/index/50-dsl.htm:14
 msgid "DSL"
 msgstr ""
@@ -1317,11 +1316,11 @@ msgstr ""
 msgid "DSL Status"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:125
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:848
 msgid "DSL line mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:519
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:963
 msgid "DTIM Interval"
 msgstr ""
 
@@ -1333,42 +1332,45 @@ msgstr "DUID"
 msgid "Data Rate"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:169
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:180
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:160
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:171
 msgid "Debug"
 msgstr "Feilsøking"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:759
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:783
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:807
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1183
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1207
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1231
 msgid "Default %d"
 msgstr "Standard %d"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:82
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:107
 msgid "Default Route"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:17
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:81
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:51
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:32
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:48
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:85
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:65
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:80
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:108
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:146
 msgid "Default gateway"
 msgstr "Standard gateway"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:541
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:594
 msgid "Default is stateless + stateful"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:70
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:54
 msgid "Default state"
 msgstr "Standard tilstand"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:503
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:553
 msgid "Define a name for this network."
 msgstr "Definer et navn for dette nettverket."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:514
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:571
 msgid ""
 "Define additional DHCP options, for example "
 "\"<code>6,192.168.2.1,192.168.2.2</code>\" which advertises different DNS "
@@ -1377,35 +1379,47 @@ msgstr ""
 "Definer flere DHCP valg, f.eks \"<code>192.168.2.1,192.168.2.2</code>\" som "
 "annonserer forskjellige DNS servere til klientene."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:705
-#: modules/luci-base/htdocs/luci-static/resources/form.js:958
-#: modules/luci-base/htdocs/luci-static/resources/form.js:959
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1271
+#: modules/luci-base/htdocs/luci-static/resources/form.js:966
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1210
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1216
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1524
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1758
 #: modules/luci-base/luasrc/view/cbi/nsection.htm:11
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:162
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:16
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:41
 msgid "Delete"
 msgstr "Fjern"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:178
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:187
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:193
 msgid "Delete key"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:45
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1654
+msgid "Delete permission denied"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1656
+msgid "Delete request failed: %d %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:723
 msgid "Delete this network"
 msgstr "Fjern dette nettverket"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:519
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:963
 msgid "Delivery Traffic Indication Message Interval"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:102
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:108
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:224
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1754
+msgid "Deselect"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:215
 msgid "Design"
 msgstr "Design"
 
@@ -1423,10 +1437,12 @@ msgstr ""
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:177
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:43
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:13
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:38
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:73
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:33
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:52
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:85
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:86
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:72
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:154
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:253
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:86
@@ -1434,15 +1450,24 @@ msgstr ""
 msgid "Device"
 msgstr "Enhet"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:138
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:737
 msgid "Device Configuration"
 msgstr "Enhet Konfigurasjon"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:81
+msgid "Device is not active"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/reboot.htm:23
 msgid "Device is rebooting..."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1889
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:167
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:513
+msgid "Device is restarting…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2430
 msgid "Device unreachable!"
 msgstr ""
 
@@ -1450,26 +1475,26 @@ msgstr ""
 msgid "Device unreachable! Still waiting for device..."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:123
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:78
 #: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:61
 msgid "Diagnostics"
 msgstr "Nettverksdiagnostikk"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:45
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:60
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:101
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:93
 msgid "Dial number"
 msgstr ""
 
-#: modules/luci-base/luasrc/view/cbi/filebrowser.htm:99
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1554
 msgid "Directory"
 msgstr "Katalog"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:131
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:715
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:754
 msgid "Disable"
 msgstr "Deaktiver"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:472
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:531
 msgid ""
 "Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for "
 "this interface."
@@ -1477,71 +1502,66 @@ msgstr ""
 "Deaktiver <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> "
 "for dette nettverket."
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:64
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:93
 msgid "Disable Encryption"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:530
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:973
 msgid "Disable Inactivity Polling"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:713
 msgid "Disable this network"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:44
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:54
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:68
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:37
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:43
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:37
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1534
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:76
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:107
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:99
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:51
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:95
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:82
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:69
 msgid "Disabled"
 msgstr "Deaktivert"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1139
-msgid "Disabled (default)"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:544
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:987
 msgid "Disassociate On Low Acknowledgement"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:193
 msgid "Discard upstream RFC1918 responses"
 msgstr "Forkast oppstrøms RFC1918 svar"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:92
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:114
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:956
 msgid "Disconnect"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:22
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:64
 msgid "Disconnection attempt failed"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1121
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1762
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1855
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:17
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1375
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1995
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2314
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2401
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1634
 msgid "Dismiss"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:240
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:334
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:770
 msgid "Distance Optimization"
 msgstr "Avstand Optimalisering"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:241
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:770
 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/luasrc/model/cbi/admin_network/wifi.lua:347
-msgid "Diversity"
-msgstr "Antennevariasjon"
-
-#: 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:61
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
@@ -1553,37 +1573,45 @@ msgstr ""
 "Fremsender for <abbr title =\"Network Address Translation\">NAT</abbr> "
 "brannmurer"
 
-#: 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:159
 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:123
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:124
 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:118
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
 msgid "Do not forward reverse lookups for local networks"
 msgstr "Ikke videresend reverserte oppslag for lokale nettverk"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:173
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1639
+msgid "Do you really want to delete \"%s\" ?"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:188
 msgid "Do you really want to delete the following SSH key?"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1637
+msgid "Do you really want to recursively delete the directory \"%s\" ?"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:74
 msgid "Domain required"
 msgstr "Domene kreves"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:205
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:206
 msgid "Domain whitelist"
 msgstr "Domene hviteliste"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:34
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:67
 msgid "Don't Fragment"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:74
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:75
 msgid ""
 "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
 "<abbr title=\"Domain Name System\">DNS</abbr>-Name"
@@ -1603,19 +1631,19 @@ msgstr "Last ned sikkerhetskopi"
 msgid "Download mtdblock"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:853
 msgid "Downstream SNR offset"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:914
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1169
 msgid "Drag to reorder"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:9
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:11
 msgid "Dropbear Instance"
 msgstr "Dropbear Instans"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:6
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 msgid ""
 "Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access "
 "and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
@@ -1623,20 +1651,21 @@ msgstr ""
 "Dropbear tilbyr <abbr title=\"Secure Shell\">SSH</abbr>-nettverks shell "
 "tilgang og en integrert <abbr title=\"Secure Copy\">SCP</abbr> server"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:11
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:14
 msgid "Dual-Stack Lite (RFC6333)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:493
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:547
 msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 msgstr ""
 "Dynamisk <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:60
 msgid "Dynamic tunnel"
 msgstr "Dynamisk tunnel"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:494
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:547
 msgid ""
 "Dynamically allocate DHCP addresses for clients. If disabled, only clients "
 "having static leases will be served."
@@ -1644,21 +1673,21 @@ msgstr ""
 "Dynamisk tildeling av DHCP adresser til klienter. Om deaktivert, kan en kun "
 "bruke klienter med statisk leie."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:67
 msgid "EA-bits length"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:990
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1386
 msgid "EAP-Method"
 msgstr "EAP-metode"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:934
-#: modules/luci-base/htdocs/luci-static/resources/form.js:935
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1199
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1188
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1191
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1450
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:154
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:160
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:38
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:291
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:720
 msgid "Edit"
 msgstr "Endre"
 
@@ -1668,90 +1697,91 @@ msgid ""
 "reload the page."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:38
-msgid "Edit this interface"
-msgstr "Endre dette grensesnittet"
-
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:718
 msgid "Edit this network"
 msgstr "Endre dette nettverket"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:669
+msgid "Edit wireless network"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:167
 msgid "Emergency"
 msgstr "Krisesituasjon"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:127
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:715
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:754
 msgid "Enable"
 msgstr "Aktiver"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:414
 msgid ""
 "Enable <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> "
 "snooping"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:271
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:412
 msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 msgstr "Aktiver <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:41
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:60
 msgid "Enable HE.net dynamic endpoint update"
 msgstr "Aktiver HE,net dynamisk endepunkt oppdatering"
 
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:51
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:89
 msgid "Enable IPv6 negotiation"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:23
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:35
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:41
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:35
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:37
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:49
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:80
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:54
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:67
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:93
 msgid "Enable IPv6 negotiation on the PPP link"
 msgstr "Aktiver IPv6 på PPP lenke"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:143
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:188
 msgid "Enable Jumbo Frame passthrough"
 msgstr "Aktiver Jumbo Frames gjennomgang"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:244
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:235
 msgid "Enable NTP client"
 msgstr "Aktiver NTP klient"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:69
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:96
 msgid "Enable Single DES"
 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:267
 msgid "Enable TFTP server"
 msgstr "Aktiver TFTP server"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:134
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:180
 msgid "Enable VLAN functionality"
 msgstr "Aktiver VLAN funksjonalitet"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1595
 msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1175
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
 msgid "Enable key reinstallation (KRACK) countermeasures"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:138
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:183
 msgid "Enable learning and aging"
 msgstr "Aktiver 'læring' og 'aldring'"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:194
 msgid "Enable mirroring of incoming packets"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:151
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:195
 msgid "Enable mirroring of outgoing packets"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:34
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:67
 msgid "Enable the DF (Don't Fragment) flag of the encapsulating packets."
 msgstr ""
 
@@ -1759,7 +1789,7 @@ msgstr ""
 msgid "Enable this mount"
 msgstr "Aktiver dette monteringspunktet"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:713
 msgid "Enable this network"
 msgstr ""
 
@@ -1767,48 +1797,52 @@ msgstr ""
 msgid "Enable this swap"
 msgstr "Aktiver denne swapenhet"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:37
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:88
 msgid "Enable/Disable"
 msgstr "Aktiver/Deaktiver"
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:76
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:152
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:251
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:41
 msgid "Enabled"
 msgstr "Aktivert"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:277
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:414
 msgid "Enables IGMP snooping on this bridge"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:892
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1310
 msgid ""
 "Enables fast roaming among access points that belong to the same Mobility "
 "Domain"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:272
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:412
 msgid "Enables the Spanning Tree Protocol on this bridge"
 msgstr "Aktiverer Spanning Tree Protocol på denne broen"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:120
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:180
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:59
+msgid "Encapsulation limit"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:843
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:901
 msgid "Encapsulation mode"
 msgstr "Innkapsling modus"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:76
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:603
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:129
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:992
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1621
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:177
 msgid "Encryption"
 msgstr "Kryptering"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:155
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:128
 msgid "Endpoint Host"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:165
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:132
 msgid "Endpoint Port"
 msgstr ""
 
@@ -1820,16 +1854,21 @@ msgstr ""
 msgid "Enter custom values"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:273
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:271
 msgid "Erasing..."
 msgstr "Sletter..."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:95
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:96
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:97
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:98
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:99
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:106
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:107
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:108
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:109
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:110
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:173
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:164
 msgid "Error"
 msgstr "Feil"
 
@@ -1837,24 +1876,28 @@ msgstr "Feil"
 msgid "Errored seconds (ES)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1646
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1852
 #: modules/luci-base/luasrc/model/network.lua:1432
 msgid "Ethernet Adapter"
 msgstr "Ethernet Tilslutning"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1637
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1843
 #: modules/luci-base/luasrc/model/network.lua:1422
 msgid "Ethernet Switch"
 msgstr "Ethernet Svitsj"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:303
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
 msgid "Exclude interfaces"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:153
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
 msgid "Expand hosts"
 msgstr "Utvid vertsliste"
 
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:195
+msgid "Expecting an hexadecimal assignment hint"
+msgstr ""
+
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:59
 msgid "Expecting: %s"
 msgstr ""
@@ -1863,61 +1906,77 @@ msgstr ""
 msgid "Expires"
 msgstr "Utgår"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:488
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:543
 #, fuzzy
 msgid ""
 "Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
 msgstr "Utløpstid på leide adresser, minimum er 2 minutter (<code>2m</code>)."
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:8
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:19
 msgid "External"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:971
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1377
 msgid "External R0 Key Holder List"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:980
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1381
 msgid "External R1 Key Holder List"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:150
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:141
 msgid "External system log server"
 msgstr "Ekstern systemlogg server"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:155
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:146
 msgid "External system log server port"
 msgstr "Ekstern systemlogg server port"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:160
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:151
 msgid "External system log server protocol"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:18
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:79
 msgid "Extra SSH command options"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:940
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1351
 msgid "FT over DS"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:941
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1352
 msgid "FT over the Air"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:938
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1349
 msgid "FT protocol"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1842
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:82
+msgid "Failed to change the system password."
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2389
 msgid "Failed to confirm apply within %ds, waiting for rollback…"
 msgstr ""
 
-#: modules/luci-base/luasrc/view/cbi/filebrowser.htm:106
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:45
+msgid "Failed to execute \"/etc/init.d/%s %s\" action: %s"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1561
 msgid "File"
 msgstr "Fil"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:279
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1514
+msgid "File not accessible"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1698
+msgid "Filename"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:280
 msgid "Filename of the boot image advertised to clients"
 msgstr "Filnavn fra boot image annonsert til klienter"
 
@@ -1927,14 +1986,15 @@ msgstr "Filnavn fra boot image annonsert til klienter"
 msgid "Filesystem"
 msgstr "Filsystem"
 
-#: 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:118
 msgid "Filter private"
 msgstr "Filtrer private"
 
-#: 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:123
 msgid "Filter useless"
 msgstr "Filtrer ubrukelige"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:23
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:65
 msgid "Finalizing failed"
 msgstr ""
@@ -1945,7 +2005,7 @@ msgid ""
 "with defaults based on what was detected"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:696
 msgid "Find and join network"
 msgstr "Finn og koble til nettverk"
 
@@ -1957,11 +2017,11 @@ msgstr "Fullfør"
 msgid "Firewall"
 msgstr "Brannmur"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:77
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:76
 msgid "Firewall Mark"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:193
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:278
 msgid "Firewall Settings"
 msgstr "Brannmur Innstillinger"
 
@@ -1969,7 +2029,7 @@ msgstr "Brannmur Innstillinger"
 msgid "Firewall Status"
 msgstr "Brannmur Status"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:137
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:860
 msgid "Firmware File"
 msgstr ""
 
@@ -1977,7 +2037,7 @@ msgstr ""
 msgid "Firmware Version"
 msgstr "Firmware Versjon"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:225
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:226
 msgid "Fixed source port for outbound DNS queries"
 msgstr "Fast kilde port for utgående DNS-spørringer"
 
@@ -1997,36 +2057,36 @@ msgstr "Flash nytt firmware image"
 msgid "Flash operations"
 msgstr "Flash operasjoner"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:194
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:192
 msgid "Flashing..."
 msgstr "Flasher..."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:498
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:550
 msgid "Force"
 msgstr "Bruk"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:258
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:782
 msgid "Force 40MHz mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:622
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1031
 msgid "Force CCMP (AES)"
 msgstr "Bruk CCMP (AES)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:499
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:550
 msgid "Force DHCP on this network even if another server is detected."
 msgstr ""
 "Bruk DHCP i dette nettverket, selv om en annen DHCP server er oppdaget."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:623
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1032
 msgid "Force TKIP"
 msgstr "Bruk TKIP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:624
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1033
 msgid "Force TKIP and CCMP (AES)"
 msgstr "Bruk TKIP og CCMP (AES)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:795
 msgid "Force link"
 msgstr ""
 
@@ -2034,7 +2094,7 @@ msgstr ""
 msgid "Force upgrade"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:60
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:90
 msgid "Force use of NAT-T"
 msgstr ""
 
@@ -2042,7 +2102,7 @@ msgstr ""
 msgid "Form token mismatch"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:34
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:164
 msgid "Forward DHCP traffic"
 msgstr "Videresend DHCP trafikk"
 
@@ -2050,46 +2110,41 @@ msgstr "Videresend DHCP trafikk"
 msgid "Forward Error Correction Seconds (FECS)"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:28
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:161
 msgid "Forward broadcast traffic"
 msgstr "Videresend kringkastingstrafikk"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:375
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:809
 msgid "Forward mesh peer traffic"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:186
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:908
 msgid "Forwarding mode"
 msgstr "Videresending modus"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:255
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:596
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:774
 msgid "Fragmentation Threshold"
 msgstr "Fragmenterings Terskel"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:332
-msgid "Frame Bursting"
-msgstr "Frame Bursting"
-
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:17
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:28
 msgid "Free"
 msgstr "Ledig"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:91
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:89
 msgid ""
-"Further information about WireGuard interfaces and peers at <a href=\"http://"
-"wireguard.com\">wireguard.com</a>."
+"Further information about WireGuard interfaces and peers at <a href='http://"
+"wireguard.com'>wireguard.com</a>."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:45
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:130
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:186
 msgid "GHz"
 msgstr "GHz"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:29
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:36
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:91
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:77
 msgid "GPRS only"
 msgstr "Kun GPRS"
 
@@ -2098,28 +2153,28 @@ msgstr "Kun GPRS"
 msgid "Gateway"
 msgstr "Gateway"
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:35
+msgid "Gateway Ports"
+msgstr "Gateway porter"
+
 #: modules/luci-base/htdocs/luci-static/resources/network.js:9
 #: modules/luci-base/luasrc/model/network.lua:29
 msgid "Gateway address is invalid"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:46
-msgid "Gateway ports"
-msgstr "Gateway porter"
-
-#: 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:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:275
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:23
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:112
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:103
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:49
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:33
 msgid "General Settings"
 msgstr "Generelle Innstillinger"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:188
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:462
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:175
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:141
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:361
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:504
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:895
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:741
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:796
 msgid "General Setup"
 msgstr "Generelt Oppsett"
 
@@ -2127,7 +2182,7 @@ msgstr "Generelt Oppsett"
 msgid "Generate Config"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:945
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1355
 msgid "Generate PMK locally"
 msgstr ""
 
@@ -2135,11 +2190,7 @@ msgstr ""
 msgid "Generate archive"
 msgstr "Opprett arkiv"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:63
-msgid "Generic 802.11%s Wireless Controller"
-msgstr "Generell 802.11%s Trådløs Kontroller"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:26
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:74
 msgid "Given password confirmation did not match, password not changed!"
 msgstr "Det oppgitte passordet var ikke korrekt, passord ble ikke endret!"
 
@@ -2147,7 +2198,7 @@ msgstr "Det oppgitte passordet var ikke korrekt, passord ble ikke endret!"
 msgid "Global Settings"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:806
 msgid "Global network options"
 msgstr ""
 
@@ -2158,33 +2209,29 @@ msgstr ""
 msgid "Go to password configuration..."
 msgstr "GÃ¥ til passord konfigurasjon..."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:857
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1369
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1112
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1616
 #: modules/luci-base/luasrc/view/cbi/full_valueheader.htm:4
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:58
 msgid "Go to relevant configuration page"
 msgstr "GÃ¥ til relevant konfigurasjonen side"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:38
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:66
 msgid "Group Password"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:11
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:22
 msgid "Guest"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:73
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:81
 msgid "HE.net password"
 msgstr "HE.net passord"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:60
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:73
 msgid "HE.net username"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:310
-msgid "HT mode (802.11n)"
-msgstr ""
-
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:16
 msgid "Hang Up"
 msgstr "Slå av"
@@ -2193,7 +2240,7 @@ msgstr "Slå av"
 msgid "Header Error Code Errors (HEC)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:103
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 msgid ""
 "Here you can configure the basic aspects of your device like its hostname or "
 "the timezone."
@@ -2201,9 +2248,7 @@ msgstr ""
 "Her kan du konfigurere grunnleggende aspekter av enheten som f.eks. dens "
 "vertsnavn eller tidssone."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:499
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:556
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:579
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:941
 msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "Skjul <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 
@@ -2214,14 +2259,15 @@ msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:92
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1959
 msgid "Host"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:20
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:21
 msgid "Host entries"
 msgstr "Vertsoppføringer"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:48
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:171
 msgid "Host expiry timeout"
 msgstr "Verts utløpstid"
 
@@ -2230,45 +2276,45 @@ msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
 msgstr ""
 "Verts-<abbr title=\"Internet Protocol Address\">IP</abbr> eller Nettverk"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:118
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:102
 msgid "Host-Uniq tag content"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:71
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:31
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:316
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:25
+#: 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:317
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:26
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:17
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:125
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:116
 msgid "Hostname"
 msgstr "Vertsnavn"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:12
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:22
 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:18
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:19
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:67
 msgid "Hostnames"
 msgstr "Vertsnavn"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:13
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:24
 msgid "Hybrid"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:45
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:75
 msgid "IKE DH Group"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:41
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:59
 msgid "IP Addresses"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:40
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:80
 msgid "IP Protocol"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:29
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:30
 msgid "IP address"
 msgstr "IP adresse"
 
@@ -2287,6 +2333,11 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:20
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:21
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:22
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:79
+#: 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/network.js:89
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:90
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:91
@@ -2294,7 +2345,7 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:93
 #: 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/luasrc/model/cbi/admin_network/proto_ncm.lua:42
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:82
 msgid "IPv4"
 msgstr "IPv4"
 
@@ -2306,24 +2357,23 @@ msgstr "IPv4 Brannmur"
 msgid "IPv4 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:57
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:178
 msgid "IPv4 address"
 msgstr "IPv4 adresse"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:26
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:33
 msgid "IPv4 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:104
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:181
 msgid "IPv4 broadcast"
 msgstr "IPv4 kringkasting"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:100
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:180
 msgid "IPv4 gateway"
 msgstr "IPv4 gateway"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:92
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:179
 msgid "IPv4 netmask"
 msgstr "IPv4 nettmaske"
 
@@ -2331,24 +2381,25 @@ msgstr "IPv4 nettmaske"
 msgid "IPv4 network in address/netmask notation"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:25
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:52
 msgid "IPv4 prefix"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:42
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:30
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:55
 msgid "IPv4 prefix length"
 msgstr "IPv4 prefikslengde"
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:43
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:83
 msgid "IPv4+IPv6"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:72
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:34
 msgid "IPv4-Address"
 msgstr "IPv4-Adresse"
 
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:10
 #: protocols/luci-proto-ipip/luasrc/model/network/proto_ipip.lua:9
 msgid "IPv4-in-IPv4 (RFC2003)"
 msgstr ""
@@ -2363,6 +2414,16 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:30
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:31
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:32
+#: 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/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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:89
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:90
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:91
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:92
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:95
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:96
@@ -2375,7 +2436,7 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:103
 #: 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/luasrc/model/cbi/admin_network/proto_ncm.lua:44
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:84
 msgid "IPv6"
 msgstr "IPv6"
 
@@ -2387,11 +2448,11 @@ msgstr "IPv6 Brannmur"
 msgid "IPv6 Neighbours"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:464
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:506
 msgid "IPv6 Settings"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:195
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:810
 msgid "IPv6 ULA-Prefix"
 msgstr ""
 
@@ -2399,21 +2460,21 @@ msgstr ""
 msgid "IPv6 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:202
 msgid "IPv6 address"
 msgstr "IPv6 adresse"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:23
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:189
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:31
 msgid "IPv6 assignment hint"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:18
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:184
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:27
 msgid "IPv6 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:207
 msgid "IPv6 gateway"
 msgstr "IPv6 gateway"
 
@@ -2421,22 +2482,22 @@ msgstr "IPv6 gateway"
 msgid "IPv6 network in address/netmask notation"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:37
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:59
 msgid "IPv6 prefix"
 msgstr "IPv6 prefiks"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:34
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:45
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:63
 msgid "IPv6 prefix length"
 msgstr "IPv6 prefikslengde"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:33
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:211
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:57
 msgid "IPv6 routed prefix"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:143
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:215
 msgid "IPv6 suffix"
 msgstr ""
 
@@ -2446,31 +2507,35 @@ msgid "IPv6-Address"
 msgstr "IPv6-Adresse"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:93
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:104
 msgid "IPv6-PD"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:10
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:13
 msgid "IPv6-in-IPv4 (RFC4213)"
 msgstr "IPv6-i-IPv4 (RFC4213)"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:17
 msgid "IPv6-over-IPv4 (6rd)"
 msgstr "IPv6-over-IPv4 (6rd)"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:15
 msgid "IPv6-over-IPv4 (6to4)"
 msgstr "IPv6-over-IPv4 (6til4)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1075
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1478
 msgid "Identity"
 msgstr "Identitet"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:70
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:96
 msgid "If checked, 1DES is enabled"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:65
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:93
 msgid "If checked, encryption is disabled"
 msgstr ""
 
@@ -2487,36 +2552,36 @@ msgid ""
 "device node"
 msgstr "Hvis oppgitt vil denne enheten bli montert utfra dens Volumnavn"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:27
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:71
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:18
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:82
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:52
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:17
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:29
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:33
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:68
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:85
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:32
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:45
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:45
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:24
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:44
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:116
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:48
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:85
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:65
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:33
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:80
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:108
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:146
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:74
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:97
 msgid "If unchecked, no default route is configured"
 msgstr "Dersom ikke avmerket blir ingen standard rute konfigurert"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:34
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:86
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:35
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:99
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:47
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:60
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:60
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:39
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:59
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:124
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:39
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:116
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:59
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:103
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:64
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:77
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:100
 msgid "If unchecked, the advertised DNS server addresses are ignored"
 msgstr "Dersom ikke avmerket blir de annonserte DNS server adresser ignorert"
 
@@ -2533,15 +2598,15 @@ 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:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:102
 msgid "Ignore <code>/etc/hosts</code>"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:471
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:531
 msgid "Ignore interface"
 msgstr "Ignorer grensesnitt"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:90
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:91
 msgid "Ignore resolve file"
 msgstr "Ignorer oppslagsfil"
 
@@ -2559,12 +2624,12 @@ msgid ""
 "blocked. Click \"Continue »\" below to return to the previous page."
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:145
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:118
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:124
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:126
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:97
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:118
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:157
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:141
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:115
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:138
 msgid "Inactivity timeout"
 msgstr "Tidsavbrudd etter innaktivitet"
 
@@ -2572,23 +2637,25 @@ msgstr "Tidsavbrudd etter innaktivitet"
 msgid "Inbound:"
 msgstr "Innkommende:"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:170
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:161
 msgid "Info"
 msgstr "Informasjon"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:105
 msgid "Information"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:25
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:67
 msgid "Initialization failure"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:34
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:87
 msgid "Initscript"
 msgstr "Oppstartskript"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:26
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:122
 msgid "Initscripts"
 msgstr "Oppstartsskript"
 
@@ -2596,55 +2663,74 @@ msgstr "Oppstartsskript"
 msgid "Install iputils-traceroute6 for IPv6 traceroute"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:223
-msgid "Install package %q"
-msgstr "Installer pakken %q"
-
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:220
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:120
 msgid "Install protocol extensions..."
 msgstr "Installer protokoll utvidelser..."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:416
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:423
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:683
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:687
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:26
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:284
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:342
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:47
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:134
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:14
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:16
 msgid "Interface"
 msgstr "Grensesnitt"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:58
 msgid "Interface %q device auto-migrated from %q to %q."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:356
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:792
 msgid "Interface Configuration"
 msgstr "Grensesnitt Konfigurasjon"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:51
-msgid "Interface Overview"
-msgstr "Grensesnitt Oversikt"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:99
+msgid "Interface has %d pending changes"
+msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:57
+msgid "Interface is marked for deletion"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:162
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:3
 msgid "Interface is reconnecting..."
 msgstr "Grensesnittet kobler til igjen..."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:162
+msgid "Interface is shutting down..."
+msgstr "Grensesnittet slår seg av..."
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:205
+msgid "Interface is starting..."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:208
+msgid "Interface is stopping..."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:954
 msgid "Interface name"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:34
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:224
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:131
 msgid "Interface not present or not connected yet."
 msgstr "Grensesnittet er ikke tilgjengelig eller er ikke tilknyttet."
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:88
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:16
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:11
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:287
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:54
 msgid "Interfaces"
 msgstr "Grensesnitt"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:9
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:20
 msgid "Internal"
 msgstr ""
 
@@ -2657,19 +2743,35 @@ msgstr "Intern server feil"
 msgid "Invalid"
 msgstr "Ugyldig"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:311
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:10
+msgid "Invalid Base64 key string"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:281
 msgid "Invalid VLAN ID given! Only IDs between %d and %d are allowed."
 msgstr "Ugyldig VLAN ID gitt! Bare IDer mellom %d og %d er tillatt."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:307
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:290
 msgid "Invalid VLAN ID given! Only unique IDs are allowed"
 msgstr "Ugyldig VLAN ID gitt! Bare unike ID'er er tillatt"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:195
+msgid "Invalid argument"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:194
+msgid "Invalid command"
+msgstr ""
+
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:80
+msgid "Invalid hexadecimal value"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/sysauth.htm:12
 msgid "Invalid username and/or password! Please try again."
 msgstr "Ugyldig brukernavn og/eller passord! Vennligst prøv igjen."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:508
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:950
 msgid "Isolate Clients"
 msgstr ""
 
@@ -2689,15 +2791,15 @@ msgstr ""
 msgid "JavaScript required!"
 msgstr "JavaScript kreves!"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:52
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1691
 msgid "Join Network"
 msgstr "Koble til nettverket"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:22
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1628
 msgid "Join Network: Wireless Scan"
 msgstr "Koble til nettverk: Trådløs Skanning"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:19
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1833
 msgid "Joining Network: %q"
 msgstr ""
 
@@ -2714,15 +2816,15 @@ msgstr "Kjerne Logg"
 msgid "Kernel Version"
 msgstr "Kjerne Versjon"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:823
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1248
 msgid "Key"
 msgstr "Nøkkel"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:851
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:852
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:853
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:854
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:870
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1277
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1278
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1279
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1291
 msgid "Key #%d"
 msgstr "Nøkkel #%d"
 
@@ -2730,33 +2832,34 @@ msgstr "Nøkkel #%d"
 msgid "Kill"
 msgstr "Drep"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:10
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:21
 msgid "L2TP"
 msgstr "L2TP"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:10
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:40
 msgid "L2TP Server"
 msgstr "L2TP Server"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:100
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:74
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:80
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:74
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:53
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:73
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:131
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:102
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:89
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:112
 msgid "LCP echo failure threshold"
 msgstr "LCP ekko feil terskel"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:118
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:89
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:95
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:89
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:68
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:91
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:144
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:102
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:125
 msgid "LCP echo interval"
 msgstr "LCP ekko intervall"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:181
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:902
 msgid "LLC"
 msgstr "LLC"
 
@@ -2765,11 +2868,11 @@ msgstr "LLC"
 msgid "Label"
 msgstr "Volumnavn"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:213
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:204
 msgid "Language"
 msgstr "Språk"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:115
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:106
 msgid "Language and Style"
 msgstr "Språk og Utseende"
 
@@ -2777,51 +2880,51 @@ msgstr "Språk og Utseende"
 msgid "Latency"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:10
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:21
 msgid "Leaf"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:369
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:487
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:393
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:543
 msgid "Lease time"
 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:87
 msgid "Leasefile"
 msgstr "<abbr title=\"Leasefile\">Leie-fil</abbr>"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:74
 #: modules/luci-base/luasrc/view/lease_status.htm:95
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:34
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
 msgid "Leasetime remaining"
 msgstr "Gjenværende leietid"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:9
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:20
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:27
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:50
 msgid "Leave empty to autodetect"
 msgstr "La stå tomt for automatisk oppdagelse"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:21
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:45
 msgid "Leave empty to use the current WAN address"
 msgstr "La stå tomt for å bruke gjeldene WAN adresse"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1746
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2299
 msgid "Legend:"
 msgstr "Forklaring:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:481
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:538
 msgid "Limit"
 msgstr "Grense"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:287
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:288
 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:299
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:300
 msgid "Limit listening to these interfaces, and loopback."
 msgstr ""
 
@@ -2841,11 +2944,11 @@ msgstr ""
 msgid "Line Uptime"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:101
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:88
 msgid "Link On"
 msgstr "Forbindelse"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:185
 msgid ""
 "List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
 "requests to"
@@ -2853,7 +2956,7 @@ msgstr ""
 "Liste med <abbr title=\"Domain Name System\">DNS</abbr> servere som "
 "forespørsler blir videresendt til"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:972
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1377
 msgid ""
 "List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-"
 "Identifier,128-bit key as hex string. <br />This list is used to map R0KH-ID "
@@ -2862,7 +2965,7 @@ msgid ""
 "Association."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:981
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1381
 msgid ""
 "List of R1KHs in the same Mobility Domain. <br />Format: MAC-address,R1KH-ID "
 "as 6 octets with colons,128-bit key as hex string. <br />This list is used "
@@ -2871,32 +2974,32 @@ msgid ""
 "PMK-R1 keys."
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:21
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:82
 msgid "List of SSH key files for auth"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:206
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:207
 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:173
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:174
 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:298
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:299
 msgid "Listen Interfaces"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:30
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:54
 msgid "Listen Port"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:15
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:16
 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:216
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:217
 msgid "Listening port for inbound DNS queries"
 msgstr "Lytte-port for innkommende DNS-spørring"
 
@@ -2915,11 +3018,11 @@ msgstr "Belastning Gjennomsnitt"
 msgid "Loading"
 msgstr "Laster"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:35
-msgid "Loading SSH keys…"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1819
+msgid "Loading directory contents…"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1204
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1296
 #: modules/luci-base/luasrc/view/view.htm:4
 msgid "Loading view…"
 msgstr ""
@@ -2929,41 +3032,41 @@ msgstr ""
 msgid "Local IP address is invalid"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:25
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:86
 msgid "Local IP address to assign"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:10
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:11
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:44
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:39
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:151
 msgid "Local IPv4 address"
 msgstr "Lokal IPv4 adresse"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:20
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:54
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:45
 msgid "Local IPv6 address"
 msgstr "Lokal IPv6 adresse"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:286
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:287
 msgid "Local Service Only"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:81
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:126
 msgid "Local Startup"
 msgstr "Lokal Oppstart"
 
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:25
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:121
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:112
 msgid "Local Time"
 msgstr "Lokal tid"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:149
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
 msgid "Local domain"
 msgstr "Lokalt domene"
 
-#: 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:147
 #, fuzzy
 msgid ""
 "Local domain specification. Names matching this domain are never forwarded "
@@ -2972,15 +3075,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:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:151
 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:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
 msgid "Local server"
 msgstr "Lokal server"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:129
 msgid ""
 "Localise hostname depending on the requesting subnet if multiple IPs are "
 "available"
@@ -2988,23 +3091,19 @@ msgstr ""
 "Lokaliser vertsnavn avhengig av subnett hvis flere IP-adresser er "
 "tilgjengelig"
 
-#: 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:128
 msgid "Localise queries"
 msgstr "Lokalisere søk"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:175
-msgid "Locked to channel %s used by: %s"
-msgstr ""
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:168
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:159
 msgid "Log output level"
 msgstr "Logg nivå"
 
-#: 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:181
 msgid "Log queries"
 msgstr "Logg spørringer"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:113
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:104
 msgid "Logging"
 msgstr "Logging"
 
@@ -3012,7 +3111,7 @@ msgstr "Logging"
 msgid "Login"
 msgstr "Logg inn"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:95
+#: modules/luci-base/luasrc/controller/admin/index.lua:103
 msgid "Logout"
 msgstr "Logg ut"
 
@@ -3020,11 +3119,13 @@ msgstr "Logg ut"
 msgid "Loss of Signal Seconds (LOSS)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:476
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:533
 msgid "Lowest leased address as offset from the network address."
 msgstr "Laveste leide adresse, forskjøvet fra nettverks adressen."
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:40
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:75
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:35
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:86
 msgid "MAC"
@@ -3032,32 +3133,32 @@ msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:73
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:109
-#: 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:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1958
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:86
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:133
 msgid "MAC-Address"
 msgstr "MAC-Adresse"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:457
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:586
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:886
 msgid "MAC-Address Filter"
 msgstr "MAC-Addresse Filter"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:142
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:363
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:798
 msgid "MAC-Filter"
 msgstr "MAC-Filter"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:464
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:590
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:893
 msgid "MAC-List"
 msgstr "MAC-Liste"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:13
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:16
 msgid "MAP / LW4over6"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:62
 msgid "MAP rule is invalid"
 msgstr ""
@@ -3075,8 +3176,8 @@ msgid "MHz"
 msgstr "MHz"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:53
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:29
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:66
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:53
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:71
 msgid "MTU"
 msgstr "MTU"
 
@@ -3086,16 +3187,17 @@ msgid ""
 "below:"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:55
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:69
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:26
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:38
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:38
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:108
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:52
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:96
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:83
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:57
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:70
 msgid "Manual"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1949
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2188
 msgid "Master"
 msgstr ""
 
@@ -3103,48 +3205,46 @@ msgstr ""
 msgid "Max. Attainable Data Rate (ATTNDR)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:539
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:982
 msgid "Maximum allowed Listen Interval"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:234
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
 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:252
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:253
 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:243
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:244
 msgid "Maximum allowed size of EDNS.0 UDP packets"
 msgstr "Maksimal tillatt størrelse på EDNS.0 UDP-pakker"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:63
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:77
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:57
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:112
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:104
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:93
 msgid "Maximum amount of seconds to wait for the modem to become ready"
 msgstr "Maksimalt antall sekunder å vente på at modemet skal bli klart"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:27
-msgid ""
-"Maximum length of the name is 15 characters including the automatic protocol/"
-"bridge prefix (br-, 6in4-, pppoe- etc.)"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:482
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:538
 msgid "Maximum number of leased addresses."
 msgstr "Maksimalt antall utleide adresser."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:761
+msgid "Maximum transmit power"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:21
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:49
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:134
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:187
 #: modules/luci-mod-status/luasrc/view/admin_status/bandwidth.htm:79
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:284
 msgid "Mbit/s"
 msgstr "Mbit/s"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:18
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:32
 msgid "Medium"
 msgstr ""
 
@@ -3156,42 +3256,43 @@ msgstr "Minne"
 msgid "Memory usage (%)"
 msgstr "Minne forbruk (%)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1952
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2191
 msgid "Mesh"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:372
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:806
 msgid "Mesh Id"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:196
+msgid "Method not found"
+msgstr ""
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:45
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:76
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:104
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:54
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:66
 msgid "Metric"
 msgstr "Metrisk"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:154
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:198
 msgid "Mirror monitor port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:153
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:197
 msgid "Mirror source port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:408
-msgid "Missing protocol extension for proto %q"
-msgstr "Mangler protokoll utvidelse for proto %q"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:923
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1337
 msgid "Mobility Domain"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:154
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:41
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:74
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:366
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:31
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:360
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:801
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1619
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:175
 msgid "Mode"
 msgstr "Modus"
@@ -3200,39 +3301,38 @@ msgstr "Modus"
 msgid "Model"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:31
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:72
 msgid "Modem default"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:11
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:19
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:11
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:10
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:73
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:73
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:57
 msgid "Modem device"
 msgstr "Modem"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:24
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:66
 msgid "Modem information query failed"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:62
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:76
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:56
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:112
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:104
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:93
 msgid "Modem init timeout"
 msgstr "Modem initiering tidsavbrudd"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1953
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:452
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:554
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:577
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2192
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:880
 msgid "Monitor"
 msgstr "Monitor"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:14
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
 msgid "More Characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:802
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1057
 msgid "More…"
 msgstr ""
 
@@ -3245,7 +3345,7 @@ msgstr "Monterings Enhet"
 msgid "Mount Point"
 msgstr "Monterings Punkt"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:26
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:36
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:137
 msgid "Mount Points"
@@ -3295,46 +3395,44 @@ msgstr "Flytt ned"
 msgid "Move up"
 msgstr "Flytt opp"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:912
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
 msgid "NAS ID"
 msgstr "NAS ID"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:57
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:87
 msgid "NAT-T Mode"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:9
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 msgid "NAT64 Prefix"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:31
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:26
 msgid "NCM"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:535
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:589
 msgid "NDP-Proxy"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:43
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:72
 msgid "NT Domain"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:273
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:264
 msgid "NTP server candidates"
 msgstr "NTP server kandidater"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:837
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1092
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:27
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:502
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:65
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:553
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:658
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:49
 msgid "Name"
 msgstr "Navn"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:17
-msgid "Name of the new interface"
-msgstr "Navnet til det nye grensesnittet"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1808
 msgid "Name of the new network"
 msgstr "Navnet til det nye nettverket"
 
@@ -3342,9 +3440,10 @@ msgstr "Navnet til det nye nettverket"
 msgid "Navigation"
 msgstr "Navigasjon"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:62
+#: modules/luci-base/luasrc/controller/admin/index.lua:69
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:108
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:402
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:834
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1957
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:389
 #: modules/luci-mod-status/luasrc/view/admin_status/index/30-network.htm:8
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:73
@@ -3356,7 +3455,7 @@ msgstr "Nettverk"
 msgid "Network Utilities"
 msgstr "Nettverks Verktøy"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:278
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:279
 msgid "Network boot image"
 msgstr "Nettverks boot image"
 
@@ -3369,53 +3468,59 @@ msgstr ""
 msgid "Network without interfaces."
 msgstr "Nettverk uten grensesnitt."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:661
+msgid "New interface name…"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:11
 msgid "Next »"
 msgstr "Neste »"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1507
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1754
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:108
 msgid "No"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:453
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:514
 msgid "No DHCP Server configured for this interface"
 msgstr "Ingen DHCP server er konfigurert for dette grensesnittet"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1162
+msgid "No Encryption"
+msgstr ""
+
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:89
 msgid "No NAT-T"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:198
+msgid "No data received"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1764
+msgid "No entries in this directory"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/backupfiles.lua:82
 msgid "No files found"
 msgstr "Ingen filer funnet"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:550
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:191
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:180
 msgid "No information available"
 msgstr "Ingen informasjon tilgjengelig"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:8
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:63
 msgid "No matching prefix delegation"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:157
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
 msgid "No negative cache"
 msgstr "Ingen negative cache"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:53
-msgid "No network configured on this device"
-msgstr "Ingen nettverk er konfigurert på denne enheten"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:65
-msgid "No network name specified"
-msgstr "Ingen nettverksnavn spesifisert"
-
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:147
-msgid "No networks in range"
-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
@@ -3423,7 +3528,12 @@ msgstr ""
 msgid "No password set!"
 msgstr "Ruteren er ikke passordbeskyttet!"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:116
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:104
+msgid "No peers defined yet"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:129
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:271
 msgid "No public keys present yet."
 msgstr ""
 
@@ -3431,19 +3541,19 @@ msgstr ""
 msgid "No rules in this chain."
 msgstr "Ingen regler i denne tabellen"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:150
-msgid "No scan results available yet..."
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:53
+msgid "No signal"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:7
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:756
 msgid "No zone assigned"
 msgstr "Ingen sone tilknyttet"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:111
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:35
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:48
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:133
 msgid "Noise"
 msgstr "Støy"
 
@@ -3459,16 +3569,16 @@ msgstr "Støy:"
 msgid "Non Pre-emtive CRC errors (CRC_P)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:292
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:293
 msgid "Non-wildcard"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:129
 msgid "None"
 msgstr "Ingen"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:181
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:172
 msgid "Normal"
 msgstr "Normal"
 
@@ -3476,25 +3586,29 @@ msgstr "Normal"
 msgid "Not Found"
 msgstr "Ikke funnet"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:27
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:5
-msgid "Not associated"
-msgstr "Ikke tilknyttet"
-
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:87
 msgid "Not connected"
 msgstr "Ikke tilkoblet"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:38
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:139
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:232
+msgid "Not present"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:105
 msgid "Not started on boot"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:26
-msgid "Note: interface name length"
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:201
+msgid "Not supported"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:171
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:162
 msgid "Notice"
 msgstr "Merk"
 
@@ -3502,63 +3616,50 @@ msgstr "Merk"
 msgid "Nslookup"
 msgstr "Nslookup"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:261
 msgid "Number of cached DNS entries (max is 10000, 0 is no caching)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:203
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:194
 msgid "Number of parallel threads used for compression"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:40
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:69
 msgid "Obfuscated Group Password"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:35
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:61
 msgid "Obfuscated Password"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:22
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:34
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:40
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:105
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:97
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:49
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:80
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:54
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:67
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:93
 msgid "Obtain IPv6-Address"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:83
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:68
 msgid "Off-State Delay"
 msgstr "Forsinkelse ved tilstand Av"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:16
-msgid ""
-"On this page you can configure the network interfaces. You can bridge "
-"several interfaces by ticking the \"bridge interfaces\" field and enter the "
-"names of several network interfaces separated by spaces. You can also use "
-"<abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
-"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
-"<samp>eth0.1</samp>)."
-msgstr ""
-"PÃ¥ denne siden kan du konfigurere nettverks grensesnittet. Du kan "
-"sammenkoble flere grensesnitt ved å hake av \"Sammekoble grensesnitt\" "
-"feltet og skrive inn navn på grensesnittene atskilt med mellomrom. Du kan "
-"også bruke <abbr title=\"Virtual Local Area Network\">VLAN</abbr> betegnelse "
-"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for eksempel\">f.eks</abbr>: "
-"<samp>eth0.1</samp>)."
-
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:95
 msgid "On-Link route"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:80
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:64
 msgid "On-State Delay"
 msgstr "Forsinkelse ved tilstand -PÃ¥-"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:360
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:382
 msgid "One of hostname or mac address must be specified!"
 msgstr "Enten Vertsnavn eller Mac-adresse må oppgis!"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:456
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:462
 msgid "One of the following: %s"
 msgstr ""
 
@@ -3580,34 +3681,35 @@ msgstr "Ett eller flere obligatoriske felter har ingen verdi!"
 msgid "Open list..."
 msgstr "Åpne liste..."
 
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:61
 #: protocols/luci-proto-openconnect/luasrc/model/network/proto_openconnect.lua:9
 msgid "OpenConnect (CISCO AnyConnect)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:757
 msgid "Operating frequency"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1753
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2306
 msgid "Option changed"
 msgstr "Innstilling endret"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1755
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2308
 msgid "Option removed"
 msgstr "Innstilling fjernet"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1140
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:55
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1535
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:66
 msgid "Optional"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:78
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:76
 msgid ""
 "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, "
 "starting with <code>0x</code>."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:144
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:215
 msgid ""
 "Optional. Allowed values: 'eui64', 'random', fixed value like '::1' or "
 "'::1:2'. When IPv6 prefix (like 'a:b:c:d::') is received from a delegating "
@@ -3615,41 +3717,41 @@ msgid ""
 "for the interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:123
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:117
 msgid ""
 "Optional. Base64-encoded preshared key. Adds in an additional layer of "
 "symmetric-key cryptography for post-quantum resistance."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:148
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:126
 msgid "Optional. Create routes for Allowed IPs for this peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:103
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:108
 msgid "Optional. Description of peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:156
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:128
 msgid ""
 "Optional. Host of peer. Names are resolved prior to bringing up the "
 "interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:67
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:71
 msgid "Optional. Maximum Transmission Unit of tunnel interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:166
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:132
 msgid "Optional. Port of peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:175
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:136
 msgid ""
 "Optional. Seconds between keep alive messages. Default is 0 (disabled). "
 "Recommended value if this device is behind a NAT is 25."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:31
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:54
 msgid "Optional. UDP port used for outgoing and incoming packets."
 msgstr ""
 
@@ -3670,7 +3772,7 @@ msgstr "Ut"
 msgid "Outbound:"
 msgstr "Ugående:"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:26
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:50
 msgid "Output Interface"
 msgstr ""
 
@@ -3679,45 +3781,45 @@ msgstr ""
 msgid "Output zone"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:63
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:155
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:33
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:54
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:54
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:219
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:50
 msgid "Override MAC address"
 msgstr "Overstyr MAC adresse"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:66
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:35
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:56
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:88
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:125
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:131
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:133
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:104
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:61
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:58
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:223
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:44
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:54
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:154
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:71
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:145
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:132
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:110
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:119
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:97
 msgid "Override MTU"
 msgstr "Overstyr MTU"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:30
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:63
 msgid "Override TOS"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:25
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:58
 msgid "Override TTL"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:954
 msgid "Override default interface name"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:41
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:167
 msgid "Override the gateway in DHCP responses"
 msgstr "Overstyr gatewayen mottatt av DHCP respons"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:507
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:555
 msgid ""
 "Override the netmask sent to clients. Normally it is calculated from the "
 "subnet that is served."
@@ -3725,7 +3827,7 @@ msgstr ""
 "Overstyr nettmaske sendt til klienter. Normalt er nettmasken beregnet ut fra "
 "subnettet som blir tildelt."
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:65
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:179
 msgid "Override the table used for internal routes"
 msgstr "Overstyr tabellen som brukes for interne ruter"
 
@@ -3733,29 +3835,33 @@ msgstr "Overstyr tabellen som brukes for interne ruter"
 msgid "Overview"
 msgstr "Oversikt"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1606
+msgid "Overwrite existing file \"%s\" ?"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:11
 msgid "Owner"
 msgstr "Eier"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:42
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:56
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:17
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:28
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:34
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:14
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:18
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:43
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:98
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:45
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:44
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:63
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:82
 msgid "PAP/CHAP password"
 msgstr "PAP/CHAP passord"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:39
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:53
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:14
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:11
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:15
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:96
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:88
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:43
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:74
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:42
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:61
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:77
 msgid "PAP/CHAP username"
 msgstr "PAP/CHAP brukernavn"
 
@@ -3763,9 +3869,9 @@ msgstr "PAP/CHAP brukernavn"
 msgid "PID"
 msgstr "PID"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:36
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:50
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:26
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:95
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:87
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:68
 msgid "PIN"
 msgstr "PIN"
 
@@ -3774,114 +3880,116 @@ msgstr "PIN"
 msgid "PIN code rejected"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:966
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1372
 msgid "PMK R1 Push"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:43
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:13
 msgid "PPP"
 msgstr "PPP"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:11
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:58
 msgid "PPPoA Encapsulation"
 msgstr "PPPoA Innkapsling"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:19
 msgid "PPPoATM"
 msgstr "PPPoATM"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:17
 msgid "PPPoE"
 msgstr "PPPoE"
 
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:28
 #: protocols/luci-proto-pppossh/luasrc/model/network/proto_pppossh.lua:9
 msgid "PPPoSSH"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:15
 msgid "PPtP"
 msgstr "PPtP"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:59
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:73
 msgid "PSID offset"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:56
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:70
 msgid "PSID-bits length"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:123
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:846
 msgid "PTM/EFM (Packet Transfer Mode)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:78
-msgid "Package libiwinfo required!"
-msgstr "Pakken libiwinfo er nødvendig!"
-
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:45
 msgid "Packets"
 msgstr "Pakker"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:7
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:756
 msgid "Part of zone %q"
 msgstr "En del av sone %q"
 
 #: modules/luci-base/luasrc/view/sysauth.htm:29
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1111
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:35
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:42
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1514
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:46
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:104
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:58
 msgid "Password"
 msgstr "Passord"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:29
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:24
 msgid "Password authentication"
 msgstr "Passord godkjenning"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1019
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1414
 msgid "Password of Private Key"
 msgstr "Passord for privatnøkkel"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1067
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1471
 msgid "Password of inner Private Key"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:14
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:16
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:18
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:20
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:32
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:34
 msgid "Password strength"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:44
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:107
 msgid "Password2"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:37
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:244
 msgid "Paste or drag SSH key file…"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1000
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1396
 msgid "Path to CA-Certificate"
 msgstr "Sti til CA-sertifikat"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1007
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1402
 msgid "Path to Client-Certificate"
 msgstr "Sti til klient-sertifikat"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1013
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1408
 msgid "Path to Private Key"
 msgstr "Sti til privatnøkkel"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1049
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1453
 msgid "Path to inner CA-Certificate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1055
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1459
 msgid "Path to inner Client-Certificate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1061
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1465
 msgid "Path to inner Private Key"
 msgstr ""
 
@@ -3899,7 +4007,7 @@ msgstr ""
 msgid "Peak:"
 msgstr "Maksimalt:"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:28
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:89
 msgid "Peer IP address to assign"
 msgstr ""
 
@@ -3908,11 +4016,11 @@ msgstr ""
 msgid "Peer address is missing"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:90
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:89
 msgid "Peers"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:50
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:80
 msgid "Perfect Forward Secrecy"
 msgstr ""
 
@@ -3924,7 +4032,11 @@ msgstr "Omstart nå"
 msgid "Perform reset"
 msgstr "Foreta nullstilling"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:174
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:199
+msgid "Permission denied"
+msgstr ""
+
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:136
 msgid "Persistent Keep Alive"
 msgstr ""
 
@@ -3932,7 +4044,7 @@ msgstr ""
 msgid "Phy Rate:"
 msgstr "Phy Hastighet:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:190
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:277
 msgid "Physical Settings"
 msgstr "Fysiske Innstillinger"
 
@@ -3943,6 +4055,10 @@ msgstr "Ping"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:16
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:17
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:41
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:77
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:87
@@ -3960,15 +4076,19 @@ msgstr "Skriv inn ditt brukernavn og passord."
 msgid "Policy"
 msgstr "Policy"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:22
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:20
 msgid "Port"
 msgstr "Port"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:18
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:133
+msgid "Port %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:274
 msgid "Port status:"
 msgstr "Port status:"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:482
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:488
 msgid "Potential negation of: %s"
 msgstr ""
 
@@ -3980,11 +4100,11 @@ msgstr ""
 msgid "Pre-emtive CRC errors (CRCP_P)"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:32
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:73
 msgid "Prefer LTE"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:33
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:74
 msgid "Prefer UMTS"
 msgstr ""
 
@@ -3992,16 +4112,16 @@ msgstr ""
 msgid "Prefix Delegated"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:122
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:117
 msgid "Preshared Key"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:101
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:75
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:81
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:75
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:54
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:74
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:131
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:102
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:89
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:112
 msgid ""
 "Presume peer to be dead after given amount of LCP echo failures, use 0 to "
 "ignore failures"
@@ -4009,16 +4129,15 @@ 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:304
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:305
 msgid "Prevent listening on these interfaces."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:509
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:562
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:950
 msgid "Prevents client-to-client communication"
 msgstr "Hindrer klient-til-klient kommunikasjon"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:18
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:49
 msgid "Private Key"
 msgstr ""
 
@@ -4039,39 +4158,33 @@ msgstr ""
 msgid "Prot."
 msgstr "Prot."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:72
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:349
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:675
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:84
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:216
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:87
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:390
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:31
-msgid "Protocol of the new interface"
-msgstr "Protokoll til det nye grensesnittet"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:222
-msgid "Protocol support is not installed"
-msgstr "Protokoll støtte er ikke installert"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:269
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:260
 msgid "Provide NTP server"
 msgstr "Funger som NTP Server"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:701
 msgid "Provide new network"
 msgstr "Lag nytt nettverk"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:451
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:879
 msgid "Pseudo Ad-Hoc (ahdemo)"
 msgstr "Pseudo Ad-Hoc (ahdemo)"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:112
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:113
 msgid "Public Key"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:278
 msgid ""
 "Public keys allow for the passwordless SSH logins with a higher security "
 "compared to the use of plain passwords. In order to upload a new key to the "
@@ -4079,47 +4192,48 @@ msgid ""
 "code> file into the input field."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:139
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:211
 msgid "Public prefix routed to this device for distribution to clients."
 msgstr ""
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:27
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:9
 msgid "QMI Cellular"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:173
 msgid "Quality"
 msgstr "Kvalitet"
 
-#: 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:171
 msgid ""
 "Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> "
 "servers"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:952
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1360
 msgid "R0 Key Lifetime"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:959
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1366
 msgid "R1 Key Holder"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:58
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:88
 msgid "RFC3947 NAT-T mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:381
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:814
 msgid "RSSI threshold for joining"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:256
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:597
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:778
 msgid "RTS/CTS Threshold"
 msgstr "RTS/CTS Terskel"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:41
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:76
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:87
 msgid "RX"
@@ -4129,35 +4243,39 @@ msgstr "RX"
 msgid "RX Rate"
 msgstr "RX Rate"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:783
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1961
+msgid "RX Rate / TX Rate"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1207
 msgid "Radius-Accounting-Port"
 msgstr "Radius-Accounting-Port"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:791
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1215
 msgid "Radius-Accounting-Secret"
 msgstr "Radius-Accounting-Secret"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:775
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1199
 msgid "Radius-Accounting-Server"
 msgstr "Radius-Accounting-Server"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:759
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1183
 msgid "Radius-Authentication-Port"
 msgstr "Radius-Authentication-Port"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:767
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1191
 msgid "Radius-Authentication-Secret"
 msgstr "Radius-Authentication-Secret"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:751
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1175
 msgid "Radius-Authentication-Server"
 msgstr "Radius-Authentication-Server"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:119
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:102
 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:83
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:84
 msgid ""
 "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-Server"
@@ -4171,19 +4289,11 @@ msgid ""
 "access to this device if you are connected via this interface"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2
-msgid ""
-"Really delete this wireless network? The deletion cannot be undone! You "
-"might lose access to this device if you are connected via this network."
-msgstr ""
-"Fjerne dette trådløse nettverket? Slettingen kan ikke omgjøres!\n"
-"Du kan miste kontakten med ruteren om du er tilkoblet via dette nettverket."
-
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:40
 msgid "Really reset all changes?"
 msgstr "Vil du nullstille alle endringer?"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:237
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:354
 msgid "Really switch protocol?"
 msgstr "Vil du endre protokoll?"
 
@@ -4207,15 +4317,15 @@ msgstr "Trafikk Sanntid"
 msgid "Realtime Wireless"
 msgstr "Trådløst i sanntid"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:931
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1343
 msgid "Reassociation Deadline"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:191
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
 msgid "Rebind protection"
 msgstr "Binde beskyttelse"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:48
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:46
 #: modules/luci-mod-system/luasrc/view/admin_system/reboot.htm:9
 msgid "Reboot"
 msgstr "Omstart"
@@ -4229,21 +4339,15 @@ msgstr "Starter på nytt..."
 msgid "Reboots the operating system of your device"
 msgstr "Omstarter operativsystemet på enheten"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:103
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:90
 msgid "Receive"
 msgstr "Motta"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:325
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:350
-msgid "Receiver Antenna"
-msgstr "Mottak antenne"
-
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:42
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:59
 msgid "Recommended. IP addresses of the WireGuard interface."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:28
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:300
 msgid "Reconnect this interface"
 msgstr "Koble til igjen"
 
@@ -4251,92 +4355,134 @@ msgstr "Koble til igjen"
 msgid "References"
 msgstr "Referanser"
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:39
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:153
 msgid "Relay"
 msgstr "Relay"
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:36
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:157
 msgid "Relay Bridge"
 msgstr "Relay bro"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:17
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:154
 msgid "Relay between networks"
 msgstr "Relay mellom nettverk"
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:64
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:12
 msgid "Relay bridge"
 msgstr "Relay bro"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:18
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:50
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:49
 msgid "Remote IPv4 address"
 msgstr "Ekstern IPv4 adresse"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:8
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:40
 msgid "Remote IPv4 address or FQDN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:45
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:725
 msgid "Remove"
 msgstr "Avinstaller"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:53
-msgid "Repeat scan"
-msgstr "Skann på nytt"
-
-#: modules/luci-base/luasrc/view/cbi/upload.htm:11
-msgid "Replace entry"
-msgstr "Erstatt oppføring"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:46
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:51
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1806
 msgid "Replace wireless configuration"
 msgstr "Erstatt trådløs konfigurasjon"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:8
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:17
 msgid "Request IPv6-address"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:16
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:23
 msgid "Request IPv6-prefix of length"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1141
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:200
+msgid "Request timeout"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1536
 msgid "Required"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:20
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:31
 msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3"
 msgstr "Er nødvendig for noen nettleverandører, f.eks Charter med DOCSIS 3"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:19
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:49
 msgid "Required. Base64-encoded private key for this interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:113
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:113
 msgid "Required. Base64-encoded public key of peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:136
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:122
 msgid ""
 "Required. IP addresses and prefixes that this peer is allowed to use inside "
 "the tunnel. Usually the peer's tunnel IP addresses and the networks the peer "
 "routes through the tunnel."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1134
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1095
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1096
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1097
+msgid "Requires hostapd"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1101
+msgid "Requires hostapd with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1102
+msgid "Requires hostapd with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1098
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1099
+msgid "Requires hostapd with SAE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1533
 msgid ""
 "Requires the 'full' version of wpad/hostapd and support from the wifi driver "
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:141
 msgid ""
 "Requires upstream supports DNSSEC; verify unsigned domain responses really "
 "come from unsigned domains"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1268
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1109
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1119
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1120
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1121
+msgid "Requires wpa-supplicant"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1113
+msgid "Requires wpa-supplicant with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1114
+msgid "Requires wpa-supplicant with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1111
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1124
+msgid "Requires wpa-supplicant with SAE support"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1355
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:17
 #: modules/luci-base/luasrc/view/cbi/footer.htm:30
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:66
@@ -4352,17 +4498,22 @@ msgstr "Nullstill Tellere"
 msgid "Reset to defaults"
 msgstr "Nullstill til standard innstilling"
 
-#: 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:68
 msgid "Resolv and Hosts Files"
 msgstr "Oppslag og Vertsfiler"
 
-#: 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:94
 msgid "Resolve file"
 msgstr "<abbr title=\"Resolvefile\">Oppslagsfil</abbr>"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:28
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:14
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:71
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:197
+msgid "Resource not found"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:302
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:693
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:90
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:112
 msgid "Restart"
 msgstr "Omstart"
 
@@ -4370,7 +4521,7 @@ msgstr "Omstart"
 msgid "Restart Firewall"
 msgstr "Omstart Brannmur"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:14
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:691
 msgid "Restart radio interface"
 msgstr ""
 
@@ -4382,26 +4533,24 @@ msgstr "Gjenoppretting"
 msgid "Restore backup"
 msgstr "Gjenopprett sikkerhetskopi"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:113
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:114
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:38
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:46
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:119
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:120
 msgid "Reveal/hide password"
 msgstr "Vis/Skjul passord"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1774
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2322
 msgid "Revert"
 msgstr "Tilbakestill"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1861
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2405
 msgid "Revert changes"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2013
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2554
 msgid "Revert request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1993
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2534
 msgid "Reverting configuration…"
 msgstr ""
 
@@ -4409,7 +4558,7 @@ msgstr ""
 msgid "Root"
 msgstr "Rot"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:271
 msgid "Root directory for files served via TFTP"
 msgstr "Rot katalog for filer gitt fra TFTP"
 
@@ -4417,7 +4566,7 @@ msgstr "Rot katalog for filer gitt fra TFTP"
 msgid "Root preparation"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:147
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:126
 msgid "Route Allowed IPs"
 msgstr ""
 
@@ -4429,12 +4578,12 @@ msgstr ""
 msgid "Route type"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:523
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:577
 msgid "Router Advertisement-Service"
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:43
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:15
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:27
 msgid "Router Password"
 msgstr "Ruter Passord"
 
@@ -4464,7 +4613,7 @@ msgstr "Kjør filsystem sjekk før montering av enheten"
 msgid "Run filesystem check"
 msgstr "Kjør filsystem sjekk"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:651
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:669
 msgid "Runtime error"
 msgstr ""
 
@@ -4476,31 +4625,31 @@ msgstr ""
 msgid "SNR"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:5
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:18
 msgid "SSH Access"
 msgstr "SSH Tilgang"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:10
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:70
 msgid "SSH server address"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:13
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:74
 msgid "SSH server port"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:8
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:58
 msgid "SSH username"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:27
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:277
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
 msgid "SSH-Keys"
 msgstr "SSH-Nøkler"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:42
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:73
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:29
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1617
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:174
 msgid "SSID"
 msgstr "SSID"
@@ -4509,17 +4658,17 @@ msgstr "SSID"
 msgid "SWAP"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1127
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1262
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1379
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1351
 #: modules/luci-base/luasrc/view/cbi/error.htm:17
 #: modules/luci-base/luasrc/view/cbi/footer.htm:26
 #: modules/luci-base/luasrc/view/cbi/header.htm:17
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:54
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:133
 msgid "Save"
 msgstr "Lagre"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1256
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1768
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1347
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2318
 #: modules/luci-base/luasrc/view/cbi/footer.htm:22
 msgid "Save & Apply"
 msgstr "Lagre & Aktiver"
@@ -4532,28 +4681,20 @@ msgstr ""
 msgid "Save mtdblock contents"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
-msgid "Saving keys…"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:698
 msgid "Scan"
 msgstr "Skann"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:109
-msgid "Scan request failed"
-msgstr ""
-
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:8
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:39
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:23
 msgid "Scheduled Tasks"
 msgstr "Planlagte Oppgaver"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1749
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2302
 msgid "Section added"
 msgstr "Seksjon lagt til"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1751
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2304
 msgid "Section removed"
 msgstr "Seksjon fjernet"
 
@@ -4568,12 +4709,18 @@ msgid ""
 "your device!"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:119
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:90
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:96
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:90
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:69
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:92
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1516
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1646
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1809
+msgid "Select file…"
+msgstr ""
+
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:144
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:102
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:125
 msgid ""
 "Send LCP echo requests at the given interval in seconds, only effective in "
 "conjunction with failure threshold"
@@ -4581,50 +4728,49 @@ msgstr ""
 "Send LCP ekko forespørsler etter angitt intervall i sekunder, dette er kun "
 "gjeldene dersom feilterskelen er nådd"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:561
-msgid "Separate Clients"
-msgstr "Separerte Klienter"
-
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:62
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:63
 msgid "Server Settings"
 msgstr "Server Innstillinger"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:26
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:50
 msgid "Service Name"
 msgstr "Tjeneste navn"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:25
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:30
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:87
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:71
 msgid "Service Type"
 msgstr "Tjeneste type"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:55
+#: modules/luci-base/luasrc/controller/admin/index.lua:62
 msgid "Services"
 msgstr "Tjenester"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:815
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:861
 msgid "Session expired"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:83
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:107
 msgid "Set VPN as Default Route"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:258
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:795
 msgid ""
 "Set interface properties regardless of the link carrier (If set, carrier "
 "sense events do not invoke hotplug handlers)."
 msgstr ""
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:23
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:55
 msgid "Setting PLMN failed"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:26
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:68
 msgid "Setting operation mode failed"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:454
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:517
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:527
 msgid "Setup DHCP Server"
 msgstr "Oppsett DHCP server"
 
@@ -4636,7 +4782,7 @@ msgstr ""
 msgid "Short GI"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:516
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:960
 msgid "Short Preamble"
 msgstr ""
 
@@ -4648,21 +4794,23 @@ msgstr "Vis gjeldende liste med sikkerhetskopifiler"
 msgid "Show empty chains"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:306
 msgid "Shutdown this interface"
 msgstr "Slå av dette grensesnittet"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:111
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:34
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:47
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:132
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1616
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:173
 msgid "Signal"
 msgstr "Signal"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1960
+msgid "Signal / Noise"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:125
 msgid "Signal Attenuation (SATN)"
 msgstr ""
@@ -4675,11 +4823,11 @@ msgstr "Signal:"
 msgid "Size"
 msgstr "Størrelse"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:259
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:260
 msgid "Size of DNS query cache"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:191
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
 msgid "Size of the ZRam device in megabytes"
 msgstr ""
 
@@ -4696,11 +4844,7 @@ msgstr "GÃ¥ til innhold"
 msgid "Skip to navigation"
 msgstr "GÃ¥ til navigasjon"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:335
-msgid "Slot time"
-msgstr "Slot tid"
-
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1640
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1846
 #: modules/luci-base/luasrc/model/network.lua:1427
 msgid "Software VLAN"
 msgstr ""
@@ -4741,62 +4885,66 @@ msgstr ""
 msgid "Specifies the directory the device is attached to"
 msgstr "Hvor lagrings enheten blir tilsluttet filsystemet (f.eks. /mnt/sda1)"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:23
-msgid "Specifies the listening port of this <em>Dropbear</em> instance"
-msgstr "Angir den lyttende porten for denne <em>Dropbear</em> instansen"
-
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:57
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:175
 msgid ""
 "Specifies the maximum amount of failed ARP requests until hosts are presumed "
 "to be dead"
 msgstr ""
 "Angir maksimalt antall feilede ARP forespørsler før verter ansees frakoblet"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:49
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:171
 msgid ""
 "Specifies the maximum amount of seconds after which hosts are presumed to be "
 "dead"
 msgstr "Angir maksimalt antall sekunder før verter ansees som frakoblet"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:761
+msgid ""
+"Specifies the maximum transmit power the wireless radio may use. Depending "
+"on regulatory requirements and wireless usage, the actual transmit power may "
+"be reduced by the driver."
+msgstr ""
+
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:63
 msgid "Specify a TOS (Type of Service)."
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:25
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:58
 msgid ""
 "Specify a TTL (Time to Live) for the encapsulating packet other than the "
 "default (64)."
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:53
 msgid ""
 "Specify an MTU (Maximum Transmission Unit) other than the default (1280 "
 "bytes)."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:60
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "Specify the secret encryption key here."
 msgstr "Angi krypteringsnøkkelen her."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:475
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:64
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:533
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:89
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:111
 msgid "Start"
 msgstr "Start"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:33
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:86
 msgid "Start priority"
 msgstr "Start prioritet"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1958
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2499
 msgid "Starting configuration apply…"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1626
 msgid "Starting wireless scan..."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:24
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:120
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
 msgid "Startup"
 msgstr "Oppstart"
 
@@ -4808,20 +4956,21 @@ msgstr "Statiske IPv4 Ruter"
 msgid "Static IPv6 Routes"
 msgstr "Statiske IPv6 Ruter"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:70
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:71
 msgid "Static Leases"
 msgstr "Statiske Leier"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:118
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:73
 msgid "Static Routes"
 msgstr "Statiske Ruter"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1194
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1384
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:172
 #: modules/luci-base/luasrc/model/network.lua:966
 msgid "Static address"
 msgstr "Statisk adresse"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:308
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:309
 msgid ""
 "Static leases are used to assign fixed IP addresses and symbolic hostnames "
 "to DHCP clients. They are also required for non-dynamic interface "
@@ -4831,39 +4980,41 @@ msgstr ""
 "vertsnavn til DHCP klienter. Dette er nødvendig om grensesnittet ikke er "
 "dynamisk konfigurert og kun klienter med dhcp leieavtale får IP."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:534
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:977
 msgid "Station inactivity limit"
 msgstr ""
 
 #: modules/luci-base/luasrc/controller/admin/index.lua:40
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:197
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:337
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:746
 #: modules/luci-mod-status/luasrc/view/admin_status/index.htm:128
 msgid "Status"
 msgstr "Status"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:35
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:75
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:308
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:91
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:113
 msgid "Stop"
 msgstr "Stop"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:165
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Strict order"
 msgstr "Streng overholdelse"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:16
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:30
 msgid "Strong"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1843
 msgid "Submit"
 msgstr "Send"
 
-#: 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:108
 msgid "Suppress logging"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:109
 msgid "Suppress logging of the routine operation of these protocols"
 msgstr ""
 
@@ -4875,42 +5026,44 @@ msgstr ""
 msgid "Swap Entry"
 msgstr "Swap Enhet"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:23
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:5
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:135
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:21
 msgid "Switch"
 msgstr "Svitsj"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:129
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:168
 msgid "Switch %q"
 msgstr "Svitsj %q"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:128
-msgid "Switch %q (%s)"
-msgstr "Svitsj %q (%s)"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:66
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:146
 msgid ""
 "Switch %q has an unknown topology - the VLAN settings might not be accurate."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:146
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:142
 msgid "Switch Port Mask"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1640
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1846
 #: modules/luci-base/luasrc/model/network.lua:1425
 msgid "Switch VLAN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:238
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:355
 msgid "Switch protocol"
 msgstr "Svitsj protokoll"
 
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:103
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:104
 #: modules/luci-base/luasrc/view/cbi/ipaddr.htm:26
 msgid "Switch to CIDR list notation"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:77
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1547
+msgid "Symbolic link"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:71
 msgid "Sync with NTP-Server"
 msgstr ""
 
@@ -4920,7 +5073,7 @@ msgstr "Synkroniser med nettleser"
 
 #: modules/luci-base/luasrc/controller/admin/index.lua:47
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:14
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:102
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:94
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
 #: modules/luci-mod-system/luasrc/view/admin_system/applyreboot.htm:39
 msgid "System"
@@ -4931,11 +5084,11 @@ msgstr "System"
 msgid "System Log"
 msgstr "System Logg"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:108
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:99
 msgid "System Properties"
 msgstr "System Egenskaper"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:145
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:136
 msgid "System log buffer size"
 msgstr "System logg buffer størrelse"
 
@@ -4943,15 +5096,17 @@ msgstr "System logg buffer størrelse"
 msgid "TCP:"
 msgstr "TCP:"
 
-#: 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:69
 msgid "TFTP Settings"
 msgstr "TFTP Innstillinger"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:269
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
 msgid "TFTP server root"
 msgstr "TFTP server roten"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:17
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:77
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:88
 msgid "TX"
@@ -4974,7 +5129,7 @@ msgstr "Tabell"
 msgid "Target"
 msgstr "MÃ¥l"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:77
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:103
 msgid "Target network"
 msgstr ""
 
@@ -4982,50 +5137,25 @@ msgstr ""
 msgid "Terminate"
 msgstr "Avslutte"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:27
-#, fuzzy
-msgid ""
-"The <em>Device Configuration</em> section covers physical settings of the "
-"radio hardware such as channel, transmit power or antenna selection which "
-"are shared among all defined wireless networks (if the radio hardware is "
-"multi-SSID capable). Per network settings like encryption or operation mode "
-"are grouped in the <em>Interface Configuration</em>."
-msgstr ""
-"<em>Enhet Konfigurasjon</em> seksjonen omhandler innstillingene av den "
-"trådløse enheten som kanaler, sende stryke eller antenne valg. Disse "
-"innstillingene er delt mellom alle definerte trådløse nettverk opprettet "
-"utfra denne enhet. (om den trådløse enheten støtter mulit-SSID). Nettverks "
-"innstillinger som kryptering eller kanaler er gruppert i <em>Grensesnitt "
-"Konfigurasjon</em>."
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:79
-msgid ""
-"The <em>libiwinfo-lua</em> package is not installed. You must install this "
-"component for working wireless configuration!"
-msgstr ""
-"Pakken <em>libiwinfo-lua</em> er ikke installert. Du må installere denne "
-"pakken for å kunne konfigurerer trådløse enheter!"
-
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:66
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:77
 msgid ""
 "The HE.net endpoint update configuration changed, you must now use the plain "
 "username instead of the user ID!"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:8
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:40
 msgid ""
 "The IPv4 address or the fully-qualified domain name of the remote tunnel end."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:27
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:38
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:59
 msgid ""
 "The IPv6 prefix assigned to the provider, usually ends with <code>::</code>"
 msgstr ""
 "IPv6 prefikset tilordnet mot leverandør, ender som regel med <code>::</code>"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:18
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1808
 msgid ""
 "The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
 "code> and <code>_</code>"
@@ -5041,7 +5171,7 @@ msgstr ""
 msgid "The configuration file could not be loaded due to the following error:"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1849
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2396
 msgid ""
 "The device could not be reached within %d seconds after applying the pending "
 "changes, which caused the configuration to be rolled back for safety "
@@ -5061,6 +5191,12 @@ msgstr ""
 "Filenheten til partisjonen eller minnet (<abbr title=\"for eksempel\">f.eks."
 "</abbr> <code>/dev/sda1</code>)"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:612
+msgid ""
+"The existing wireless configuration needs to be changed for LuCI to function "
+"properly."
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:127
 msgid ""
 "The filesystem that was used to format the memory (<abbr title=\"for example"
@@ -5085,46 +5221,49 @@ msgstr ""
 msgid "The following rules are currently active on this system."
 msgstr "Følgende regler er aktiver på systemet."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:144
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:154
+msgid "The gateway address must not be a local IP address"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:154
 msgid "The given SSH public key has already been added."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:150
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:160
 msgid ""
 "The given SSH public key is invalid. Please supply proper public RSA or "
 "ECDSA keys."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:67
-msgid "The given network name is not unique"
-msgstr "Det angitte nettverksnavnet er ikke unikt"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:664
+msgid "The interface name is already used"
+msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:52
-#, fuzzy
-msgid ""
-"The hardware is not multi-SSID capable and the existing configuration will "
-"be replaced if you proceed."
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:670
+msgid "The interface name is too long"
 msgstr ""
-"Maskinvaren er ikke multi-SSID kapabel og den ekisterende konfigurasjonen "
-"vil bli erstattet om du fortsetter."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:43
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:31
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:55
 msgid ""
 "The length of the IPv4 prefix in bits, the remainder is used in the IPv6 "
 "addresses."
 msgstr "Lengden IPv4 prefikset i bits, resten brukt i IPv6-adresser."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:35
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:46
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:63
 msgid "The length of the IPv6 prefix in bits"
 msgstr "Lengden på IPv6 prefikset i bits"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:12
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:44
 msgid "The local IPv4 address over which the tunnel is created (optional)."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:5
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1814
+msgid "The network name is already used"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:135
 msgid ""
 "The network ports on this device can be combined to several <abbr title="
 "\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
@@ -5140,16 +5279,15 @@ msgstr ""
 "Uplink port for tilkobling til større nettverk som internett og andre porter "
 "til lokalt nettverk."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:77
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:395
-msgid "The selected protocol needs a device assigned"
-msgstr "Den valgte protokoll må ha en enhet tilknyttet"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1149
+msgid "The selected %s mode is incompatible with %s encryption"
+msgstr ""
 
 #: modules/luci-base/luasrc/view/csrftoken.htm:11
 msgid "The submitted security token is invalid or already expired!"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:274
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:272
 msgid ""
 "The system is erasing the configuration partition now and will reboot itself "
 "when finished."
@@ -5157,7 +5295,7 @@ msgstr ""
 "Systemet sletter konfigurasjonspartisjonen nå, enheten vil bli startet på "
 "nytt når dette er utført."
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:195
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:193
 #, fuzzy
 msgid ""
 "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
@@ -5169,7 +5307,7 @@ msgstr ""
 "du prøver å koble til igjen. Det kan være nødvendig å fornye ip-adressen til "
 "datamaskinen din for å nå enheten på nytt. (avhengig av innstillingene dine)"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:15
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:80
 msgid "The system password has been successfully changed."
 msgstr ""
 
@@ -5181,7 +5319,7 @@ 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:403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:427
 msgid "There are no active leases"
 msgstr ""
 
@@ -5190,18 +5328,10 @@ msgstr ""
 msgid "There are no active leases."
 msgstr "Det er ingen aktive leieavtaler."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1973
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2514
 msgid "There are no changes to apply"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:204
-msgid ""
-"There is no device assigned yet, please attach a network device in the "
-"\"Physical Settings\" tab"
-msgstr ""
-"Det er ingen enhet som er tilordnet ennå, vennligst legg til en "
-"nettverksenhet i \"Fysiske Innstillinger\""
-
 #: 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
@@ -5213,11 +5343,19 @@ msgstr ""
 "Det er ikke satt noe passord på denne ruter. Vennligst konfigurer et "
 "passord, dette beskytter webgrensesnittet og aktiverer SSH."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:19
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:49
 msgid "This IPv4 address of the relay"
 msgstr "Dette IPv4 adressen til relayet"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1448
+msgid "This authentication type is not applicable to the selected EAP method."
+msgstr ""
+
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:54
+msgid "This does not look like a valid PEM file"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
 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 "
@@ -5234,13 +5372,13 @@ msgstr ""
 "som skal inkluderes under sysupgrade. Endrede filer i /etc/config/ og "
 "enkelte andre konfigurasjoner blir automatisk bevart."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:74
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:81
 msgid ""
 "This is either the \"Update Key\" configured for the tunnel or the account "
 "password if no update key has been configured"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:82
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:127
 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."
@@ -5248,7 +5386,7 @@ msgstr ""
 "Dette er innholdet i /etc/rc.local. Her kan du legge til egne kommandoer som "
 "blir startet ved slutten av boot sekvensen. (før 'exit 0')"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:27
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:54
 msgid ""
 "This is the local endpoint address assigned by the tunnel broker, it usually "
 "ends with <code>...:2/64</code>"
@@ -5256,7 +5394,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:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:79
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> in the local network"
@@ -5264,20 +5402,20 @@ msgstr ""
 "Dette er den eneste <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr> server i det lokale nettverket"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:73
 msgid "This is the plain username for logging into the account"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:34
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:57
 msgid ""
 "This is the prefix routed to you by the tunnel broker for use by clients"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:9
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:41
 msgid "This is the system crontab in which scheduled tasks can be defined."
 msgstr "Dette er systemets crontab, hvor planlagte oppgaver kan defineres."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:19
+#: 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 ""
@@ -5294,26 +5432,26 @@ msgid "This page gives an overview over currently active network connections."
 msgstr ""
 "Denne siden gir en oversikt over gjeldende aktive nettverkstilkoblinger."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:726
-#: modules/luci-base/htdocs/luci-static/resources/form.js:809
+#: modules/luci-base/htdocs/luci-static/resources/form.js:936
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1064
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:172
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:32
 msgid "This section contains no values yet"
 msgstr "Denne seksjonen inneholder ennå ingen verdier"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:114
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:105
 msgid "Time Synchronization"
 msgstr "Tidssynkronisering"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:525
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:968
 msgid "Time interval for rekeying GTK"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:128
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:119
 msgid "Timezone"
 msgstr "Tidssone"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:825
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:871
 msgid "To login…"
 msgstr ""
 
@@ -5328,7 +5466,7 @@ msgstr ""
 "tilstand, klikker du på \"Utfør nullstilling\" (kun mulig på squashfs "
 "firmwarer)."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:835
 msgid "Tone"
 msgstr ""
 
@@ -5352,55 +5490,41 @@ msgstr "Trafikk"
 msgid "Transfer"
 msgstr "Overføring"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:595
-msgid "Transmission Rate"
-msgstr "Overførings rate"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:102
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:89
 msgid "Transmit"
 msgstr "Sende"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:211
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:273
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:345
-msgid "Transmit Power"
-msgstr "Sende styrke"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:318
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:349
-msgid "Transmitter Antenna"
-msgstr "Sende Antenne"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:73
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:57
 msgid "Trigger"
 msgstr "Utløser"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:98
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:84
 msgid "Trigger Mode"
 msgstr "Utløsende Tilstand"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:54
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:69
 msgid "Tunnel ID"
 msgstr "Tunnel ID"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1643
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1849
 #: modules/luci-base/luasrc/model/network.lua:1430
 msgid "Tunnel Interface"
 msgstr "Tunnel grensesnitt"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:44
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:55
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:76
 msgid "Tunnel Link"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:46
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:131
 msgid "Tx-Power"
 msgstr "Tx-Styrke"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:32
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:185
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:11
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:43
 msgid "Type"
 msgstr "Type"
 
@@ -5408,19 +5532,20 @@ msgstr "Type"
 msgid "UDP:"
 msgstr "UDP:"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:28
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:90
 msgid "UMTS only"
 msgstr "Kun UMTS"
 
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:43
 #: protocols/luci-proto-3g/luasrc/model/network/proto_3g.lua:10
 msgid "UMTS/GPRS/EV-DO"
 msgstr "UMTS/GPRS/EV-DO"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:106
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:93
 msgid "USB Device"
 msgstr "USB Enhet"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:122
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:110
 msgid "USB Ports"
 msgstr ""
 
@@ -5450,10 +5575,12 @@ msgstr ""
 msgid "Unable to dispatch"
 msgstr "Kan ikke sende"
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:22
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:54
 msgid "Unable to obtain client ID"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:61
 msgid "Unable to resolve AFTR host name"
 msgstr ""
@@ -5463,21 +5590,31 @@ msgstr ""
 msgid "Unable to resolve peer host name"
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:33
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:68
+msgid "Unable to save contents: %s"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:132
 msgid "Unavailable Seconds (UAS)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1196
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1386
 #: modules/luci-base/luasrc/model/network.lua:970
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1349
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1539
 #: modules/luci-base/luasrc/model/network.lua:1137
 msgid "Unknown error (%s)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1193
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:204
+msgid "Unknown error code"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1383
+#: modules/luci-base/htdocs/luci-static/resources/protocol/none.js:6
 #: modules/luci-base/luasrc/model/network.lua:964
 msgid "Unmanaged"
 msgstr "Uhåndtert"
@@ -5487,22 +5624,30 @@ msgstr "Uhåndtert"
 msgid "Unmount"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:107
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:262
 msgid "Unnamed key"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1708
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2261
 msgid "Unsaved Changes"
 msgstr "Ulagrede Endringer"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:202
+msgid "Unspecified error"
+msgstr ""
+
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:64
 msgid "Unsupported MAP type"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:27
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:69
 msgid "Unsupported modem"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:219
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:119
 msgid "Unsupported protocol type."
 msgstr "Protokoll type er ikke støttet."
@@ -5525,56 +5670,70 @@ msgstr ""
 msgid "Upload archive..."
 msgstr "Last opp arkiv..."
 
-#: modules/luci-base/luasrc/view/cbi/upload.htm:8
-msgid "Uploaded File"
-msgstr "Opplastet Fil"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1703
+msgid "Upload file"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1678
+msgid "Upload file…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1623
+msgid "Upload request failed: %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:613
+msgid ""
+"Upon pressing \"Continue\", anonymous \"wifi-iface\" sections will be "
+"assigned with a name in the form <em>wifinet#</em> and the network will be "
+"restarted to apply the updated configuration."
+msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:14
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:74
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:85
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:26
 msgid "Uptime"
 msgstr "Oppetid"
 
-#: 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:83
 msgid "Use <code>/etc/ethers</code>"
 msgstr "Bruk <code>/etc/ethers</code>"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:40
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:167
 msgid "Use DHCP gateway"
 msgstr "Bruk DHCP gateway"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:33
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:85
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:34
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:98
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:46
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:65
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:38
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:58
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:124
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:39
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:116
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:59
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:103
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:64
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:77
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:100
 msgid "Use DNS servers advertised by peer"
 msgstr "Bruk DNS servere annonsert av peer"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:227
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:233
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:479
 msgid "Use ISO/IEC 3166 alpha2 country codes."
 msgstr "Bruk ISO/IEC 3166 alpha2 landskoder."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:31
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:100
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:70
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:35
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:51
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:86
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:56
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:97
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:77
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:75
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:92
 msgid "Use MTU on tunnel interface"
 msgstr "Bruk MTU på tunnel grensesnitt"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:95
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:65
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:30
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:46
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:81
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:93
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:73
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:88
 msgid "Use TTL on tunnel interface"
 msgstr "Bruk TTL på tunnel grensesnitt"
 
@@ -5586,68 +5745,65 @@ msgstr ""
 msgid "Use as root filesystem (/)"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:19
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:31
 msgid "Use broadcast flag"
 msgstr "Bruk kringkasting flagg"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:253
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:791
 msgid "Use builtin IPv6-management"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:40
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:109
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:92
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:45
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:105
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:53
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:72
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:45
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:65
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:40
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:182
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:127
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:42
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:119
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:62
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:67
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:80
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:103
 msgid "Use custom DNS servers"
 msgstr "Bruk egendefinerte DNS servere"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:26
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:70
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:16
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:28
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:84
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:24
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:50
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:23
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:43
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:116
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:33
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:74
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:97
 msgid "Use default gateway"
 msgstr "Bruk standard gateway"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:48
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:164
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:77
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:24
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:88
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:58
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:23
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:39
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:74
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:90
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:38
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:57
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:30
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:50
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:45
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:227
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:119
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:51
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:88
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:68
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:52
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:70
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:83
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:111
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:149
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:67
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:111
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:98
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:72
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:85
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:108
 msgid "Use gateway metric"
 msgstr "Bruk gateway metrikk"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:64
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:179
 msgid "Use routing table"
 msgstr "Bruk rutingtabellen"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:309
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:310
 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 "
@@ -5664,77 +5820,78 @@ msgstr ""
 msgid "Used"
 msgstr "Brukt"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:848
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1273
 msgid "Used Key Slot"
 msgstr "Brukte Nøkler"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:913
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
 msgid ""
 "Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not "
 "needed with normal WPA(2)-PSK."
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:48
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:110
 msgid "User certificate (PEM encoded)"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:61
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:122
 msgid "User key (PEM encoded)"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/sysauth.htm:23
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:41
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:32
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:102
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:56
 msgid "Username"
 msgstr "Brukernavn"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:182
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:903
 msgid "VC-Mux"
 msgstr "VC-Mux"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:851
 msgid "VDSL"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:172
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:169
 msgid "VLANs on %q"
 msgstr "VLANs på %q"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:171
-msgid "VLANs on %q (%s)"
-msgstr "VLANs på %q (%s)"
+#: modules/luci-base/luasrc/controller/admin/index.lua:55
+msgid "VPN"
+msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:18
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:42
 msgid "VPN Local address"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:22
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:46
 msgid "VPN Local port"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:15
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:11
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:15
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:58
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:39
 msgid "VPN Server"
 msgstr "VPN server"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:18
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:96
 msgid "VPN Server port"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:37
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:100
 msgid "VPN Server's certificate SHA1 hash"
 msgstr ""
 
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:9
 #: protocols/luci-proto-vpnc/luasrc/model/network/proto_vpnc.lua:9
 msgid "VPNC (CISCO 3000 (and others) VPN)"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:44
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:73
 msgid "Vendor"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:60
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:52
 msgid "Vendor Class to send when requesting DHCP"
 msgstr "Leverandør klasse som sendes ved DHCP spørring"
 
@@ -5742,41 +5899,37 @@ msgstr "Leverandør klasse som sendes ved DHCP spørring"
 msgid "Verify"
 msgstr "Bekreft"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:52
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:76
 msgid "Virtual dynamic interface"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:470
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:471
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:553
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:576
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:908
 msgid "WDS"
 msgstr "WDS"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:667
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1160
 msgid "WEP Open System"
 msgstr "WEP åpent system"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:668
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1161
 msgid "WEP Shared Key"
 msgstr "WEP delt nøkkel"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "WEP passphrase"
 msgstr "WEP passord"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:503
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:566
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:945
 msgid "WMM Mode"
 msgstr "WMM Modus"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "WPA passphrase"
 msgstr "WPA passord"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:716
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:735
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:740
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1074
 msgid ""
 "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
 "and ad-hoc mode) to be installed."
@@ -5792,7 +5945,7 @@ msgstr "Venter på at endringer utføres..."
 msgid "Waiting for command to complete..."
 msgstr "Venter på at kommando fullføres..."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1940
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2481
 msgid "Waiting for configuration to get applied… %ds"
 msgstr ""
 
@@ -5800,8 +5953,8 @@ msgstr ""
 msgid "Waiting for device..."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:172
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:163
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:173
 msgid "Warning"
 msgstr "Advarsel"
 
@@ -5809,11 +5962,11 @@ msgstr "Advarsel"
 msgid "Warning: There are unsaved changes that will get lost on reboot!"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:20
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:34
 msgid "Weak"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:946
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1355
 msgid ""
 "When using a PSK, the PMK can be automatically generated. When enabled, the "
 "R0/R1 key options below are not applied. Disable this to use the R0 and R1 "
@@ -5821,78 +5974,85 @@ msgid ""
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:383
 msgid "Width"
 msgstr ""
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:17
 #: protocols/luci-proto-wireguard/luasrc/model/network/proto_wireguard.lua:9
 msgid "WireGuard VPN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:58
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:40
 #: modules/luci-mod-status/luasrc/controller/admin/status.lua:28
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:14
 msgid "Wireless"
 msgstr "Trådløs"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1631
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1837
 #: modules/luci-base/luasrc/model/network.lua:1418
 msgid "Wireless Adapter"
 msgstr "Trådløs Tilslutning"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1617
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2052
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1823
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2288
 #: modules/luci-base/luasrc/model/network.lua:1404
 #: modules/luci-base/luasrc/model/network.lua:1865
 msgid "Wireless Network"
 msgstr "Trådløst Nettverk"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:629
 msgid "Wireless Overview"
 msgstr "Trådløs Oversikt"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:362
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:797
 msgid "Wireless Security"
 msgstr "Trådløs Sikkerhet"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:54
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:611
+msgid "Wireless configuration migration"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:139
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:179
 msgid "Wireless is disabled"
 msgstr "Trådløs er deaktiver"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:54
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:139
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:179
 msgid "Wireless is not associated"
 msgstr "Trådløs er ikke tilknyttet"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:15
-msgid "Wireless is restarting..."
-msgstr "Trådløst starter på nytt..."
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:752
 msgid "Wireless network is disabled"
 msgstr "Trådløst nettverk er deaktivert"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:752
 msgid "Wireless network is enabled"
 msgstr "Trådløst nettverk er aktivert"
 
-#: 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:182
 msgid "Write received DNS requests to syslog"
 msgstr "Skriv mottatte DNS forespørsler til syslog"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:164
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:155
 msgid "Write system log to file"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1507
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:85
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1754
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:109
 msgid "Yes"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:26
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:943
+msgid ""
+"You appear to be currently connected to the device via the \"%h\" interface. "
+"Do you really want to shut down the interface?"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:123
 msgid ""
 "You can enable or disable installed init scripts here. Changes will applied "
 "after a device reboot.<br /><strong>Warning: If you disable essential init "
@@ -5913,38 +6073,34 @@ msgstr ""
 "Du må aktivere JavaScript i nettleseren din ellers vil ikke LuCI fungere "
 "skikkelig."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:196
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:187
 msgid "ZRam Compression Algorithm"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:203
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:194
 msgid "ZRam Compression Streams"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:189
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:180
 msgid "ZRam Settings"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:191
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
 msgid "ZRam Size"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:229
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:230
 msgid "any"
 msgstr "enhver"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:113
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:121
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:126
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:218
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:282
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:321
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:328
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:621
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:37
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:22
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:29
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:121
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:836
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:844
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:849
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1030
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:78
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:48
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:51
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:103
 msgid "auto"
 msgstr "auto"
 
@@ -5952,11 +6108,11 @@ msgstr "auto"
 msgid "automatic"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:45
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:78
 msgid "baseT"
 msgstr "baseT"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:909
 msgid "bridged"
 msgstr "brokoblet"
 
@@ -5972,22 +6128,21 @@ msgstr ""
 msgid "create:"
 msgstr "opprett:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:264
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:368
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:678
 msgid "creates a bridge over specified interface(s)"
 msgstr "Oppretter en bro mellom angitte grensesnitt"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:277
 msgid "dB"
 msgstr "dB"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:34
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:35
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:46
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:47
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:48
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:131
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:132
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:133
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:277
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:279
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:331
@@ -5999,26 +6154,30 @@ msgstr "dB"
 msgid "dBm"
 msgstr "dBm"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:460
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:587
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:889
 msgid "disable"
 msgstr "Deaktiver"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:119
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:524
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:530
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:536
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:18
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:578
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:584
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:590
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:25
 msgid "disabled"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:433
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:467
+msgid "driver default"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/lease_status.htm:17
 #: modules/luci-base/luasrc/view/lease_status.htm:46
-#: 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:416
 msgid "expired"
 msgstr "utgått"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:88
 msgid ""
 "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr>-leases will be stored"
@@ -6032,25 +6191,21 @@ msgstr ""
 msgid "forward"
 msgstr "videresend"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:80
 msgid "full-duplex"
 msgstr "full-dupleks"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:80
 msgid "half-duplex"
 msgstr "halv-dupleks"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:559
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:565
 msgid "hexadecimal encoded value"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:138
-msgid "hidden"
-msgstr "skjult"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:527
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:533
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:538
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:581
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:587
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:592
 msgid "hybrid mode"
 msgstr ""
 
@@ -6058,6 +6213,10 @@ msgstr ""
 msgid "if target is a network"
 msgstr "Dersom målet er et nettverk"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:63
+msgid "ignore"
+msgstr ""
+
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:177
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
@@ -6092,25 +6251,26 @@ msgstr ""
 msgid "key with either 5 or 13 characters"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:94
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:95
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr "lokal <abbr title=\"Domain Navn System\">DNS</abbr>-fil"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:952
-msgid "minutes"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1168
+msgid "medium security"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:43
-msgid "mixed WPA/WPA2"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1360
+msgid "minutes"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:225
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:232
 msgid "no"
 msgstr "nei"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:54
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:72
 msgid "no link"
 msgstr "ingen forbindelse"
 
@@ -6118,7 +6278,7 @@ msgstr "ingen forbindelse"
 msgid "non-empty value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1195
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1446
 msgid "none"
 msgstr "ingen"
 
@@ -6128,7 +6288,9 @@ msgstr "ingen"
 msgid "not present"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:363
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:341
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:776
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:780
 #: 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
@@ -6143,9 +6305,9 @@ msgstr "av"
 msgid "on"
 msgstr "på"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
-msgid "open"
-msgstr "Ã¥pen"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1169
+msgid "open network"
+msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
@@ -6164,73 +6326,77 @@ msgstr ""
 msgid "positive integer value"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:34
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:56
 msgid "random"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:526
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:532
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:537
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:580
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:586
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:591
 msgid "relay mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:910
 msgid "routed"
 msgstr "rutet"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:525
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:534
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:968
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:977
 msgid "sec"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:525
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:531
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:579
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:585
 msgid "server mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:544
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:597
 msgid "stateful-only"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:542
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:595
 msgid "stateless"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:543
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:596
 msgid "stateless + stateful"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:369
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1167
+msgid "strong security"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:346
 msgid "tagged"
 msgstr "tagget"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:932
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1343
 msgid "time units (TUs / 1.024 ms) [1000-65535]"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:549
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:555
 msgid "unique value"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:448
 msgid "unknown"
 msgstr "ukjent"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:15
 #: modules/luci-base/luasrc/view/lease_status.htm:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:238
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:390
+#: 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:414
 msgid "unlimited"
 msgstr "ubegrenset"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1401
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1648
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:63
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:355
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:378
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:413
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:446
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:512
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:450
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:545
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:53
 #: modules/luci-base/luasrc/view/cbi/network_netlist.htm:38
 msgid "unspecified"
@@ -6240,7 +6406,7 @@ msgstr "uspesifisert"
 msgid "unspecified -or- create:"
 msgstr "uspesifisert --eller-- opprett:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:366
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:344
 msgid "untagged"
 msgstr "utagget"
 
@@ -6321,8 +6487,8 @@ msgstr ""
 msgid "valid address:port"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:523
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:527
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:529
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:533
 msgid "valid date (YYYY-MM-DD)"
 msgstr ""
 
@@ -6359,7 +6525,7 @@ msgstr ""
 msgid "valid network in address/netmask notation"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:498
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:504
 msgid "valid phone digit (0-9, \"*\", \"#\", \"!\" or \".\")"
 msgstr ""
 
@@ -6372,11 +6538,11 @@ msgstr ""
 msgid "valid port value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:503
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:509
 msgid "valid time (HH:MM:SS)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:425
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:431
 msgid "value between %d and %d characters"
 msgstr ""
 
@@ -6392,14 +6558,23 @@ msgstr ""
 msgid "value smaller or equal to %f"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:430
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:425
+msgid "value with %d characters"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:436
 msgid "value with at least %d characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:435
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:441
 msgid "value with at most %d characters"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1169
+msgid "weak security"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:221
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:232
@@ -6410,6 +6585,201 @@ msgstr "ja"
 msgid "« Back"
 msgstr "« Tilbake"
 
+#~ msgid "Specifies the listening port of this <em>Dropbear</em> instance"
+#~ msgstr "Angir den lyttende porten for denne <em>Dropbear</em> instansen"
+
+#~ msgid "Switch %q (%s)"
+#~ msgstr "Svitsj %q (%s)"
+
+#~ msgid "VLANs on %q (%s)"
+#~ msgstr "VLANs på %q (%s)"
+
+#~ msgid "Antenna 1"
+#~ msgstr "Antenne 1"
+
+#~ msgid "Antenna 2"
+#~ msgstr "Antenne 2"
+
+#~ msgid "Antenna Configuration"
+#~ msgstr "Antennekonfigurasjon"
+
+#~ msgid "Back to overview"
+#~ msgstr "Tilbake til oversikt"
+
+#~ msgid "Back to scan results"
+#~ msgstr "Tilbake til skanne resultat"
+
+#~ msgid "Broadcom 802.11%s Wireless Controller"
+#~ msgstr "Broadcom 802.11%s Trådløs Kontroller"
+
+#~ msgid "Broadcom BCM%04x 802.11 Wireless Controller"
+#~ msgstr "Broadcom BCM%04x 802.11 Trådløs Kontroller"
+
+#~ msgid "Common Configuration"
+#~ msgstr "Vanlige Innstillinger"
+
+#~ msgid "Connect"
+#~ msgstr "Koble til"
+
+#~ msgid "Connection Limit"
+#~ msgstr "Tilkoblingsgrense (antall)"
+
+#~ msgid "Cover the following interface"
+#~ msgstr "Gjelder det følgende grensesnitt"
+
+#~ msgid "Cover the following interfaces"
+#~ msgstr "Gjelder de følgende grensesnitt"
+
+#~ msgid "Create Interface"
+#~ msgstr "Opprett Grensesnitt"
+
+#~ msgid "Create a bridge over multiple interfaces"
+#~ msgstr "Opprett en bro over flere grensesnitt"
+
+#~ msgid "Diversity"
+#~ msgstr "Antennevariasjon"
+
+#~ msgid "Edit this interface"
+#~ msgstr "Endre dette grensesnittet"
+
+#~ msgid "Frame Bursting"
+#~ msgstr "Frame Bursting"
+
+#~ msgid "Generic 802.11%s Wireless Controller"
+#~ msgstr "Generell 802.11%s Trådløs Kontroller"
+
+#~ msgid "Install package %q"
+#~ msgstr "Installer pakken %q"
+
+#~ msgid "Interface Overview"
+#~ msgstr "Grensesnitt Oversikt"
+
+#~ msgid "Missing protocol extension for proto %q"
+#~ msgstr "Mangler protokoll utvidelse for proto %q"
+
+#~ msgid "Name of the new interface"
+#~ msgstr "Navnet til det nye grensesnittet"
+
+#~ msgid "No network configured on this device"
+#~ msgstr "Ingen nettverk er konfigurert på denne enheten"
+
+#~ msgid "No network name specified"
+#~ msgstr "Ingen nettverksnavn spesifisert"
+
+#~ msgid "Not associated"
+#~ msgstr "Ikke tilknyttet"
+
+#~ msgid ""
+#~ "On this page you can configure the network interfaces. You can bridge "
+#~ "several interfaces by ticking the \"bridge interfaces\" field and enter "
+#~ "the names of several network interfaces separated by spaces. You can also "
+#~ "use <abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
+#~ "<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
+#~ "<samp>eth0.1</samp>)."
+#~ msgstr ""
+#~ "PÃ¥ denne siden kan du konfigurere nettverks grensesnittet. Du kan "
+#~ "sammenkoble flere grensesnitt ved å hake av \"Sammekoble grensesnitt\" "
+#~ "feltet og skrive inn navn på grensesnittene atskilt med mellomrom. Du kan "
+#~ "også bruke <abbr title=\"Virtual Local Area Network\">VLAN</abbr> "
+#~ "betegnelse <samp>INTERFACE.VLANNR</samp> (<abbr title=\"for eksempel\">f."
+#~ "eks</abbr>: <samp>eth0.1</samp>)."
+
+#~ msgid "Package libiwinfo required!"
+#~ msgstr "Pakken libiwinfo er nødvendig!"
+
+#~ msgid "Protocol of the new interface"
+#~ msgstr "Protokoll til det nye grensesnittet"
+
+#~ msgid "Protocol support is not installed"
+#~ msgstr "Protokoll støtte er ikke installert"
+
+#~ msgid ""
+#~ "Really delete this wireless network? The deletion cannot be undone! You "
+#~ "might lose access to this device if you are connected via this network."
+#~ msgstr ""
+#~ "Fjerne dette trådløse nettverket? Slettingen kan ikke omgjøres!\n"
+#~ "Du kan miste kontakten med ruteren om du er tilkoblet via dette "
+#~ "nettverket."
+
+#~ msgid "Receiver Antenna"
+#~ msgstr "Mottak antenne"
+
+#~ msgid "Repeat scan"
+#~ msgstr "Skann på nytt"
+
+#~ msgid "Replace entry"
+#~ msgstr "Erstatt oppføring"
+
+#~ msgid "Separate Clients"
+#~ msgstr "Separerte Klienter"
+
+#~ msgid "Slot time"
+#~ msgstr "Slot tid"
+
+#, fuzzy
+#~ msgid ""
+#~ "The <em>Device Configuration</em> section covers physical settings of the "
+#~ "radio hardware such as channel, transmit power or antenna selection which "
+#~ "are shared among all defined wireless networks (if the radio hardware is "
+#~ "multi-SSID capable). Per network settings like encryption or operation "
+#~ "mode are grouped in the <em>Interface Configuration</em>."
+#~ msgstr ""
+#~ "<em>Enhet Konfigurasjon</em> seksjonen omhandler innstillingene av den "
+#~ "trådløse enheten som kanaler, sende stryke eller antenne valg. Disse "
+#~ "innstillingene er delt mellom alle definerte trådløse nettverk opprettet "
+#~ "utfra denne enhet. (om den trådløse enheten støtter mulit-SSID). "
+#~ "Nettverks innstillinger som kryptering eller kanaler er gruppert i "
+#~ "<em>Grensesnitt Konfigurasjon</em>."
+
+#~ msgid ""
+#~ "The <em>libiwinfo-lua</em> package is not installed. You must install "
+#~ "this component for working wireless configuration!"
+#~ msgstr ""
+#~ "Pakken <em>libiwinfo-lua</em> er ikke installert. Du må installere denne "
+#~ "pakken for å kunne konfigurerer trådløse enheter!"
+
+#~ msgid "The given network name is not unique"
+#~ msgstr "Det angitte nettverksnavnet er ikke unikt"
+
+#, fuzzy
+#~ msgid ""
+#~ "The hardware is not multi-SSID capable and the existing configuration "
+#~ "will be replaced if you proceed."
+#~ msgstr ""
+#~ "Maskinvaren er ikke multi-SSID kapabel og den ekisterende konfigurasjonen "
+#~ "vil bli erstattet om du fortsetter."
+
+#~ msgid "The selected protocol needs a device assigned"
+#~ msgstr "Den valgte protokoll må ha en enhet tilknyttet"
+
+#~ msgid ""
+#~ "There is no device assigned yet, please attach a network device in the "
+#~ "\"Physical Settings\" tab"
+#~ msgstr ""
+#~ "Det er ingen enhet som er tilordnet ennå, vennligst legg til en "
+#~ "nettverksenhet i \"Fysiske Innstillinger\""
+
+#~ msgid "Transmission Rate"
+#~ msgstr "Overførings rate"
+
+#~ msgid "Transmit Power"
+#~ msgstr "Sende styrke"
+
+#~ msgid "Transmitter Antenna"
+#~ msgstr "Sende Antenne"
+
+#~ msgid "Uploaded File"
+#~ msgstr "Opplastet Fil"
+
+#~ msgid "Wireless is restarting..."
+#~ msgstr "Trådløst starter på nytt..."
+
+#~ msgid "hidden"
+#~ msgstr "skjult"
+
+#~ msgid "open"
+#~ msgstr "Ã¥pen"
+
 #~ msgid "Back"
 #~ msgstr "Tilbake"
 
@@ -6540,9 +6910,6 @@ msgstr "« Tilbake"
 #~ msgid "Hermes 802.11b Wireless Controller"
 #~ msgstr "Hermes 802.11b Trådløs Kontroller"
 
-#~ msgid "Interface is shutting down..."
-#~ msgstr "Grensesnittet slår seg av..."
-
 #~ msgid "Interface reconnected"
 #~ msgstr "Grensesnittet er koblet til igjen"
 
diff --git a/modules/luci-base/po/pl/base.po b/modules/luci-base/po/pl/base.po
index e6ec3deb9..2413eb940 100644
--- a/modules/luci-base/po/pl/base.po
+++ b/modules/luci-base/po/pl/base.po
@@ -14,19 +14,20 @@ msgstr ""
 "|| n%100>=20) ? 1 : 2);\n"
 "X-Generator: Pootle 2.0.6\n"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:133
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:857
 msgid "%.1f dB"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:109
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:122
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 msgid "%d Bit"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1641
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2194
 msgid "%d invalid field(s)"
 msgstr "%d nieprawidłowe pole(pola)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:281
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:31
 msgid "%s is untagged in multiple VLANs!"
 msgstr "%s jest nieotagowany w wielu grupach VLAN!"
 
@@ -64,19 +65,19 @@ msgid "-- Additional Field --"
 msgstr "-- Dodatkowe pole --"
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:258
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1401
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1533
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:250
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:350
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1114
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1648
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1780
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:314
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:414
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1178
 #: modules/luci-base/luasrc/view/cbi/header.htm:5
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:26
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:88
 msgid "-- Please choose --"
 msgstr "-- Proszę wybrać --"
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:259
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:351
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1115
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:415
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1179
 #: modules/luci-base/luasrc/view/cbi/header.htm:6
 msgid "-- custom --"
 msgstr "-- własne --"
@@ -99,7 +100,7 @@ msgstr "-- dopasuj po uuid --"
 msgid "-- please select --"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:382
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:814
 msgid "0 = not using RSSI threshold, 1 = do not change driver default"
 msgstr ""
 
@@ -111,10 +112,11 @@ msgstr "Obciążenie 1 min.:"
 msgid "15 Minute Load:"
 msgstr "Obciążenie 15 min.:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:924
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1337
 msgid "4-character hexadecimal ID"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:11
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:18
 msgid "464XLAT (CLAT)"
 msgstr "464XLAT (CLAT)"
@@ -123,47 +125,47 @@ msgstr "464XLAT (CLAT)"
 msgid "5 Minute Load:"
 msgstr "Obciążenie 5 min.:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:960
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1366
 msgid "6-octet identifier as a hex string - no colons"
 msgstr "Identyfikator 6-oktetowy jako ciąg szesnastkowy - bez dwukropków"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:891
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1310
 msgid "802.11r Fast Transition"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1157
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1567
 msgid "802.11w Association SA Query maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1574
 msgid "802.11w Association SA Query retry timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1133
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1533
 msgid "802.11w Management Frame Protection"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1156
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1567
 msgid "802.11w maximum timeout"
 msgstr "802.11w maksymalny czas oczekiwania"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1165
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1574
 msgid "802.11w retry timeout"
 msgstr "802.11w interwał ponawiania prób"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:399
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:831
 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:224
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:225
 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:215
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:216
 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:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
 msgid ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
 "order of the resolvfile"
@@ -171,11 +173,11 @@ msgstr ""
 "Nazwa <abbr title=\"Domain Name System\">DNS</abbr> będzie rozwijana przez "
 "kolejne serwery w porządku podanym w resolvfile"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:388
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:820
 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:351
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:373
 #: 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>"
@@ -185,8 +187,8 @@ msgstr "Adres <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
 msgstr "Brama <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:555
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:35
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:506
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr "Maska sieci <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
 
@@ -201,29 +203,29 @@ 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:378
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:402
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
 msgstr "Sufiks <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>(hex)"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:58
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:35
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:33
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "Konfiguracja diod <abbr title=\"Light Emitting Diode\">LED</abbr>"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:67
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:51
 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:328
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:329
 #: 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:372
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:233
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:234
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> leases"
@@ -231,7 +233,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:242
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> packet size"
@@ -239,11 +241,11 @@ 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:251
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:252
 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
 msgstr "<abbr title=\"Maksymalna ilość\">Maks.</abbr> zapytań równoczesnych"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:10
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:42
 msgid ""
 "<br/>Note: you need to manually restart the cron service if the crontab file "
 "was empty before editing."
@@ -251,57 +253,61 @@ msgstr ""
 "<br/>Uwaga: musisz ręcznie zrestartować usługę cron, jeśli plik crontab był "
 "pusty przed edycją."
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:817
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1605
+msgid "A directory with the same name already exists."
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:863
 msgid "A new login is required since the authentication session expired."
 msgstr "Wymagane jest ponowne zalogowanie ponieważ sesja wygasła."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:114
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:837
 msgid "A43C + J43 + A43"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:838
 msgid "A43C + J43 + A43 + V43"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:850
 msgid "ADSL"
 msgstr "ADSL"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:826
 msgid "ANSI T1.413"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:33
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:47
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:23
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:94
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:86
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:67
 msgid "APN"
 msgstr "APN"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:56
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:175
 msgid "ARP retry threshold"
 msgstr "Próg powtórzeń ARP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:122
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:845
 msgid "ATM (Asynchronous Transfer Mode)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:144
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:866
 msgid "ATM Bridges"
 msgstr "Mosty ATM"
 
 # Nie wiem czy to powinno się tłumaczyć wg. mnie lepiej zostawić po angielsku
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:178
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:21
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:898
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:66
 msgid "ATM Virtual Channel Identifier (VCI)"
 msgstr "Identyfikator kanału wirtualnego ATM (VCI)"
 
 # j.w.
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:179
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:26
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:899
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:70
 msgid "ATM Virtual Path Identifier (VPI)"
 msgstr "Identyfikator ścieżki wirtualnej ATM (VPI)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:866
 msgid ""
 "ATM bridges expose encapsulated ethernet in AAL5 connections as virtual "
 "Linux network interfaces which can be used in conjunction with DHCP or PPP "
@@ -311,8 +317,8 @@ msgstr ""
 "wirtualne interfejsy sieciowe systemu Linux, które mogą być używane w "
 "połączeniu z protokołem DHCP lub PPP w celu polączenia się z siecią dostawcy."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:184
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:905
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:62
 msgid "ATM device number"
 msgstr "Numer urządzenia ATM"
 
@@ -321,18 +327,18 @@ msgid "ATU-C System Vendor ID"
 msgstr "ID dostawcy systemu ATU-C"
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:251
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:495
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:499
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:528
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:532
 msgid "Absent Interface"
 msgstr ""
 
 # co to takiego?
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:19
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
 msgid "Access Concentrator"
 msgstr "Koncentrator dostępowy (ATM)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:368
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:470
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:802
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
 msgid "Access Point"
 msgstr "Punkt dostępowy"
 
@@ -359,7 +365,7 @@ msgid "Active Connections"
 msgstr "Aktywne połączenia"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:68
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:30
 msgid "Active DHCP Leases"
 msgstr "Aktywne dzierżawy DHCP"
 
@@ -367,55 +373,75 @@ msgstr "Aktywne dzierżawy DHCP"
 msgid "Active DHCPv6 Leases"
 msgstr "Aktywne dzierżawy DHCPv6"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1951
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:370
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:12
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2190
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:804
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:23
 msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:650
-#: modules/luci-base/htdocs/luci-static/resources/form.js:651
-#: modules/luci-base/htdocs/luci-static/resources/form.js:666
-#: modules/luci-base/htdocs/luci-static/resources/form.js:667
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1290
+#: modules/luci-base/htdocs/luci-static/resources/form.js:902
+#: modules/luci-base/htdocs/luci-static/resources/form.js:904
+#: modules/luci-base/htdocs/luci-static/resources/form.js:917
+#: modules/luci-base/htdocs/luci-static/resources/form.js:918
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1539
 #: modules/luci-base/luasrc/view/cbi/nsection.htm:25
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:189
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:197
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:39
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:47
 #: modules/luci-base/luasrc/view/cbi/ucisection.htm:54
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:703
 msgid "Add"
 msgstr "Dodaj"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:60
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:870
+msgid "Add ATM Bridge"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:92
 msgid "Add IPv4 address…"
 msgstr "Dodaj adres IPv4…"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:129
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:204
 msgid "Add IPv6 address…"
 msgstr "Dodaj adres IPv6…"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:143
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:149
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:38
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:47
+msgid "Add LED action"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:215
+msgid "Add VLAN"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:14
+msgid "Add instance"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:153
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:159
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:250
 msgid "Add key"
 msgstr "Dodaj klucz"
 
-#: 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:155
 msgid "Add local domain suffix to names served from hosts files"
 msgstr "Dodaj lokalny sufiks domeny do nazw urządzeń z pliku hosts"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:705
 msgid "Add new interface..."
 msgstr "Dodaj nowy interfejs..."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:104
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:99
+msgid "Add peer"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:105
 msgid "Additional Hosts files"
 msgstr "Dodatkowe pliki Hosts"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:161
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
 msgid "Additional servers file"
 msgstr "Dodatkowe pliki serwera"
 
@@ -443,7 +469,7 @@ msgid "Address"
 msgstr "Adres"
 
 # Na upartego można by zrobić Adres dostępowy mostu przekaźnikowego - ale kto to zrozumie?
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:12
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:151
 msgid "Address to access local relay bridge"
 msgstr "Adres dostępowy do \"relay bridge\""
 
@@ -452,13 +478,13 @@ msgstr "Adres dostępowy do \"relay bridge\""
 msgid "Administration"
 msgstr "Zarządzanie"
 
-#: 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:70
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:505
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:896
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:24
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:189
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:463
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:176
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:143
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:364
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:742
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:799
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:50
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:34
 msgid "Advanced Settings"
@@ -468,89 +494,89 @@ msgstr "Ustawienia zaawansowane"
 msgid "Aggregate Transmit Power(ACTATP)"
 msgstr "Agregacja siły transmisji (ACTATP)"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:175
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:166
 msgid "Alert"
 msgstr "Alarm"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1628
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1834
 #: modules/luci-base/luasrc/model/network.lua:1416
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:54
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:78
 msgid "Alias Interface"
 msgstr "Alias Interfejsu"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:138
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:66
 msgid "Alias of \"%s\""
 msgstr "Alias \"%s\""
 
-#: 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:170
 msgid "All Servers"
 msgstr "Wszystkie serwery"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:114
 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:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:113
 msgid "Allocate IP sequentially"
 msgstr "Przydzielaj adresy IP po kolei"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:24
 msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
 msgstr "Pozwól na logowanie <abbr title=\"Secure Shell\">SSH</abbr>"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:545
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:987
 msgid "Allow AP mode to disconnect STAs based on low ACK condition"
 msgstr "Pozwól aby tryb AP rozłączał stacje STA w oparciu o niski stan ACK"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:462
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:589
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:891
 msgid "Allow all except listed"
 msgstr "Pozwól wszystkim oprócz wymienionych"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:236
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:767
 msgid "Allow legacy 802.11b rates"
 msgstr "Zezwalaj na starsze wersje 802.11b"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:461
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:588
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:890
 msgid "Allow listed only"
 msgstr "Pozwól tylko wymienionym"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:198
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:199
 msgid "Allow localhost"
 msgstr "Pozwól tylko sobie (localhost)"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:47
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:35
 msgid "Allow remote hosts to connect to local SSH forwarded ports"
 msgstr ""
 "Zezwalaj zdalnym hostom na łączenie się z lokalnie przekazywanymi portami SSH"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:38
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:30
 msgid "Allow root logins with password"
 msgstr "Zezwól na logowanie roota przy pomocy hasła"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:39
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:30
 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:199
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:200
 msgid ""
 "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
 msgstr ""
 "Pozwól na ruch wychodzący (odpowiedzi) z podsieci 127.0.0.0/8, np. usługi RBL"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:135
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:122
 msgid "Allowed IPs"
 msgstr "Dozwolone adresy IP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:549
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:602
 msgid "Always announce default router"
 msgstr "Zawsze rozgłaszaj domyślny router"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:259
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:782
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
 "option does not comply with IEEE 802.11n-2009!"
@@ -558,82 +584,82 @@ msgstr ""
 "Zawsze używaj kanału 40 MHz, nawet jeśli kanał dodatkowy nachodzi na inny. "
 "Używanie tej opcji nie jest zgodne z IEEE 802.11n-2009!"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:95
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:818
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:119
 msgid "Annex"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:96
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:819
 msgid "Annex A + L + M (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:827
 msgid "Annex A G.992.1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:828
 msgid "Annex A G.992.2"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:829
 msgid "Annex A G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:830
 msgid "Annex A G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:97
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:820
 msgid "Annex B (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:823
 msgid "Annex B G.992.1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:824
 msgid "Annex B G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:102
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:825
 msgid "Annex B G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:98
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:821
 msgid "Annex J (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:831
 msgid "Annex L G.992.3 POTS 1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:99
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:822
 msgid "Annex M (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:109
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:832
 msgid "Annex M G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:833
 msgid "Annex M G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:550
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:602
 msgid "Announce as default router even if no public prefix is available."
 msgstr ""
 "Rozgłaszaj jako domyślny router nawet jeśli publiczny prefiks nie jest "
 "dostępny."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:555
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:607
 msgid "Announced DNS domains"
 msgstr "Rozgłaszaj domeny DNS"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:554
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:606
 msgid "Announced DNS servers"
 msgstr "Rozgłaszaj serwery DNS"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1093
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1496
 msgid "Anonymous Identity"
 msgstr ""
 
@@ -645,20 +671,6 @@ msgstr ""
 msgid "Anonymous Swap"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:322
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:329
-msgid "Antenna 1"
-msgstr "Antena 1"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:323
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:330
-msgid "Antenna 2"
-msgstr "Antena 2"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:246
-msgid "Antenna Configuration"
-msgstr "Ustawienia anteny"
-
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:71
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:160
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:181
@@ -666,11 +678,11 @@ msgstr "Ustawienia anteny"
 msgid "Any zone"
 msgstr "Dowolna strefa"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1981
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2522
 msgid "Apply request failed with status <code>%h</code>"
 msgstr "Żądanie zatwierdzenia nie powiodło się ze statusem <code>%h</code>"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1867
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2409
 msgid "Apply unchecked"
 msgstr ""
 
@@ -678,8 +690,8 @@ msgstr ""
 msgid "Architecture"
 msgstr "Architektura"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:19
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:184
+#: 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 ""
@@ -690,15 +702,15 @@ msgstr ""
 msgid "Assign interfaces..."
 msgstr "Przypisz interfejsy..."
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:124
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:24
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:189
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:31
 msgid ""
 "Assign prefix parts using this hexadecimal subprefix ID for this interface."
 msgstr ""
 "Przypisz cześć prefiksu za pomocą szesnastkowego ID subprefiksu dla tego "
 "interfejsu"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:148
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1967
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:22
 msgid "Associated Stations"
 msgstr "Połączone stacje"
@@ -707,20 +719,20 @@ msgstr "Połączone stacje"
 msgid "Associations"
 msgstr "Połączeni"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:39
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:37
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:101
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:64
 msgid "Auth Group"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1027
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1421
 msgid "Authentication"
 msgstr "Uwierzytelnianie"
 
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:29
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:70
 msgid "Authentication Type"
 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:78
 msgid "Authoritative"
 msgstr "Autorytatywny"
 
@@ -738,17 +750,19 @@ msgstr "Wymagana autoryzacja"
 msgid "Auto Refresh"
 msgstr "Automatyczne odświeżanie"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:53
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:7
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:17
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:67
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:24
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:36
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:42
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:36
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:106
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:24
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:98
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:50
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:94
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:81
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:55
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:68
 msgid "Automatic"
 msgstr ""
 
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:7
 #: protocols/luci-proto-hnet/luasrc/model/network/proto_hnet.lua:7
 msgid "Automatic Homenet (HNCP)"
 msgstr ""
@@ -791,21 +805,21 @@ msgstr "Dostępne"
 msgid "Average:"
 msgstr "Średnia:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:116
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:839
 msgid "B43 + B43C"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:840
 msgid "B43 + B43C + V43"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:48
 msgid "BR / DMR / AFTR"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:43
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:75
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1620
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:176
 msgid "BSSID"
 msgstr "BSSID"
@@ -819,19 +833,11 @@ msgstr "Wróć do przeglądu"
 msgid "Back to configuration"
 msgstr "Wróć do konfiguracji"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:48
-msgid "Back to overview"
-msgstr "Wróć do przeglądu"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:20
-msgid "Back to scan results"
-msgstr "Wróć do wyników skanowania"
-
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:17
 msgid "Backup"
 msgstr "Kopia zapasowa"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:38
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:36
 msgid "Backup / Flash Firmware"
 msgstr "Kopia zapasowa / aktualizacja firmware"
 
@@ -844,11 +850,11 @@ msgid "Bad address specified!"
 msgstr "Wprowadzono zły adres"
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:158
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:288
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:368
 msgid "Band"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:261
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:785
 msgid "Beacon Interval"
 msgstr "Interwał Beaconu"
 
@@ -862,79 +868,85 @@ 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:293
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:294
 msgid ""
 "Bind dynamically to interfaces rather than wildcard address (recommended as "
 "linux default)"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:16
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:48
 msgid "Bind interface"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:16
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:48
 msgid "Bind the tunnel to this interface (optional)."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:49
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:134
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:187
 msgid "Bitrate"
 msgstr "Szybkość transmisji"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:172
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
 msgid "Bogus NX Domain Override"
 msgstr "Podrób statystyki NXDOMAIN"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1634
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1840
 #: modules/luci-base/luasrc/model/network.lua:1420
 msgid "Bridge"
 msgstr "Most"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:264
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:368
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:678
 msgid "Bridge interfaces"
 msgstr "Interfejs mostu"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:906
 msgid "Bridge unit number"
 msgstr "Numer Mostu (urządzenia)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:250
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:364
 msgid "Bring up on boot"
 msgstr "Podnieś przy stracie"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:35
-msgid "Broadcom 802.11%s Wireless Controller"
-msgstr "Bezprzewodowy kontroler Broadcom 802.11%s"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:45
-msgid "Broadcom BCM%04x 802.11 Wireless Controller"
-msgstr "Bezprzewodowy kontroler Broadcom BCM%04x 802.11"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1697
+msgid "Browse…"
+msgstr ""
 
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:18
 msgid "Buffered"
 msgstr "Buforowana"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:75
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:134
 msgid "CA certificate; if empty it will be saved after the first connection."
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:7
+msgid "CLAT configuration failed"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:13
 msgid "CPU usage (%)"
 msgstr "Użycie CPU (%)"
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:21
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:53
 msgid "Call failed"
 msgstr "Połączenie nieudane"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1789
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:14
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:52
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:711
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:948
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1839
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:191
 #: modules/luci-mod-system/luasrc/view/admin_system/upgrade.htm:60
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:6
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:17
 msgid "Category"
 msgstr ""
 
@@ -952,13 +964,7 @@ msgstr "Uwaga: Zostanie wymuszone uaktualnienie systemu"
 msgid "Chain"
 msgstr "Łańcuch"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:9
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:14
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:24
-msgid "Change login password"
-msgstr "Zmień hasło logowania"
-
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1744
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 msgid "Changes"
 msgstr "Zmiany"
 
@@ -966,33 +972,23 @@ msgstr "Zmiany"
 msgid "Changes applied."
 msgstr "Zmiany zostały zastosowane."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2004
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2545
 msgid "Changes have been reverted."
 msgstr "Zmiany zostały cofnięte."
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:43
 msgid "Changes the administrator password for accessing the device"
 msgstr "Zmienia hasło administratora"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:10
-msgid "Changing password…"
-msgstr "Zmieniam hasło…"
-
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:162
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:45
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:87
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:174
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:376
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1618
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:186
 msgid "Channel"
 msgstr "Kanał"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:119
-msgid ""
-"Channel %d is not available in the %s regulatory domain and has been auto-"
-"adjusted to %d."
-msgstr ""
-
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:229
 msgid "Check"
 msgstr "Sprawdź"
@@ -1001,7 +997,7 @@ msgstr "Sprawdź"
 msgid "Check filesystems before mount"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1806
 msgid "Check this option to delete the existing networks from this radio."
 msgstr ""
 
@@ -1013,8 +1009,8 @@ msgstr "Suma kontrolna"
 msgid "Choose mtdblock"
 msgstr "Wybierz mtdblock"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:358
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:443
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1829
 msgid ""
 "Choose the firewall zone you want to assign to this interface. Select "
 "<em>unspecified</em> to remove the interface from the associated zone or "
@@ -1026,7 +1022,7 @@ msgstr ""
 "pole <em>utwórz</em> aby zdefiniować nową strefę i przypisać ją do "
 "interfejsu."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:834
 msgid ""
 "Choose the network(s) you want to attach to this wireless interface or fill "
 "out the <em>create</em> field to define a new network."
@@ -1034,11 +1030,11 @@ msgstr ""
 "Wybierz sieć/sieci które chcesz przyłączyć do tego interfejsu "
 "bezprzewodowego lub wypełnij pole <em>utwórz</em> aby utworzyć nową sieć."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:614
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1023
 msgid "Cipher"
 msgstr "Szyfr"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:61
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:91
 msgid "Cisco UDP encapsulation"
 msgstr ""
 
@@ -1058,28 +1054,28 @@ msgstr ""
 "Kliknij \"Zapisz mtdblock\", aby pobrać określony plik mtdblock. (UWAGA: TA "
 "FUNKCJA JEST DLA PROFESJONALISTÓW! )"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1950
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:369
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:471
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2189
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:803
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:908
 msgid "Client"
 msgstr "Klient"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:55
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:52
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:47
 msgid "Client ID to send when requesting DHCP"
 msgstr "Nazwa (ID) klienta do wysłania podczas negocjacji DHCP"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:145
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:151
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:155
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:161
 msgid "Close"
 msgstr "Zamknij"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:146
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:119
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:125
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:127
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:98
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:119
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:157
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:141
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:115
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:138
 msgid ""
 "Close inactive connection after the given amount of seconds, use 0 to "
 "persist connection"
@@ -1094,12 +1090,9 @@ msgstr "Zamknij listę..."
 #: modules/luci-base/luasrc/view/lease_status.htm:77
 #: modules/luci-base/luasrc/view/lease_status.htm:98
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:118
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:37
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:24
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1965
 #: modules/luci-mod-network/luasrc/view/admin_network/iface_status.htm:6
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:40
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:30
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:8
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:398
 #: modules/luci-mod-status/luasrc/view/admin_status/index/30-network.htm:11
 #: modules/luci-mod-status/luasrc/view/admin_status/index/50-dsl.htm:17
@@ -1113,15 +1106,19 @@ msgstr "Zbieranie danych..."
 msgid "Command"
 msgstr "Polecenie"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:193
+msgid "Command OK"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:41
+msgid "Command failed"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:64
 msgid "Comment"
 msgstr "Komentarz"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:185
-msgid "Common Configuration"
-msgstr "Konfiguracja podstawowa"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
 msgid ""
 "Complicates key reinstallation attacks on the client side by disabling "
 "retransmission of EAPOL-Key frames that are used to install keys. This "
@@ -1134,13 +1131,14 @@ msgstr ""
 "odporność kluczowych negocjacji, szczególnie w środowiskach o dużym "
 "natężeniu ruchu."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1744
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 #: modules/luci-base/luasrc/controller/admin/uci.lua:11
 #: modules/luci-mod-system/luasrc/view/admin_system/backupfiles.htm:9
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:13
 msgid "Configuration"
 msgstr "Konfiguracja"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:21
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:63
 msgid "Configuration failed"
 msgstr "Konfiguracja nieudana"
@@ -1149,90 +1147,89 @@ msgstr "Konfiguracja nieudana"
 msgid "Configuration files will be kept"
 msgstr "Pliki konfiguracyjne zostaną zachowane"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1915
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2456
 msgid "Configuration has been applied."
 msgstr "Konfiguracja została zastosowana."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1848
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2395
 msgid "Configuration has been rolled back!"
 msgstr "Konfiguracja została wycofana!"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:43
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:942
+msgid "Confirm disconnect"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:50
 msgid "Confirmation"
 msgstr "Potwierdzenie"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:32
-msgid "Connect"
-msgstr "Połącz"
-
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:72
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:105
 msgid "Connected"
 msgstr "Połączony"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:338
-msgid "Connection Limit"
-msgstr "Limit połączeń"
-
 #: modules/luci-base/htdocs/luci-static/resources/network.js:7
 #: modules/luci-base/luasrc/model/network.lua:27
 msgid "Connection attempt failed"
 msgstr "Próba połączenia nieudana"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:203
+msgid "Connection lost"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/controller/admin/status.lua:32
 msgid "Connections"
 msgstr "Połączenia"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1890
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:66
+msgid "Contents have been saved."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:618
+msgid "Continue"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2431
 msgid ""
 "Could not regain access to the device after applying the configuration "
 "changes. You might need to reconnect if you modified network related "
 "settings such as the IP address or wireless security credentials."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:135
 msgid "Country"
 msgstr "Kraj"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:227
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:233
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:337
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:764
 msgid "Country Code"
 msgstr "Kod kraju"
 
-# Pokrywa następujące interfejsy
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:36
-msgid "Cover the following interface"
-msgstr "Pokrywa następujący interfejs"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:43
-msgid "Cover the following interfaces"
-msgstr "Pokrywa następujące interfejsy"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:357
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:86
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:443
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1829
 msgid "Create / Assign firewall-zone"
 msgstr "Utwórz / Przypisz strefę firewalla"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:9
-msgid "Create Interface"
-msgstr "Utwórz interfejs"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:33
-msgid "Create a bridge over multiple interfaces"
-msgstr "Utwórz most pomiędzy wieloma interfejsami"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:735
+msgid "Create interface"
+msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:174
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:165
 msgid "Critical"
 msgstr "Krytyczne"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:178
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:169
 msgid "Cron Log Level"
 msgstr "Poziom logowania Cron`a"
 
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:519
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:521
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:447
+msgid "Current power"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:552
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:554
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:51
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:53
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:82
@@ -1240,7 +1237,7 @@ msgstr "Poziom logowania Cron`a"
 msgid "Custom Interface"
 msgstr "Interfejs niestandardowy"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:36
 msgid "Custom delegated IPv6-prefix"
 msgstr "Delegowany niestandardowy prefiks IPv6"
 
@@ -1252,7 +1249,7 @@ msgstr ""
 "Własne pliki (certyfikaty, skrypty) mogą pozostać w systemie. Aby zapobiec "
 "temu, wykonaj najpierw reset do ustawień fabrycznych"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:59
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:41
 msgid ""
 "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
 "\">LED</abbr>s if possible."
@@ -1260,46 +1257,47 @@ msgstr ""
 "Dostosuj zachowanie diod <abbr title=\"Light Emitting Diode\">LED</abbr> "
 "urządzenia jeśli jest to możliwe."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:799
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1223
 msgid "DAE-Client"
 msgstr "DAE-Klient"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:807
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1231
 msgid "DAE-Port"
 msgstr "DAE-Port"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:815
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1239
 msgid "DAE-Secret"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:448
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:459
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:279
 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:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:61
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:62
 msgid "DHCP and DNS"
 msgstr "DHCP i DNS"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1195
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1385
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:16
 #: modules/luci-base/luasrc/model/network.lua:968
 msgid "DHCP client"
 msgstr "Klient DHCP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:571
 msgid "DHCP-Options"
 msgstr "Opcje DHCP"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_dhcpv6.lua:7
 msgid "DHCPv6 client"
 msgstr "Klient DHCPv6"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:540
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:594
 msgid "DHCPv6-Mode"
 msgstr "Tryb DHCPv6"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:529
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:583
 msgid "DHCPv6-Service"
 msgstr "Serwis DHCPv6"
 
@@ -1316,31 +1314,31 @@ msgstr "Serwis DHCPv6"
 msgid "DNS"
 msgstr "DNS"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:183
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
 msgid "DNS forwardings"
 msgstr "Przekierowania DNS"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:30
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:37
 msgid "DNS-Label / FQDN"
 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:136
 msgid "DNSSEC"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:139
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
 msgid "DNSSEC check unsigned"
 msgstr "Sprawdzanie DNSSEC bez podpisu"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:73
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:99
 msgid "DPD Idle Timeout"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:14
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:41
 msgid "DS-Lite AFTR address"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:92
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:815
 #: modules/luci-mod-status/luasrc/view/admin_status/index/50-dsl.htm:14
 msgid "DSL"
 msgstr "DSL"
@@ -1349,11 +1347,11 @@ msgstr "DSL"
 msgid "DSL Status"
 msgstr "Status DSL"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:125
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:848
 msgid "DSL line mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:519
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:963
 msgid "DTIM Interval"
 msgstr "Interwał DTIM"
 
@@ -1365,42 +1363,45 @@ msgstr "DUID"
 msgid "Data Rate"
 msgstr "Szybkość przesyłania danych"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:169
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:180
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:160
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:171
 msgid "Debug"
 msgstr "Debug"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:759
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:783
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:807
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1183
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1207
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1231
 msgid "Default %d"
 msgstr "Domyślne %d"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:82
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:107
 msgid "Default Route"
 msgstr "Domyślna ścieżka routingu"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:17
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:81
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:51
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:32
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:48
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:85
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:65
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:80
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:108
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:146
 msgid "Default gateway"
 msgstr "Brama domyślna"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:541
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:594
 msgid "Default is stateless + stateful"
 msgstr "Domyślnie jest to stateless + stateful"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:70
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:54
 msgid "Default state"
 msgstr "Stan domyślny"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:503
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:553
 msgid "Define a name for this network."
 msgstr "Określ nazwę dla tej sieci."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:514
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:571
 msgid ""
 "Define additional DHCP options, for example "
 "\"<code>6,192.168.2.1,192.168.2.2</code>\" which advertises different DNS "
@@ -1409,35 +1410,47 @@ msgstr ""
 "Zdefiniuj dodatkowe opcje DHCP, np. \"<code>6,192.168.2.1,192.168.2.2</code>"
 "\" rozgłasza domyślne serwery DNS klientom DHCP."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:705
-#: modules/luci-base/htdocs/luci-static/resources/form.js:958
-#: modules/luci-base/htdocs/luci-static/resources/form.js:959
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1271
+#: modules/luci-base/htdocs/luci-static/resources/form.js:966
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1210
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1216
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1524
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1758
 #: modules/luci-base/luasrc/view/cbi/nsection.htm:11
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:162
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:16
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:41
 msgid "Delete"
 msgstr "Usuń"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:178
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:187
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:193
 msgid "Delete key"
 msgstr "Usuń klucz"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:45
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1654
+msgid "Delete permission denied"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1656
+msgid "Delete request failed: %d %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:723
 msgid "Delete this network"
 msgstr "Usuń tą sieć"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:519
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:963
 msgid "Delivery Traffic Indication Message Interval"
 msgstr "Interwał komunikatu o wskazaniu dostawy ruchu"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:102
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:108
 msgid "Description"
 msgstr "Opis"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:224
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1754
+msgid "Deselect"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:215
 msgid "Design"
 msgstr "Motyw"
 
@@ -1455,10 +1468,12 @@ msgstr ""
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:177
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:43
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:13
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:38
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:73
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:33
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:52
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:85
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:86
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:72
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:154
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:253
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:86
@@ -1466,15 +1481,24 @@ msgstr ""
 msgid "Device"
 msgstr "Urządzenie"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:138
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:737
 msgid "Device Configuration"
 msgstr "Konfiguracja urządzenia"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:81
+msgid "Device is not active"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/reboot.htm:23
 msgid "Device is rebooting..."
 msgstr "Urządzenie jest uruchamiane ponownie ..."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1889
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:167
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:513
+msgid "Device is restarting…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2430
 msgid "Device unreachable!"
 msgstr "Urządzenie nieosiągalne!"
 
@@ -1482,26 +1506,26 @@ 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:123
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:78
 #: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:61
 msgid "Diagnostics"
 msgstr "Diagnostyka"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:45
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:60
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:101
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:93
 msgid "Dial number"
 msgstr ""
 
-#: modules/luci-base/luasrc/view/cbi/filebrowser.htm:99
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1554
 msgid "Directory"
 msgstr "Katalog"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:131
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:715
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:754
 msgid "Disable"
 msgstr "Wyłącz"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:472
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:531
 msgid ""
 "Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for "
 "this interface."
@@ -1509,72 +1533,66 @@ msgstr ""
 "Wyłącz <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> na "
 "tym interfejsie."
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:64
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:93
 msgid "Disable Encryption"
 msgstr "Wyłącz szyfrowanie"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:530
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:973
 msgid "Disable Inactivity Polling"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:713
 msgid "Disable this network"
 msgstr "Wyłącz tą sieć"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:44
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:54
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:68
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:37
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:43
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:37
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1534
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:76
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:107
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:99
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:51
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:95
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:82
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:69
 msgid "Disabled"
 msgstr "Wyłączony"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1139
-msgid "Disabled (default)"
-msgstr "Wyłączone (domyślnie)"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:544
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:987
 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:192
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:193
 msgid "Discard upstream RFC1918 responses"
 msgstr "Odrzuć wychodzące odpowiedzi RFC1918"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:92
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:114
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:956
 msgid "Disconnect"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:22
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:64
 msgid "Disconnection attempt failed"
 msgstr "Próba rozłączenia nie powiodła się"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1121
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1762
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1855
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:17
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1375
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1995
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2314
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2401
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1634
 msgid "Dismiss"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:240
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:334
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:770
 msgid "Distance Optimization"
 msgstr "Optymalizacja odległości"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:241
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:770
 msgid "Distance to farthest network member in meters."
 msgstr "Odległość do najdalej oddalonego członka sieci w metrach."
 
-# Jak poprzednio trzymam się konwencji
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:347
-msgid "Diversity"
-msgstr "Wielorakość"
-
-#: 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:61
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
@@ -1586,37 +1604,45 @@ msgstr ""
 "\">DNS</abbr>. Jest to serwer przekazujący (Fowarder) dla firewalli <abbr "
 "title=\"Network Address Translation\">NAT</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:159
 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:123
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:124
 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:118
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
 msgid "Do not forward reverse lookups for local networks"
 msgstr "Nie przekazuj odwrotnych lookup`ów do sieci lokalnych"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:173
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1639
+msgid "Do you really want to delete \"%s\" ?"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:188
 msgid "Do you really want to delete the following SSH key?"
 msgstr "Czy na pewno chcesz usunąć następujący klucz SSH?"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1637
+msgid "Do you really want to recursively delete the directory \"%s\" ?"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:74
 msgid "Domain required"
 msgstr "Wymagana domena"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:205
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:206
 msgid "Domain whitelist"
 msgstr "Whitelist domen (Dozwolone domeny)"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:34
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:67
 msgid "Don't Fragment"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:74
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:75
 msgid ""
 "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
 "<abbr title=\"Domain Name System\">DNS</abbr>-Name"
@@ -1636,19 +1662,19 @@ msgstr "Pobierz kopię zapasową"
 msgid "Download mtdblock"
 msgstr "Pobierz mtdblock"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:853
 msgid "Downstream SNR offset"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:914
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1169
 msgid "Drag to reorder"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:9
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:11
 msgid "Dropbear Instance"
 msgstr "Usługa Dropbear"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:6
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 msgid ""
 "Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access "
 "and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
@@ -1657,20 +1683,21 @@ msgstr ""
 "<abbr title=\"Secure Shell\">SSH</abbr> oraz serwer <abbr title=\"Secure Copy"
 "\">SCP</abbr>"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:11
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:14
 msgid "Dual-Stack Lite (RFC6333)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:493
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:547
 msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 msgstr ""
 "<abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> dynamiczne"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:60
 msgid "Dynamic tunnel"
 msgstr "Tunel dynamiczny"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:494
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:547
 msgid ""
 "Dynamically allocate DHCP addresses for clients. If disabled, only clients "
 "having static leases will be served."
@@ -1678,21 +1705,21 @@ msgstr ""
 "Dynamicznie rezerwuje adresy DHCP dla klientów. Jeśli jest wyłączone tylko "
 "klienci posiadający stałe dzierżawy będą obsłużeni."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:67
 msgid "EA-bits length"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:990
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1386
 msgid "EAP-Method"
 msgstr "Metoda EAP"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:934
-#: modules/luci-base/htdocs/luci-static/resources/form.js:935
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1199
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1188
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1191
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1450
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:154
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:160
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:38
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:291
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:720
 msgid "Edit"
 msgstr "Edycja"
 
@@ -1702,24 +1729,24 @@ msgid ""
 "reload the page."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:38
-msgid "Edit this interface"
-msgstr "Edytuj ten interfejs"
-
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:718
 msgid "Edit this network"
 msgstr "Edytuj tą sieć"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:669
+msgid "Edit wireless network"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:167
 msgid "Emergency"
 msgstr "Zagrożenie"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:127
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:715
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:754
 msgid "Enable"
 msgstr "Włącz"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:414
 msgid ""
 "Enable <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> "
 "snooping"
@@ -1727,67 +1754,68 @@ msgstr ""
 "Włącz nasłuchiwanie <abbr title=\"Internet Group Management Protocol\">IGMP</"
 "abbr>"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:271
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:412
 msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 msgstr "Włącz <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:41
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:60
 msgid "Enable HE.net dynamic endpoint update"
 msgstr "Włącz dynamiczną aktualizację punktu końcowego sieci HE.net"
 
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:51
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:89
 msgid "Enable IPv6 negotiation"
 msgstr "Włącz negocjację IPv6"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:23
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:35
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:41
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:35
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:37
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:49
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:80
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:54
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:67
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:93
 msgid "Enable IPv6 negotiation on the PPP link"
 msgstr "Włącz negocjację IPv6 na łączu PPP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:143
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:188
 msgid "Enable Jumbo Frame passthrough"
 msgstr "Włącz przechodzenie ramek Jumbo"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:244
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:235
 msgid "Enable NTP client"
 msgstr "Włącz klienta NTP"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:69
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:96
 msgid "Enable Single DES"
 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:267
 msgid "Enable TFTP server"
 msgstr "Włącz serwer TFTP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:134
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:180
 msgid "Enable VLAN functionality"
 msgstr "Włącz funkcjonalność VLAN"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1595
 msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
 msgstr "Włącz przycisk WPS, wymaga WPA(2)-PSK"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1175
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
 msgid "Enable key reinstallation (KRACK) countermeasures"
 msgstr "Włącz środki zaradcze dotyczące ponownej instalacji kluczy (KRACK)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:138
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:183
 msgid "Enable learning and aging"
 msgstr "Włącz uczenie się i starzenie"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:194
 msgid "Enable mirroring of incoming packets"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:151
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:195
 msgid "Enable mirroring of outgoing packets"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:34
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:67
 msgid "Enable the DF (Don't Fragment) flag of the encapsulating packets."
 msgstr ""
 
@@ -1795,7 +1823,7 @@ msgstr ""
 msgid "Enable this mount"
 msgstr "Włącz ten punkt montowania"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:713
 msgid "Enable this network"
 msgstr ""
 
@@ -1803,21 +1831,21 @@ msgstr ""
 msgid "Enable this swap"
 msgstr "Włącz ten swap"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:37
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:88
 msgid "Enable/Disable"
 msgstr "Wlącz/Wyłącz"
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:76
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:152
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:251
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:41
 msgid "Enabled"
 msgstr "Włączony"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:277
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:414
 msgid "Enables IGMP snooping on this bridge"
 msgstr "Włącz nasłuchiwanie IGMP na tym moście"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:892
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1310
 msgid ""
 "Enables fast roaming among access points that belong to the same Mobility "
 "Domain"
@@ -1825,30 +1853,34 @@ msgstr ""
 "Aktywuje szybki roaming pomiędzy punktami dostępowymi, które należą do tej "
 "samej domeny"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:272
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:412
 msgid "Enables the Spanning Tree Protocol on this bridge"
 msgstr ""
 "Włącz protokół <abbr title=\"Spanning Tree Protocol\">STP</abbr> na tym "
 "moście"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:120
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:180
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:59
+msgid "Encapsulation limit"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:843
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:901
 msgid "Encapsulation mode"
 msgstr "Sposób enkapsulacji"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:76
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:603
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:129
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:992
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1621
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:177
 msgid "Encryption"
 msgstr "Szyfrowanie"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:155
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:128
 msgid "Endpoint Host"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:165
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:132
 msgid "Endpoint Port"
 msgstr ""
 
@@ -1860,16 +1892,21 @@ msgstr ""
 msgid "Enter custom values"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:273
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:271
 msgid "Erasing..."
 msgstr "Usuwanie..."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:95
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:96
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:97
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:98
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:99
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:106
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:107
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:108
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:109
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:110
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:173
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:164
 msgid "Error"
 msgstr "Błąd"
 
@@ -1877,24 +1914,28 @@ msgstr "Błąd"
 msgid "Errored seconds (ES)"
 msgstr "Ilość błędów (ES)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1646
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1852
 #: modules/luci-base/luasrc/model/network.lua:1432
 msgid "Ethernet Adapter"
 msgstr "Karta Ethernet"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1637
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1843
 #: modules/luci-base/luasrc/model/network.lua:1422
 msgid "Ethernet Switch"
 msgstr "Switch Ethernet"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:303
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
 msgid "Exclude interfaces"
 msgstr "Wyklucz interfejsy"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:153
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
 msgid "Expand hosts"
 msgstr "Rozwiń hosty"
 
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:195
+msgid "Expecting an hexadecimal assignment hint"
+msgstr ""
+
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:59
 msgid "Expecting: %s"
 msgstr ""
@@ -1903,62 +1944,78 @@ msgstr ""
 msgid "Expires"
 msgstr "Wygasa"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:488
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:543
 #, fuzzy
 msgid ""
 "Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
 msgstr ""
 "Czas wygasania dzierżawy adresu, minimum to 2 Minuty (<code>2m</code>)."
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:8
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:19
 msgid "External"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:971
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1377
 msgid "External R0 Key Holder List"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:980
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1381
 msgid "External R1 Key Holder List"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:150
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:141
 msgid "External system log server"
 msgstr "Serwer zewnętrzny dla logów systemowych"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:155
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:146
 msgid "External system log server port"
 msgstr "Port zewnętrznego serwera logów systemowych"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:160
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:151
 msgid "External system log server protocol"
 msgstr "Protokół zewnętrznego serwera logów systemowych"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:18
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:79
 msgid "Extra SSH command options"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:940
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1351
 msgid "FT over DS"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:941
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1352
 msgid "FT over the Air"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:938
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1349
 msgid "FT protocol"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1842
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:82
+msgid "Failed to change the system password."
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2389
 msgid "Failed to confirm apply within %ds, waiting for rollback…"
 msgstr "Nie udało się zatwierdzić w ciągu %ds, czekam na wycofanie…"
 
-#: modules/luci-base/luasrc/view/cbi/filebrowser.htm:106
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:45
+msgid "Failed to execute \"/etc/init.d/%s %s\" action: %s"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1561
 msgid "File"
 msgstr "Plik"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:279
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1514
+msgid "File not accessible"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1698
+msgid "Filename"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:280
 msgid "Filename of the boot image advertised to clients"
 msgstr "Rozgłoszono nazwę pliku obrazu startowego do klientów"
 
@@ -1968,14 +2025,15 @@ 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:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:118
 msgid "Filter private"
 msgstr "Filtruj prywatne"
 
-#: 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:123
 msgid "Filter useless"
 msgstr "Filtruj bezużyteczne"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:23
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:65
 msgid "Finalizing failed"
 msgstr "Finalizacja nie powiodła się"
@@ -1986,7 +2044,7 @@ msgid ""
 "with defaults based on what was detected"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:696
 msgid "Find and join network"
 msgstr "Znajdź i podłącz się do sieci"
 
@@ -1998,11 +2056,11 @@ msgstr "Zakończ"
 msgid "Firewall"
 msgstr "Firewall"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:77
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:76
 msgid "Firewall Mark"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:193
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:278
 msgid "Firewall Settings"
 msgstr "Ustawienia firewalla"
 
@@ -2010,7 +2068,7 @@ msgstr "Ustawienia firewalla"
 msgid "Firewall Status"
 msgstr "Stan firewalla"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:137
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:860
 msgid "Firmware File"
 msgstr "Plik firmware"
 
@@ -2018,7 +2076,7 @@ msgstr "Plik firmware"
 msgid "Firmware Version"
 msgstr "Wersja firmware"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:225
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:226
 msgid "Fixed source port for outbound DNS queries"
 msgstr "Stały port źródłowy dla wychodzących zapytań DNS"
 
@@ -2038,36 +2096,36 @@ msgstr "Wgraj nowy firmware"
 msgid "Flash operations"
 msgstr "Operacje aktualizacji"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:194
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:192
 msgid "Flashing..."
 msgstr "Flashowanie..."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:498
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:550
 msgid "Force"
 msgstr "Wymuś"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:258
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:782
 msgid "Force 40MHz mode"
 msgstr "Wymuś tryb 40MHz"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:622
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1031
 msgid "Force CCMP (AES)"
 msgstr "Wymuś CCMP (AES)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:499
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:550
 msgid "Force DHCP on this network even if another server is detected."
 msgstr ""
 "Wymuś uruchomienie serwera DHCP w tej sieci nawet gdy wykryto inny serwer."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:623
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1032
 msgid "Force TKIP"
 msgstr "Wymuś TKIP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:624
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1033
 msgid "Force TKIP and CCMP (AES)"
 msgstr "Wymuś TKIP i CCMP (AES)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:795
 msgid "Force link"
 msgstr "Wymuś połączenie"
 
@@ -2075,7 +2133,7 @@ msgstr "Wymuś połączenie"
 msgid "Force upgrade"
 msgstr "Wymuś uaktualnienie"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:60
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:90
 msgid "Force use of NAT-T"
 msgstr ""
 
@@ -2083,7 +2141,7 @@ msgstr ""
 msgid "Form token mismatch"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:34
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:164
 msgid "Forward DHCP traffic"
 msgstr "Przekazuj ruch DHCP"
 
@@ -2091,46 +2149,41 @@ msgstr "Przekazuj ruch DHCP"
 msgid "Forward Error Correction Seconds (FECS)"
 msgstr "Próby korekcji błędów (FECS)"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:28
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:161
 msgid "Forward broadcast traffic"
 msgstr "Przekazuj broadcast`y"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:375
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:809
 msgid "Forward mesh peer traffic"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:186
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:908
 msgid "Forwarding mode"
 msgstr "Tryb przekazywania"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:255
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:596
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:774
 msgid "Fragmentation Threshold"
 msgstr "Próg Fragmentacji"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:332
-msgid "Frame Bursting"
-msgstr "Dzielenie ramek"
-
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:17
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:28
 msgid "Free"
 msgstr "Wolna"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:91
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:89
 msgid ""
-"Further information about WireGuard interfaces and peers at <a href=\"http://"
-"wireguard.com\">wireguard.com</a>."
+"Further information about WireGuard interfaces and peers at <a href='http://"
+"wireguard.com'>wireguard.com</a>."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:45
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:130
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:186
 msgid "GHz"
 msgstr "GHz"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:29
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:36
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:91
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:77
 msgid "GPRS only"
 msgstr "Tylko GPRS"
 
@@ -2139,28 +2192,28 @@ msgstr "Tylko GPRS"
 msgid "Gateway"
 msgstr "Brama"
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:35
+msgid "Gateway Ports"
+msgstr "Porty bramy"
+
 #: modules/luci-base/htdocs/luci-static/resources/network.js:9
 #: modules/luci-base/luasrc/model/network.lua:29
 msgid "Gateway address is invalid"
 msgstr "Adres bramy jest nieprawidłowy"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:46
-msgid "Gateway ports"
-msgstr "Porty bramy"
-
-#: 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:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:275
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:23
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:112
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:103
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:49
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:33
 msgid "General Settings"
 msgstr "Ustawienia główne"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:188
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:462
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:175
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:141
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:361
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:504
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:895
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:741
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:796
 msgid "General Setup"
 msgstr "Ustawienia podstawowe"
 
@@ -2168,7 +2221,7 @@ msgstr "Ustawienia podstawowe"
 msgid "Generate Config"
 msgstr "Wygeneruj konfigurację"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:945
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1355
 msgid "Generate PMK locally"
 msgstr "Wygeneruj PMK lokalnie"
 
@@ -2176,11 +2229,7 @@ msgstr "Wygeneruj PMK lokalnie"
 msgid "Generate archive"
 msgstr "Twórz archiwum"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:63
-msgid "Generic 802.11%s Wireless Controller"
-msgstr "Ogólny bezprzewodowy kontroler 802.11%s"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:26
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:74
 msgid "Given password confirmation did not match, password not changed!"
 msgstr ""
 "Hasło nie zostało zmienione, wpisane poprzednie hasło routera jest "
@@ -2190,7 +2239,7 @@ msgstr ""
 msgid "Global Settings"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:806
 msgid "Global network options"
 msgstr "Globalne opcje sieciowe"
 
@@ -2201,33 +2250,29 @@ msgstr "Globalne opcje sieciowe"
 msgid "Go to password configuration..."
 msgstr "Przejdź do konfiguracji hasła..."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:857
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1369
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1112
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1616
 #: modules/luci-base/luasrc/view/cbi/full_valueheader.htm:4
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:58
 msgid "Go to relevant configuration page"
 msgstr "Przejdź do powiązanych ustawień"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:38
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:66
 msgid "Group Password"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:11
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:22
 msgid "Guest"
 msgstr "Gość"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:73
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:81
 msgid "HE.net password"
 msgstr "Hasło HE.net"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:60
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:73
 msgid "HE.net username"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:310
-msgid "HT mode (802.11n)"
-msgstr ""
-
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:16
 msgid "Hang Up"
 msgstr "Rozłącz"
@@ -2236,7 +2281,7 @@ msgstr "Rozłącz"
 msgid "Header Error Code Errors (HEC)"
 msgstr "Błędy kodu nagłówka (HEC)"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:103
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 msgid ""
 "Here you can configure the basic aspects of your device like its hostname or "
 "the timezone."
@@ -2244,9 +2289,7 @@ msgstr ""
 "Tutaj możesz skonfigurować podstawowe ustawienia twojego urządzenia, np. "
 "nazwę hosta, strefę czasową."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:499
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:556
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:579
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:941
 msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr ""
 "Ukryj <abbr title=\"Extended Service Set Identifier (Nazwę sieci)\">ESSID</"
@@ -2259,14 +2302,15 @@ msgstr "Ukryj puste łańcuchy"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:92
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1959
 msgid "Host"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:20
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:21
 msgid "Host entries"
 msgstr "Wpisy PC"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:48
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:171
 msgid "Host expiry timeout"
 msgstr "Czas wygasania hosta"
 
@@ -2274,45 +2318,45 @@ msgstr "Czas wygasania hosta"
 msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
 msgstr "<abbr title=\"Internet Protocol Address\">IP</abbr> lub sieć Hosta"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:118
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:102
 msgid "Host-Uniq tag content"
 msgstr "Zawartość znacznika Host-Uniq"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:71
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:31
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:316
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:25
+#: 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:317
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:26
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:17
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:125
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:116
 msgid "Hostname"
 msgstr "Nazwa hosta"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:12
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:22
 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:18
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:19
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:67
 msgid "Hostnames"
 msgstr "Nazwy hostów"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:13
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:24
 msgid "Hybrid"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:45
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:75
 msgid "IKE DH Group"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:41
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:59
 msgid "IP Addresses"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:40
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:80
 msgid "IP Protocol"
 msgstr "Protokół IP"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:29
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:30
 msgid "IP address"
 msgstr "Adres IP"
 
@@ -2331,6 +2375,11 @@ msgstr "Brakuje adresu IP"
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:20
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:21
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:22
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:79
+#: 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/network.js:89
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:90
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:91
@@ -2338,7 +2387,7 @@ msgstr "Brakuje adresu IP"
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:93
 #: 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/luasrc/model/cbi/admin_network/proto_ncm.lua:42
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:82
 msgid "IPv4"
 msgstr "IPv4"
 
@@ -2350,24 +2399,23 @@ msgstr "Firewall IPv4"
 msgid "IPv4 Upstream"
 msgstr "Źródłowy IPv4"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:57
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:178
 msgid "IPv4 address"
 msgstr "Adres IPv4"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:26
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:33
 msgid "IPv4 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:104
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:181
 msgid "IPv4 broadcast"
 msgstr "Broadcast IPv4"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:100
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:180
 msgid "IPv4 gateway"
 msgstr "Brama IPv4"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:92
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:179
 msgid "IPv4 netmask"
 msgstr "Maska IPv4"
 
@@ -2375,24 +2423,25 @@ msgstr "Maska IPv4"
 msgid "IPv4 network in address/netmask notation"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:25
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:52
 msgid "IPv4 prefix"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:42
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:30
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:55
 msgid "IPv4 prefix length"
 msgstr "Długość prefiksu IPv4"
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:43
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:83
 msgid "IPv4+IPv6"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:72
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:34
 msgid "IPv4-Address"
 msgstr "Adres IPv4"
 
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:10
 #: protocols/luci-proto-ipip/luasrc/model/network/proto_ipip.lua:9
 msgid "IPv4-in-IPv4 (RFC2003)"
 msgstr ""
@@ -2407,6 +2456,16 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:30
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:31
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:32
+#: 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/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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:89
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:90
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:91
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:92
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:95
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:96
@@ -2419,7 +2478,7 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:103
 #: 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/luasrc/model/cbi/admin_network/proto_ncm.lua:44
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:84
 msgid "IPv6"
 msgstr "IPv6"
 
@@ -2431,11 +2490,11 @@ msgstr "Firewall IPv6"
 msgid "IPv6 Neighbours"
 msgstr "Sąsiedztwo IPv6"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:464
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:506
 msgid "IPv6 Settings"
 msgstr "Ustawienia IPv6"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:195
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:810
 msgid "IPv6 ULA-Prefix"
 msgstr "IPv6 Prefiks-ULA"
 
@@ -2443,21 +2502,21 @@ msgstr "IPv6 Prefiks-ULA"
 msgid "IPv6 Upstream"
 msgstr "Źródłowy IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:202
 msgid "IPv6 address"
 msgstr "Adres IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:23
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:189
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:31
 msgid "IPv6 assignment hint"
 msgstr "Wskazówka przypisania IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:18
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:184
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:27
 msgid "IPv6 assignment length"
 msgstr "Długość przydziału IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:207
 msgid "IPv6 gateway"
 msgstr "Brama IPv6"
 
@@ -2465,22 +2524,22 @@ msgstr "Brama IPv6"
 msgid "IPv6 network in address/netmask notation"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:37
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:59
 msgid "IPv6 prefix"
 msgstr "Prefiks IPv6"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:34
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:45
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:63
 msgid "IPv6 prefix length"
 msgstr "Długość prefiksu IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:33
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:211
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:57
 msgid "IPv6 routed prefix"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:143
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:215
 msgid "IPv6 suffix"
 msgstr "Sufiks IPv6"
 
@@ -2490,32 +2549,36 @@ msgid "IPv6-Address"
 msgstr "Adres IPv6"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:93
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:104
 msgid "IPv6-PD"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:10
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:13
 msgid "IPv6-in-IPv4 (RFC4213)"
 msgstr "IPv6-w-IPv4 (RFC4213)"
 
 # 6rd to nie "szóste", tylko IPv6 rapid deployment
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:17
 msgid "IPv6-over-IPv4 (6rd)"
 msgstr "IPv6-przez-IPv4 (6rd)"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:15
 msgid "IPv6-over-IPv4 (6to4)"
 msgstr "IPv6-przez-IPv4 (6to4)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1075
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1478
 msgid "Identity"
 msgstr "Tożsamość"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:70
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:96
 msgid "If checked, 1DES is enabled"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:65
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:93
 msgid "If checked, encryption is disabled"
 msgstr ""
 
@@ -2536,36 +2599,36 @@ msgstr ""
 "Jeśli podano, zainstaluj urządzenie poprzez nazwę partycji zamiast <abbr "
 "title=\"fixed device node\">ustalonego węzła urządzenia</abbr>"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:27
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:71
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:18
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:82
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:52
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:17
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:29
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:33
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:68
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:85
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:32
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:45
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:45
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:24
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:44
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:116
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:48
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:85
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:65
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:33
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:80
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:108
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:146
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:74
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:97
 msgid "If unchecked, no default route is configured"
 msgstr "Jeśli odznaczone, nie ma zdefiniowanej domyślnej ścieżki routingu"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:34
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:86
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:35
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:99
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:47
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:60
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:60
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:39
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:59
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:124
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:39
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:116
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:59
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:103
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:64
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:77
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:100
 msgid "If unchecked, the advertised DNS server addresses are ignored"
 msgstr "Jeśli odznaczone, rozgłoszane adresy serwerów DNS są ignorowane"
 
@@ -2583,15 +2646,15 @@ 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:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:102
 msgid "Ignore <code>/etc/hosts</code>"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:471
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:531
 msgid "Ignore interface"
 msgstr "Ignoruj interfejs"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:90
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:91
 msgid "Ignore resolve file"
 msgstr "Ignoruj pliki resolve"
 
@@ -2609,12 +2672,12 @@ msgid ""
 "blocked. Click \"Continue »\" below to return to the previous page."
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:145
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:118
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:124
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:126
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:97
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:118
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:157
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:141
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:115
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:138
 msgid "Inactivity timeout"
 msgstr "Czas bezczynności"
 
@@ -2622,23 +2685,25 @@ msgstr "Czas bezczynności"
 msgid "Inbound:"
 msgstr "Przychodzący:"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:170
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:161
 msgid "Info"
 msgstr "Info"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:105
 msgid "Information"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:25
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:67
 msgid "Initialization failure"
 msgstr "Błąd inicjalizacji"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:34
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:87
 msgid "Initscript"
 msgstr "Skrypt startowy"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:26
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:122
 msgid "Initscripts"
 msgstr "Skrypty startowe"
 
@@ -2647,55 +2712,74 @@ msgid "Install iputils-traceroute6 for IPv6 traceroute"
 msgstr ""
 "Zainstaluj iputils-traceroute6 w celu skorzystania z traceroute dla iPv6"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:223
-msgid "Install package %q"
-msgstr "Instaluj pakiet %q"
-
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:220
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:120
 msgid "Install protocol extensions..."
 msgstr "Instaluj rozszerzenia protokołów..."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:416
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:423
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:683
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:687
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:26
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:284
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:342
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:47
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:134
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:14
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:16
 msgid "Interface"
 msgstr "Interfejs"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:58
 msgid "Interface %q device auto-migrated from %q to %q."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:356
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:792
 msgid "Interface Configuration"
 msgstr "Konfiguracja Interfejsu"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:51
-msgid "Interface Overview"
-msgstr "Przegląd Interfejsów"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:99
+msgid "Interface has %d pending changes"
+msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:57
+msgid "Interface is marked for deletion"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:162
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:3
 msgid "Interface is reconnecting..."
 msgstr "Ponowne łączenie interfejsu..."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:162
+msgid "Interface is shutting down..."
+msgstr "Interfejs jest wyłączany..."
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:205
+msgid "Interface is starting..."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:208
+msgid "Interface is stopping..."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:954
 msgid "Interface name"
 msgstr "Nazwa interfejsu"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:34
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:224
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:131
 msgid "Interface not present or not connected yet."
 msgstr "Interfejs nie istnieje lub nie jest jeszcze podłączony."
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:88
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:16
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:11
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:287
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:54
 msgid "Interfaces"
 msgstr "Interfejsy"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:9
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:20
 msgid "Internal"
 msgstr ""
 
@@ -2708,19 +2792,35 @@ msgstr "Wewnętrzny błąd serwera"
 msgid "Invalid"
 msgstr "Niewłaściwy"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:311
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:10
+msgid "Invalid Base64 key string"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:281
 msgid "Invalid VLAN ID given! Only IDs between %d and %d are allowed."
 msgstr "Podano niewłaściwy ID VLAN`u! Dozwolone są tylko ID pomiędzy %d a %d."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:307
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:290
 msgid "Invalid VLAN ID given! Only unique IDs are allowed"
 msgstr "Podano niewłaściwy ID VLAN`u! Dozwolone są tylko unikalne ID."
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:195
+msgid "Invalid argument"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:194
+msgid "Invalid command"
+msgstr ""
+
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:80
+msgid "Invalid hexadecimal value"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/sysauth.htm:12
 msgid "Invalid username and/or password! Please try again."
 msgstr "Niewłaściwy login i/lub hasło! Spróbuj ponownie."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:508
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:950
 msgid "Isolate Clients"
 msgstr "Izoluj klientów"
 
@@ -2740,15 +2840,15 @@ msgstr ""
 msgid "JavaScript required!"
 msgstr "JavaScript jest wymagany!"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:52
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1691
 msgid "Join Network"
 msgstr "Połącz z siecią"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:22
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1628
 msgid "Join Network: Wireless Scan"
 msgstr "Przyłącz do sieci: Skanuj sieci Wi-Fi"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:19
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1833
 msgid "Joining Network: %q"
 msgstr "Przyłączanie do sieci: %q"
 
@@ -2765,15 +2865,15 @@ msgstr "Log jądra"
 msgid "Kernel Version"
 msgstr "Wersja jądra"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:823
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1248
 msgid "Key"
 msgstr "Klucz"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:851
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:852
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:853
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:854
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:870
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1277
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1278
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1279
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1291
 msgid "Key #%d"
 msgstr "Klucz #%d"
 
@@ -2781,33 +2881,34 @@ msgstr "Klucz #%d"
 msgid "Kill"
 msgstr "Zabij"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:10
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:21
 msgid "L2TP"
 msgstr "L2TP"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:10
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:40
 msgid "L2TP Server"
 msgstr "Serwer L2TP"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:100
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:74
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:80
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:74
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:53
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:73
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:131
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:102
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:89
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:112
 msgid "LCP echo failure threshold"
 msgstr "Próg błędu echa LCP"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:118
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:89
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:95
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:89
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:68
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:91
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:144
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:102
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:125
 msgid "LCP echo interval"
 msgstr "Interwał echa LCP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:181
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:902
 msgid "LLC"
 msgstr "LLC"
 
@@ -2816,11 +2917,11 @@ msgstr "LLC"
 msgid "Label"
 msgstr "Oznaczenie"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:213
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:204
 msgid "Language"
 msgstr "Język"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:115
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:106
 msgid "Language and Style"
 msgstr "Wygląd i język"
 
@@ -2828,52 +2929,52 @@ msgstr "Wygląd i język"
 msgid "Latency"
 msgstr "Opoźnienie"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:10
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:21
 msgid "Leaf"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:369
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:487
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:393
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:543
 msgid "Lease time"
 msgstr "Czas dzierżawy"
 
-#: 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:87
 msgid "Leasefile"
 msgstr "Plik dzierżaw"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:74
 #: modules/luci-base/luasrc/view/lease_status.htm:95
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:34
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
 msgid "Leasetime remaining"
 msgstr "Pozostały czas dzierżawy"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:9
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:20
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:27
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:50
 msgid "Leave empty to autodetect"
 msgstr "Pozostaw puste, aby automatycznie wykryć"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:21
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:45
 msgid "Leave empty to use the current WAN address"
 msgstr "Pozostaw puste, aby użyć bieżącego adresu WAN"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1746
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2299
 msgid "Legend:"
 msgstr "Legenda:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:481
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:538
 msgid "Limit"
 msgstr "Limit"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:287
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:288
 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:299
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:300
 msgid "Limit listening to these interfaces, and loopback."
 msgstr "Ogranicz nasłuchiwanie do tych interfesjów, oraz loopbacku."
 
@@ -2893,11 +2994,11 @@ msgstr "Stan linii"
 msgid "Line Uptime"
 msgstr "Czas działania linii"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:101
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:88
 msgid "Link On"
 msgstr "Połączenie aktywne"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:185
 msgid ""
 "List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
 "requests to"
@@ -2905,7 +3006,7 @@ msgstr ""
 "Lista serwerów <abbr title=\"Domain Name System\">DNS</abbr> do których będą "
 "przekazywane zapytania"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:972
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1377
 msgid ""
 "List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-"
 "Identifier,128-bit key as hex string. <br />This list is used to map R0KH-ID "
@@ -2914,7 +3015,7 @@ msgid ""
 "Association."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:981
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1381
 msgid ""
 "List of R1KHs in the same Mobility Domain. <br />Format: MAC-address,R1KH-ID "
 "as 6 octets with colons,128-bit key as hex string. <br />This list is used "
@@ -2923,32 +3024,32 @@ msgid ""
 "PMK-R1 keys."
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:21
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:82
 msgid "List of SSH key files for auth"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:206
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:207
 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:173
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:174
 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:298
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:299
 msgid "Listen Interfaces"
 msgstr "Nasłuchuj interfejs"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:30
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:54
 msgid "Listen Port"
 msgstr "Nasłuchuj port"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:15
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:16
 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:216
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:217
 msgid "Listening port for inbound DNS queries"
 msgstr "Port nasłuchu dla przychodzących zapytań DNS"
 
@@ -2967,11 +3068,11 @@ msgstr "Średnie obciążenie"
 msgid "Loading"
 msgstr "Ładowanie"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:35
-msgid "Loading SSH keys…"
-msgstr "Ładowanie kluczy SSH…"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1819
+msgid "Loading directory contents…"
+msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1204
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1296
 #: modules/luci-base/luasrc/view/view.htm:4
 msgid "Loading view…"
 msgstr ""
@@ -2981,41 +3082,41 @@ msgstr ""
 msgid "Local IP address is invalid"
 msgstr "Lokalny adres IP jest nieprawidłowy"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:25
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:86
 msgid "Local IP address to assign"
 msgstr "Lokalny adres IP do przypisania"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:10
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:11
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:44
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:39
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:151
 msgid "Local IPv4 address"
 msgstr "Lokalny adres IPv4"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:20
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:54
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:45
 msgid "Local IPv6 address"
 msgstr "Lokalny adres IPv6"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:286
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:287
 msgid "Local Service Only"
 msgstr "Tylko serwis lokalny"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:81
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:126
 msgid "Local Startup"
 msgstr "Lokalny autostart"
 
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:25
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:121
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:112
 msgid "Local Time"
 msgstr "Czas lokalny"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:149
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
 msgid "Local domain"
 msgstr "Domena lokalna"
 
-#: 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:147
 #, fuzzy
 msgid ""
 "Local domain specification. Names matching this domain are never forwarded "
@@ -3024,16 +3125,16 @@ msgstr ""
 "Specyfikacja domeny lokalnej. Nazwy należące do tej domeny nie są "
 "przekazywane dalej ani rozwijane przez DHCP lub tylko pliki hosts"
 
-#: 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:151
 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 hosts"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
 msgid "Local server"
 msgstr "Serwer lokalny"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:129
 msgid ""
 "Localise hostname depending on the requesting subnet if multiple IPs are "
 "available"
@@ -3041,23 +3142,19 @@ 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:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:128
 msgid "Localise queries"
 msgstr "Zapytania lokalizujące"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:175
-msgid "Locked to channel %s used by: %s"
-msgstr ""
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:168
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:159
 msgid "Log output level"
 msgstr "Poziom logowania"
 
-#: 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:181
 msgid "Log queries"
 msgstr "Loguj zapytania"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:113
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:104
 msgid "Logging"
 msgstr "Logowanie"
 
@@ -3065,7 +3162,7 @@ msgstr "Logowanie"
 msgid "Login"
 msgstr "Zaloguj"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:95
+#: modules/luci-base/luasrc/controller/admin/index.lua:103
 msgid "Logout"
 msgstr "Wyloguj"
 
@@ -3073,11 +3170,13 @@ msgstr "Wyloguj"
 msgid "Loss of Signal Seconds (LOSS)"
 msgstr "Utrata sygnału (LOSS)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:476
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:533
 msgid "Lowest leased address as offset from the network address."
 msgstr "Najniższy wydzierżawiony adres jako offset dla adresu sieci."
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:40
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:75
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:35
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:86
 msgid "MAC"
@@ -3085,32 +3184,32 @@ msgstr "MAC"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:73
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:109
-#: 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:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1958
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:86
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:133
 msgid "MAC-Address"
 msgstr "Adres MAC"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:457
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:586
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:886
 msgid "MAC-Address Filter"
 msgstr "Filtr adresów MAC"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:142
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:363
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:798
 msgid "MAC-Filter"
 msgstr "Filtr adresów MAC"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:464
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:590
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:893
 msgid "MAC-List"
 msgstr "Lista MAC"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:13
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:16
 msgid "MAP / LW4over6"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:62
 msgid "MAP rule is invalid"
 msgstr "Reguła MAP jest nieprawidłowa"
@@ -3128,8 +3227,8 @@ msgid "MHz"
 msgstr "MHz"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:53
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:29
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:66
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:53
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:71
 msgid "MTU"
 msgstr "MTU"
 
@@ -3141,16 +3240,17 @@ msgstr ""
 "Upewnij się, że klonujesz główny system plików, używając czegoś podobnego do "
 "poleceń poniżej:"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:55
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:69
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:26
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:38
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:38
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:108
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:52
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:96
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:83
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:57
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:70
 msgid "Manual"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1949
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2188
 msgid "Master"
 msgstr ""
 
@@ -3158,48 +3258,46 @@ msgstr ""
 msgid "Max. Attainable Data Rate (ATTNDR)"
 msgstr "Max. Osiągalna przepustowość danych (ATTNDR)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:539
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:982
 msgid "Maximum allowed Listen Interval"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:234
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
 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:252
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:253
 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:243
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:244
 msgid "Maximum allowed size of EDNS.0 UDP packets"
 msgstr "Maksymalny dozwolony rozmiar pakietu EDNS.0 UDP"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:63
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:77
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:57
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:112
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:104
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:93
 msgid "Maximum amount of seconds to wait for the modem to become ready"
 msgstr "Maksymalny czas podany w sekundach do pełnej gotowości modemu"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:27
-msgid ""
-"Maximum length of the name is 15 characters including the automatic protocol/"
-"bridge prefix (br-, 6in4-, pppoe- etc.)"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:482
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:538
 msgid "Maximum number of leased addresses."
 msgstr "Maksymalna liczba dzierżawionych adresów."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:761
+msgid "Maximum transmit power"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:21
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:49
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:134
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:187
 #: modules/luci-mod-status/luasrc/view/admin_status/bandwidth.htm:79
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:284
 msgid "Mbit/s"
 msgstr "Mbit/s"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:18
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:32
 msgid "Medium"
 msgstr ""
 
@@ -3211,42 +3309,43 @@ msgstr "Pamięć"
 msgid "Memory usage (%)"
 msgstr "Użycie pamięci (%)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1952
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2191
 msgid "Mesh"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:372
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:806
 msgid "Mesh Id"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:196
+msgid "Method not found"
+msgstr ""
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:45
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:76
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:104
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:54
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:66
 msgid "Metric"
 msgstr "Metryka"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:154
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:198
 msgid "Mirror monitor port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:153
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:197
 msgid "Mirror source port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:408
-msgid "Missing protocol extension for proto %q"
-msgstr "Brakujące rozszerzenie protokołu dla protokołu %q"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:923
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1337
 msgid "Mobility Domain"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:154
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:41
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:74
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:366
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:31
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:360
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:801
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1619
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:175
 msgid "Mode"
 msgstr "Tryb"
@@ -3255,39 +3354,38 @@ msgstr "Tryb"
 msgid "Model"
 msgstr "Model"
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:31
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:72
 msgid "Modem default"
 msgstr "Domyślny modem"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:11
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:19
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:11
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:10
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:73
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:73
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:57
 msgid "Modem device"
 msgstr "Urządzenie modemowe"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:24
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:66
 msgid "Modem information query failed"
 msgstr "Zapytanie dotyczące modemu nie powiodło się"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:62
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:76
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:56
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:112
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:104
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:93
 msgid "Modem init timeout"
 msgstr "Limit czasu inicjacji modemu"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1953
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:452
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:554
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:577
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2192
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:880
 msgid "Monitor"
 msgstr "Monitor"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:14
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
 msgid "More Characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:802
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1057
 msgid "More…"
 msgstr ""
 
@@ -3300,7 +3398,7 @@ msgstr "Wpis montowania"
 msgid "Mount Point"
 msgstr "Punkt montowania"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:26
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:36
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:137
 msgid "Mount Points"
@@ -3350,46 +3448,44 @@ msgstr "Przesuń w dół"
 msgid "Move up"
 msgstr "Przesuń w górę"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:912
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
 msgid "NAS ID"
 msgstr "NAS ID"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:57
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:87
 msgid "NAT-T Mode"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:9
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 msgid "NAT64 Prefix"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:31
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:26
 msgid "NCM"
 msgstr "NCM"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:535
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:589
 msgid "NDP-Proxy"
 msgstr "Proxy NDP"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:43
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:72
 msgid "NT Domain"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:273
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:264
 msgid "NTP server candidates"
 msgstr "Lista serwerów NTP"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:837
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1092
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:27
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:502
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:65
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:553
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:658
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:49
 msgid "Name"
 msgstr "Nazwa"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:17
-msgid "Name of the new interface"
-msgstr "Nazwa nowego interfejsu"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1808
 msgid "Name of the new network"
 msgstr "Nazwa nowej sieci"
 
@@ -3397,9 +3493,10 @@ msgstr "Nazwa nowej sieci"
 msgid "Navigation"
 msgstr "Nawigacja"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:62
+#: modules/luci-base/luasrc/controller/admin/index.lua:69
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:108
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:402
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:834
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1957
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:389
 #: modules/luci-mod-status/luasrc/view/admin_status/index/30-network.htm:8
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:73
@@ -3411,7 +3508,7 @@ msgstr "Sieć"
 msgid "Network Utilities"
 msgstr "Narzędzia sieciowe"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:278
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:279
 msgid "Network boot image"
 msgstr "Sieciowy obraz startowy"
 
@@ -3424,53 +3521,59 @@ msgstr "Urządzenie sieciowe nie jest obecne"
 msgid "Network without interfaces."
 msgstr "Sieć bez interfejsów"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:661
+msgid "New interface name…"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:11
 msgid "Next »"
 msgstr "Następna »"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1507
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1754
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:108
 msgid "No"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:453
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:514
 msgid "No DHCP Server configured for this interface"
 msgstr "Brak skonfigurowanego serwera DHCP dla tego interfejsu"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1162
+msgid "No Encryption"
+msgstr ""
+
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:89
 msgid "No NAT-T"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:198
+msgid "No data received"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1764
+msgid "No entries in this directory"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/backupfiles.lua:82
 msgid "No files found"
 msgstr "Nie znaleziono plików"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:550
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:191
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:180
 msgid "No information available"
 msgstr "Brak dostępnych informacji"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:8
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:63
 msgid "No matching prefix delegation"
 msgstr "Brak zgodnej delegacji prefiksu"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:157
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
 msgid "No negative cache"
 msgstr "Brak odwrotnego cache`a"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:53
-msgid "No network configured on this device"
-msgstr "Brak skonfigurowanych sieci na tym urządzeniu"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:65
-msgid "No network name specified"
-msgstr "Nie podano nazwy sieci"
-
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:147
-msgid "No networks in range"
-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
@@ -3478,7 +3581,12 @@ msgstr ""
 msgid "No password set!"
 msgstr "Nie ustawiono hasła!"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:116
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:104
+msgid "No peers defined yet"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:129
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:271
 msgid "No public keys present yet."
 msgstr "Nie ma jeszcze kluczy publicznych."
 
@@ -3486,19 +3594,19 @@ msgstr "Nie ma jeszcze kluczy publicznych."
 msgid "No rules in this chain."
 msgstr "Brak zasad w tym łańcuchu."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:150
-msgid "No scan results available yet..."
-msgstr "Brak wyników skanowania..."
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:53
+msgid "No signal"
+msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:7
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:756
 msgid "No zone assigned"
 msgstr "Brak przypisanej strefy"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:111
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:35
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:48
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:133
 msgid "Noise"
 msgstr "Szum"
 
@@ -3514,16 +3622,16 @@ msgstr "Szum:"
 msgid "Non Pre-emtive CRC errors (CRC_P)"
 msgstr "Nieprzewidziane błedy CRC (CRC_P)"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:292
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:293
 msgid "Non-wildcard"
 msgstr "Bez symboli wieloznacznych"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:129
 msgid "None"
 msgstr "Brak"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:181
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:172
 msgid "Normal"
 msgstr "Normalny"
 
@@ -3531,25 +3639,29 @@ msgstr "Normalny"
 msgid "Not Found"
 msgstr "Nie znaleziono"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:27
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:5
-msgid "Not associated"
-msgstr "Nie powiązany"
-
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:87
 msgid "Not connected"
 msgstr "Nie podłączony"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:38
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:139
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:232
+msgid "Not present"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:105
 msgid "Not started on boot"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:26
-msgid "Note: interface name length"
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:201
+msgid "Not supported"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:171
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:162
 msgid "Notice"
 msgstr "Spostrzeżenie"
 
@@ -3557,64 +3669,52 @@ msgstr "Spostrzeżenie"
 msgid "Nslookup"
 msgstr "Nslookup"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:261
 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 "
 "podręcznej)"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:203
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:194
 msgid "Number of parallel threads used for compression"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:40
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:69
 msgid "Obfuscated Group Password"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:35
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:61
 msgid "Obfuscated Password"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:22
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:34
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:40
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:105
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:97
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:49
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:80
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:54
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:67
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:93
 msgid "Obtain IPv6-Address"
 msgstr "Uzyskaj adres IPv6"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:83
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:68
 msgid "Off-State Delay"
 msgstr "Zwłoka wyłączenia"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:16
-msgid ""
-"On this page you can configure the network interfaces. You can bridge "
-"several interfaces by ticking the \"bridge interfaces\" field and enter the "
-"names of several network interfaces separated by spaces. You can also use "
-"<abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
-"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
-"<samp>eth0.1</samp>)."
-msgstr ""
-"Na tej stronie można skonfigurować interfejsy urządzenia. Możesz zmostkować "
-"kilka interfejsów zaznaczając pole \"mostkuj interfejsy\", a następnie "
-"wpisując ich nazwy oddzielone spacjami. Można także użyć notacji <abbr title="
-"\"Virtual Local Area Network\">VLAN`ów</abbr> <samp>INTERFACE.VLANNR</samp> "
-"(<abbr title=\"na przykład\">np.</abbr>: <samp>eth0.1</samp>)."
-
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:95
 msgid "On-Link route"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:80
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:64
 msgid "On-State Delay"
 msgstr "Zwłoka włączenia"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:360
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:382
 msgid "One of hostname or mac address must be specified!"
 msgstr "Nazwa hosta lub adres MAC musu być podany!"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:456
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:462
 msgid "One of the following: %s"
 msgstr ""
 
@@ -3636,34 +3736,35 @@ msgstr "Jedno lub więcej pól nie posiada wpisanych wartości!"
 msgid "Open list..."
 msgstr "Otwórz listę..."
 
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:61
 #: protocols/luci-proto-openconnect/luasrc/model/network/proto_openconnect.lua:9
 msgid "OpenConnect (CISCO AnyConnect)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:757
 msgid "Operating frequency"
 msgstr "Częstotliwość"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1753
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2306
 msgid "Option changed"
 msgstr "Wartość zmieniona"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1755
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2308
 msgid "Option removed"
 msgstr "Usunięto wartość"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1140
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:55
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1535
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:66
 msgid "Optional"
 msgstr "Opcjonalny"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:78
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:76
 msgid ""
 "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, "
 "starting with <code>0x</code>."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:144
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:215
 msgid ""
 "Optional. Allowed values: 'eui64', 'random', fixed value like '::1' or "
 "'::1:2'. When IPv6 prefix (like 'a:b:c:d::') is received from a delegating "
@@ -3675,41 +3776,41 @@ msgstr ""
 "odbierany z serwera delegującego, użyj sufiksa (takiego jak '::1') aby "
 "utworzyć adres IPv6 ('a:b:c:d::1') dla tego interfejsu."
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:123
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:117
 msgid ""
 "Optional. Base64-encoded preshared key. Adds in an additional layer of "
 "symmetric-key cryptography for post-quantum resistance."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:148
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:126
 msgid "Optional. Create routes for Allowed IPs for this peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:103
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:108
 msgid "Optional. Description of peer."
 msgstr "Opcjonalny. Opis peera."
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:156
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:128
 msgid ""
 "Optional. Host of peer. Names are resolved prior to bringing up the "
 "interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:67
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:71
 msgid "Optional. Maximum Transmission Unit of tunnel interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:166
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:132
 msgid "Optional. Port of peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:175
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:136
 msgid ""
 "Optional. Seconds between keep alive messages. Default is 0 (disabled). "
 "Recommended value if this device is behind a NAT is 25."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:31
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:54
 msgid "Optional. UDP port used for outgoing and incoming packets."
 msgstr ""
 
@@ -3730,7 +3831,7 @@ msgstr "Wychodzące"
 msgid "Outbound:"
 msgstr "Wychodzący:"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:26
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:50
 msgid "Output Interface"
 msgstr ""
 
@@ -3739,45 +3840,45 @@ msgstr ""
 msgid "Output zone"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:63
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:155
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:33
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:54
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:54
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:219
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:50
 msgid "Override MAC address"
 msgstr "Nadpisz adres MAC"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:66
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:35
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:56
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:88
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:125
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:131
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:133
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:104
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:61
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:58
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:223
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:44
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:54
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:154
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:71
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:145
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:132
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:110
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:119
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:97
 msgid "Override MTU"
 msgstr "Nadpisz MTU"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:30
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:63
 msgid "Override TOS"
 msgstr "Nadpisz TOS"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:25
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:58
 msgid "Override TTL"
 msgstr "Nadpisz TTL"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:954
 msgid "Override default interface name"
 msgstr "Nadpisz domyślną nazwę interfejsu"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:41
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:167
 msgid "Override the gateway in DHCP responses"
 msgstr "Nadpisz adres bramy w odpowiedziach DHCP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:507
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:555
 msgid ""
 "Override the netmask sent to clients. Normally it is calculated from the "
 "subnet that is served."
@@ -3785,7 +3886,7 @@ msgstr ""
 "Nadpisz maskę sieci wysyłaną do klientów. Zazwyczaj jest ona wyliczana z "
 "podsieci która jest rozsyłana."
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:65
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:179
 msgid "Override the table used for internal routes"
 msgstr "Nadpisz tablicę routingu używaną dla wewnętrznych tras routowania"
 
@@ -3793,29 +3894,33 @@ msgstr "Nadpisz tablicę routingu używaną dla wewnętrznych tras routowania"
 msgid "Overview"
 msgstr "Przegląd"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1606
+msgid "Overwrite existing file \"%s\" ?"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:11
 msgid "Owner"
 msgstr "Właściciel"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:42
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:56
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:17
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:28
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:34
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:14
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:18
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:43
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:98
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:45
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:44
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:63
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:82
 msgid "PAP/CHAP password"
 msgstr "Hasło PAP/CHAP"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:39
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:53
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:14
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:11
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:15
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:96
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:88
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:43
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:74
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:42
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:61
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:77
 msgid "PAP/CHAP username"
 msgstr "Nazwa użytkownika PAP/CHAP"
 
@@ -3823,9 +3928,9 @@ msgstr "Nazwa użytkownika PAP/CHAP"
 msgid "PID"
 msgstr "PID"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:36
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:50
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:26
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:95
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:87
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:68
 msgid "PIN"
 msgstr "PIN"
 
@@ -3834,114 +3939,116 @@ msgstr "PIN"
 msgid "PIN code rejected"
 msgstr "Kod PIN został odrzucony"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:966
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1372
 msgid "PMK R1 Push"
 msgstr "PMK R1 Push"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:43
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:13
 msgid "PPP"
 msgstr "PPP"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:11
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:58
 msgid "PPPoA Encapsulation"
 msgstr "Enkapsulacja PPPoA"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:19
 msgid "PPPoATM"
 msgstr "PPPoATM"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:17
 msgid "PPPoE"
 msgstr "PPPoE"
 
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:28
 #: protocols/luci-proto-pppossh/luasrc/model/network/proto_pppossh.lua:9
 msgid "PPPoSSH"
 msgstr "PPPoSSH"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:15
 msgid "PPtP"
 msgstr "PPtP"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:59
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:73
 msgid "PSID offset"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:56
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:70
 msgid "PSID-bits length"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:123
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:846
 msgid "PTM/EFM (Packet Transfer Mode)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:78
-msgid "Package libiwinfo required!"
-msgstr "Wymagany pakiet libiwinfo!"
-
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:45
 msgid "Packets"
 msgstr "Pakiety"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:7
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:756
 msgid "Part of zone %q"
 msgstr "Część strefy %q"
 
 #: modules/luci-base/luasrc/view/sysauth.htm:29
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1111
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:35
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:42
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1514
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:46
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:104
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:58
 msgid "Password"
 msgstr "Hasło"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:29
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:24
 msgid "Password authentication"
 msgstr "Uwierzytelnianie hasłem"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1019
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1414
 msgid "Password of Private Key"
 msgstr "Hasło lub klucz prywatny"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1067
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1471
 msgid "Password of inner Private Key"
 msgstr "Wewnętrzne hasło klucza prywatnego"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:14
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:16
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:18
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:20
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:32
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:34
 msgid "Password strength"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:44
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:107
 msgid "Password2"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:37
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:244
 msgid "Paste or drag SSH key file…"
 msgstr "Wklej lub przeciągnij plik klucza SSH…"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1000
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1396
 msgid "Path to CA-Certificate"
 msgstr "Ścieżka do certyfikatu CA"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1007
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1402
 msgid "Path to Client-Certificate"
 msgstr "Ścieżka do certyfikatu klienta"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1013
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1408
 msgid "Path to Private Key"
 msgstr "Ścieżka do Klucza Prywatnego"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1049
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1453
 msgid "Path to inner CA-Certificate"
 msgstr "Ścieżka do wewnętrznego certyfikatu CA"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1055
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1459
 msgid "Path to inner Client-Certificate"
 msgstr "Ścieżka do wewnętrznego certyfikatu Klienta"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1061
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1465
 msgid "Path to inner Private Key"
 msgstr "Ścieżka do wewnętrznego klucza prywatnego "
 
@@ -3959,7 +4066,7 @@ msgstr "Ścieżka do wewnętrznego klucza prywatnego "
 msgid "Peak:"
 msgstr "Szczyt:"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:28
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:89
 msgid "Peer IP address to assign"
 msgstr ""
 
@@ -3968,11 +4075,11 @@ msgstr ""
 msgid "Peer address is missing"
 msgstr "Brakuje adresu Peera"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:90
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:89
 msgid "Peers"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:50
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:80
 msgid "Perfect Forward Secrecy"
 msgstr ""
 
@@ -3984,7 +4091,11 @@ msgstr "Wykonaj restart"
 msgid "Perform reset"
 msgstr "Wykonaj reset"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:174
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:199
+msgid "Permission denied"
+msgstr ""
+
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:136
 msgid "Persistent Keep Alive"
 msgstr ""
 
@@ -3992,7 +4103,7 @@ msgstr ""
 msgid "Phy Rate:"
 msgstr "Szybkość Phy:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:190
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:277
 msgid "Physical Settings"
 msgstr "Ustawienia sprzętowe"
 
@@ -4003,6 +4114,10 @@ msgstr "Ping"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:16
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:17
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:41
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:77
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:87
@@ -4020,15 +4135,19 @@ msgstr "Proszę wprowadź swój login i hasło."
 msgid "Policy"
 msgstr "Zasada"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:22
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:20
 msgid "Port"
 msgstr "Port"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:18
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:133
+msgid "Port %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:274
 msgid "Port status:"
 msgstr "Status portu:"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:482
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:488
 msgid "Potential negation of: %s"
 msgstr ""
 
@@ -4040,11 +4159,11 @@ msgstr "Tryb zarządzania energią"
 msgid "Pre-emtive CRC errors (CRCP_P)"
 msgstr "Przewidziane błedy CRC (CRCP_P)"
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:32
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:73
 msgid "Prefer LTE"
 msgstr "Preferuj LTE"
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:33
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:74
 msgid "Prefer UMTS"
 msgstr "Preferuj UMTS"
 
@@ -4052,16 +4171,16 @@ msgstr "Preferuj UMTS"
 msgid "Prefix Delegated"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:122
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:117
 msgid "Preshared Key"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:101
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:75
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:81
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:75
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:54
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:74
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:131
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:102
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:89
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:112
 msgid ""
 "Presume peer to be dead after given amount of LCP echo failures, use 0 to "
 "ignore failures"
@@ -4069,16 +4188,15 @@ 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:304
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:305
 msgid "Prevent listening on these interfaces."
 msgstr "Zapobiegaj nasłuchiwaniu na tych interfejsach."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:509
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:562
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:950
 msgid "Prevents client-to-client communication"
 msgstr "Zapobiega komunikacji między klientem a klientem"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:18
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:49
 msgid "Private Key"
 msgstr "Klucz prywatny"
 
@@ -4099,39 +4217,33 @@ msgstr "Profil"
 msgid "Prot."
 msgstr "Prot."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:72
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:349
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:675
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:84
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:216
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:87
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:390
 msgid "Protocol"
 msgstr "Protokół"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:31
-msgid "Protocol of the new interface"
-msgstr "Protokół nowego interfejsu"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:222
-msgid "Protocol support is not installed"
-msgstr "Wsparcie dla protokołu nie jest zainstalowane"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:269
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:260
 msgid "Provide NTP server"
 msgstr "Włącz serwer NTP"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:701
 msgid "Provide new network"
 msgstr "Utwórz nową sieć"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:451
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:879
 msgid "Pseudo Ad-Hoc (ahdemo)"
 msgstr "Pseudo Ad-Hoc (ahdemo)"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:112
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:113
 msgid "Public Key"
 msgstr "Klucz publiczny"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:278
 msgid ""
 "Public keys allow for the passwordless SSH logins with a higher security "
 "compared to the use of plain passwords. In order to upload a new key to the "
@@ -4143,20 +4255,20 @@ msgstr ""
 "klucz do urządzenia, wklej klucz publiczny zgodny z OpenSSH lub przeciągnij "
 "plik <code>.pub</code> do pola wejściowego."
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:139
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:211
 msgid "Public prefix routed to this device for distribution to clients."
 msgstr ""
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:27
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:9
 msgid "QMI Cellular"
 msgstr "Komórkowy QMI"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:173
 msgid "Quality"
 msgstr "Jakość"
 
-#: 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:171
 msgid ""
 "Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> "
 "servers"
@@ -4164,28 +4276,29 @@ msgstr ""
 "Zapytaj o wszystkie dostępne serwery <abbr title=\"Domain Name System\">DNS</"
 "abbr> "
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:952
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1360
 msgid "R0 Key Lifetime"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:959
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1366
 msgid "R1 Key Holder"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:58
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:88
 msgid "RFC3947 NAT-T mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:381
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:814
 msgid "RSSI threshold for joining"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:256
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:597
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:778
 msgid "RTS/CTS Threshold"
 msgstr "Próg RTS/CTS"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:41
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:76
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:87
 msgid "RX"
@@ -4195,37 +4308,41 @@ msgstr "RX"
 msgid "RX Rate"
 msgstr "Szybkość RX"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:783
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1961
+msgid "RX Rate / TX Rate"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1207
 msgid "Radius-Accounting-Port"
 msgstr "Port Radius-Accounting"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:791
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1215
 msgid "Radius-Accounting-Secret"
 msgstr "Sekret Radius-Accounting"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:775
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1199
 msgid "Radius-Accounting-Server"
 msgstr "Serwer Radius-Accounting"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:759
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1183
 msgid "Radius-Authentication-Port"
 msgstr "Port Radius-Authentication"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:767
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1191
 msgid "Radius-Authentication-Secret"
 msgstr "Sekret Radius-Authentication"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:751
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1175
 msgid "Radius-Authentication-Server"
 msgstr "Serwer Radius-Authentication"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:119
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:102
 msgid "Raw hex-encoded bytes. Leave empty unless your ISP require this"
 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:83
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:84
 msgid ""
 "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-Server"
@@ -4239,20 +4356,11 @@ msgid ""
 "access to this device if you are connected via this interface"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2
-msgid ""
-"Really delete this wireless network? The deletion cannot be undone! You "
-"might lose access to this device if you are connected via this network."
-msgstr ""
-"Naprawdę usunąć tę sieć bezprzewodową? Usunięcie nie może zostać cofnięte!\n"
-"Możesz stracić dostęp do tego urządzenia, jeśli jesteś połączony przez tę "
-"sieć!"
-
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:40
 msgid "Really reset all changes?"
 msgstr "Naprawdę usunąć wszelkie zmiany?"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:237
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:354
 msgid "Really switch protocol?"
 msgstr "Naprawdę zmienić protokół?"
 
@@ -4276,15 +4384,15 @@ msgstr "Ruch w czasie rzeczywistym"
 msgid "Realtime Wireless"
 msgstr "Wi-Fi w czasie rzeczywistym"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:931
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1343
 msgid "Reassociation Deadline"
 msgstr "Termin reasocjacji"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:191
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
 msgid "Rebind protection"
 msgstr "Przypisz ochronę"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:48
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:46
 #: modules/luci-mod-system/luasrc/view/admin_system/reboot.htm:9
 msgid "Reboot"
 msgstr "Restart"
@@ -4298,21 +4406,15 @@ msgstr "Ponowne uruchamianie..."
 msgid "Reboots the operating system of your device"
 msgstr "Uruchamia ponownie system na twoim urządzeniu"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:103
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:90
 msgid "Receive"
 msgstr "Odebrane"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:325
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:350
-msgid "Receiver Antenna"
-msgstr "Antena odbiorcza"
-
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:42
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:59
 msgid "Recommended. IP addresses of the WireGuard interface."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:28
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:300
 msgid "Reconnect this interface"
 msgstr "Połącz ponownie ten interfejs"
 
@@ -4320,86 +4422,104 @@ msgstr "Połącz ponownie ten interfejs"
 msgid "References"
 msgstr "Referencje"
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:39
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:153
 msgid "Relay"
 msgstr "Przekaźnik"
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:36
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:157
 msgid "Relay Bridge"
 msgstr "Most przekaźnikowy"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:17
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:154
 msgid "Relay between networks"
 msgstr "Przekaźnik pomiędzy sieciami"
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:64
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:12
 msgid "Relay bridge"
 msgstr "Most przekaźnikowy"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:18
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:50
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:49
 msgid "Remote IPv4 address"
 msgstr "Zdalny adres IPv4"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:8
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:40
 msgid "Remote IPv4 address or FQDN"
 msgstr "Zdalny adres IPv4 lub FQDN"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:45
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:725
 msgid "Remove"
 msgstr "Usuń"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:53
-msgid "Repeat scan"
-msgstr "Powtórz skanowanie"
-
-#: modules/luci-base/luasrc/view/cbi/upload.htm:11
-msgid "Replace entry"
-msgstr "Zamień wpis"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:46
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:51
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1806
 msgid "Replace wireless configuration"
 msgstr "Zamień konfigurację WiFi"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:8
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:17
 msgid "Request IPv6-address"
 msgstr "Zażądaj adresu IPv6"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:16
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:23
 msgid "Request IPv6-prefix of length"
 msgstr "Zażądaj długość prefiksu IPv6"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1141
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:200
+msgid "Request timeout"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1536
 msgid "Required"
 msgstr "Wymagany"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:20
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:31
 msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3"
 msgstr "Wymagany dla niektórych dostawców internetu, np. Charter z DOCSIS 3"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:19
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:49
 msgid "Required. Base64-encoded private key for this interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:113
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:113
 msgid "Required. Base64-encoded public key of peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:136
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:122
 msgid ""
 "Required. IP addresses and prefixes that this peer is allowed to use inside "
 "the tunnel. Usually the peer's tunnel IP addresses and the networks the peer "
 "routes through the tunnel."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1134
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1095
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1096
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1097
+msgid "Requires hostapd"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1101
+msgid "Requires hostapd with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1102
+msgid "Requires hostapd with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1098
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1099
+msgid "Requires hostapd with SAE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1533
 msgid ""
 "Requires the 'full' version of wpad/hostapd and support from the wifi driver "
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:141
 msgid ""
 "Requires upstream supports DNSSEC; verify unsigned domain responses really "
 "come from unsigned domains"
@@ -4407,7 +4527,31 @@ msgstr ""
 "Wymagane jest wsparcie dla DNSSEC; sprawdzanie, czy niepodpisane odpowiedzi "
 "w domenie rzeczywiście pochodzą z domen bez znaku"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1268
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1109
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1119
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1120
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1121
+msgid "Requires wpa-supplicant"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1113
+msgid "Requires wpa-supplicant with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1114
+msgid "Requires wpa-supplicant with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1111
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1124
+msgid "Requires wpa-supplicant with SAE support"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1355
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:17
 #: modules/luci-base/luasrc/view/cbi/footer.htm:30
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:66
@@ -4423,17 +4567,22 @@ msgstr "Wyczyść liczniki"
 msgid "Reset to defaults"
 msgstr "Resetuj do domyślnych"
 
-#: 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:68
 msgid "Resolv and Hosts Files"
 msgstr "Pliki Resolv i Hosts"
 
-#: 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:94
 msgid "Resolve file"
 msgstr "Plik Resolve"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:28
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:14
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:71
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:197
+msgid "Resource not found"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:302
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:693
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:90
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:112
 msgid "Restart"
 msgstr "Uruchom ponownie"
 
@@ -4441,7 +4590,7 @@ msgstr "Uruchom ponownie"
 msgid "Restart Firewall"
 msgstr "Uruchom ponownie Firewalla"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:14
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:691
 msgid "Restart radio interface"
 msgstr "Uruchom ponownie interfejs radiowy"
 
@@ -4453,26 +4602,24 @@ msgstr "Przywróć"
 msgid "Restore backup"
 msgstr "Przywróć kopię zapasową"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:113
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:114
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:38
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:46
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:119
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:120
 msgid "Reveal/hide password"
 msgstr "Odsłoń/Ukryj hasło"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1774
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2322
 msgid "Revert"
 msgstr "Przywróć"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1861
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2405
 msgid "Revert changes"
 msgstr "Przywróć zmiany"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2013
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2554
 msgid "Revert request failed with status <code>%h</code>"
 msgstr "Żądanie powrotu nie powiodło się ze statusem <code>%h</code>"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1993
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2534
 msgid "Reverting configuration…"
 msgstr "Przywracanie konfiguracji…"
 
@@ -4480,7 +4627,7 @@ msgstr "Przywracanie konfiguracji…"
 msgid "Root"
 msgstr "Root"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:271
 msgid "Root directory for files served via TFTP"
 msgstr "Katalog Root`a dla plików udostępnianych przez TFTP"
 
@@ -4488,7 +4635,7 @@ msgstr "Katalog Root`a dla plików udostępnianych przez TFTP"
 msgid "Root preparation"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:147
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:126
 msgid "Route Allowed IPs"
 msgstr ""
 
@@ -4500,12 +4647,12 @@ msgstr ""
 msgid "Route type"
 msgstr "Typ trasy"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:523
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:577
 msgid "Router Advertisement-Service"
 msgstr "Serwis rozgłoszeniowy routera"
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:43
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:15
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:27
 msgid "Router Password"
 msgstr "Hasło routera"
 
@@ -4536,7 +4683,7 @@ msgstr ""
 msgid "Run filesystem check"
 msgstr "Sprawdź czy system plików nie zawiera błędów"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:651
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:669
 msgid "Runtime error"
 msgstr ""
 
@@ -4548,31 +4695,31 @@ msgstr ""
 msgid "SNR"
 msgstr "SNR"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:5
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:18
 msgid "SSH Access"
 msgstr "Dostęp SSH"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:10
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:70
 msgid "SSH server address"
 msgstr "Adres serwera SSH"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:13
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:74
 msgid "SSH server port"
 msgstr "Port serwera SSH"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:8
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:58
 msgid "SSH username"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:27
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:277
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
 msgid "SSH-Keys"
 msgstr "Klucze SSH"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:42
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:73
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:29
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1617
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:174
 msgid "SSID"
 msgstr "SSID"
@@ -4581,17 +4728,17 @@ msgstr "SSID"
 msgid "SWAP"
 msgstr "SWAP"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1127
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1262
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1379
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1351
 #: modules/luci-base/luasrc/view/cbi/error.htm:17
 #: modules/luci-base/luasrc/view/cbi/footer.htm:26
 #: modules/luci-base/luasrc/view/cbi/header.htm:17
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:54
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:133
 msgid "Save"
 msgstr "Zapisz"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1256
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1768
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1347
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2318
 #: modules/luci-base/luasrc/view/cbi/footer.htm:22
 msgid "Save & Apply"
 msgstr "Zapisz i zastosuj"
@@ -4604,28 +4751,20 @@ msgstr "Zapisz mtdblock"
 msgid "Save mtdblock contents"
 msgstr "Zapisz zawartość mtdblock"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
-msgid "Saving keys…"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:698
 msgid "Scan"
 msgstr "Skanuj"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:109
-msgid "Scan request failed"
-msgstr "Próba skanowania nie powiodła się"
-
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:8
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:39
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:23
 msgid "Scheduled Tasks"
 msgstr "Zaplanowane Zadania"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1749
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2302
 msgid "Section added"
 msgstr "Dodano sekcję"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1751
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2304
 msgid "Section removed"
 msgstr "Usunięto sekcję"
 
@@ -4643,12 +4782,18 @@ msgstr ""
 "formatu obrazu nie powiedzie się. Używaj tylko wtedy, gdy masz pewność że "
 "oprogramowanie jest poprawne i jest przeznaczone dla Twojego urządzenia!"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:119
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:90
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:96
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:90
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:69
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:92
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1516
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1646
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1809
+msgid "Select file…"
+msgstr ""
+
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:144
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:102
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:125
 msgid ""
 "Send LCP echo requests at the given interval in seconds, only effective in "
 "conjunction with failure threshold"
@@ -4656,36 +4801,32 @@ 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/luasrc/model/cbi/admin_network/wifi.lua:561
-msgid "Separate Clients"
-msgstr "Rozdziel klientów"
-
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:62
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:63
 msgid "Server Settings"
 msgstr "Ustawienia serwera"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:26
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:50
 msgid "Service Name"
 msgstr "Nazwa serwisu"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:25
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:30
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:87
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:71
 msgid "Service Type"
 msgstr "Typ serwisu"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:55
+#: modules/luci-base/luasrc/controller/admin/index.lua:62
 msgid "Services"
 msgstr "Serwisy"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:815
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:861
 msgid "Session expired"
 msgstr "Sesja wygasła"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:83
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:107
 msgid "Set VPN as Default Route"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:258
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:795
 msgid ""
 "Set interface properties regardless of the link carrier (If set, carrier "
 "sense events do not invoke hotplug handlers)."
@@ -4693,15 +4834,18 @@ msgstr ""
 "Ustaw właściwości interfejsu, niezależnie od operatora łącza (nie wpływa na "
 "programy operatora które ustanawiają połączenie)."
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:23
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:55
 msgid "Setting PLMN failed"
 msgstr "Ustawienie PLMN nie powiodło się"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:26
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:68
 msgid "Setting operation mode failed"
 msgstr "Ustawienie trybu nie powiodło się"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:454
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:517
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:527
 msgid "Setup DHCP Server"
 msgstr "Ustawienia serwera DHCP"
 
@@ -4713,7 +4857,7 @@ msgstr "Ilość poważnych błedów (SES)"
 msgid "Short GI"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:516
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:960
 msgid "Short Preamble"
 msgstr "Krótki Wstęp"
 
@@ -4725,21 +4869,23 @@ msgstr "Pokaż aktualną listę plików do backupu"
 msgid "Show empty chains"
 msgstr "Pokaż puste łańcuchy"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:306
 msgid "Shutdown this interface"
 msgstr "Wyłącz ten interfejs"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:111
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:34
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:47
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:132
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1616
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:173
 msgid "Signal"
 msgstr "Sygnał"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1960
+msgid "Signal / Noise"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:125
 msgid "Signal Attenuation (SATN)"
 msgstr "Tłumienie sygnału (SATN)"
@@ -4752,11 +4898,11 @@ msgstr "Sygnał:"
 msgid "Size"
 msgstr "Rozmiar"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:259
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:260
 msgid "Size of DNS query cache"
 msgstr "Rozmiar pamięci podręcznej zapytań DNS"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:191
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
 msgid "Size of the ZRam device in megabytes"
 msgstr ""
 
@@ -4773,11 +4919,7 @@ msgstr "Pomiń do zawartości"
 msgid "Skip to navigation"
 msgstr "Pomiń do nawigacji"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:335
-msgid "Slot time"
-msgstr "Szczelina czasowa"
-
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1640
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1846
 #: modules/luci-base/luasrc/model/network.lua:1427
 msgid "Software VLAN"
 msgstr "Programowy VLAN"
@@ -4818,11 +4960,7 @@ msgstr ""
 msgid "Specifies the directory the device is attached to"
 msgstr "Podaje katalog do którego jest podłączone urządzenie"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:23
-msgid "Specifies the listening port of this <em>Dropbear</em> instance"
-msgstr "Określa port nasłuchu dla tej instancji <em>Dropbear</em>"
-
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:57
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:175
 msgid ""
 "Specifies the maximum amount of failed ARP requests until hosts are presumed "
 "to be dead"
@@ -4830,52 +4968,60 @@ msgstr ""
 "Określa maksymalną ilość błędów dla zapytania ARP przed założeniem, że host "
 "jest martwy"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:49
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:171
 msgid ""
 "Specifies the maximum amount of seconds after which hosts are presumed to be "
 "dead"
 msgstr ""
 "Określa maksymalny czas w sekundach przed założeniem, że host jest martwy"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:761
+msgid ""
+"Specifies the maximum transmit power the wireless radio may use. Depending "
+"on regulatory requirements and wireless usage, the actual transmit power may "
+"be reduced by the driver."
+msgstr ""
+
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:63
 msgid "Specify a TOS (Type of Service)."
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:25
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:58
 msgid ""
 "Specify a TTL (Time to Live) for the encapsulating packet other than the "
 "default (64)."
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:53
 msgid ""
 "Specify an MTU (Maximum Transmission Unit) other than the default (1280 "
 "bytes)."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:60
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "Specify the secret encryption key here."
 msgstr "Określ tajny klucz szyfrowania."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:475
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:64
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:533
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:89
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:111
 msgid "Start"
 msgstr "Uruchomienie"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:33
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:86
 msgid "Start priority"
 msgstr "Priorytet uruchomienia"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1958
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2499
 msgid "Starting configuration apply…"
 msgstr "Zatwierdzanie konfiguracji…"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1626
 msgid "Starting wireless scan..."
 msgstr "Rozpoczynanie skanowania..."
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:24
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:120
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
 msgid "Startup"
 msgstr "Autostart"
 
@@ -4887,20 +5033,21 @@ 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:70
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:71
 msgid "Static Leases"
 msgstr "Dzierżawy statyczne"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:118
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:73
 msgid "Static Routes"
 msgstr "Statyczne ścieżki routingu"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1194
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1384
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:172
 #: modules/luci-base/luasrc/model/network.lua:966
 msgid "Static address"
 msgstr "Stały adres"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:308
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:309
 msgid ""
 "Static leases are used to assign fixed IP addresses and symbolic hostnames "
 "to DHCP clients. They are also required for non-dynamic interface "
@@ -4911,39 +5058,41 @@ msgstr ""
 "niedynamicznych konfiguracji interfejsu, gdzie obsługiwane są tylko hosty z "
 "odpowiednim dzierżawami."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:534
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:977
 msgid "Station inactivity limit"
 msgstr "Station inactivity limit"
 
 #: modules/luci-base/luasrc/controller/admin/index.lua:40
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:197
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:337
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:746
 #: modules/luci-mod-status/luasrc/view/admin_status/index.htm:128
 msgid "Status"
 msgstr "Status"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:35
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:75
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:308
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:91
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:113
 msgid "Stop"
 msgstr "Stop"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:165
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Strict order"
 msgstr "Zachowaj kolejność"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:16
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:30
 msgid "Strong"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1843
 msgid "Submit"
 msgstr "Wyślij"
 
-#: 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:108
 msgid "Suppress logging"
 msgstr "Pomiń rejestrowanie"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:109
 msgid "Suppress logging of the routine operation of these protocols"
 msgstr "Pomiń rejestrowanie rutynowych operacji dla tych protokołów"
 
@@ -4955,42 +5104,44 @@ msgstr "Swap"
 msgid "Swap Entry"
 msgstr "Zamień wpis"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:23
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:5
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:135
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:21
 msgid "Switch"
 msgstr "Przełącznik"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:129
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:168
 msgid "Switch %q"
 msgstr "Przełącznik %q"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:128
-msgid "Switch %q (%s)"
-msgstr "Przełącznik %q (%s)"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:66
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:146
 msgid ""
 "Switch %q has an unknown topology - the VLAN settings might not be accurate."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:146
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:142
 msgid "Switch Port Mask"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1640
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1846
 #: modules/luci-base/luasrc/model/network.lua:1425
 msgid "Switch VLAN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:238
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:355
 msgid "Switch protocol"
 msgstr "Protokół przełącznika"
 
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:103
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:104
 #: modules/luci-base/luasrc/view/cbi/ipaddr.htm:26
 msgid "Switch to CIDR list notation"
 msgstr "Przejdź do notacji listy CIDR"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:77
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1547
+msgid "Symbolic link"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:71
 msgid "Sync with NTP-Server"
 msgstr ""
 
@@ -5000,7 +5151,7 @@ msgstr "Synchronizuj z przeglądarką"
 
 #: modules/luci-base/luasrc/controller/admin/index.lua:47
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:14
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:102
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:94
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
 #: modules/luci-mod-system/luasrc/view/admin_system/applyreboot.htm:39
 msgid "System"
@@ -5011,12 +5162,12 @@ msgstr "System"
 msgid "System Log"
 msgstr "Log systemowy"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:108
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:99
 msgid "System Properties"
 msgstr "Właściwości systemu"
 
 # Wszędzie używane jest "loga" z małej litery.
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:145
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:136
 msgid "System log buffer size"
 msgstr "Rozmiar bufora loga systemu"
 
@@ -5024,15 +5175,17 @@ msgstr "Rozmiar bufora loga systemu"
 msgid "TCP:"
 msgstr "TCP:"
 
-#: 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:69
 msgid "TFTP Settings"
 msgstr "Ustawienia TFTP"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:269
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
 msgid "TFTP server root"
 msgstr "Root serwera TFTP"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:17
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:77
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:88
 msgid "TX"
@@ -5055,7 +5208,7 @@ msgstr "Tablica"
 msgid "Target"
 msgstr "Cel"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:77
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:103
 msgid "Target network"
 msgstr ""
 
@@ -5063,50 +5216,25 @@ msgstr ""
 msgid "Terminate"
 msgstr "Zakończ"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:27
-#, fuzzy
-msgid ""
-"The <em>Device Configuration</em> section covers physical settings of the "
-"radio hardware such as channel, transmit power or antenna selection which "
-"are shared among all defined wireless networks (if the radio hardware is "
-"multi-SSID capable). Per network settings like encryption or operation mode "
-"are grouped in the <em>Interface Configuration</em>."
-msgstr ""
-"Sekcja <em>Konfiguracja Urządzenia</em> zawiera sprzętowe ustawienia toru "
-"transmisji radiowej takie jak kanał, moc sygnału, czy wybór anteny, które to "
-"są wspólne dla wszystkich zdefiniowanych sieci bezprzewodowych (jeśli tor "
-"transmisji jest kompatybilny z transmisją multi-SSID). Ustawienia sieci "
-"takie jak szyfrowanie lub tryb operacji są zebrane w sekcji <em>Konfiguracja "
-"Interfejsu</em>."
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:79
-msgid ""
-"The <em>libiwinfo-lua</em> package is not installed. You must install this "
-"component for working wireless configuration!"
-msgstr ""
-"Pakiet <em>libiwinfo-lua</em> nie jest zainstalowany. Musisz go zainstalować "
-"aby WiFi prawidłowo zadziałało!"
-
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:66
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:77
 msgid ""
 "The HE.net endpoint update configuration changed, you must now use the plain "
 "username instead of the user ID!"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:8
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:40
 msgid ""
 "The IPv4 address or the fully-qualified domain name of the remote tunnel end."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:27
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:38
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:59
 msgid ""
 "The IPv6 prefix assigned to the provider, usually ends with <code>::</code>"
 msgstr ""
 "Prefiks IPv6 przypisany do dostawcy, zazwyczaj kończy się <code>::</code>"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:18
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1808
 msgid ""
 "The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
 "code> and <code>_</code>"
@@ -5122,7 +5250,7 @@ msgstr "Archiwum kopii zapasowej nie wygląda na prawidłowe."
 msgid "The configuration file could not be loaded due to the following error:"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1849
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2396
 msgid ""
 "The device could not be reached within %d seconds after applying the pending "
 "changes, which caused the configuration to be rolled back for safety "
@@ -5142,6 +5270,12 @@ msgstr ""
 "Plik urządzenia - pamięci lub partycji (<abbr title=\"na przykład\">np.</"
 "abbr> <code>/dev/sda1</code>)"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:612
+msgid ""
+"The existing wireless configuration needs to be changed for LuCI to function "
+"properly."
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:127
 msgid ""
 "The filesystem that was used to format the memory (<abbr title=\"for example"
@@ -5167,11 +5301,15 @@ msgstr ""
 msgid "The following rules are currently active on this system."
 msgstr "Następujące zasady są obecnie aktywne w tym systemie."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:144
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:154
+msgid "The gateway address must not be a local IP address"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:154
 msgid "The given SSH public key has already been added."
 msgstr "Podany klucz publiczny SSH został już dodany."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:150
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:160
 msgid ""
 "The given SSH public key is invalid. Please supply proper public RSA or "
 "ECDSA keys."
@@ -5179,37 +5317,36 @@ msgstr ""
 "Podany klucz publiczny SSH jest nieprawidłowy. Podaj odpowiedni publiczny "
 "RSA lub klucze ECDSA."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:67
-msgid "The given network name is not unique"
-msgstr "Podana sieć nie jest unikalna"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:664
+msgid "The interface name is already used"
+msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:52
-#, fuzzy
-msgid ""
-"The hardware is not multi-SSID capable and the existing configuration will "
-"be replaced if you proceed."
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:670
+msgid "The interface name is too long"
 msgstr ""
-"Sprzęt nie jest urządzeniem typu multi-SSID, więc bieżąca konfiguracja "
-"zostanie nadpisana nową jeśli będziesz kontynuować."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:43
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:31
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:55
 msgid ""
 "The length of the IPv4 prefix in bits, the remainder is used in the IPv6 "
 "addresses."
 msgstr ""
 "Długość prefiksu IPv4 w bitach, pozostała część jest używana w adresach IPv6."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:35
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:46
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:63
 msgid "The length of the IPv6 prefix in bits"
 msgstr "Długość prefiksu IPv6 w bitach"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:12
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:44
 msgid "The local IPv4 address over which the tunnel is created (optional)."
 msgstr "Lokalny adres IPv4, na którym tworzony jest tunel (opcjonalnie)."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:5
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1814
+msgid "The network name is already used"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:135
 msgid ""
 "The network ports on this device can be combined to several <abbr title="
 "\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
@@ -5226,23 +5363,22 @@ msgstr ""
 "do połączenia z większą siecią, taką jak Internet, a inne porty dla sieci "
 "lokalnej."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:77
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:395
-msgid "The selected protocol needs a device assigned"
-msgstr "Wybrany protokół potrzebuje przypisanego urządzenia"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1149
+msgid "The selected %s mode is incompatible with %s encryption"
+msgstr ""
 
 #: modules/luci-base/luasrc/view/csrftoken.htm:11
 msgid "The submitted security token is invalid or already expired!"
 msgstr "The submitted security token is invalid or already expired!"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:274
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:272
 msgid ""
 "The system is erasing the configuration partition now and will reboot itself "
 "when finished."
 msgstr ""
 "System usuwa teraz partycję konfiguracji i zrestartuje się po zakończeniu."
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:195
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:193
 #, fuzzy
 msgid ""
 "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
@@ -5255,7 +5391,7 @@ msgstr ""
 "ustawień może być konieczne odnowienie adresu Twojego komputera, aby dostać "
 "się do urządzenia."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:15
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:80
 msgid "The system password has been successfully changed."
 msgstr "Hasło systemowe zostało pomyślnie zmienione."
 
@@ -5267,7 +5403,7 @@ 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:403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:427
 msgid "There are no active leases"
 msgstr ""
 
@@ -5276,18 +5412,10 @@ msgstr ""
 msgid "There are no active leases."
 msgstr "Brak aktywnych dzierżaw."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1973
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2514
 msgid "There are no changes to apply"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:204
-msgid ""
-"There is no device assigned yet, please attach a network device in the "
-"\"Physical Settings\" tab"
-msgstr ""
-"Żadne urządzenie nie jest jeszcze przypisane. Proszę dołączyć urządzenie "
-"sieciowe na karcie \"Ustawienia sprzętowe\""
-
 #: 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
@@ -5299,11 +5427,19 @@ msgstr ""
 "Hasło nie zostało ustawione. Proszę skonfigurować hasło roota, aby "
 "zabezpieczyć interfejs WWW i włączyć SSH."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:19
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:49
 msgid "This IPv4 address of the relay"
 msgstr "Ten adres IPv4 przekaźnika"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1448
+msgid "This authentication type is not applicable to the selected EAP method."
+msgstr ""
+
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:54
+msgid "This does not look like a valid PEM file"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
 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 "
@@ -5321,13 +5457,13 @@ msgstr ""
 "\". Zmodyfikowane pliki w /etc/config/ i w niektórych innych ustawieniach są "
 "automatycznie zachowywane."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:74
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:81
 msgid ""
 "This is either the \"Update Key\" configured for the tunnel or the account "
 "password if no update key has been configured"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:82
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:127
 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."
@@ -5335,7 +5471,7 @@ msgstr ""
 "To jest zawartość pliku /etc/rc.local. Wstaw tutaj własne komendy (przed "
 "'exit 0'), aby zostały wykonane pod koniec procesu rozruchu."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:27
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:54
 msgid ""
 "This is the local endpoint address assigned by the tunnel broker, it usually "
 "ends with <code>...:2/64</code>"
@@ -5344,7 +5480,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:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:79
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> in the local network"
@@ -5352,21 +5488,21 @@ msgstr ""
 "To jest jedyny serwer <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr> w sieci lokalnej"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:73
 msgid "This is the plain username for logging into the account"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:34
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:57
 msgid ""
 "This is the prefix routed to you by the tunnel broker for use by clients"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:9
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:41
 msgid "This is the system crontab in which scheduled tasks can be defined."
 msgstr ""
 "To jest system crontab, w którym mogą być zdefiniowane zaplanowane zadania."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:19
+#: 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 ""
@@ -5384,26 +5520,26 @@ msgstr ""
 msgid "This page gives an overview over currently active network connections."
 msgstr "Poniższa strona przedstawia aktualnie aktywne połączenia sieciowe."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:726
-#: modules/luci-base/htdocs/luci-static/resources/form.js:809
+#: modules/luci-base/htdocs/luci-static/resources/form.js:936
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1064
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:172
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:32
 msgid "This section contains no values yet"
 msgstr "Ta sekcja nie zawiera jeszcze żadnych wartości"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:114
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:105
 msgid "Time Synchronization"
 msgstr "Synchronizacja czasu"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:525
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:968
 msgid "Time interval for rekeying GTK"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:128
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:119
 msgid "Timezone"
 msgstr "Strefa czasowa"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:825
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:871
 msgid "To login…"
 msgstr "Zaloguj się…"
 
@@ -5417,7 +5553,7 @@ msgstr ""
 "utworzoną kopię zapasową. Aby przywrócić ustawienia domyślne wciśnij "
 "\"Wykonaj reset\" (możliwe tylko w przypadku obrazu squashfs)."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:835
 msgid "Tone"
 msgstr "Ton"
 
@@ -5441,55 +5577,41 @@ msgstr "Ruch"
 msgid "Transfer"
 msgstr "Transfer"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:595
-msgid "Transmission Rate"
-msgstr "Prędkość transmisji"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:102
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:89
 msgid "Transmit"
 msgstr "Nadawanie"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:211
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:273
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:345
-msgid "Transmit Power"
-msgstr "Siła nadawania"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:318
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:349
-msgid "Transmitter Antenna"
-msgstr "Antena nadajnika"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:73
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:57
 msgid "Trigger"
 msgstr "Trigger"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:98
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:84
 msgid "Trigger Mode"
 msgstr "Rodzaj Triggeru"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:54
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:69
 msgid "Tunnel ID"
 msgstr "Numer identyfikacyjny tunelu"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1643
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1849
 #: modules/luci-base/luasrc/model/network.lua:1430
 msgid "Tunnel Interface"
 msgstr "Interfejs tunelu"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:44
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:55
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:76
 msgid "Tunnel Link"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:46
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:131
 msgid "Tx-Power"
 msgstr "Moc nadawania"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:32
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:185
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:11
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:43
 msgid "Type"
 msgstr "Typ"
 
@@ -5497,19 +5619,20 @@ msgstr "Typ"
 msgid "UDP:"
 msgstr "UDP:"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:28
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:90
 msgid "UMTS only"
 msgstr "Tylko UMTS"
 
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:43
 #: protocols/luci-proto-3g/luasrc/model/network/proto_3g.lua:10
 msgid "UMTS/GPRS/EV-DO"
 msgstr "UMTS/GPRS/EV-DO"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:106
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:93
 msgid "USB Device"
 msgstr "Urządzenie USB"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:122
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:110
 msgid "USB Ports"
 msgstr "Porty USB"
 
@@ -5539,10 +5662,12 @@ msgstr "Nie można określić interfejsu źródłowego"
 msgid "Unable to dispatch"
 msgstr "Nie można wysłać"
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:22
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:54
 msgid "Unable to obtain client ID"
 msgstr "Nie można uzyskać ID klienta"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:61
 msgid "Unable to resolve AFTR host name"
 msgstr "Nie można rozpoznać nazwy AFTR hosta"
@@ -5552,21 +5677,31 @@ msgstr "Nie można rozpoznać nazwy AFTR hosta"
 msgid "Unable to resolve peer host name"
 msgstr "Nie można rozpoznać nazwy peera"
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:33
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:68
+msgid "Unable to save contents: %s"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:132
 msgid "Unavailable Seconds (UAS)"
 msgstr "Czas niedostępnośći (UAS)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1196
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1386
 #: modules/luci-base/luasrc/model/network.lua:970
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1349
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1539
 #: modules/luci-base/luasrc/model/network.lua:1137
 msgid "Unknown error (%s)"
 msgstr "Nieznany błąd (%s)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1193
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:204
+msgid "Unknown error code"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1383
+#: modules/luci-base/htdocs/luci-static/resources/protocol/none.js:6
 #: modules/luci-base/luasrc/model/network.lua:964
 msgid "Unmanaged"
 msgstr "Niezarządzalny"
@@ -5576,22 +5711,30 @@ msgstr "Niezarządzalny"
 msgid "Unmount"
 msgstr "Odmontuj"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:107
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:262
 msgid "Unnamed key"
 msgstr "Klucz beznazwy"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1708
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2261
 msgid "Unsaved Changes"
 msgstr "Niezapisane zmiany"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:202
+msgid "Unspecified error"
+msgstr ""
+
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:64
 msgid "Unsupported MAP type"
 msgstr "Nieobsługiwany typ MAP"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:27
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:69
 msgid "Unsupported modem"
 msgstr "Nieobsługiwany modem"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:219
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:119
 msgid "Unsupported protocol type."
 msgstr "Nieobsługiwany typ protokołu."
@@ -5615,56 +5758,70 @@ msgstr ""
 msgid "Upload archive..."
 msgstr "Załaduj archiwum..."
 
-#: modules/luci-base/luasrc/view/cbi/upload.htm:8
-msgid "Uploaded File"
-msgstr "Załaduj plik"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1703
+msgid "Upload file"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1678
+msgid "Upload file…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1623
+msgid "Upload request failed: %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:613
+msgid ""
+"Upon pressing \"Continue\", anonymous \"wifi-iface\" sections will be "
+"assigned with a name in the form <em>wifinet#</em> and the network will be "
+"restarted to apply the updated configuration."
+msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:14
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:74
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:85
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:26
 msgid "Uptime"
 msgstr "Czas pracy"
 
-#: 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:83
 msgid "Use <code>/etc/ethers</code>"
 msgstr "Użyj <code>/etc/ethers</code>"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:40
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:167
 msgid "Use DHCP gateway"
 msgstr "Użyj bramy DHCP"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:33
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:85
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:34
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:98
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:46
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:65
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:38
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:58
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:124
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:39
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:116
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:59
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:103
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:64
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:77
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:100
 msgid "Use DNS servers advertised by peer"
 msgstr "Użyj serwerów DNS rozgłaszanych przez peera"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:227
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:233
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:479
 msgid "Use ISO/IEC 3166 alpha2 country codes."
 msgstr "Użyj kodów kraju ISO/IEC 3166 alpha2"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:31
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:100
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:70
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:35
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:51
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:86
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:56
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:97
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:77
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:75
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:92
 msgid "Use MTU on tunnel interface"
 msgstr "Użyj MTU na interfejsie tunelu"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:95
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:65
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:30
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:46
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:81
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:93
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:73
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:88
 msgid "Use TTL on tunnel interface"
 msgstr "Użyj TTL na interfejsie tunelu"
 
@@ -5676,68 +5833,65 @@ msgstr ""
 msgid "Use as root filesystem (/)"
 msgstr "Użyj jako systemu plików root (/)"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:19
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:31
 msgid "Use broadcast flag"
 msgstr "Użyj flagi rozgłaszania"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:253
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:791
 msgid "Use builtin IPv6-management"
 msgstr "Skorzystaj z wbudowanego zarządzania protokołem IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:40
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:109
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:92
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:45
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:105
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:53
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:72
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:45
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:65
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:40
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:182
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:127
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:42
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:119
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:62
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:67
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:80
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:103
 msgid "Use custom DNS servers"
 msgstr "Użyj własne serwery DNS"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:26
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:70
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:16
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:28
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:84
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:24
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:50
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:23
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:43
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:116
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:33
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:74
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:97
 msgid "Use default gateway"
 msgstr "Użyj domyślnej bramy"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:48
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:164
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:77
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:24
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:88
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:58
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:23
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:39
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:74
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:90
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:38
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:57
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:30
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:50
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:45
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:227
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:119
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:51
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:88
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:68
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:52
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:70
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:83
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:111
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:149
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:67
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:111
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:98
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:72
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:85
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:108
 msgid "Use gateway metric"
 msgstr "Użyj metryki bramy"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:64
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:179
 msgid "Use routing table"
 msgstr "Użyj tabeli routingu"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:309
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:310
 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 "
@@ -5755,77 +5909,78 @@ msgstr ""
 msgid "Used"
 msgstr "Użyte"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:848
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1273
 msgid "Used Key Slot"
 msgstr "Użyte gniazdo klucza"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:913
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
 msgid ""
 "Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not "
 "needed with normal WPA(2)-PSK."
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:48
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:110
 msgid "User certificate (PEM encoded)"
 msgstr "Certyfikat użytkownika (kodowany PEM)"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:61
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:122
 msgid "User key (PEM encoded)"
 msgstr "Klucz użytkownika (kodowany PEM)"
 
 #: modules/luci-base/luasrc/view/sysauth.htm:23
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:41
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:32
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:102
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:56
 msgid "Username"
 msgstr "Nazwa użytkownika"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:182
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:903
 msgid "VC-Mux"
 msgstr "VC-Mux"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:851
 msgid "VDSL"
 msgstr "VDSL"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:172
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:169
 msgid "VLANs on %q"
 msgstr "Sieci VLAN na %q"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:171
-msgid "VLANs on %q (%s)"
-msgstr "Sieci VLAN na %q (%s)"
+#: modules/luci-base/luasrc/controller/admin/index.lua:55
+msgid "VPN"
+msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:18
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:42
 msgid "VPN Local address"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:22
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:46
 msgid "VPN Local port"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:15
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:11
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:15
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:58
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:39
 msgid "VPN Server"
 msgstr "Serwer VPN"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:18
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:96
 msgid "VPN Server port"
 msgstr "Port serwera VPN"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:37
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:100
 msgid "VPN Server's certificate SHA1 hash"
 msgstr ""
 
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:9
 #: protocols/luci-proto-vpnc/luasrc/model/network/proto_vpnc.lua:9
 msgid "VPNC (CISCO 3000 (and others) VPN)"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:44
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:73
 msgid "Vendor"
 msgstr "Producent"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:60
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:52
 msgid "Vendor Class to send when requesting DHCP"
 msgstr "Klasa producenta do wysłania podczas żądania DHCP"
 
@@ -5833,41 +5988,37 @@ msgstr "Klasa producenta do wysłania podczas żądania DHCP"
 msgid "Verify"
 msgstr "Zweryfikuj"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:52
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:76
 msgid "Virtual dynamic interface"
 msgstr "Wirtualny interfejs dynamiczny"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:470
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:471
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:553
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:576
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:908
 msgid "WDS"
 msgstr "WDS"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:667
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1160
 msgid "WEP Open System"
 msgstr "Otwarty system WEP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:668
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1161
 msgid "WEP Shared Key"
 msgstr "Współdzielony klucz WEP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "WEP passphrase"
 msgstr "Hasło WEP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:503
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:566
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:945
 msgid "WMM Mode"
 msgstr "Tryb WMM"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "WPA passphrase"
 msgstr "Hasło WPA"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:716
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:735
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:740
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1074
 msgid ""
 "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
 "and ad-hoc mode) to be installed."
@@ -5883,7 +6034,7 @@ msgstr "Trwa wprowadzenie zmian..."
 msgid "Waiting for command to complete..."
 msgstr "Trwa wykonanie polecenia..."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1940
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2481
 msgid "Waiting for configuration to get applied… %ds"
 msgstr ""
 
@@ -5891,8 +6042,8 @@ msgstr ""
 msgid "Waiting for device..."
 msgstr "Oczekiwanie na urządzenie..."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:172
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:163
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:173
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
@@ -5902,11 +6053,11 @@ msgstr ""
 "Ostrzeżenie: Istnieją niezapisane zmiany, które zostaną utracone po ponownym "
 "uruchomieniu urządzenia!"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:20
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:34
 msgid "Weak"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:946
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1355
 msgid ""
 "When using a PSK, the PMK can be automatically generated. When enabled, the "
 "R0/R1 key options below are not applied. Disable this to use the R0 and R1 "
@@ -5914,78 +6065,85 @@ msgid ""
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:383
 msgid "Width"
 msgstr "Szerokość"
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:17
 #: protocols/luci-proto-wireguard/luasrc/model/network/proto_wireguard.lua:9
 msgid "WireGuard VPN"
 msgstr "WireGuard VPN"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:58
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:40
 #: modules/luci-mod-status/luasrc/controller/admin/status.lua:28
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:14
 msgid "Wireless"
 msgstr "Sieć bezprzewodowa"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1631
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1837
 #: modules/luci-base/luasrc/model/network.lua:1418
 msgid "Wireless Adapter"
 msgstr "Adapter bezprzewodowy"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1617
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2052
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1823
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2288
 #: modules/luci-base/luasrc/model/network.lua:1404
 #: modules/luci-base/luasrc/model/network.lua:1865
 msgid "Wireless Network"
 msgstr "Sieć bezprzewodowa"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:629
 msgid "Wireless Overview"
 msgstr "Przegląd sieci bezprzewodowych"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:362
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:797
 msgid "Wireless Security"
 msgstr "Zabezpieczenia sieci bezprzewodowych"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:54
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:611
+msgid "Wireless configuration migration"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:139
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:179
 msgid "Wireless is disabled"
 msgstr "Sieć bezprzewodowa jest wyłączona"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:54
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:139
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:179
 msgid "Wireless is not associated"
 msgstr "Sieć bezprzewodowa jest niepołączona"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:15
-msgid "Wireless is restarting..."
-msgstr "Restart sieci bezprzewodowej..."
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:752
 msgid "Wireless network is disabled"
 msgstr "Sieć bezprzewodowa jest wyłączona"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:752
 msgid "Wireless network is enabled"
 msgstr "Sieć bezprzewodowa jest włączona"
 
-#: 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:182
 msgid "Write received DNS requests to syslog"
 msgstr "Zapisz otrzymane żądania DNS do syslog'a"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:164
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:155
 msgid "Write system log to file"
 msgstr "Zapisz log systemowy do pliku"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1507
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:85
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1754
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:109
 msgid "Yes"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:26
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:943
+msgid ""
+"You appear to be currently connected to the device via the \"%h\" interface. "
+"Do you really want to shut down the interface?"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:123
 msgid ""
 "You can enable or disable installed init scripts here. Changes will applied "
 "after a device reboot.<br /><strong>Warning: If you disable essential init "
@@ -6006,38 +6164,34 @@ msgstr ""
 "Musisz włączyć obsługę JavaScript w swojej przeglądarce, inaczej LuCI nie "
 "będzie działać poprawnie."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:196
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:187
 msgid "ZRam Compression Algorithm"
 msgstr "Alogrytm kompresji ZRam"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:203
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:194
 msgid "ZRam Compression Streams"
 msgstr "Strumienie kompresji ZRam"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:189
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:180
 msgid "ZRam Settings"
 msgstr "Ustawienia ZRam"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:191
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
 msgid "ZRam Size"
 msgstr "Rozmiar ZRam"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:229
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:230
 msgid "any"
 msgstr "dowolny"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:113
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:121
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:126
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:218
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:282
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:321
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:328
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:621
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:37
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:22
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:29
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:121
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:836
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:844
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:849
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1030
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:78
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:48
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:51
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:103
 msgid "auto"
 msgstr "auto"
 
@@ -6045,11 +6199,11 @@ msgstr "auto"
 msgid "automatic"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:45
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:78
 msgid "baseT"
 msgstr "baseT"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:909
 msgid "bridged"
 msgstr "zmostkowany"
 
@@ -6065,22 +6219,21 @@ msgstr ""
 msgid "create:"
 msgstr "utwórz:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:264
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:368
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:678
 msgid "creates a bridge over specified interface(s)"
 msgstr "utwórz most na określonych interfejsach"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:277
 msgid "dB"
 msgstr "dB"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:34
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:35
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:46
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:47
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:48
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:131
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:132
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:133
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:277
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:279
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:331
@@ -6092,26 +6245,30 @@ msgstr "dB"
 msgid "dBm"
 msgstr "dBm"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:460
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:587
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:889
 msgid "disable"
 msgstr "wyłącz"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:119
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:524
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:530
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:536
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:18
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:578
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:584
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:590
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:25
 msgid "disabled"
 msgstr "wyłączony"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:433
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:467
+msgid "driver default"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/lease_status.htm:17
 #: modules/luci-base/luasrc/view/lease_status.htm:46
-#: 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:416
 msgid "expired"
 msgstr "wygasły"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:88
 msgid ""
 "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr>-leases will be stored"
@@ -6125,25 +6282,21 @@ msgstr ""
 msgid "forward"
 msgstr "przekaż"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:80
 msgid "full-duplex"
 msgstr "pełny-duplex"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:80
 msgid "half-duplex"
 msgstr "pół-duplex"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:559
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:565
 msgid "hexadecimal encoded value"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:138
-msgid "hidden"
-msgstr "ukryty"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:527
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:533
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:538
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:581
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:587
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:592
 msgid "hybrid mode"
 msgstr "tryb hybrydowy"
 
@@ -6151,6 +6304,10 @@ msgstr "tryb hybrydowy"
 msgid "if target is a network"
 msgstr "jeżeli celem jest sieć"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:63
+msgid "ignore"
+msgstr ""
+
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:177
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
@@ -6185,18 +6342,19 @@ 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:94
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:95
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr "lokalny plik <abbr title=\"Domain Name System\">DNS</abbr>"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:952
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1168
+msgid "medium security"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1360
 msgid "minutes"
 msgstr "minuty"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:43
-msgid "mixed WPA/WPA2"
-msgstr "mieszany WPA/WPA2"
-
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:225
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:232
@@ -6204,7 +6362,7 @@ msgid "no"
 msgstr "nie"
 
 # skorzystałem z niemieckiego tłumaczenia
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:54
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:72
 msgid "no link"
 msgstr "niepowiązane"
 
@@ -6212,7 +6370,7 @@ msgstr "niepowiązane"
 msgid "non-empty value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1195
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1446
 msgid "none"
 msgstr "żaden"
 
@@ -6222,7 +6380,9 @@ msgstr "żaden"
 msgid "not present"
 msgstr "nieobecny"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:363
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:341
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:776
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:780
 #: 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
@@ -6237,9 +6397,9 @@ msgstr "wyłączone"
 msgid "on"
 msgstr "włączone"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
-msgid "open"
-msgstr "otwarte"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1169
+msgid "open network"
+msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
@@ -6258,73 +6418,77 @@ msgstr ""
 msgid "positive integer value"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:34
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:56
 msgid "random"
 msgstr "losowy"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:526
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:532
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:537
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:580
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:586
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:591
 msgid "relay mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:910
 msgid "routed"
 msgstr "routowane"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:525
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:534
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:968
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:977
 msgid "sec"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:525
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:531
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:579
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:585
 msgid "server mode"
 msgstr "tryb serwera"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:544
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:597
 msgid "stateful-only"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:542
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:595
 msgid "stateless"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:543
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:596
 msgid "stateless + stateful"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:369
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1167
+msgid "strong security"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:346
 msgid "tagged"
 msgstr "otagowane"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:932
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1343
 msgid "time units (TUs / 1.024 ms) [1000-65535]"
 msgstr "jednostki czasu (TUs / 1.024 ms) [1000-65535]"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:549
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:555
 msgid "unique value"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:448
 msgid "unknown"
 msgstr "nieznane"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:15
 #: modules/luci-base/luasrc/view/lease_status.htm:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:238
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:390
+#: 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:414
 msgid "unlimited"
 msgstr "nielimitowane"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1401
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1648
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:63
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:355
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:378
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:413
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:446
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:512
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:450
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:545
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:53
 #: modules/luci-base/luasrc/view/cbi/network_netlist.htm:38
 msgid "unspecified"
@@ -6334,7 +6498,7 @@ msgstr "nieokreślone"
 msgid "unspecified -or- create:"
 msgstr "nieokreślone -lub- utwórz:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:366
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:344
 msgid "untagged"
 msgstr "nieotagowane"
 
@@ -6415,8 +6579,8 @@ msgstr ""
 msgid "valid address:port"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:523
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:527
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:529
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:533
 msgid "valid date (YYYY-MM-DD)"
 msgstr ""
 
@@ -6453,7 +6617,7 @@ msgstr ""
 msgid "valid network in address/netmask notation"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:498
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:504
 msgid "valid phone digit (0-9, \"*\", \"#\", \"!\" or \".\")"
 msgstr ""
 
@@ -6466,11 +6630,11 @@ msgstr ""
 msgid "valid port value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:503
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:509
 msgid "valid time (HH:MM:SS)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:425
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:431
 msgid "value between %d and %d characters"
 msgstr ""
 
@@ -6486,14 +6650,23 @@ msgstr ""
 msgid "value smaller or equal to %f"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:430
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:425
+msgid "value with %d characters"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:436
 msgid "value with at least %d characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:435
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:441
 msgid "value with at most %d characters"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1169
+msgid "weak security"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:221
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:232
@@ -6504,6 +6677,225 @@ msgstr "tak"
 msgid "« Back"
 msgstr "« Wróć"
 
+#~ msgid "Change login password"
+#~ msgstr "Zmień hasło logowania"
+
+#~ msgid "Changing password…"
+#~ msgstr "Zmieniam hasło…"
+
+#~ msgid "Disabled (default)"
+#~ msgstr "Wyłączone (domyślnie)"
+
+#~ msgid "Loading SSH keys…"
+#~ msgstr "Ładowanie kluczy SSH…"
+
+#~ msgid "Specifies the listening port of this <em>Dropbear</em> instance"
+#~ msgstr "Określa port nasłuchu dla tej instancji <em>Dropbear</em>"
+
+#~ msgid "Switch %q (%s)"
+#~ msgstr "Przełącznik %q (%s)"
+
+#~ msgid "VLANs on %q (%s)"
+#~ msgstr "Sieci VLAN na %q (%s)"
+
+#~ msgid "Antenna 1"
+#~ msgstr "Antena 1"
+
+#~ msgid "Antenna 2"
+#~ msgstr "Antena 2"
+
+#~ msgid "Antenna Configuration"
+#~ msgstr "Ustawienia anteny"
+
+#~ msgid "Back to overview"
+#~ msgstr "Wróć do przeglądu"
+
+#~ msgid "Back to scan results"
+#~ msgstr "Wróć do wyników skanowania"
+
+#~ msgid "Broadcom 802.11%s Wireless Controller"
+#~ msgstr "Bezprzewodowy kontroler Broadcom 802.11%s"
+
+#~ msgid "Broadcom BCM%04x 802.11 Wireless Controller"
+#~ msgstr "Bezprzewodowy kontroler Broadcom BCM%04x 802.11"
+
+#~ msgid "Common Configuration"
+#~ msgstr "Konfiguracja podstawowa"
+
+#~ msgid "Connect"
+#~ msgstr "Połącz"
+
+#~ msgid "Connection Limit"
+#~ msgstr "Limit połączeń"
+
+# Pokrywa następujące interfejsy
+#~ msgid "Cover the following interface"
+#~ msgstr "Pokrywa następujący interfejs"
+
+#~ msgid "Cover the following interfaces"
+#~ msgstr "Pokrywa następujące interfejsy"
+
+#~ msgid "Create Interface"
+#~ msgstr "Utwórz interfejs"
+
+#~ msgid "Create a bridge over multiple interfaces"
+#~ msgstr "Utwórz most pomiędzy wieloma interfejsami"
+
+# Jak poprzednio trzymam się konwencji
+#~ msgid "Diversity"
+#~ msgstr "Wielorakość"
+
+#~ msgid "Edit this interface"
+#~ msgstr "Edytuj ten interfejs"
+
+#~ msgid "Frame Bursting"
+#~ msgstr "Dzielenie ramek"
+
+#~ msgid "Generic 802.11%s Wireless Controller"
+#~ msgstr "Ogólny bezprzewodowy kontroler 802.11%s"
+
+#~ msgid "Install package %q"
+#~ msgstr "Instaluj pakiet %q"
+
+#~ msgid "Interface Overview"
+#~ msgstr "Przegląd Interfejsów"
+
+#~ msgid "Missing protocol extension for proto %q"
+#~ msgstr "Brakujące rozszerzenie protokołu dla protokołu %q"
+
+#~ msgid "Name of the new interface"
+#~ msgstr "Nazwa nowego interfejsu"
+
+#~ msgid "No network configured on this device"
+#~ msgstr "Brak skonfigurowanych sieci na tym urządzeniu"
+
+#~ msgid "No network name specified"
+#~ msgstr "Nie podano nazwy sieci"
+
+#~ msgid "No scan results available yet..."
+#~ msgstr "Brak wyników skanowania..."
+
+#~ msgid "Not associated"
+#~ msgstr "Nie powiązany"
+
+#~ msgid ""
+#~ "On this page you can configure the network interfaces. You can bridge "
+#~ "several interfaces by ticking the \"bridge interfaces\" field and enter "
+#~ "the names of several network interfaces separated by spaces. You can also "
+#~ "use <abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
+#~ "<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
+#~ "<samp>eth0.1</samp>)."
+#~ msgstr ""
+#~ "Na tej stronie można skonfigurować interfejsy urządzenia. Możesz "
+#~ "zmostkować kilka interfejsów zaznaczając pole \"mostkuj interfejsy\", a "
+#~ "następnie wpisując ich nazwy oddzielone spacjami. Można także użyć "
+#~ "notacji <abbr title=\"Virtual Local Area Network\">VLAN`ów</abbr> "
+#~ "<samp>INTERFACE.VLANNR</samp> (<abbr title=\"na przykład\">np.</abbr>: "
+#~ "<samp>eth0.1</samp>)."
+
+#~ msgid "Package libiwinfo required!"
+#~ msgstr "Wymagany pakiet libiwinfo!"
+
+#~ msgid "Protocol of the new interface"
+#~ msgstr "Protokół nowego interfejsu"
+
+#~ msgid "Protocol support is not installed"
+#~ msgstr "Wsparcie dla protokołu nie jest zainstalowane"
+
+#~ msgid ""
+#~ "Really delete this wireless network? The deletion cannot be undone! You "
+#~ "might lose access to this device if you are connected via this network."
+#~ msgstr ""
+#~ "Naprawdę usunąć tę sieć bezprzewodową? Usunięcie nie może zostać "
+#~ "cofnięte!\n"
+#~ "Możesz stracić dostęp do tego urządzenia, jeśli jesteś połączony przez tę "
+#~ "sieć!"
+
+#~ msgid "Receiver Antenna"
+#~ msgstr "Antena odbiorcza"
+
+#~ msgid "Repeat scan"
+#~ msgstr "Powtórz skanowanie"
+
+#~ msgid "Replace entry"
+#~ msgstr "Zamień wpis"
+
+#~ msgid "Scan request failed"
+#~ msgstr "Próba skanowania nie powiodła się"
+
+#~ msgid "Separate Clients"
+#~ msgstr "Rozdziel klientów"
+
+#~ msgid "Slot time"
+#~ msgstr "Szczelina czasowa"
+
+#, fuzzy
+#~ msgid ""
+#~ "The <em>Device Configuration</em> section covers physical settings of the "
+#~ "radio hardware such as channel, transmit power or antenna selection which "
+#~ "are shared among all defined wireless networks (if the radio hardware is "
+#~ "multi-SSID capable). Per network settings like encryption or operation "
+#~ "mode are grouped in the <em>Interface Configuration</em>."
+#~ msgstr ""
+#~ "Sekcja <em>Konfiguracja Urządzenia</em> zawiera sprzętowe ustawienia toru "
+#~ "transmisji radiowej takie jak kanał, moc sygnału, czy wybór anteny, które "
+#~ "to są wspólne dla wszystkich zdefiniowanych sieci bezprzewodowych (jeśli "
+#~ "tor transmisji jest kompatybilny z transmisją multi-SSID). Ustawienia "
+#~ "sieci takie jak szyfrowanie lub tryb operacji są zebrane w sekcji "
+#~ "<em>Konfiguracja Interfejsu</em>."
+
+#~ msgid ""
+#~ "The <em>libiwinfo-lua</em> package is not installed. You must install "
+#~ "this component for working wireless configuration!"
+#~ msgstr ""
+#~ "Pakiet <em>libiwinfo-lua</em> nie jest zainstalowany. Musisz go "
+#~ "zainstalować aby WiFi prawidłowo zadziałało!"
+
+#~ msgid "The given network name is not unique"
+#~ msgstr "Podana sieć nie jest unikalna"
+
+#, fuzzy
+#~ msgid ""
+#~ "The hardware is not multi-SSID capable and the existing configuration "
+#~ "will be replaced if you proceed."
+#~ msgstr ""
+#~ "Sprzęt nie jest urządzeniem typu multi-SSID, więc bieżąca konfiguracja "
+#~ "zostanie nadpisana nową jeśli będziesz kontynuować."
+
+#~ msgid "The selected protocol needs a device assigned"
+#~ msgstr "Wybrany protokół potrzebuje przypisanego urządzenia"
+
+#~ msgid ""
+#~ "There is no device assigned yet, please attach a network device in the "
+#~ "\"Physical Settings\" tab"
+#~ msgstr ""
+#~ "Żadne urządzenie nie jest jeszcze przypisane. Proszę dołączyć urządzenie "
+#~ "sieciowe na karcie \"Ustawienia sprzętowe\""
+
+#~ msgid "Transmission Rate"
+#~ msgstr "Prędkość transmisji"
+
+#~ msgid "Transmit Power"
+#~ msgstr "Siła nadawania"
+
+#~ msgid "Transmitter Antenna"
+#~ msgstr "Antena nadajnika"
+
+#~ msgid "Uploaded File"
+#~ msgstr "Załaduj plik"
+
+#~ msgid "Wireless is restarting..."
+#~ msgstr "Restart sieci bezprzewodowej..."
+
+#~ msgid "hidden"
+#~ msgstr "ukryty"
+
+#~ msgid "mixed WPA/WPA2"
+#~ msgstr "mieszany WPA/WPA2"
+
+#~ msgid "open"
+#~ msgstr "otwarte"
+
 #~ msgid "Always off (%s)"
 #~ msgstr "Zawsze wyłączony (%s)"
 
@@ -6748,9 +7140,6 @@ msgstr "« Wróć"
 #~ msgid "Hermes 802.11b Wireless Controller"
 #~ msgstr "Kontroler bezprzewodowy Hermes 802.11b"
 
-#~ msgid "Interface is shutting down..."
-#~ msgstr "Interfejs jest wyłączany..."
-
 #~ msgid "Interface reconnected"
 #~ msgstr "Połączono ponownie interfejs"
 
diff --git a/modules/luci-base/po/pt-br/base.po b/modules/luci-base/po/pt-br/base.po
index a87bdd111..6594d82a8 100644
--- a/modules/luci-base/po/pt-br/base.po
+++ b/modules/luci-base/po/pt-br/base.po
@@ -13,19 +13,20 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Poedit 2.1.1\n"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:133
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:857
 msgid "%.1f dB"
 msgstr "%.1f dB"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:109
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:122
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 msgid "%d Bit"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1641
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2194
 msgid "%d invalid field(s)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:281
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:31
 msgid "%s is untagged in multiple VLANs!"
 msgstr "%s está sem etiqueta em múltiplas VLANs!"
 
@@ -63,19 +64,19 @@ msgid "-- Additional Field --"
 msgstr "-- Campo Adicional --"
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:258
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1401
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1533
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:250
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:350
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1114
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1648
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1780
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:314
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:414
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1178
 #: modules/luci-base/luasrc/view/cbi/header.htm:5
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:26
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:88
 msgid "-- Please choose --"
 msgstr "-- Por favor, escolha --"
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:259
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:351
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1115
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:415
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1179
 #: modules/luci-base/luasrc/view/cbi/header.htm:6
 msgid "-- custom --"
 msgstr "-- personalizado --"
@@ -100,7 +101,7 @@ msgstr ""
 msgid "-- please select --"
 msgstr "-- por favor, selecione --"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:382
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:814
 msgid "0 = not using RSSI threshold, 1 = do not change driver default"
 msgstr ""
 
@@ -112,10 +113,11 @@ msgstr "Carga 1 Minuto:"
 msgid "15 Minute Load:"
 msgstr "Carga 15 Minutos:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:924
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1337
 msgid "4-character hexadecimal ID"
 msgstr "Identificador hexadecimal de 4 caracteres"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:11
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:18
 msgid "464XLAT (CLAT)"
 msgstr "464XLAT (CLAT)"
@@ -124,52 +126,52 @@ msgstr "464XLAT (CLAT)"
 msgid "5 Minute Load:"
 msgstr "Carga 5 Minutos:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:960
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1366
 msgid "6-octet identifier as a hex string - no colons"
 msgstr ""
 "Identificador de 6 octetos como uma cadeia hexadecimal - sem dois pontos"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:891
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1310
 msgid "802.11r Fast Transition"
 msgstr "802.11r Fast Transition"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1157
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1567
 msgid "802.11w Association SA Query maximum timeout"
 msgstr "Tempo de expiração máximo da consulta da Associação SA do 802.11w"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1574
 msgid "802.11w Association SA Query retry timeout"
 msgstr ""
 "Tempo de expiração de tentativa de consulta da Associação SA do 802.11w"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1133
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1533
 msgid "802.11w Management Frame Protection"
 msgstr "Proteção do Quadro de Gerenciamento do 802.11w"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1156
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1567
 msgid "802.11w maximum timeout"
 msgstr "Estouro de tempo máximo do 802.11w"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1165
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1574
 msgid "802.11w retry timeout"
 msgstr "Estouro de tempo da nova tentativa do 802.11w"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:399
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:831
 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:224
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:225
 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:215
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:216
 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:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
 msgid ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
 "order of the resolvfile"
@@ -177,12 +179,12 @@ msgstr ""
 "O servidor <abbr title=\"Sistema de Nomes de Domínios\">DNS</abbr> irá "
 "consultar na ordem do arquivo resolvfile"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:388
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:820
 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:351
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:373
 #: 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>"
@@ -192,8 +194,8 @@ msgstr "Endereço <abbr title=\"Protocolo de Internet Versão 4\">IPv4</abbr>"
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
 msgstr "Roteador <abbr title=\"Protocolo de Internet Versão 4\">IPv4</abbr>"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:555
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:35
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:506
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr ""
 "Máscara de rede <abbr title=\"Protocolo de Internet Versão 4\">IPv4</abbr>"
@@ -210,31 +212,31 @@ 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:378
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:402
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
 msgstr ""
 "<abbr title=\"Internet Protocol Version 6/Protocolo Internet Versão "
 "6\">IPv6</abbr>-Suffix (hex)"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:58
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:35
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:33
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "Configuração do <abbr title=\"Diodo Emissor de Luz\">LED</abbr>"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:67
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:51
 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:328
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:329
 #: 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:372
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 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:233
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:234
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> leases"
@@ -242,7 +244,7 @@ msgstr ""
 "Numero máximo de alocaçõ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:242
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> packet size"
@@ -250,11 +252,11 @@ 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:251
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:252
 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
 msgstr "Número máximo de consultas concorrentes"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:10
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:42
 msgid ""
 "<br/>Note: you need to manually restart the cron service if the crontab file "
 "was empty before editing."
@@ -262,63 +264,67 @@ msgstr ""
 "<br/>Nota: você precisa reiniciar manualmente o serviço da cron se o arquivo "
 "crontab estava vazio antes da edição."
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:817
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1605
+msgid "A directory with the same name already exists."
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:863
 msgid "A new login is required since the authentication session expired."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:114
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:837
 msgid "A43C + J43 + A43"
 msgstr "A43C + J43 + A43"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:838
 msgid "A43C + J43 + A43 + V43"
 msgstr "A43C + J43 + A43 + V43"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:850
 msgid "ADSL"
 msgstr ""
 "<abbr title=\"Assymetrical Digital Subscriber Line/Linha Digital Assimétrica "
 "para Assinante\">ADSL</abbr>"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:826
 msgid "ANSI T1.413"
 msgstr "ANSI T1.413"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:33
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:47
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:23
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:94
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:86
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:67
 msgid "APN"
 msgstr "<abbr title=\"Access Point Name\">APN</abbr>"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:56
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:175
 msgid "ARP retry threshold"
 msgstr ""
 "Limite de retentativas do <abbr title=\"Address Resolution Protocol\">ARP</"
 "abbr>"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:122
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:845
 msgid "ATM (Asynchronous Transfer Mode)"
 msgstr "ATM (Asynchronous Transfer Mode)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:144
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:866
 msgid "ATM Bridges"
 msgstr "Ponte ATM"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:178
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:21
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:898
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:66
 msgid "ATM Virtual Channel Identifier (VCI)"
 msgstr ""
 "Identificador de Canal Virtual ATM (<abbr title=\"Virtual Channel Identifier"
 "\">VCI</abbr>)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:179
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:26
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:899
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:70
 msgid "ATM Virtual Path Identifier (VPI)"
 msgstr ""
 "Identificador de Caminho Virtual ATM (<abbr title=\"Virtual Path Identifier"
 "\">VPI</abbr>)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:866
 msgid ""
 "ATM bridges expose encapsulated ethernet in AAL5 connections as virtual "
 "Linux network interfaces which can be used in conjunction with DHCP or PPP "
@@ -328,8 +334,8 @@ msgstr ""
 "rede virutais no Linux. Estas podem ser usadas em conjunto com o DHCP ou PPP "
 "para discar em um provedor de rede."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:184
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:905
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:62
 msgid "ATM device number"
 msgstr "Número do dispositivo ATM"
 
@@ -338,17 +344,17 @@ msgid "ATU-C System Vendor ID"
 msgstr "Identificador de"
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:251
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:495
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:499
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:528
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:532
 msgid "Absent Interface"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:19
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
 msgid "Access Concentrator"
 msgstr "Concentrador de Acesso"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:368
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:470
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:802
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
 msgid "Access Point"
 msgstr "Ponto de Acceso (AP)"
 
@@ -373,7 +379,7 @@ msgid "Active Connections"
 msgstr "Conexões Ativas"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:68
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:30
 msgid "Active DHCP Leases"
 msgstr "Alocações DHCP ativas"
 
@@ -381,55 +387,75 @@ msgstr "Alocações DHCP ativas"
 msgid "Active DHCPv6 Leases"
 msgstr "Alocações DHCPv6 ativas"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1951
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:370
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:12
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2190
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:804
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:23
 msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:650
-#: modules/luci-base/htdocs/luci-static/resources/form.js:651
-#: modules/luci-base/htdocs/luci-static/resources/form.js:666
-#: modules/luci-base/htdocs/luci-static/resources/form.js:667
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1290
+#: modules/luci-base/htdocs/luci-static/resources/form.js:902
+#: modules/luci-base/htdocs/luci-static/resources/form.js:904
+#: modules/luci-base/htdocs/luci-static/resources/form.js:917
+#: modules/luci-base/htdocs/luci-static/resources/form.js:918
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1539
 #: modules/luci-base/luasrc/view/cbi/nsection.htm:25
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:189
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:197
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:39
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:47
 #: modules/luci-base/luasrc/view/cbi/ucisection.htm:54
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:703
 msgid "Add"
 msgstr "Adicionar"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:60
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:870
+msgid "Add ATM Bridge"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:92
 msgid "Add IPv4 address…"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:129
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:204
 msgid "Add IPv6 address…"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:143
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:149
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:38
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:47
+msgid "Add LED action"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:215
+msgid "Add VLAN"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:14
+msgid "Add instance"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:153
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:159
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:250
 msgid "Add key"
 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:155
 msgid "Add local domain suffix to names served from hosts files"
 msgstr "Adiciona um sufixo de domínio local para equipamentos conhecidos"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:705
 msgid "Add new interface..."
 msgstr "Adiciona uma nova interface..."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:104
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:99
+msgid "Add peer"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:105
 msgid "Additional Hosts files"
 msgstr "Arquivos adicionais de equipamentos conhecidos (hosts)"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:161
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
 msgid "Additional servers file"
 msgstr "Arquivo de servidores adicionais"
 
@@ -456,7 +482,7 @@ msgstr "Arquivo de servidores adicionais"
 msgid "Address"
 msgstr "Endereço"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:12
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:151
 msgid "Address to access local relay bridge"
 msgstr "Endereço para acessar a ponte por retransmissão local"
 
@@ -465,13 +491,13 @@ msgstr "Endereço para acessar a ponte por retransmissão local"
 msgid "Administration"
 msgstr "Administração"
 
-#: 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:70
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:505
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:896
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:24
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:189
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:463
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:176
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:143
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:364
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:742
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:799
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:50
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:34
 msgid "Advanced Settings"
@@ -483,25 +509,27 @@ msgstr ""
 "Potência de Transmissão Agregada (<abbr title=\"Aggregate Transmit Power"
 "\">ACTATP</abbr>)"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:175
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:166
 msgid "Alert"
 msgstr "Alerta"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1628
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1834
 #: modules/luci-base/luasrc/model/network.lua:1416
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:54
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:78
 msgid "Alias Interface"
 msgstr "Interface Adicional"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:138
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:66
 msgid "Alias of \"%s\""
 msgstr "Interface adicional de \"%s\""
 
-#: 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:170
 msgid "All Servers"
 msgstr "Todos os Servidores"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:114
 msgid ""
 "Allocate IP addresses sequentially, starting from the lowest available "
 "address"
@@ -509,69 +537,67 @@ 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:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:113
 msgid "Allocate IP sequentially"
 msgstr "Alocar endereços IP sequencialmente"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:24
 msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
 msgstr ""
 "Permitir autenticação <abbr title=\"Shell Seguro\">SSH</abbr> por senha"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:545
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:987
 msgid "Allow AP mode to disconnect STAs based on low ACK condition"
 msgstr ""
 "Permitir, em modo AP, a desconexão de estações baseada na baixa qualidade "
 "das confirmações (ACK)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:462
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:589
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:891
 msgid "Allow all except listed"
 msgstr "Permitir todos, exceto os listados"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:236
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:767
 msgid "Allow legacy 802.11b rates"
 msgstr "Permitir taxas legadas do 802.11b"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:461
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:588
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:890
 msgid "Allow listed only"
 msgstr "Permitir somente os listados"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:198
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:199
 msgid "Allow localhost"
 msgstr "Permitir computador local"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:47
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:35
 msgid "Allow remote hosts to connect to local SSH forwarded ports"
 msgstr ""
 "Permitir que equipamentos remotos conectem à portas locais encaminhadas por "
 "SSH"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:38
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:30
 msgid "Allow root logins with password"
 msgstr "Permite autenticação do root com senha"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:39
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:30
 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:199
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:200
 msgid ""
 "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
 msgstr ""
 "Permite respostas que apontem para 127.0.0.0/8 de servidores externos, por "
 "exemplo, para os serviços RBL"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:135
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:122
 msgid "Allowed IPs"
 msgstr "Endereços IP autorizados"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:549
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:602
 msgid "Always announce default router"
 msgstr "Sempre anuncie o roteador padrão"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:259
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:782
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
 "option does not comply with IEEE 802.11n-2009!"
@@ -579,81 +605,81 @@ msgstr ""
 "Permitir o uso de canais 40Mhz mesmo se o canal secundário estiver "
 "sobreposto. Esta opção não está de acordo com IEEE 802.11n-2009!"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:95
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:818
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:119
 msgid "Annex"
 msgstr "Anexo"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:96
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:819
 msgid "Annex A + L + M (all)"
 msgstr "Anexos A + L + M (todo)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:827
 msgid "Annex A G.992.1"
 msgstr "Anexo A G.992.1"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:828
 msgid "Annex A G.992.2"
 msgstr "Anexo A G.992.2"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:829
 msgid "Annex A G.992.3"
 msgstr "Anexo A G.992.3"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:830
 msgid "Annex A G.992.5"
 msgstr "Anexo A G.992.5"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:97
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:820
 msgid "Annex B (all)"
 msgstr "Anexo B (todo)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:823
 msgid "Annex B G.992.1"
 msgstr "Anexo B G.992.1"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:824
 msgid "Annex B G.992.3"
 msgstr "Anexo B G.992.3"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:102
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:825
 msgid "Annex B G.992.5"
 msgstr "Anexo B G.992.5"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:98
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:821
 msgid "Annex J (all)"
 msgstr "Anexo J (todo)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:831
 msgid "Annex L G.992.3 POTS 1"
 msgstr "Anexo L G.992.3 POTS 1"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:99
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:822
 msgid "Annex M (all)"
 msgstr "Anexo M (todo)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:109
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:832
 msgid "Annex M G.992.3"
 msgstr "Anexo M G.992.3"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:833
 msgid "Annex M G.992.5"
 msgstr "Anexo M G.992.5"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:550
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:602
 msgid "Announce as default router even if no public prefix is available."
 msgstr ""
 "Anuncie-se como rotador padrão mesmo se não existir um prefixo público."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:555
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:607
 msgid "Announced DNS domains"
 msgstr "Domínios DNS anunciados"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:554
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:606
 msgid "Announced DNS servers"
 msgstr "Servidores DNS anunciados"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1093
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1496
 msgid "Anonymous Identity"
 msgstr "Identidade Anônima"
 
@@ -665,20 +691,6 @@ msgstr "Montagem Anônima"
 msgid "Anonymous Swap"
 msgstr "Espaço de Troca (swap) Anônimo"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:322
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:329
-msgid "Antenna 1"
-msgstr "Antena 1"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:323
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:330
-msgid "Antenna 2"
-msgstr "Antena 2"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:246
-msgid "Antenna Configuration"
-msgstr "Configuração da antena"
-
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:71
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:160
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:181
@@ -686,11 +698,11 @@ msgstr "Configuração da antena"
 msgid "Any zone"
 msgstr "Qualquer zona"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1981
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2522
 msgid "Apply request failed with status <code>%h</code>"
 msgstr "Pedido para aplicar falhou com o estado <code>%h</code>"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1867
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2409
 msgid "Apply unchecked"
 msgstr ""
 
@@ -698,8 +710,8 @@ msgstr ""
 msgid "Architecture"
 msgstr "Arquitetura"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:19
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:184
+#: 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 ""
@@ -710,15 +722,15 @@ msgstr ""
 msgid "Assign interfaces..."
 msgstr "Atribuir as interfaces..."
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:124
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:24
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:189
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:31
 msgid ""
 "Assign prefix parts using this hexadecimal subprefix ID for this interface."
 msgstr ""
 "Atribua partes do prefixo usando este identificador hexadecimal do "
 "subprefixo para esta interface."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:148
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1967
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:22
 msgid "Associated Stations"
 msgstr "Estações associadas"
@@ -727,20 +739,20 @@ msgstr "Estações associadas"
 msgid "Associations"
 msgstr "Associações"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:39
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:37
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:101
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:64
 msgid "Auth Group"
 msgstr "Grupo de Autenticação"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1027
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1421
 msgid "Authentication"
 msgstr "Autenticação"
 
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:29
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:70
 msgid "Authentication Type"
 msgstr "Tipo de Autenticação"
 
-#: 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:78
 msgid "Authoritative"
 msgstr "Autoritário"
 
@@ -758,17 +770,19 @@ msgstr "Autorização Necessária"
 msgid "Auto Refresh"
 msgstr "Atualização Automática"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:53
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:7
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:17
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:67
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:24
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:36
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:42
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:36
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:106
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:24
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:98
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:50
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:94
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:81
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:55
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:68
 msgid "Automatic"
 msgstr "Automático"
 
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:7
 #: protocols/luci-proto-hnet/luasrc/model/network/proto_hnet.lua:7
 msgid "Automatic Homenet (HNCP)"
 msgstr ""
@@ -815,21 +829,21 @@ msgstr "Disponível"
 msgid "Average:"
 msgstr "Média:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:116
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:839
 msgid "B43 + B43C"
 msgstr "B43 + B43C"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:840
 msgid "B43 + B43C + V43"
 msgstr "B43 + B43C + V43"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:48
 msgid "BR / DMR / AFTR"
 msgstr "BR / DMR / AFTR"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:43
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:75
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1620
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:176
 msgid "BSSID"
 msgstr "BSSID"
@@ -843,19 +857,11 @@ msgstr "Voltar para Visão Geral"
 msgid "Back to configuration"
 msgstr "Voltar para configuração"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:48
-msgid "Back to overview"
-msgstr "Voltar para visão geral"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:20
-msgid "Back to scan results"
-msgstr "Voltar para os resultados da busca"
-
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:17
 msgid "Backup"
 msgstr "Cópia de Segurança"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:38
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:36
 msgid "Backup / Flash Firmware"
 msgstr "Cópia de Segurança / Gravar Firmware"
 
@@ -868,11 +874,11 @@ msgid "Bad address specified!"
 msgstr "Endereço especificado está incorreto!"
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:158
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:288
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:368
 msgid "Band"
 msgstr "Banda"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:261
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:785
 msgid "Beacon Interval"
 msgstr "Intervalo do quadro de monitoramento (Beacon)"
 
@@ -886,80 +892,86 @@ 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:293
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:294
 msgid ""
 "Bind dynamically to interfaces rather than wildcard address (recommended as "
 "linux default)"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:16
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:48
 msgid "Bind interface"
 msgstr "Interface Vinculada"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:16
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:48
 msgid "Bind the tunnel to this interface (optional)."
 msgstr "Vincule o túnel a esta interface (opcional)"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:49
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:134
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:187
 msgid "Bitrate"
 msgstr "Taxa de bits"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:172
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
 msgid "Bogus NX Domain Override"
 msgstr "Substituir Domínio NX Falsos"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1634
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1840
 #: modules/luci-base/luasrc/model/network.lua:1420
 msgid "Bridge"
 msgstr "Ponte"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:264
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:368
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:678
 msgid "Bridge interfaces"
 msgstr "Juntar interfaces em uma ponte"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:906
 msgid "Bridge unit number"
 msgstr "Número da ponte"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:250
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:364
 msgid "Bring up on boot"
 msgstr "Levantar na iniciação"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:35
-msgid "Broadcom 802.11%s Wireless Controller"
-msgstr "Controlador Wireless Broadcom 802.11%s"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:45
-msgid "Broadcom BCM%04x 802.11 Wireless Controller"
-msgstr "Broadcom BCM%04x 802.11 Wireless Controlador"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1697
+msgid "Browse…"
+msgstr ""
 
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:18
 msgid "Buffered"
 msgstr "Buffered"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:75
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:134
 msgid "CA certificate; if empty it will be saved after the first connection."
 msgstr ""
 "Certificado da AC; se em branco, será salvo depois da primeira conexão."
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:7
+msgid "CLAT configuration failed"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:13
 msgid "CPU usage (%)"
 msgstr "Uso da CPU (%)"
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:21
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:53
 msgid "Call failed"
 msgstr "A chamada falhou"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1789
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:14
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:52
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:711
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:948
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1839
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:191
 #: modules/luci-mod-system/luasrc/view/admin_system/upgrade.htm:60
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:6
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:17
 msgid "Category"
 msgstr "Categoria"
 
@@ -977,13 +989,7 @@ msgstr "Cuidado: A atualização do sistema será forçada"
 msgid "Chain"
 msgstr "Cadeia"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:9
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:14
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:24
-msgid "Change login password"
-msgstr ""
-
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1744
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 msgid "Changes"
 msgstr "Alterações"
 
@@ -991,35 +997,23 @@ msgstr "Alterações"
 msgid "Changes applied."
 msgstr "Alterações aplicadas."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2004
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2545
 msgid "Changes have been reverted."
 msgstr "As mudanças foram revertidas."
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:43
 msgid "Changes the administrator password for accessing the device"
 msgstr "Muda a senha do administrador para acessar este dispositivo"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:10
-msgid "Changing password…"
-msgstr ""
-
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:162
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:45
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:87
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:174
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:376
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1618
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:186
 msgid "Channel"
 msgstr "Canal"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:119
-msgid ""
-"Channel %d is not available in the %s regulatory domain and has been auto-"
-"adjusted to %d."
-msgstr ""
-"O canal %d não está disponível no domínio regulatório '%s' e foi ajustado "
-"automaticamente para %d."
-
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:229
 msgid "Check"
 msgstr "Verificar"
@@ -1029,7 +1023,7 @@ msgid "Check filesystems before mount"
 msgstr ""
 "Execute a verificação do sistema de arquivos antes da montagem do dispositivo"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1806
 msgid "Check this option to delete the existing networks from this radio."
 msgstr "Marque esta opção para remover as redes existentes neste rádio."
 
@@ -1041,8 +1035,8 @@ msgstr "Soma de verificação"
 msgid "Choose mtdblock"
 msgstr "Escolha o bloco mtd"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:358
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:443
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1829
 msgid ""
 "Choose the firewall zone you want to assign to this interface. Select "
 "<em>unspecified</em> to remove the interface from the associated zone or "
@@ -1054,7 +1048,7 @@ msgstr ""
 "zona associada ou preencha o campo para criar uma nova zona associada a esta "
 "interface."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:834
 msgid ""
 "Choose the network(s) you want to attach to this wireless interface or fill "
 "out the <em>create</em> field to define a new network."
@@ -1062,11 +1056,11 @@ msgstr ""
 "Escolha a rede (s) que deseja anexar a este interface wireless ou preencha o "
 "<em> criar </em> campo para definir uma nova rede."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:614
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1023
 msgid "Cipher"
 msgstr "Cifra"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:61
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:91
 msgid "Cisco UDP encapsulation"
 msgstr "Encapsulamento UDP da Cisco"
 
@@ -1086,29 +1080,29 @@ msgstr ""
 "Clique em \"Salvar o bloco mtd\" para baixar o arquivo do bloco mtd "
 "especificado. (NOTA: ESTE RECURSO É PARA PROFISSIONAIS!)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1950
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:369
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:471
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2189
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:803
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:908
 msgid "Client"
 msgstr "Cliente"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:55
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:52
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:47
 msgid "Client ID to send when requesting DHCP"
 msgstr ""
 "Identificador do cliente enviando quando a requisição do DHCP é realizada"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:145
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:151
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:155
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:161
 msgid "Close"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:146
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:119
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:125
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:127
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:98
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:119
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:157
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:141
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:115
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:138
 msgid ""
 "Close inactive connection after the given amount of seconds, use 0 to "
 "persist connection"
@@ -1123,12 +1117,9 @@ msgstr "Fechar a lista..."
 #: modules/luci-base/luasrc/view/lease_status.htm:77
 #: modules/luci-base/luasrc/view/lease_status.htm:98
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:118
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:37
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:24
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1965
 #: modules/luci-mod-network/luasrc/view/admin_network/iface_status.htm:6
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:40
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:30
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:8
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:398
 #: modules/luci-mod-status/luasrc/view/admin_status/index/30-network.htm:11
 #: modules/luci-mod-status/luasrc/view/admin_status/index/50-dsl.htm:17
@@ -1142,15 +1133,19 @@ msgstr "Coletando dados..."
 msgid "Command"
 msgstr "Comando"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:193
+msgid "Command OK"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:41
+msgid "Command failed"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:64
 msgid "Comment"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:185
-msgid "Common Configuration"
-msgstr "Configuração Comum"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
 msgid ""
 "Complicates key reinstallation attacks on the client side by disabling "
 "retransmission of EAPOL-Key frames that are used to install keys. This "
@@ -1163,13 +1158,14 @@ msgstr ""
 "compatibilidade e reduzir a robustez da negociação de chaves, especialmente "
 "em ambientes com muito tráfego."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1744
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 #: modules/luci-base/luasrc/controller/admin/uci.lua:11
 #: modules/luci-mod-system/luasrc/view/admin_system/backupfiles.htm:9
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:13
 msgid "Configuration"
 msgstr "Configuração"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:21
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:63
 msgid "Configuration failed"
 msgstr "A configuração falhou"
@@ -1178,42 +1174,52 @@ msgstr "A configuração falhou"
 msgid "Configuration files will be kept"
 msgstr "Arquivos de configuração que serão mantidos"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1915
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2456
 msgid "Configuration has been applied."
 msgstr "A configuração foi aplicada."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1848
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2395
 msgid "Configuration has been rolled back!"
 msgstr "A configuração foi revertida!"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:43
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:942
+msgid "Confirm disconnect"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:50
 msgid "Confirmation"
 msgstr "Confirmação"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:32
-msgid "Connect"
-msgstr "Conectar"
-
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:72
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:105
 msgid "Connected"
 msgstr "Conectado"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:338
-msgid "Connection Limit"
-msgstr "Limite de conexão"
-
 #: modules/luci-base/htdocs/luci-static/resources/network.js:7
 #: modules/luci-base/luasrc/model/network.lua:27
 msgid "Connection attempt failed"
 msgstr "A tentativa de conexão falhou"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:203
+msgid "Connection lost"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/controller/admin/status.lua:32
 msgid "Connections"
 msgstr "Conexões"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1890
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:66
+msgid "Contents have been saved."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:618
+msgid "Continue"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2431
 msgid ""
 "Could not regain access to the device after applying the configuration "
 "changes. You might need to reconnect if you modified network related "
@@ -1224,47 +1230,37 @@ msgstr ""
 "configurações relacionadas a rede, como endereços IP ou credenciais de "
 "segurança da rede sem fio."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:135
 msgid "Country"
 msgstr "País"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:227
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:233
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:337
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:764
 msgid "Country Code"
 msgstr "Código do País"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:36
-msgid "Cover the following interface"
-msgstr "Utilizando a seguinte interface"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:43
-msgid "Cover the following interfaces"
-msgstr "Utilizando as seguintes interfaces"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:357
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:86
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:443
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1829
 msgid "Create / Assign firewall-zone"
 msgstr "Criar / Atribuir a uma zona de firewall"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:9
-msgid "Create Interface"
-msgstr "Criar Interface"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:33
-msgid "Create a bridge over multiple interfaces"
-msgstr "Criar uma ponte juntando múltiplas interfaces"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:735
+msgid "Create interface"
+msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:174
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:165
 msgid "Critical"
 msgstr "Crítico"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:178
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:169
 msgid "Cron Log Level"
 msgstr "Nível de Registro da Cron"
 
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:519
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:521
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:447
+msgid "Current power"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:552
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:554
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:51
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:53
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:82
@@ -1272,7 +1268,7 @@ msgstr "Nível de Registro da Cron"
 msgid "Custom Interface"
 msgstr "Interface Personalizada"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:36
 msgid "Custom delegated IPv6-prefix"
 msgstr "Prefixo IPv6 delegado personalizado"
 
@@ -1284,7 +1280,7 @@ msgstr ""
 "Arquivos personalizados (certificados, scripts) podem permanecer no sistema. "
 "Para evitar isso, restaure antes as configurações inicias."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:59
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:41
 msgid ""
 "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
 "\">LED</abbr>s if possible."
@@ -1292,46 +1288,47 @@ msgstr ""
 "Se possível, personaliza o comportamento dos <abbr title=\"Diodo Emissor de "
 "Luz\">LED</abbr>s."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:799
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1223
 msgid "DAE-Client"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:807
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1231
 msgid "DAE-Port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:815
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1239
 msgid "DAE-Secret"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:448
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:459
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:279
 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:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:61
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:62
 msgid "DHCP and DNS"
 msgstr "DHCP e DNS"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1195
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1385
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:16
 #: modules/luci-base/luasrc/model/network.lua:968
 msgid "DHCP client"
 msgstr "Cliente DHCP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:571
 msgid "DHCP-Options"
 msgstr "Opções de DHCP"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_dhcpv6.lua:7
 msgid "DHCPv6 client"
 msgstr "Cliente DHCPv6"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:540
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:594
 msgid "DHCPv6-Mode"
 msgstr "Modo DHCPv6"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:529
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:583
 msgid "DHCPv6-Service"
 msgstr "Serviço DHCPv6"
 
@@ -1348,31 +1345,31 @@ msgstr "Serviço DHCPv6"
 msgid "DNS"
 msgstr "DNS"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:183
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
 msgid "DNS forwardings"
 msgstr "Encaminhamentos DNS"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:30
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:37
 msgid "DNS-Label / FQDN"
 msgstr "Rótulo DNS / FQDN"
 
-#: 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:136
 msgid "DNSSEC"
 msgstr "DNSSEC"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:139
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
 msgid "DNSSEC check unsigned"
 msgstr "Verificar DNSSEC sem assinatura"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:73
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:99
 msgid "DPD Idle Timeout"
 msgstr "Tempo de expiração para ociosidade do DPD"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:14
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:41
 msgid "DS-Lite AFTR address"
 msgstr "Endereço DS-Lite AFTR"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:92
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:815
 #: modules/luci-mod-status/luasrc/view/admin_status/index/50-dsl.htm:14
 msgid "DSL"
 msgstr "DSL"
@@ -1381,11 +1378,11 @@ msgstr "DSL"
 msgid "DSL Status"
 msgstr "Estado da DSL"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:125
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:848
 msgid "DSL line mode"
 msgstr "Modo de linha DSL"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:519
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:963
 msgid "DTIM Interval"
 msgstr ""
 "Intervalo <abbr title=\"Mensagem Indicativa de Envio de Tráfego/Delivery "
@@ -1399,42 +1396,45 @@ msgstr "DUID"
 msgid "Data Rate"
 msgstr "Taxa de Dados"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:169
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:180
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:160
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:171
 msgid "Debug"
 msgstr "Depurar"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:759
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:783
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:807
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1183
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1207
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1231
 msgid "Default %d"
 msgstr "Padrão %d"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:82
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:107
 msgid "Default Route"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:17
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:81
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:51
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:32
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:48
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:85
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:65
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:80
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:108
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:146
 msgid "Default gateway"
 msgstr "Roteador Padrão"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:541
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:594
 msgid "Default is stateless + stateful"
 msgstr "O padrão é sem estado + com estado"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:70
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:54
 msgid "Default state"
 msgstr "Estado padrão"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:503
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:553
 msgid "Define a name for this network."
 msgstr "Define um nome para esta rede."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:514
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:571
 msgid ""
 "Define additional DHCP options, for example "
 "\"<code>6,192.168.2.1,192.168.2.2</code>\" which advertises different DNS "
@@ -1444,35 +1444,47 @@ msgstr ""
 "\"<code>6,192.168.2.1,192.168.2.2</code>\" que anuncia diferentes servidores "
 "DNS para os clientes."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:705
-#: modules/luci-base/htdocs/luci-static/resources/form.js:958
-#: modules/luci-base/htdocs/luci-static/resources/form.js:959
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1271
+#: modules/luci-base/htdocs/luci-static/resources/form.js:966
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1210
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1216
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1524
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1758
 #: modules/luci-base/luasrc/view/cbi/nsection.htm:11
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:162
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:16
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:41
 msgid "Delete"
 msgstr "Apagar"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:178
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:187
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:193
 msgid "Delete key"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:45
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1654
+msgid "Delete permission denied"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1656
+msgid "Delete request failed: %d %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:723
 msgid "Delete this network"
 msgstr "Apagar esta rede"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:519
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:963
 msgid "Delivery Traffic Indication Message Interval"
 msgstr "Intervalo da Mensagem Indicativa de Envio de Tráfego"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:102
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:108
 msgid "Description"
 msgstr "Descrição"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:224
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1754
+msgid "Deselect"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:215
 msgid "Design"
 msgstr "Tema"
 
@@ -1490,10 +1502,12 @@ msgstr ""
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:177
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:43
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:13
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:38
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:73
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:33
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:52
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:85
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:86
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:72
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:154
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:253
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:86
@@ -1501,15 +1515,24 @@ msgstr ""
 msgid "Device"
 msgstr "Dispositivo"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:138
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:737
 msgid "Device Configuration"
 msgstr "Configuração do Dispositivo"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:81
+msgid "Device is not active"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/reboot.htm:23
 msgid "Device is rebooting..."
 msgstr "O dispositivo está reiniciando..."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1889
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:167
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:513
+msgid "Device is restarting…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2430
 msgid "Device unreachable!"
 msgstr "Dispositivo não alcançável!"
 
@@ -1518,26 +1541,26 @@ 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:123
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:78
 #: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:61
 msgid "Diagnostics"
 msgstr "Diagnóstico"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:45
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:60
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:101
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:93
 msgid "Dial number"
 msgstr "Número de discagem"
 
-#: modules/luci-base/luasrc/view/cbi/filebrowser.htm:99
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1554
 msgid "Directory"
 msgstr "Diretório"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:131
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:715
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:754
 msgid "Disable"
 msgstr "Desabilitar"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:472
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:531
 msgid ""
 "Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for "
 "this interface."
@@ -1545,72 +1568,67 @@ msgstr ""
 "Desabilita <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> "
 "para esta interface."
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:64
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:93
 msgid "Disable Encryption"
 msgstr "Desabilitar Cifragem"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:530
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:973
 msgid "Disable Inactivity Polling"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:713
 msgid "Disable this network"
 msgstr "Desabilitar esta rede"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:44
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:54
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:68
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:37
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:43
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:37
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1534
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:76
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:107
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:99
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:51
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:95
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:82
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:69
 msgid "Disabled"
 msgstr "Desabilitado"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1139
-msgid "Disabled (default)"
-msgstr "Desabilitado (padrão)"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:544
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:987
 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:192
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:193
 msgid "Discard upstream RFC1918 responses"
 msgstr ""
 "Descartar respostas de servidores externos para redes privadas (RFC1918)"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:92
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:114
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:956
 msgid "Disconnect"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:22
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:64
 msgid "Disconnection attempt failed"
 msgstr "A tentativa de desconexão falhou"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1121
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1762
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1855
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:17
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1375
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1995
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2314
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2401
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1634
 msgid "Dismiss"
 msgstr "Dispensar"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:240
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:334
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:770
 msgid "Distance Optimization"
 msgstr "Otimização de Distância"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:241
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:770
 msgid "Distance to farthest network member in meters."
 msgstr "Distância para o computador mais distante da rede (em metros)."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:347
-msgid "Diversity"
-msgstr "Diversidade"
-
-#: 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:61
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
@@ -1622,39 +1640,47 @@ 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:158
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:159
 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:123
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:124
 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:118
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
 msgid "Do not forward reverse lookups for local networks"
 msgstr "Não encaminhe buscas por endereço reverso das redes local"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:173
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1639
+msgid "Do you really want to delete \"%s\" ?"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:188
 msgid "Do you really want to delete the following SSH key?"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1637
+msgid "Do you really want to recursively delete the directory \"%s\" ?"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:74
 msgid "Domain required"
 msgstr "Requerer domínio"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:205
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:206
 msgid "Domain whitelist"
 msgstr "Lista branca de domínios"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:34
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:67
 msgid "Don't Fragment"
 msgstr "Não Fragmentar"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:74
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:75
 msgid ""
 "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
 "<abbr title=\"Domain Name System\">DNS</abbr>-Name"
@@ -1675,21 +1701,21 @@ msgstr "Baixar a cópia de segurança"
 msgid "Download mtdblock"
 msgstr "Baixar o bloco mtd"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:853
 msgid "Downstream SNR offset"
 msgstr ""
 "Deslocamento <abbr title=\"Razão entre Sinal e Ruído/Signal to Noise Ratio"
 "\">SNR</abbr> do sinal recebido"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:914
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1169
 msgid "Drag to reorder"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:9
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:11
 msgid "Dropbear Instance"
 msgstr "Dropbear"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:6
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 msgid ""
 "Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access "
 "and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
@@ -1698,21 +1724,22 @@ msgstr ""
 "\">(SSH)</abbr> e um servidor <abbr title=\"Cópia Segura\">SCP</abbr> "
 "integrado"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:11
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:14
 msgid "Dual-Stack Lite (RFC6333)"
 msgstr "Duas Pilhas Leve (RFC6333)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:493
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:547
 msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 msgstr ""
 "<abbr title=\"Protocolo de Configuração Dinâmica de Hosts\">DHCP</abbr> "
 "Dinâmico"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:60
 msgid "Dynamic tunnel"
 msgstr "Túnel dinâmico"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:494
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:547
 msgid ""
 "Dynamically allocate DHCP addresses for clients. If disabled, only clients "
 "having static leases will be served."
@@ -1720,21 +1747,21 @@ msgstr ""
 "Aloca dinamicamente os endereços do DHCP para os clientes. Se desabilitado, "
 "somente os clientes com atribuições estáticas serão servidos."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:67
 msgid "EA-bits length"
 msgstr "Comprimento dos bits EA"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:990
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1386
 msgid "EAP-Method"
 msgstr "Método EAP"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:934
-#: modules/luci-base/htdocs/luci-static/resources/form.js:935
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1199
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1188
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1191
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1450
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:154
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:160
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:38
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:291
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:720
 msgid "Edit"
 msgstr "Editar"
 
@@ -1746,24 +1773,24 @@ msgstr ""
 "Edite os dados de configuração brutos abaixo para arrumar qualquer erro e "
 "clique em \"Salvar\" para recarregar a página."
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:38
-msgid "Edit this interface"
-msgstr "Editar esta interface"
-
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:718
 msgid "Edit this network"
 msgstr "Editar esta rede"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:669
+msgid "Edit wireless network"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:167
 msgid "Emergency"
 msgstr "Emergência"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:127
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:715
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:754
 msgid "Enable"
 msgstr "Ativar"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:414
 msgid ""
 "Enable <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> "
 "snooping"
@@ -1772,68 +1799,69 @@ msgstr ""
 "Grupos da Internet/Internet Group Management Protocol\">IGMP</abbr> "
 "(Snooping)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:271
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:412
 msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 msgstr "Ativar <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:41
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:60
 msgid "Enable HE.net dynamic endpoint update"
 msgstr "Ativar a atualização de ponto final dinâmico HE.net"
 
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:51
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:89
 msgid "Enable IPv6 negotiation"
 msgstr "Ativar a negociação de IPv6"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:23
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:35
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:41
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:35
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:37
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:49
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:80
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:54
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:67
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:93
 msgid "Enable IPv6 negotiation on the PPP link"
 msgstr "Ativar a negociação de IPv6 no enlace PPP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:143
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:188
 msgid "Enable Jumbo Frame passthrough"
 msgstr "Ativar o encaminhamento de quadros jumbos (Jumbo Frames)"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:244
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:235
 msgid "Enable NTP client"
 msgstr "Ativar o cliente <abbr title=\"Network Time Protocol\">NTP</abbr>"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:69
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:96
 msgid "Enable Single DES"
 msgstr "Habilitar DES Simples"
 
-#: 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:267
 msgid "Enable TFTP server"
 msgstr "Ativar servidor TFTP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:134
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:180
 msgid "Enable VLAN functionality"
 msgstr "Ativar funcionalidade de VLAN"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1595
 msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
 msgstr "Habilite o botão WPS. requer WPA(2)-PSK"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1175
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
 msgid "Enable key reinstallation (KRACK) countermeasures"
 msgstr ""
 "Habilitar contramedidas contra o ataque de reinstalação de chave (KRACK)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:138
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:183
 msgid "Enable learning and aging"
 msgstr "Ativar o aprendizado e obsolescência"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:194
 msgid "Enable mirroring of incoming packets"
 msgstr "Habilitar espelhamento dos pacotes entrantes"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:151
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:195
 msgid "Enable mirroring of outgoing packets"
 msgstr "Habilitar espelhamento dos pacotes saintes"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:34
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:67
 msgid "Enable the DF (Don't Fragment) flag of the encapsulating packets."
 msgstr "Habilita o campo DF (Não Fragmentar) dos pacotes encapsulados."
 
@@ -1841,7 +1869,7 @@ msgstr "Habilita o campo DF (Não Fragmentar) dos pacotes encapsulados."
 msgid "Enable this mount"
 msgstr "Ativar esta montagem"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:713
 msgid "Enable this network"
 msgstr "Habilitar esta rede"
 
@@ -1849,24 +1877,24 @@ msgstr "Habilitar esta rede"
 msgid "Enable this swap"
 msgstr "Ativar este espaço de troca (swap)"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:37
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:88
 msgid "Enable/Disable"
 msgstr "Ativar/Desativar"
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:76
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:152
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:251
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:41
 msgid "Enabled"
 msgstr "Ativado"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:277
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:414
 msgid "Enables IGMP snooping on this bridge"
 msgstr ""
 "Habilitar o monitoramento do <abbr title=\"Protocolo de Gerenciamento de "
 "Grupos da Internet/Internet Group Management Protocol\">IGMP</abbr> "
 "(Snooping) nesta ponte"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:892
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1310
 msgid ""
 "Enables fast roaming among access points that belong to the same Mobility "
 "Domain"
@@ -1874,28 +1902,32 @@ msgstr ""
 "Ativa a troca rápida entre pontos de acesso que pertencem ao mesmo Domínio "
 "de Mobilidade"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:272
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:412
 msgid "Enables the Spanning Tree Protocol on this bridge"
 msgstr "Ativa o protocolo STP nesta ponte"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:120
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:180
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:59
+msgid "Encapsulation limit"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:843
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:901
 msgid "Encapsulation mode"
 msgstr "Modo de encapsulamento"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:76
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:603
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:129
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:992
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1621
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:177
 msgid "Encryption"
 msgstr "Cifragem"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:155
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:128
 msgid "Endpoint Host"
 msgstr "Equipamento do ponto final"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:165
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:132
 msgid "Endpoint Port"
 msgstr "Porta do ponto final"
 
@@ -1907,16 +1939,21 @@ msgstr "Entre com valor personalizado"
 msgid "Enter custom values"
 msgstr "Entre com valores personalizados"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:273
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:271
 msgid "Erasing..."
 msgstr "Apagando..."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:95
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:96
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:97
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:98
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:99
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:106
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:107
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:108
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:109
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:110
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:173
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:164
 msgid "Error"
 msgstr "Erro"
 
@@ -1924,24 +1961,28 @@ msgstr "Erro"
 msgid "Errored seconds (ES)"
 msgstr "Segundos com erro (ES)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1646
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1852
 #: modules/luci-base/luasrc/model/network.lua:1432
 msgid "Ethernet Adapter"
 msgstr "Adaptador Ethernet"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1637
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1843
 #: modules/luci-base/luasrc/model/network.lua:1422
 msgid "Ethernet Switch"
 msgstr "Switch Ethernet"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:303
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
 msgid "Exclude interfaces"
 msgstr "Excluir interfaces"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:153
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
 msgid "Expand hosts"
 msgstr "Expandir arquivos de equipamentos conhecidos (hosts)"
 
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:195
+msgid "Expecting an hexadecimal assignment hint"
+msgstr ""
+
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:59
 msgid "Expecting: %s"
 msgstr ""
@@ -1950,67 +1991,83 @@ msgstr ""
 msgid "Expires"
 msgstr "Expira"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:488
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:543
 msgid ""
 "Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
 msgstr ""
 "Tempo de expiração dos endereços atribuídos. Mínimo é 2 minutos (<code>2m</"
 "code>)."
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:8
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:19
 msgid "External"
 msgstr "Externo"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:971
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1377
 msgid "External R0 Key Holder List"
 msgstr "Lista dos Detentor de Chave R0 Externa"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:980
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1381
 msgid "External R1 Key Holder List"
 msgstr "Lista dos Detentor de Chave R1 Externa"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:150
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:141
 msgid "External system log server"
 msgstr "Servidor externo de registros do sistema (syslog)"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:155
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:146
 msgid "External system log server port"
 msgstr "Porta do servidor externo de registro do sistema (syslog)"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:160
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:151
 msgid "External system log server protocol"
 msgstr "Protocolo do servidor externo de registro do sistema (syslog)"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:18
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:79
 msgid "Extra SSH command options"
 msgstr "Opções adicionais do comando SSH"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:940
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1351
 msgid "FT over DS"
 msgstr ""
 "<abbr title=\"Transição Rápida/Fast Transition\">FT</abbr> sobre  <abbr "
 "title=\"Sistema Distribuído/Distributed System\">DS</abbr>"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:941
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1352
 msgid "FT over the Air"
 msgstr "<abbr title=\"Transição Rápida/Fast Transition\">FT</abbr> pelo ar"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:938
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1349
 msgid "FT protocol"
 msgstr ""
 "Protocolo de <abbr title=\"Transição Rápida/Fast Transition\">FT</abbr>"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1842
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:82
+msgid "Failed to change the system password."
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2389
 msgid "Failed to confirm apply within %ds, waiting for rollback…"
 msgstr ""
 "A confirmação das mudanças na configuração não foram confirmadas em %d "
 "segundos. Aguardando a reversão da configuração..."
 
-#: modules/luci-base/luasrc/view/cbi/filebrowser.htm:106
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:45
+msgid "Failed to execute \"/etc/init.d/%s %s\" action: %s"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1561
 msgid "File"
 msgstr "Arquivo"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:279
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1514
+msgid "File not accessible"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1698
+msgid "Filename"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:280
 msgid "Filename of the boot image advertised to clients"
 msgstr "Nome do arquivo da imagem de boot anunciada para os clientes"
 
@@ -2020,14 +2077,15 @@ 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:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:118
 msgid "Filter private"
 msgstr "Filtrar endereços privados"
 
-#: 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:123
 msgid "Filter useless"
 msgstr "Filtrar consultas inúteis"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:23
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:65
 msgid "Finalizing failed"
 msgstr "A finalização falhou"
@@ -2041,7 +2099,7 @@ msgstr ""
 "conectados e substitua a configuração com valores padrão baseados no que foi "
 "detectado"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:696
 msgid "Find and join network"
 msgstr "Procurar e conectar à rede"
 
@@ -2053,11 +2111,11 @@ msgstr "Terminar"
 msgid "Firewall"
 msgstr "Firewall"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:77
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:76
 msgid "Firewall Mark"
 msgstr "Marca do Firewall"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:193
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:278
 msgid "Firewall Settings"
 msgstr "Configurações do Firewall"
 
@@ -2065,7 +2123,7 @@ msgstr "Configurações do Firewall"
 msgid "Firewall Status"
 msgstr "Estado do Firewall"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:137
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:860
 msgid "Firmware File"
 msgstr "Arquivo da Firmware"
 
@@ -2073,7 +2131,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:225
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:226
 msgid "Fixed source port for outbound DNS queries"
 msgstr "Porta de origem fixa para saída de consultas DNS"
 
@@ -2093,35 +2151,35 @@ msgstr "Gravar nova imagem do firmware"
 msgid "Flash operations"
 msgstr "Operações na memória flash"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:194
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:192
 msgid "Flashing..."
 msgstr "Gravando na flash..."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:498
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:550
 msgid "Force"
 msgstr "Forçar"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:258
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:782
 msgid "Force 40MHz mode"
 msgstr "Force o modo 40MHz"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:622
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1031
 msgid "Force CCMP (AES)"
 msgstr "Forçar CCMP (AES)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:499
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:550
 msgid "Force DHCP on this network even if another server is detected."
 msgstr "Forçar o DHCP nesta rede mesmo se outro servidor for detectado."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:623
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1032
 msgid "Force TKIP"
 msgstr "Forçar TKIP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:624
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1033
 msgid "Force TKIP and CCMP (AES)"
 msgstr "Forçar TKIP e CCMP (AES)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:795
 msgid "Force link"
 msgstr "Forçar o enlace"
 
@@ -2129,7 +2187,7 @@ msgstr "Forçar o enlace"
 msgid "Force upgrade"
 msgstr "Forçar a atualização"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:60
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:90
 msgid "Force use of NAT-T"
 msgstr "Force o uso do NAT-T"
 
@@ -2137,7 +2195,7 @@ msgstr "Force o uso do NAT-T"
 msgid "Form token mismatch"
 msgstr "Chave eletrônica do formulário não casa"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:34
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:164
 msgid "Forward DHCP traffic"
 msgstr "Encaminhar tráfego DHCP"
 
@@ -2147,48 +2205,41 @@ msgstr ""
 "Segundos a frente de correção de erros ( <abbr title=\"Forward Error "
 "Correction Seconds\">FECS</abbr>)"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:28
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:161
 msgid "Forward broadcast traffic"
 msgstr "Encaminhar tráfego broadcast"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:375
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:809
 msgid "Forward mesh peer traffic"
 msgstr "Encaminhar o tráfego do parceiro da malha"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:186
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:908
 msgid "Forwarding mode"
 msgstr "Modo de encaminhamento"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:255
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:596
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:774
 msgid "Fragmentation Threshold"
 msgstr "Limiar de Fragmentação"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:332
-msgid "Frame Bursting"
-msgstr "Explosão de Quadros (Frame Bursting)"
-
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:17
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:28
 msgid "Free"
 msgstr "Livre"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:91
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:89
 msgid ""
-"Further information about WireGuard interfaces and peers at <a href=\"http://"
-"wireguard.com\">wireguard.com</a>."
+"Further information about WireGuard interfaces and peers at <a href='http://"
+"wireguard.com'>wireguard.com</a>."
 msgstr ""
-"Mais informações sobre interfaces e parceiros WireGuard em <a href=\"http://"
-"wireguard.com\">wireguard.com</a>."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:45
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:130
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:186
 msgid "GHz"
 msgstr "GHz"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:29
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:36
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:91
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:77
 msgid "GPRS only"
 msgstr "Somente GPRS"
 
@@ -2197,28 +2248,28 @@ msgstr "Somente GPRS"
 msgid "Gateway"
 msgstr "Roteador"
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:35
+msgid "Gateway Ports"
+msgstr "Acesso remoto a portas encaminhadas"
+
 #: modules/luci-base/htdocs/luci-static/resources/network.js:9
 #: modules/luci-base/luasrc/model/network.lua:29
 msgid "Gateway address is invalid"
 msgstr "O endereço do roteador padrão é inválido"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:46
-msgid "Gateway ports"
-msgstr "Acesso remoto a portas encaminhadas"
-
-#: 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:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:275
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:23
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:112
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:103
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:49
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:33
 msgid "General Settings"
 msgstr "Configurações Gerais"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:188
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:462
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:175
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:141
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:361
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:504
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:895
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:741
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:796
 msgid "General Setup"
 msgstr "Configurações Gerais"
 
@@ -2226,7 +2277,7 @@ msgstr "Configurações Gerais"
 msgid "Generate Config"
 msgstr "Gerar Configuração"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:945
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1355
 msgid "Generate PMK locally"
 msgstr ""
 "Gerar a <abbr title=\"Chave mestre do emparelhamento/Pairwise Master Key"
@@ -2236,11 +2287,7 @@ msgstr ""
 msgid "Generate archive"
 msgstr "Gerar arquivo"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:63
-msgid "Generic 802.11%s Wireless Controller"
-msgstr "Generico 802.11%s Wireless Controlador"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:26
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:74
 msgid "Given password confirmation did not match, password not changed!"
 msgstr "A senha de confirmação informada não casa. Senha não alterada!"
 
@@ -2248,7 +2295,7 @@ msgstr "A senha de confirmação informada não casa. Senha não alterada!"
 msgid "Global Settings"
 msgstr "Configurações Globais"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:806
 msgid "Global network options"
 msgstr "Opções de rede globais"
 
@@ -2259,35 +2306,29 @@ msgstr "Opções de rede globais"
 msgid "Go to password configuration..."
 msgstr "Ir para a configuração de senha..."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:857
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1369
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1112
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1616
 #: modules/luci-base/luasrc/view/cbi/full_valueheader.htm:4
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:58
 msgid "Go to relevant configuration page"
 msgstr "Ir para a página de configuração pertinente"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:38
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:66
 msgid "Group Password"
 msgstr "Senha do Grupo"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:11
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:22
 msgid "Guest"
 msgstr "Convidado"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:73
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:81
 msgid "HE.net password"
 msgstr "Senha HE.net"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:60
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:73
 msgid "HE.net username"
 msgstr "Usuário do HE.net"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:310
-msgid "HT mode (802.11n)"
-msgstr ""
-"Modo <abbr title=\"High Throughput/Alta Taxa de Transferência\">HT</abbr>  "
-"(802.11n)"
-
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:16
 msgid "Hang Up"
 msgstr "Suspender"
@@ -2298,7 +2339,7 @@ msgstr ""
 "Erros de Código de Erro de Cabeçalho (<abbr title=\"Header Error Code\">HEC</"
 "abbr>)"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:103
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 msgid ""
 "Here you can configure the basic aspects of your device like its hostname or "
 "the timezone."
@@ -2306,9 +2347,7 @@ msgstr ""
 "Aqui você pode configurar os aspectos básicos do seu equipamento, como o "
 "nome do equipamento ou o fuso horário."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:499
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:556
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:579
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:941
 msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr ""
 "Ocultar <abbr title=\"Identificador de Conjunto de Serviços Estendidos"
@@ -2321,14 +2360,15 @@ msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:92
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1959
 msgid "Host"
 msgstr "Equipamento"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:20
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:21
 msgid "Host entries"
 msgstr "Entradas de Equipamentos"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:48
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:171
 msgid "Host expiry timeout"
 msgstr "Tempo limite de expiração de equipamento"
 
@@ -2338,47 +2378,47 @@ msgstr ""
 "<abbr title=\"Endereço do Protocolo de Internet\">IP</abbr> do Equipamento "
 "ou Rede"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:118
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:102
 msgid "Host-Uniq tag content"
 msgstr "Conteúdo da etiqueta única do equipamento"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:71
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:31
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:316
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:25
+#: 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:317
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:26
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:17
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:125
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:116
 msgid "Hostname"
 msgstr "Nome do equipamento"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:12
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:22
 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:18
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:19
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:67
 msgid "Hostnames"
 msgstr "Nome dos equipamentos"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:13
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:24
 msgid "Hybrid"
 msgstr "Híbrido"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:45
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:75
 msgid "IKE DH Group"
 msgstr ""
 "Grupo <abbr title=\"Diffie-Hellman\">DH</abbr>  do <abbr title=\"Internet "
 "Key Exchange/Troca de Chaves na Internet\">IKE</abbr>"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:41
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:59
 msgid "IP Addresses"
 msgstr "Endereços IP"
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:40
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:80
 msgid "IP Protocol"
 msgstr "Protocolo IP"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:29
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:30
 msgid "IP address"
 msgstr "Endereço IP"
 
@@ -2397,6 +2437,11 @@ msgstr "O endereço IP está ausente"
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:20
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:21
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:22
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:79
+#: 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/network.js:89
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:90
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:91
@@ -2404,7 +2449,7 @@ msgstr "O endereço IP está ausente"
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:93
 #: 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/luasrc/model/cbi/admin_network/proto_ncm.lua:42
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:82
 msgid "IPv4"
 msgstr "IPv4"
 
@@ -2416,24 +2461,23 @@ msgstr "Firewall para IPv4"
 msgid "IPv4 Upstream"
 msgstr "Enlace IPv4 Superior"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:57
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:178
 msgid "IPv4 address"
 msgstr "Endereço IPv4"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:26
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:33
 msgid "IPv4 assignment length"
 msgstr "Tamanho da atribuição IPv4"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:104
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:181
 msgid "IPv4 broadcast"
 msgstr "Broadcast IPv4"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:100
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:180
 msgid "IPv4 gateway"
 msgstr "Roteador padrão IPv4"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:92
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:179
 msgid "IPv4 netmask"
 msgstr "Máscara de rede IPv4"
 
@@ -2441,24 +2485,25 @@ msgstr "Máscara de rede IPv4"
 msgid "IPv4 network in address/netmask notation"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:25
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:52
 msgid "IPv4 prefix"
 msgstr "Prefixo IPv4"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:42
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:30
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:55
 msgid "IPv4 prefix length"
 msgstr "Tamanho do prefixo IPv4"
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:43
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:83
 msgid "IPv4+IPv6"
 msgstr "IPv4+IPv6"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:72
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:34
 msgid "IPv4-Address"
 msgstr "Endereço IPv4"
 
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:10
 #: protocols/luci-proto-ipip/luasrc/model/network/proto_ipip.lua:9
 msgid "IPv4-in-IPv4 (RFC2003)"
 msgstr "IPv4-in-IPv4 (RFC2003)"
@@ -2473,6 +2518,16 @@ msgstr "IPv4-in-IPv4 (RFC2003)"
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:30
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:31
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:32
+#: 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/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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:89
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:90
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:91
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:92
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:95
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:96
@@ -2485,7 +2540,7 @@ msgstr "IPv4-in-IPv4 (RFC2003)"
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:103
 #: 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/luasrc/model/cbi/admin_network/proto_ncm.lua:44
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:84
 msgid "IPv6"
 msgstr "IPv6"
 
@@ -2497,11 +2552,11 @@ msgstr "Firewall para IPv6"
 msgid "IPv6 Neighbours"
 msgstr "Vizinhos IPv6"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:464
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:506
 msgid "IPv6 Settings"
 msgstr "Configurações IPv6"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:195
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:810
 msgid "IPv6 ULA-Prefix"
 msgstr ""
 "Prefixo <abbr title=\"Unique Local Address/Endereço Local Único\">ULA</abbr> "
@@ -2511,21 +2566,21 @@ msgstr ""
 msgid "IPv6 Upstream"
 msgstr "Enlace IPv6 Superior"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:202
 msgid "IPv6 address"
 msgstr "Endereço IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:23
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:189
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:31
 msgid "IPv6 assignment hint"
 msgstr "Sugestão de atribuição IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:18
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:184
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:27
 msgid "IPv6 assignment length"
 msgstr "Tamanho da atribuição IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:207
 msgid "IPv6 gateway"
 msgstr "Roteador padrão do IPv6"
 
@@ -2533,22 +2588,22 @@ msgstr "Roteador padrão do IPv6"
 msgid "IPv6 network in address/netmask notation"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:37
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:59
 msgid "IPv6 prefix"
 msgstr "Prefixo IPv6"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:34
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:45
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:63
 msgid "IPv6 prefix length"
 msgstr "Tamanho Prefixo IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:33
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:211
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:57
 msgid "IPv6 routed prefix"
 msgstr "Prefixo roteável IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:143
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:215
 msgid "IPv6 suffix"
 msgstr "Sufixo IPv6"
 
@@ -2558,31 +2613,35 @@ msgid "IPv6-Address"
 msgstr "Endereço IPv6"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:93
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:104
 msgid "IPv6-PD"
 msgstr "IPv6-PD"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:10
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:13
 msgid "IPv6-in-IPv4 (RFC4213)"
 msgstr "IPv6-in-IPv4 (RFC4213)"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:17
 msgid "IPv6-over-IPv4 (6rd)"
 msgstr "IPv6-sobre-IPv4 (6rd)"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:15
 msgid "IPv6-over-IPv4 (6to4)"
 msgstr "IPv6-sobre-IPv4 (6to4)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1075
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1478
 msgid "Identity"
 msgstr "Identidade PEAP"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:70
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:96
 msgid "If checked, 1DES is enabled"
 msgstr "Se marcado, a cifragem 1DES será habilitada"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:65
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:93
 msgid "If checked, encryption is disabled"
 msgstr "Se marcado, a cifragem estará desabilitada"
 
@@ -2603,36 +2662,36 @@ msgstr ""
 "Se especificado, monta o dispositivo pela etiqueta da partiçãoo ao invés de "
 "um nó de dispositivo fixo"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:27
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:71
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:18
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:82
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:52
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:17
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:29
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:33
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:68
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:85
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:32
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:45
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:45
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:24
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:44
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:116
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:48
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:85
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:65
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:33
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:80
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:108
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:146
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:74
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:97
 msgid "If unchecked, no default route is configured"
 msgstr "Se desmarcado, nenhuma rota padrão será configurada"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:34
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:86
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:35
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:99
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:47
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:60
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:60
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:39
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:59
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:124
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:39
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:116
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:59
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:103
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:64
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:77
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:100
 msgid "If unchecked, the advertised DNS server addresses are ignored"
 msgstr ""
 "Se desmarcado, os endereços dos servidores DNS anunciados serão ignorados"
@@ -2653,15 +2712,15 @@ 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:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:102
 msgid "Ignore <code>/etc/hosts</code>"
 msgstr "Ignorar <code>/etc/hosts</code>"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:471
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:531
 msgid "Ignore interface"
 msgstr "Ignorar interface"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:90
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:91
 msgid "Ignore resolve file"
 msgstr "Ignorar arquivo de resolução de nomes (resolv.conf)"
 
@@ -2681,12 +2740,12 @@ msgstr ""
 "Para prevenir acesso não autorizado neste sistema, sua requisição foi "
 "bloqueada. Clique abaixo em \"Continuar »\" para retornar à página anterior."
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:145
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:118
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:124
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:126
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:97
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:118
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:157
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:141
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:115
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:138
 msgid "Inactivity timeout"
 msgstr "Tempo limite de inatividade"
 
@@ -2694,23 +2753,25 @@ msgstr "Tempo limite de inatividade"
 msgid "Inbound:"
 msgstr "Entrando:"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:170
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:161
 msgid "Info"
 msgstr "Informação"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:105
 msgid "Information"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:25
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:67
 msgid "Initialization failure"
 msgstr "Falha na iniciação"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:34
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:87
 msgid "Initscript"
 msgstr "Script de iniciação"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:26
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:122
 msgid "Initscripts"
 msgstr "Scripts de iniciação"
 
@@ -2718,55 +2779,74 @@ msgstr "Scripts de iniciação"
 msgid "Install iputils-traceroute6 for IPv6 traceroute"
 msgstr "Instale iputils-traceroute6 para rastrear rotas IPv6"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:223
-msgid "Install package %q"
-msgstr "Instalar pacote %q"
-
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:220
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:120
 msgid "Install protocol extensions..."
 msgstr "Instalar extensões de protocolo..."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:416
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:423
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:683
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:687
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:26
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:284
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:342
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:47
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:134
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:14
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:16
 msgid "Interface"
 msgstr "Interface"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:58
 msgid "Interface %q device auto-migrated from %q to %q."
 msgstr "Dispositivo da interface %q foi migrada automaticamente de %q para &q."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:356
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:792
 msgid "Interface Configuration"
 msgstr "Configuração da Interface"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:51
-msgid "Interface Overview"
-msgstr "Visão Geral da Interface"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:99
+msgid "Interface has %d pending changes"
+msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:57
+msgid "Interface is marked for deletion"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:162
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:3
 msgid "Interface is reconnecting..."
 msgstr "A interface está reconectando..."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:162
+msgid "Interface is shutting down..."
+msgstr "A interface está desligando..."
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:205
+msgid "Interface is starting..."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:208
+msgid "Interface is stopping..."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:954
 msgid "Interface name"
 msgstr "Nome da Interface"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:34
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:224
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:131
 msgid "Interface not present or not connected yet."
 msgstr "A interface não está presente ou não está conectada ainda."
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:88
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:16
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:11
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:287
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:54
 msgid "Interfaces"
 msgstr "Interfaces"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:9
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:20
 msgid "Internal"
 msgstr "Interno"
 
@@ -2779,23 +2859,39 @@ msgstr "Erro Interno no Servidor"
 msgid "Invalid"
 msgstr "Valor inválido"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:311
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:10
+msgid "Invalid Base64 key string"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:281
 msgid "Invalid VLAN ID given! Only IDs between %d and %d are allowed."
 msgstr ""
 "O valor informado do ID da VLAN é inválido! Somente valores entre %d e %d "
 "são permitidos."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:307
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:290
 msgid "Invalid VLAN ID given! Only unique IDs are allowed"
 msgstr ""
 "O valor informado do ID da VLAN é inválido! Somente valores únicos são "
 "permitidos"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:195
+msgid "Invalid argument"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:194
+msgid "Invalid command"
+msgstr ""
+
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:80
+msgid "Invalid hexadecimal value"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/sysauth.htm:12
 msgid "Invalid username and/or password! Please try again."
 msgstr "Usuário e/ou senha inválida! Por favor, tente novamente."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:508
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:950
 msgid "Isolate Clients"
 msgstr "Isolar Clientes"
 
@@ -2814,15 +2910,15 @@ msgstr ""
 msgid "JavaScript required!"
 msgstr "É necessário JavaScript!"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:52
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1691
 msgid "Join Network"
 msgstr "Conectar à Rede"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:22
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1628
 msgid "Join Network: Wireless Scan"
 msgstr "Conectar à Rede: Busca por Rede Sem Fio"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:19
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1833
 msgid "Joining Network: %q"
 msgstr "Juntando-se à rede %q"
 
@@ -2839,15 +2935,15 @@ msgstr "Registro do Kernel"
 msgid "Kernel Version"
 msgstr "Versão do Kernel"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:823
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1248
 msgid "Key"
 msgstr "Chave"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:851
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:852
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:853
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:854
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:870
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1277
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1278
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1279
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1291
 msgid "Key #%d"
 msgstr "Chave #%d"
 
@@ -2855,33 +2951,34 @@ msgstr "Chave #%d"
 msgid "Kill"
 msgstr "Matar"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:10
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:21
 msgid "L2TP"
 msgstr "L2TP"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:10
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:40
 msgid "L2TP Server"
 msgstr "Servidor L2TP"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:100
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:74
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:80
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:74
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:53
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:73
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:131
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:102
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:89
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:112
 msgid "LCP echo failure threshold"
 msgstr "Limite de falha no eco do LCP"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:118
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:89
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:95
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:89
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:68
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:91
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:144
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:102
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:125
 msgid "LCP echo interval"
 msgstr "Intervalo do eco do LCP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:181
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:902
 msgid "LLC"
 msgstr "LLC"
 
@@ -2890,11 +2987,11 @@ msgstr "LLC"
 msgid "Label"
 msgstr "Etiqueta"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:213
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:204
 msgid "Language"
 msgstr "Idioma"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:115
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:106
 msgid "Language and Style"
 msgstr "Idioma e Estilo"
 
@@ -2902,53 +2999,53 @@ msgstr "Idioma e Estilo"
 msgid "Latency"
 msgstr "Latência"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:10
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:21
 msgid "Leaf"
 msgstr "Folha"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:369
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:487
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:393
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:543
 msgid "Lease time"
 msgstr "Tempo de concessão"
 
-#: 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:87
 msgid "Leasefile"
 msgstr "Arquivo de atribuições"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:74
 #: modules/luci-base/luasrc/view/lease_status.htm:95
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:34
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
 msgid "Leasetime remaining"
 msgstr "Tempo restante da atribuição"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:9
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:20
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:27
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:50
 msgid "Leave empty to autodetect"
 msgstr "Deixe vazio para detectar automaticamente"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:21
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:45
 msgid "Leave empty to use the current WAN address"
 msgstr "Deixe vazio para usar o endereço WAN atual"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1746
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2299
 msgid "Legend:"
 msgstr "Legenda:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:481
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:538
 msgid "Limit"
 msgstr "Limite"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:287
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:288
 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:299
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:300
 msgid "Limit listening to these interfaces, and loopback."
 msgstr "Escute somente nestas interfaces e na interface local (loopback)."
 
@@ -2968,11 +3065,11 @@ msgstr "Estado da Linha"
 msgid "Line Uptime"
 msgstr "Tempo de Atividade da Linha"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:101
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:88
 msgid "Link On"
 msgstr "Enlace Ativo"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:185
 msgid ""
 "List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
 "requests to"
@@ -2980,7 +3077,7 @@ msgstr ""
 "Lista dos servidores <abbr title=\"Domain Name System\">DNS</abbr> para "
 "encaminhar as requisições"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:972
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1377
 msgid ""
 "List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-"
 "Identifier,128-bit key as hex string. <br />This list is used to map R0KH-ID "
@@ -2994,7 +3091,7 @@ msgstr ""
 "um endereço MAC de destino ao solicitar a chave PMK-R1 a partir do R0KH que "
 "o STA usado durante a Associação de Domínio de Mobilidade Inicial."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:981
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1381
 msgid ""
 "List of R1KHs in the same Mobility Domain. <br />Format: MAC-address,R1KH-ID "
 "as 6 octets with colons,128-bit key as hex string. <br />This list is used "
@@ -3008,36 +3105,36 @@ msgstr ""
 "um endereço MAC de destino ao enviar a chave PMK-R1 a partir do R0KH. Esta é "
 "também a lista de R1KHs autorizados no MD que podem solicitar chaves PMK-R1."
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:21
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:82
 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:206
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:207
 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:173
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:174
 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:298
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:299
 msgid "Listen Interfaces"
 msgstr "Interfaces de Escuta"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:30
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:54
 msgid "Listen Port"
 msgstr "Porta de Escuta"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:15
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:16
 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:216
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:217
 msgid "Listening port for inbound DNS queries"
 msgstr "Porta de escuta para a entrada das consultas DNS"
 
@@ -3056,11 +3153,11 @@ msgstr "Carga Média"
 msgid "Loading"
 msgstr "Carregando"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:35
-msgid "Loading SSH keys…"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1819
+msgid "Loading directory contents…"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1204
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1296
 #: modules/luci-base/luasrc/view/view.htm:4
 msgid "Loading view…"
 msgstr ""
@@ -3070,41 +3167,41 @@ msgstr ""
 msgid "Local IP address is invalid"
 msgstr "O endereço IP local é inválido"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:25
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:86
 msgid "Local IP address to assign"
 msgstr "Endereço IP local para atribuir"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:10
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:11
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:44
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:39
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:151
 msgid "Local IPv4 address"
 msgstr "Endereço IPv4 local"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:20
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:54
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:45
 msgid "Local IPv6 address"
 msgstr "Endereço IPv6 local"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:286
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:287
 msgid "Local Service Only"
 msgstr "Somente Serviço Local"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:81
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:126
 msgid "Local Startup"
 msgstr "Iniciação Local"
 
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:25
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:121
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:112
 msgid "Local Time"
 msgstr "Hora Local"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:149
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
 msgid "Local domain"
 msgstr "Domínio 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:147
 msgid ""
 "Local domain specification. Names matching this domain are never forwarded "
 "and are resolved from DHCP or hosts files only"
@@ -3113,17 +3210,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:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:151
 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:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
 msgid "Local server"
 msgstr "Servidor local"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:129
 msgid ""
 "Localise hostname depending on the requesting subnet if multiple IPs are "
 "available"
@@ -3131,23 +3228,19 @@ 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:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:128
 msgid "Localise queries"
 msgstr "Localizar consultas"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:175
-msgid "Locked to channel %s used by: %s"
-msgstr "Travado no canal %s usado por: %s"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:168
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:159
 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:180
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:181
 msgid "Log queries"
 msgstr "Registar as consultas"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:113
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:104
 msgid "Logging"
 msgstr "Registrando os eventos"
 
@@ -3155,7 +3248,7 @@ msgstr "Registrando os eventos"
 msgid "Login"
 msgstr "Entrar"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:95
+#: modules/luci-base/luasrc/controller/admin/index.lua:103
 msgid "Logout"
 msgstr "Sair"
 
@@ -3165,11 +3258,13 @@ msgstr ""
 "Segundos de Perda de Sinal (<abbr title=\"Loss of Signal Seconds\">LOSS</"
 "abbr>)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:476
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:533
 msgid "Lowest leased address as offset from the network address."
 msgstr "O endereço mais baixo concedido como deslocamento do endereço da rede."
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:40
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:75
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:35
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:86
 msgid "MAC"
@@ -3177,32 +3272,32 @@ msgstr "MAC"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:73
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:109
-#: 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:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1958
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:86
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:133
 msgid "MAC-Address"
 msgstr "Endereço MAC"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:457
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:586
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:886
 msgid "MAC-Address Filter"
 msgstr "Filtro de Endereço MAC"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:142
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:363
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:798
 msgid "MAC-Filter"
 msgstr "Filtro de MAC"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:464
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:590
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:893
 msgid "MAC-List"
 msgstr "Lista de MAC"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:13
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:16
 msgid "MAP / LW4over6"
 msgstr "MAP / LW4over6"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:62
 msgid "MAP rule is invalid"
 msgstr "A regra MAC é inválida"
@@ -3220,8 +3315,8 @@ msgid "MHz"
 msgstr "MHz"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:53
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:29
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:66
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:53
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:71
 msgid "MTU"
 msgstr ""
 "<abbr title=\"Maximum Transmission Unit/Unidade Máxima de Transmissão\">MTU</"
@@ -3235,16 +3330,17 @@ msgstr ""
 "Certifique-se que clonou o sistema de arquivos raiz com algo como o comando "
 "abaixo:"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:55
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:69
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:26
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:38
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:38
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:108
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:52
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:96
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:83
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:57
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:70
 msgid "Manual"
 msgstr "Manual"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1949
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2188
 msgid "Master"
 msgstr ""
 
@@ -3254,50 +3350,46 @@ msgstr ""
 "Taxa de Dados Atingível Máxima (<abbr title=\"Maximum Attainable Data Rate"
 "\">ATTNDR</abbr>)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:539
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:982
 msgid "Maximum allowed Listen Interval"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:234
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
 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:252
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:253
 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:243
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:244
 msgid "Maximum allowed size of EDNS.0 UDP packets"
 msgstr "Tamanho máximo permitido dos pacotes UDP EDNS.0"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:63
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:77
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:57
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:112
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:104
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:93
 msgid "Maximum amount of seconds to wait for the modem to become ready"
 msgstr "Tempo máximo, em segundos, para esperar que o modem fique pronto"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:27
-msgid ""
-"Maximum length of the name is 15 characters including the automatic protocol/"
-"bridge prefix (br-, 6in4-, pppoe- etc.)"
-msgstr ""
-"Comprimento máximo do nome é de 15 caracteres, incluindo o prefixo "
-"automático do protocolo/ponte (br-, 6in4- pppoe-, etc.)"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:482
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:538
 msgid "Maximum number of leased addresses."
 msgstr "Número máximo de endereços atribuídos."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:761
+msgid "Maximum transmit power"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:21
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:49
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:134
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:187
 #: modules/luci-mod-status/luasrc/view/admin_status/bandwidth.htm:79
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:284
 msgid "Mbit/s"
 msgstr "Mbit/s"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:18
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:32
 msgid "Medium"
 msgstr ""
 
@@ -3309,42 +3401,43 @@ msgstr "Memória"
 msgid "Memory usage (%)"
 msgstr "Uso da memória (%)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1952
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2191
 msgid "Mesh"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:372
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:806
 msgid "Mesh Id"
 msgstr "Identificador da Malha"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:196
+msgid "Method not found"
+msgstr ""
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:45
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:76
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:104
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:54
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:66
 msgid "Metric"
 msgstr "Métrica"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:154
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:198
 msgid "Mirror monitor port"
 msgstr "Porta de monitoramento do espelho"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:153
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:197
 msgid "Mirror source port"
 msgstr "Porta de origem do espelho"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:408
-msgid "Missing protocol extension for proto %q"
-msgstr "Extensão para o protocolo %q está ausente"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:923
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1337
 msgid "Mobility Domain"
 msgstr "Domínio da Mobilidade"
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:154
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:41
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:74
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:366
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:31
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:360
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:801
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1619
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:175
 msgid "Mode"
 msgstr "Modo"
@@ -3353,39 +3446,38 @@ msgstr "Modo"
 msgid "Model"
 msgstr "Modelo"
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:31
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:72
 msgid "Modem default"
 msgstr "Padrão do modem"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:11
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:19
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:11
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:10
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:73
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:73
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:57
 msgid "Modem device"
 msgstr "Dispositivo do Modem"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:24
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:66
 msgid "Modem information query failed"
 msgstr "A consulta das informações do modem falhou"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:62
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:76
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:56
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:112
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:104
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:93
 msgid "Modem init timeout"
 msgstr "Estouro de tempo da iniciação do modem"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1953
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:452
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:554
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:577
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2192
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:880
 msgid "Monitor"
 msgstr "Monitor"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:14
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
 msgid "More Characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:802
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1057
 msgid "More…"
 msgstr ""
 
@@ -3398,7 +3490,7 @@ msgstr "Entrada de Montagem"
 msgid "Mount Point"
 msgstr "Ponto de Montagem"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:26
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:36
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:137
 msgid "Mount Points"
@@ -3448,46 +3540,44 @@ msgstr "Mover para baixo"
 msgid "Move up"
 msgstr "Mover para cima"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:912
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
 msgid "NAS ID"
 msgstr "NAS ID"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:57
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:87
 msgid "NAT-T Mode"
 msgstr "Modo NAT-T"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:9
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 msgid "NAT64 Prefix"
 msgstr "Prefixo NAT64"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:31
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:26
 msgid "NCM"
 msgstr "NCM"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:535
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:589
 msgid "NDP-Proxy"
 msgstr "Proxy NDP"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:43
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:72
 msgid "NT Domain"
 msgstr "Domínio NT"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:273
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:264
 msgid "NTP server candidates"
 msgstr "Candidatos a servidor NTP"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:837
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1092
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:27
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:502
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:65
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:553
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:658
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:49
 msgid "Name"
 msgstr "Nome"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:17
-msgid "Name of the new interface"
-msgstr "Nome da nova interface"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1808
 msgid "Name of the new network"
 msgstr "Nome da nova rede"
 
@@ -3495,9 +3585,10 @@ msgstr "Nome da nova rede"
 msgid "Navigation"
 msgstr "Navegação"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:62
+#: modules/luci-base/luasrc/controller/admin/index.lua:69
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:108
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:402
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:834
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1957
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:389
 #: modules/luci-mod-status/luasrc/view/admin_status/index/30-network.htm:8
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:73
@@ -3509,7 +3600,7 @@ msgstr "Rede"
 msgid "Network Utilities"
 msgstr "Utilitários de Rede"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:278
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:279
 msgid "Network boot image"
 msgstr "Imagem de boot pela rede"
 
@@ -3522,53 +3613,59 @@ msgstr "O dispositivo de rede não está presente"
 msgid "Network without interfaces."
 msgstr "Rede sem interfaces."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:661
+msgid "New interface name…"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:11
 msgid "Next »"
 msgstr "Próximo »"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1507
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1754
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:108
 msgid "No"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:453
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:514
 msgid "No DHCP Server configured for this interface"
 msgstr "Nenhum Servidor DHCP configurado para esta interface"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1162
+msgid "No Encryption"
+msgstr ""
+
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:89
 msgid "No NAT-T"
 msgstr "Sem NAT-T"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:198
+msgid "No data received"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1764
+msgid "No entries in this directory"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/backupfiles.lua:82
 msgid "No files found"
 msgstr "Nenhum arquivo encontrado"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:550
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:191
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:180
 msgid "No information available"
 msgstr "Nenhuma informação disponível"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:8
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:63
 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:157
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
 msgid "No negative cache"
 msgstr "Nenhum cache negativo"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:53
-msgid "No network configured on this device"
-msgstr "Nenhuma rede configurada neste dispositivo"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:65
-msgid "No network name specified"
-msgstr "Nenhum nome de rede foi especificado"
-
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:147
-msgid "No networks in range"
-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
@@ -3576,7 +3673,12 @@ msgstr ""
 msgid "No password set!"
 msgstr "Nenhuma senha definida!"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:116
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:104
+msgid "No peers defined yet"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:129
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:271
 msgid "No public keys present yet."
 msgstr ""
 
@@ -3584,19 +3686,19 @@ msgstr ""
 msgid "No rules in this chain."
 msgstr "Sem regras nesta cadeia"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:150
-msgid "No scan results available yet..."
-msgstr "Ainda não existem resultados do escaneamento..."
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:53
+msgid "No signal"
+msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:7
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:756
 msgid "No zone assigned"
 msgstr "Nenhuma zona definida"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:111
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:35
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:48
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:133
 msgid "Noise"
 msgstr "Ruído"
 
@@ -3616,16 +3718,16 @@ 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:292
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:293
 msgid "Non-wildcard"
 msgstr "Sem caracter curinga"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:129
 msgid "None"
 msgstr "Nenhum"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:181
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:172
 msgid "Normal"
 msgstr "Normal"
 
@@ -3633,25 +3735,29 @@ msgstr "Normal"
 msgid "Not Found"
 msgstr "Não Encontrado"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:27
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:5
-msgid "Not associated"
-msgstr "Não conectado"
-
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:87
 msgid "Not connected"
 msgstr "Não conectado"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:38
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:139
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:232
+msgid "Not present"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:105
 msgid "Not started on boot"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:26
-msgid "Note: interface name length"
-msgstr "Aviso: tamanho do nome da interface"
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:201
+msgid "Not supported"
+msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:171
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:162
 msgid "Notice"
 msgstr "Aviso"
 
@@ -3659,64 +3765,51 @@ msgstr "Aviso"
 msgid "Nslookup"
 msgstr "Nslookup"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:261
 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)"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:203
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:194
 msgid "Number of parallel threads used for compression"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:40
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:69
 msgid "Obfuscated Group Password"
 msgstr "Senha Ofuscada do Grupo"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:35
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:61
 msgid "Obfuscated Password"
 msgstr "Senha Ofuscada"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:22
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:34
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:40
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:105
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:97
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:49
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:80
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:54
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:67
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:93
 msgid "Obtain IPv6-Address"
 msgstr "Obter Endereço IPv6"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:83
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:68
 msgid "Off-State Delay"
 msgstr "Atraso no estado de desligado"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:16
-msgid ""
-"On this page you can configure the network interfaces. You can bridge "
-"several interfaces by ticking the \"bridge interfaces\" field and enter the "
-"names of several network interfaces separated by spaces. You can also use "
-"<abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
-"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
-"<samp>eth0.1</samp>)."
-msgstr ""
-"Nesta página pode configurar as interfaces de rede. Esta interface pode "
-"formar uma ponte juntando várias interfaces. Para isto, marque o campo "
-"\"Juntar interfaces em uma ponte\" e informar as várias interfaces de rede. "
-"Pode também usar a notação para <abbr title=\"Rede Local Virtual\">VLAN</"
-"abbr> <samp>INTERFACE.VLANNR</samp> (<abbr title=\"por exemplo\">ex.</abbr>: "
-"<samp>eth0.1</samp>)."
-
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:95
 msgid "On-Link route"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:80
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:64
 msgid "On-State Delay"
 msgstr "Atraso no estado de conexões"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:360
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:382
 msgid "One of hostname or mac address must be specified!"
 msgstr ""
 "É necessário especificar ao menos um nome de equipamento ou endereço MAC!"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:456
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:462
 msgid "One of the following: %s"
 msgstr ""
 
@@ -3738,28 +3831,29 @@ msgstr "Um ou mais campos obrigatórios não tem valor!"
 msgid "Open list..."
 msgstr "Abrir lista..."
 
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:61
 #: protocols/luci-proto-openconnect/luasrc/model/network/proto_openconnect.lua:9
 msgid "OpenConnect (CISCO AnyConnect)"
 msgstr "OpenConnect (CISCO AnyConnect)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:757
 msgid "Operating frequency"
 msgstr "Frequência de Operação"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1753
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2306
 msgid "Option changed"
 msgstr "Opção alterada"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1755
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2308
 msgid "Option removed"
 msgstr "Opção removida"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1140
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:55
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1535
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:66
 msgid "Optional"
 msgstr "Opcional"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:78
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:76
 msgid ""
 "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, "
 "starting with <code>0x</code>."
@@ -3767,7 +3861,7 @@ msgstr ""
 "Opcional. Marca 32 bits dos pacotes cifrados que estão saindo. Entre valores "
 "em hexadecimal, começando com <code>0x</code>."
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:144
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:215
 msgid ""
 "Optional. Allowed values: 'eui64', 'random', fixed value like '::1' or "
 "'::1:2'. When IPv6 prefix (like 'a:b:c:d::') is received from a delegating "
@@ -3779,7 +3873,7 @@ msgstr ""
 "um servidor, use este sufixo (como '::1') para formar o endereço IPv6 ('a:b:"
 "c:d::1') para esta interface."
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:123
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:117
 msgid ""
 "Optional. Base64-encoded preshared key. Adds in an additional layer of "
 "symmetric-key cryptography for post-quantum resistance."
@@ -3787,15 +3881,15 @@ msgstr ""
 "Opcional. Adiciona uma camada extra de cifragem simétrica para resistência "
 "pós quântica."
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:148
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:126
 msgid "Optional. Create routes for Allowed IPs for this peer."
 msgstr "Opcional. Cria rotas para endereços IP Autorizados para este parceiro."
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:103
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:108
 msgid "Optional. Description of peer."
 msgstr "Opcional. Descrição do parceiro."
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:156
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:128
 msgid ""
 "Optional. Host of peer. Names are resolved prior to bringing up the "
 "interface."
@@ -3803,15 +3897,15 @@ msgstr ""
 "Opcional. Equipamento do parceiro. Nomes serão resolvido antes de levantar a "
 "interface."
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:67
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:71
 msgid "Optional. Maximum Transmission Unit of tunnel interface."
 msgstr "Opcional. Unidade Máxima de Transmissão da interface do túnel."
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:166
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:132
 msgid "Optional. Port of peer."
 msgstr "Opcional. Porta do parceiro."
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:175
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:136
 msgid ""
 "Optional. Seconds between keep alive messages. Default is 0 (disabled). "
 "Recommended value if this device is behind a NAT is 25."
@@ -3820,7 +3914,7 @@ msgstr ""
 "(desabilitado). O valor recomendado caso este dispositivo esteja atrás de "
 "uma NAT é 25."
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:31
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:54
 msgid "Optional. UDP port used for outgoing and incoming packets."
 msgstr "Opcional. Porta UDP usada para pacotes saintes ou entrantes."
 
@@ -3841,7 +3935,7 @@ msgstr "Saída"
 msgid "Outbound:"
 msgstr "Saindo:"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:26
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:50
 msgid "Output Interface"
 msgstr "Interface de Saída"
 
@@ -3850,47 +3944,47 @@ msgstr "Interface de Saída"
 msgid "Output zone"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:63
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:155
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:33
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:54
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:54
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:219
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:50
 msgid "Override MAC address"
 msgstr "Sobrescrever o endereço MAC"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:66
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:35
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:56
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:88
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:125
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:131
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:133
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:104
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:61
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:58
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:223
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:44
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:54
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:154
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:71
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:145
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:132
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:110
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:119
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:97
 msgid "Override MTU"
 msgstr ""
 "Sobrescrever o <abbr title=\"Maximum Transmission Unit/Unidade Máxima de "
 "Transmissão\">MTU</abbr>"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:30
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:63
 msgid "Override TOS"
 msgstr "Sobrescrever o TOS"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:25
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:58
 msgid "Override TTL"
 msgstr "Sobrescrever o TTL"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:954
 msgid "Override default interface name"
 msgstr "Sobrescrever o nome da nova interface"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:41
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:167
 msgid "Override the gateway in DHCP responses"
 msgstr "Sobrescrever o roteador padrão nas respostas do DHCP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:507
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:555
 msgid ""
 "Override the netmask sent to clients. Normally it is calculated from the "
 "subnet that is served."
@@ -3899,7 +3993,7 @@ msgstr ""
 "calculada a partir da máscara da subrede de onde o cliente solicitou o "
 "endereço."
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:65
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:179
 msgid "Override the table used for internal routes"
 msgstr "Sobrescrever a tabela usada para as rotas internas"
 
@@ -3907,29 +4001,33 @@ msgstr "Sobrescrever a tabela usada para as rotas internas"
 msgid "Overview"
 msgstr "Visão geral"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1606
+msgid "Overwrite existing file \"%s\" ?"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:11
 msgid "Owner"
 msgstr "Dono"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:42
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:56
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:17
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:28
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:34
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:14
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:18
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:43
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:98
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:45
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:44
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:63
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:82
 msgid "PAP/CHAP password"
 msgstr "Senha do PAP/CHAP"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:39
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:53
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:14
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:11
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:15
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:96
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:88
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:43
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:74
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:42
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:61
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:77
 msgid "PAP/CHAP username"
 msgstr "Usuário do PAP/CHAP"
 
@@ -3937,9 +4035,9 @@ msgstr "Usuário do PAP/CHAP"
 msgid "PID"
 msgstr "PID"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:36
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:50
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:26
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:95
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:87
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:68
 msgid "PIN"
 msgstr "PIN"
 
@@ -3948,114 +4046,116 @@ msgstr "PIN"
 msgid "PIN code rejected"
 msgstr "Código PIN rejeitado"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:966
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1372
 msgid "PMK R1 Push"
 msgstr "PMK R1 Push"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:43
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:13
 msgid "PPP"
 msgstr "PPP"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:11
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:58
 msgid "PPPoA Encapsulation"
 msgstr "Encapsulamento PPPoA"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:19
 msgid "PPPoATM"
 msgstr "PPPoATM"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:17
 msgid "PPPoE"
 msgstr "PPPoE"
 
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:28
 #: protocols/luci-proto-pppossh/luasrc/model/network/proto_pppossh.lua:9
 msgid "PPPoSSH"
 msgstr "PPPoSSH"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:15
 msgid "PPtP"
 msgstr "PPtP"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:59
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:73
 msgid "PSID offset"
 msgstr "Deslocamento PSID"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:56
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:70
 msgid "PSID-bits length"
 msgstr "Comprimento dos bits PSID"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:123
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:846
 msgid "PTM/EFM (Packet Transfer Mode)"
 msgstr "PTM/EFM (Modo de Transferência de Pacotes)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:78
-msgid "Package libiwinfo required!"
-msgstr "O pacote libiwinfo é necessário!"
-
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:45
 msgid "Packets"
 msgstr "Pacotes"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:7
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:756
 msgid "Part of zone %q"
 msgstr "Parte da zona %q"
 
 #: modules/luci-base/luasrc/view/sysauth.htm:29
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1111
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:35
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:42
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1514
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:46
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:104
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:58
 msgid "Password"
 msgstr "Senha"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:29
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:24
 msgid "Password authentication"
 msgstr "Autenticação por senha"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1019
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1414
 msgid "Password of Private Key"
 msgstr "Senha da Chave Privada"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1067
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1471
 msgid "Password of inner Private Key"
 msgstr "Senha da Chave Privada interna"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:14
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:16
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:18
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:20
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:32
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:34
 msgid "Password strength"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:44
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:107
 msgid "Password2"
 msgstr "Senha2"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:37
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:244
 msgid "Paste or drag SSH key file…"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1000
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1396
 msgid "Path to CA-Certificate"
 msgstr "Caminho para o Certificado da AC"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1007
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1402
 msgid "Path to Client-Certificate"
 msgstr "Caminho para o Certificado do Cliente"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1013
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1408
 msgid "Path to Private Key"
 msgstr "Caminho para a Chave Privada"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1049
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1453
 msgid "Path to inner CA-Certificate"
 msgstr "Caminho para o certificado AC interno"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1055
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1459
 msgid "Path to inner Client-Certificate"
 msgstr "Caminho para o Certificado do Cliente interno"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1061
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1465
 msgid "Path to inner Private Key"
 msgstr "Caminho para a Chave Privada interna"
 
@@ -4073,7 +4173,7 @@ msgstr "Caminho para a Chave Privada interna"
 msgid "Peak:"
 msgstr "Pico:"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:28
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:89
 msgid "Peer IP address to assign"
 msgstr "Endereço IP do parceiro para atribuir"
 
@@ -4082,11 +4182,11 @@ msgstr "Endereço IP do parceiro para atribuir"
 msgid "Peer address is missing"
 msgstr "O endereço do parceiro está ausente"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:90
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:89
 msgid "Peers"
 msgstr "Parceiros"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:50
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:80
 msgid "Perfect Forward Secrecy"
 msgstr "Sigilo Encaminhado Perfeito"
 
@@ -4098,7 +4198,11 @@ msgstr "Reiniciar o sistema"
 msgid "Perform reset"
 msgstr "Restaurar as configuração iniciais"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:174
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:199
+msgid "Permission denied"
+msgstr ""
+
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:136
 msgid "Persistent Keep Alive"
 msgstr "Manutenção da Conexão Persistente"
 
@@ -4106,7 +4210,7 @@ msgstr "Manutenção da Conexão Persistente"
 msgid "Phy Rate:"
 msgstr "Taxa física:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:190
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:277
 msgid "Physical Settings"
 msgstr "Configurações Físicas"
 
@@ -4117,6 +4221,10 @@ msgstr "Ping"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:16
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:17
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:41
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:77
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:87
@@ -4134,15 +4242,19 @@ msgstr "Entre com o seu usuário e senha."
 msgid "Policy"
 msgstr "Política"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:22
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:20
 msgid "Port"
 msgstr "Porta"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:18
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:133
+msgid "Port %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:274
 msgid "Port status:"
 msgstr "Status da porta:"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:482
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:488
 msgid "Potential negation of: %s"
 msgstr ""
 
@@ -4155,11 +4267,11 @@ msgid "Pre-emtive CRC errors (CRCP_P)"
 msgstr ""
 "Erros CRC Preemptivos<abbr title=\"Pre-emptive CRC errors\">CRCP_P</abbr>"
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:32
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:73
 msgid "Prefer LTE"
 msgstr "Preferir LTE"
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:33
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:74
 msgid "Prefer UMTS"
 msgstr "Preferir UMTS"
 
@@ -4167,16 +4279,16 @@ msgstr "Preferir UMTS"
 msgid "Prefix Delegated"
 msgstr "Prefixo Delegado"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:122
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:117
 msgid "Preshared Key"
 msgstr "Chave Compartilhada"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:101
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:75
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:81
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:75
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:54
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:74
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:131
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:102
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:89
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:112
 msgid ""
 "Presume peer to be dead after given amount of LCP echo failures, use 0 to "
 "ignore failures"
@@ -4184,16 +4296,15 @@ 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:304
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:305
 msgid "Prevent listening on these interfaces."
 msgstr "Evite escutar nestas Interfaces."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:509
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:562
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:950
 msgid "Prevents client-to-client communication"
 msgstr "Impede a comunicação de cliente para cliente"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:18
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:49
 msgid "Private Key"
 msgstr "Chave Privada"
 
@@ -4214,39 +4325,33 @@ msgstr "Perfil"
 msgid "Prot."
 msgstr "Protocolo"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:72
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:349
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:675
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:84
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:216
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:87
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:390
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:31
-msgid "Protocol of the new interface"
-msgstr "Protocolo para a nova interface"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:222
-msgid "Protocol support is not installed"
-msgstr "O suporte ao protocolo não está instalado"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:269
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:260
 msgid "Provide NTP server"
 msgstr "Fornecer serviço <abbr title=\"Network Time Protocol\">NTP</abbr>"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:701
 msgid "Provide new network"
 msgstr "Prover nova rede"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:451
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:879
 msgid "Pseudo Ad-Hoc (ahdemo)"
 msgstr "Ad-Hoc falso (ahdemo)"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:112
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:113
 msgid "Public Key"
 msgstr "Chave Pública"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:278
 msgid ""
 "Public keys allow for the passwordless SSH logins with a higher security "
 "compared to the use of plain passwords. In order to upload a new key to the "
@@ -4254,22 +4359,22 @@ msgid ""
 "code> file into the input field."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:139
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:211
 msgid "Public prefix routed to this device for distribution to clients."
 msgstr ""
 "Prefixo público roteado para este dispositivo para distribuição a seus "
 "clientes."
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:27
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:9
 msgid "QMI Cellular"
 msgstr "Celular QMI"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:173
 msgid "Quality"
 msgstr "Qualidade"
 
-#: 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:171
 msgid ""
 "Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> "
 "servers"
@@ -4277,28 +4382,29 @@ msgstr ""
 "Consulte todos os servidores <abbr title=\\\"Sistema de Nomes de Domínios\\"
 "\">DNS</abbr>"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:952
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1360
 msgid "R0 Key Lifetime"
 msgstr "Validade da Chave R0"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:959
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1366
 msgid "R1 Key Holder"
 msgstr "Detentor da Chave R1"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:58
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:88
 msgid "RFC3947 NAT-T mode"
 msgstr "Modo NAT-T (RFC3947)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:381
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:814
 msgid "RSSI threshold for joining"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:256
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:597
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:778
 msgid "RTS/CTS Threshold"
 msgstr "Limiar RTS/CTS"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:41
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:76
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:87
 msgid "RX"
@@ -4308,37 +4414,41 @@ msgstr "RX"
 msgid "RX Rate"
 msgstr "Taxa de RX"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:783
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1961
+msgid "RX Rate / TX Rate"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1207
 msgid "Radius-Accounting-Port"
 msgstr "Porta de contabilidade do RADIUS"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:791
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1215
 msgid "Radius-Accounting-Secret"
 msgstr "Segredo da contabilidade do RADIUS"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:775
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1199
 msgid "Radius-Accounting-Server"
 msgstr "Servidor da contabilidade do RADIUS"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:759
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1183
 msgid "Radius-Authentication-Port"
 msgstr "Porta de autenticação do RADIUS"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:767
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1191
 msgid "Radius-Authentication-Secret"
 msgstr "Segredo da autenticação do RADIUS"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:751
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1175
 msgid "Radius-Authentication-Server"
 msgstr "Servidor da autenticação do RADIUS"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:119
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:102
 msgid "Raw hex-encoded bytes. Leave empty unless your ISP require this"
 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:83
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:84
 msgid ""
 "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-Server"
@@ -4355,21 +4465,11 @@ msgstr ""
 "desfeita! Você pode perder acesso a este dispositivo se você estiver "
 "conectado por meio desta interface"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2
-msgid ""
-"Really delete this wireless network? The deletion cannot be undone! You "
-"might lose access to this device if you are connected via this network."
-msgstr ""
-"Realmente excluir esta interface Wireless? A exclusão não pode ser "
-"desfeita!\n"
-"Você poderá perder o acesso a este dispositivo se você estiver conectado "
-"através desta interface."
-
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:40
 msgid "Really reset all changes?"
 msgstr "Realmente limpar todas as mudanças?"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:237
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:354
 msgid "Really switch protocol?"
 msgstr "Realmente trocar o protocolo?"
 
@@ -4393,15 +4493,15 @@ msgstr "Tráfego em Tempo Real"
 msgid "Realtime Wireless"
 msgstr "Rede sem fio em Tempo Real"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:931
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1343
 msgid "Reassociation Deadline"
 msgstr "Limite para Reassociação"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:191
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
 msgid "Rebind protection"
 msgstr "Proteção contra \"Rebind\""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:48
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:46
 #: modules/luci-mod-system/luasrc/view/admin_system/reboot.htm:9
 msgid "Reboot"
 msgstr "Reiniciar"
@@ -4415,21 +4515,15 @@ msgstr "Reiniciando..."
 msgid "Reboots the operating system of your device"
 msgstr "Reinicia o sistema operacional do seu dispositivo"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:103
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:90
 msgid "Receive"
 msgstr "Receber"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:325
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:350
-msgid "Receiver Antenna"
-msgstr "Antena de Recepção"
-
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:42
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:59
 msgid "Recommended. IP addresses of the WireGuard interface."
 msgstr "Recomendado. Endereços IP da interface do WireGuard."
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:28
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:300
 msgid "Reconnect this interface"
 msgstr "Reconectar esta interface"
 
@@ -4437,74 +4531,72 @@ msgstr "Reconectar esta interface"
 msgid "References"
 msgstr "Referências"
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:39
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:153
 msgid "Relay"
 msgstr "Retransmissor"
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:36
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:157
 msgid "Relay Bridge"
 msgstr "Ponte por Retransmissão"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:17
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:154
 msgid "Relay between networks"
 msgstr "Encaminha o tráfego entre as redes"
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:64
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:12
 msgid "Relay bridge"
 msgstr "Ponte por retransmissão"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:18
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:50
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:49
 msgid "Remote IPv4 address"
 msgstr "Endereço IPv4 remoto"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:8
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:40
 msgid "Remote IPv4 address or FQDN"
 msgstr "Endereço IPv4 remoto ou FQDN"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:45
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:725
 msgid "Remove"
 msgstr "Remover"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:53
-msgid "Repeat scan"
-msgstr "Repetir busca"
-
-#: modules/luci-base/luasrc/view/cbi/upload.htm:11
-msgid "Replace entry"
-msgstr "Substituir entrada"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:46
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:51
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1806
 msgid "Replace wireless configuration"
 msgstr "Substituir a configuração da rede sem fio"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:8
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:17
 msgid "Request IPv6-address"
 msgstr "Solicita endereço IPv6"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:16
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:23
 msgid "Request IPv6-prefix of length"
 msgstr "Solicita prefixo IPv6 de tamanho"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1141
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:200
+msgid "Request timeout"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1536
 msgid "Required"
 msgstr "Necessário"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:20
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:31
 msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3"
 msgstr ""
 "Obrigatório para alguns provedores de internet, ex. Charter com DOCSIS 3"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:19
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:49
 msgid "Required. Base64-encoded private key for this interface."
 msgstr "Obrigatório. Chave privada codificada em Base64 para esta interface."
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:113
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:113
 msgid "Required. Base64-encoded public key of peer."
 msgstr "Necessário. Chave Pública do parceiro codificada como Base64."
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:136
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:122
 msgid ""
 "Required. IP addresses and prefixes that this peer is allowed to use inside "
 "the tunnel. Usually the peer's tunnel IP addresses and the networks the peer "
@@ -4514,13 +4606,33 @@ msgstr ""
 "usar dentro do túnel. Normalmente é o endereço IP do parceiro no túnel e as "
 "redes que o parceiro roteia através do túnel."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1134
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1095
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1096
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1097
+msgid "Requires hostapd"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1101
+msgid "Requires hostapd with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1102
+msgid "Requires hostapd with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1098
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1099
+msgid "Requires hostapd with SAE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1533
 msgid ""
 "Requires the 'full' version of wpad/hostapd and support from the wifi driver "
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:141
 msgid ""
 "Requires upstream supports DNSSEC; verify unsigned domain responses really "
 "come from unsigned domains"
@@ -4528,7 +4640,31 @@ msgstr ""
 "Exige o suporte DNSSEC do servidor superior; verifica se as respostas não "
 "assinadas realmente vêm de domínios não assinados"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1268
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1109
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1119
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1120
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1121
+msgid "Requires wpa-supplicant"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1113
+msgid "Requires wpa-supplicant with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1114
+msgid "Requires wpa-supplicant with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1111
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1124
+msgid "Requires wpa-supplicant with SAE support"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1355
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:17
 #: modules/luci-base/luasrc/view/cbi/footer.htm:30
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:66
@@ -4544,17 +4680,22 @@ msgstr "Reiniciar contadores"
 msgid "Reset to defaults"
 msgstr "Redefinir para os valores padrão"
 
-#: 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:68
 msgid "Resolv and Hosts Files"
 msgstr "Arquivos de Resolv e Hosts"
 
-#: 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:94
 msgid "Resolve file"
 msgstr "Arquivo Resolv"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:28
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:14
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:71
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:197
+msgid "Resource not found"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:302
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:693
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:90
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:112
 msgid "Restart"
 msgstr "Reiniciar"
 
@@ -4562,7 +4703,7 @@ msgstr "Reiniciar"
 msgid "Restart Firewall"
 msgstr "Reiniciar o firewall"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:14
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:691
 msgid "Restart radio interface"
 msgstr "Reinicie a interface do rádio"
 
@@ -4574,27 +4715,25 @@ msgstr "Restauração"
 msgid "Restore backup"
 msgstr "Restaurar cópia de segurança"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:113
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:114
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:38
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:46
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:119
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:120
 msgid "Reveal/hide password"
 msgstr "Relevar/esconder senha"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1774
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2322
 msgid "Revert"
 msgstr "Reverter"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1861
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2405
 msgid "Revert changes"
 msgstr "Reverter as mudanças"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2013
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2554
 msgid "Revert request failed with status <code>%h</code>"
 msgstr ""
 "O pedido para reverter as configurações falhou com o estado <code>%h</code>"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1993
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2534
 msgid "Reverting configuration…"
 msgstr "Revertendo configurações..."
 
@@ -4602,7 +4741,7 @@ msgstr "Revertendo configurações..."
 msgid "Root"
 msgstr "Raiz"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:271
 msgid "Root directory for files served via TFTP"
 msgstr "Diretório raiz para arquivos disponibilizados pelo TFTP"
 
@@ -4610,7 +4749,7 @@ msgstr "Diretório raiz para arquivos disponibilizados pelo TFTP"
 msgid "Root preparation"
 msgstr "Prepação da raiz (/)"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:147
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:126
 msgid "Route Allowed IPs"
 msgstr "Roteie Andereços IP Autorizados"
 
@@ -4622,12 +4761,12 @@ msgstr ""
 msgid "Route type"
 msgstr "Tipo de rota"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:523
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:577
 msgid "Router Advertisement-Service"
 msgstr "Serviço de Anúncio de Roteador"
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:43
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:15
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:27
 msgid "Router Password"
 msgstr "Senha do Roteador"
 
@@ -4658,7 +4797,7 @@ msgstr ""
 msgid "Run filesystem check"
 msgstr "Execute a verificação do sistema de arquivos"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:651
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:669
 msgid "Runtime error"
 msgstr ""
 
@@ -4670,31 +4809,31 @@ msgstr "SHA256"
 msgid "SNR"
 msgstr "SNR"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:5
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:18
 msgid "SSH Access"
 msgstr "Acesso SSH"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:10
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:70
 msgid "SSH server address"
 msgstr "Endereço do servidor SSH"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:13
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:74
 msgid "SSH server port"
 msgstr "Porta do servidor SSH"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:8
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:58
 msgid "SSH username"
 msgstr "Usuário do SSH"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:27
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:277
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
 msgid "SSH-Keys"
 msgstr "Chaves SSH"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:42
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:73
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:29
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1617
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:174
 msgid "SSID"
 msgstr "SSID"
@@ -4703,17 +4842,17 @@ msgstr "SSID"
 msgid "SWAP"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1127
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1262
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1379
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1351
 #: modules/luci-base/luasrc/view/cbi/error.htm:17
 #: modules/luci-base/luasrc/view/cbi/footer.htm:26
 #: modules/luci-base/luasrc/view/cbi/header.htm:17
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:54
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:133
 msgid "Save"
 msgstr "Salvar"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1256
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1768
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1347
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2318
 #: modules/luci-base/luasrc/view/cbi/footer.htm:22
 msgid "Save & Apply"
 msgstr "Salvar & Aplicar"
@@ -4726,28 +4865,20 @@ msgstr "Salvar o bloco mtd"
 msgid "Save mtdblock contents"
 msgstr "Salvar o conteúdo do bloco mtd"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
-msgid "Saving keys…"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:698
 msgid "Scan"
 msgstr "Procurar"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:109
-msgid "Scan request failed"
-msgstr "O pedido de escaneamento falhou"
-
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:8
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:39
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:23
 msgid "Scheduled Tasks"
 msgstr "Tarefas Agendadas"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1749
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2302
 msgid "Section added"
 msgstr "Seção adicionada"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1751
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2304
 msgid "Section removed"
 msgstr "Seção removida"
 
@@ -4765,12 +4896,18 @@ msgstr ""
 "do formato da imagem falhar. Use somente se você estiver confiante que a "
 "firmware está correta e é destinada para seu dispositivo!"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:119
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:90
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:96
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:90
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:69
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:92
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1516
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1646
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1809
+msgid "Select file…"
+msgstr ""
+
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:144
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:102
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:125
 msgid ""
 "Send LCP echo requests at the given interval in seconds, only effective in "
 "conjunction with failure threshold"
@@ -4778,36 +4915,32 @@ 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/luasrc/model/cbi/admin_network/wifi.lua:561
-msgid "Separate Clients"
-msgstr "Isolar Clientes"
-
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:62
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:63
 msgid "Server Settings"
 msgstr "Configurações do Servidor"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:26
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:50
 msgid "Service Name"
 msgstr "Nome do Serviço"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:25
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:30
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:87
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:71
 msgid "Service Type"
 msgstr "Tipo do Serviço"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:55
+#: modules/luci-base/luasrc/controller/admin/index.lua:62
 msgid "Services"
 msgstr "Serviços"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:815
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:861
 msgid "Session expired"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:83
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:107
 msgid "Set VPN as Default Route"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:258
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:795
 msgid ""
 "Set interface properties regardless of the link carrier (If set, carrier "
 "sense events do not invoke hotplug handlers)."
@@ -4816,17 +4949,20 @@ msgstr ""
 "enlace (Se definido, eventos de detecção da portadora não irão gerar eventos "
 "do hotplug)."
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:23
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:55
 msgid "Setting PLMN failed"
 msgstr ""
 "A configuração da <abbr title=\"Public Land Mobile Network\">PLNM</abbr> "
 "falhou"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:26
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:68
 msgid "Setting operation mode failed"
 msgstr "A configuração do modo de operação falhou"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:454
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:517
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:527
 msgid "Setup DHCP Server"
 msgstr "Configurar Servidor DHCP"
 
@@ -4840,7 +4976,7 @@ msgstr ""
 msgid "Short GI"
 msgstr "Intervalo de guarda curto"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:516
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:960
 msgid "Short Preamble"
 msgstr "Preâmbulo curto"
 
@@ -4852,21 +4988,23 @@ msgstr "Mostra a lista atual de arquivos para a cópia de segurança"
 msgid "Show empty chains"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:306
 msgid "Shutdown this interface"
 msgstr "Desligar esta interface"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:111
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:34
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:47
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:132
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1616
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:173
 msgid "Signal"
 msgstr "Sinal"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1960
+msgid "Signal / Noise"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:125
 msgid "Signal Attenuation (SATN)"
 msgstr "Atenuação do Sinal (<abbr title=\"Signal Attenuation\">SATN</abbr>)"
@@ -4879,11 +5017,11 @@ msgstr "Sinal:"
 msgid "Size"
 msgstr "Tamanho"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:259
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:260
 msgid "Size of DNS query cache"
 msgstr "Tamanho do cache de consultas DNS"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:191
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
 msgid "Size of the ZRam device in megabytes"
 msgstr ""
 
@@ -4900,11 +5038,7 @@ msgstr "Pular para o conteúdo"
 msgid "Skip to navigation"
 msgstr "Pular para a navegação"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:335
-msgid "Slot time"
-msgstr "Intervalo de tempo"
-
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1640
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1846
 #: modules/luci-base/luasrc/model/network.lua:1427
 msgid "Software VLAN"
 msgstr "VLAN em Software"
@@ -4945,11 +5079,7 @@ msgstr ""
 msgid "Specifies the directory the device is attached to"
 msgstr "Especifica o diretório que o dispositivo está conectado"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:23
-msgid "Specifies the listening port of this <em>Dropbear</em> instance"
-msgstr "Especifica a porta de escuta deste <em>Dropbear</em>"
-
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:57
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:175
 msgid ""
 "Specifies the maximum amount of failed ARP requests until hosts are presumed "
 "to be dead"
@@ -4957,7 +5087,7 @@ msgstr ""
 "Especifica a quantidade máxima de requisições ARP falhadas antes de "
 "considerar que um equipamento está morto"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:49
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:171
 msgid ""
 "Specifies the maximum amount of seconds after which hosts are presumed to be "
 "dead"
@@ -4965,11 +5095,18 @@ msgstr ""
 "Especifica a quantidade máxima de segundos antes de considerar que um "
 "equipamento está morto"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:761
+msgid ""
+"Specifies the maximum transmit power the wireless radio may use. Depending "
+"on regulatory requirements and wireless usage, the actual transmit power may "
+"be reduced by the driver."
+msgstr ""
+
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:63
 msgid "Specify a TOS (Type of Service)."
 msgstr "Especifique um Tipo de Serviço (TOS)"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:25
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:58
 msgid ""
 "Specify a TTL (Time to Live) for the encapsulating packet other than the "
 "default (64)."
@@ -4977,7 +5114,7 @@ msgstr ""
 "Especifica o tempo de vida (<abbr title=\"Time to Live\">TTL</abbr>) para os "
 "pacotes encapsulados ao invés do padrão (64)."
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:53
 msgid ""
 "Specify an MTU (Maximum Transmission Unit) other than the default (1280 "
 "bytes)."
@@ -4985,29 +5122,30 @@ msgstr ""
 "Especifica a unidade máxima de transmissão (<abbr title=\"Maximum "
 "Transmission Unit\">MTU</abbr>) ao invés do valor padrão (1280 bytes)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:60
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "Specify the secret encryption key here."
 msgstr "Especifique a chave de cifragem secreta aqui."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:475
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:64
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:533
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:89
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:111
 msgid "Start"
 msgstr "Iniciar"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:33
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:86
 msgid "Start priority"
 msgstr "Prioridade de iniciação"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1958
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2499
 msgid "Starting configuration apply…"
 msgstr "Iniciando a aplicação da configuração..."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1626
 msgid "Starting wireless scan..."
 msgstr "Iniciando o escaneamento da rede sem fio..."
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:24
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:120
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
 msgid "Startup"
 msgstr "Iniciação"
 
@@ -5019,20 +5157,21 @@ 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:70
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:71
 msgid "Static Leases"
 msgstr "Alocações Estáticas"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:118
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:73
 msgid "Static Routes"
 msgstr "Rotas Estáticas"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1194
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1384
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:172
 #: modules/luci-base/luasrc/model/network.lua:966
 msgid "Static address"
 msgstr "Endereço Estático"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:308
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:309
 msgid ""
 "Static leases are used to assign fixed IP addresses and symbolic hostnames "
 "to DHCP clients. They are also required for non-dynamic interface "
@@ -5043,39 +5182,41 @@ msgstr ""
 "configurações não dinâmicas onde um computador com a alocação correspondente "
 "é provido."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:534
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:977
 msgid "Station inactivity limit"
 msgstr ""
 
 #: modules/luci-base/luasrc/controller/admin/index.lua:40
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:197
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:337
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:746
 #: modules/luci-mod-status/luasrc/view/admin_status/index.htm:128
 msgid "Status"
 msgstr "Estado"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:35
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:75
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:308
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:91
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:113
 msgid "Stop"
 msgstr "Parar"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:165
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Strict order"
 msgstr "Ordem Exata"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:16
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:30
 msgid "Strong"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1843
 msgid "Submit"
 msgstr "Enviar"
 
-#: 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:108
 msgid "Suppress logging"
 msgstr "Suprimir registros (log)"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:109
 msgid "Suppress logging of the routine operation of these protocols"
 msgstr "Suprimir registros (log) de operações rotineiras destes protocolos"
 
@@ -5087,44 +5228,46 @@ msgstr "Espaço de Troca (swap)"
 msgid "Swap Entry"
 msgstr "Entrada do espaço de troca (Swap)"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:23
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:5
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:135
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:21
 msgid "Switch"
 msgstr "Switch"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:129
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:168
 msgid "Switch %q"
 msgstr "Switch %q"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:128
-msgid "Switch %q (%s)"
-msgstr "Switch %q (%s)"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:66
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:146
 msgid ""
 "Switch %q has an unknown topology - the VLAN settings might not be accurate."
 msgstr ""
 "O Switch %q tem uma topologia desconhecida - as configurações de VLAN podem "
 "não ser precisas."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:146
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:142
 msgid "Switch Port Mask"
 msgstr "Máscara da porta do Switch"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1640
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1846
 #: modules/luci-base/luasrc/model/network.lua:1425
 msgid "Switch VLAN"
 msgstr "Switch VLAN"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:238
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:355
 msgid "Switch protocol"
 msgstr "Trocar o protocolo"
 
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:103
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:104
 #: modules/luci-base/luasrc/view/cbi/ipaddr.htm:26
 msgid "Switch to CIDR list notation"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:77
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1547
+msgid "Symbolic link"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:71
 msgid "Sync with NTP-Server"
 msgstr ""
 
@@ -5134,7 +5277,7 @@ msgstr "Sincronizar com o navegador"
 
 #: modules/luci-base/luasrc/controller/admin/index.lua:47
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:14
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:102
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:94
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
 #: modules/luci-mod-system/luasrc/view/admin_system/applyreboot.htm:39
 msgid "System"
@@ -5145,11 +5288,11 @@ msgstr "Sistema"
 msgid "System Log"
 msgstr "Registro do Sistema"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:108
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:99
 msgid "System Properties"
 msgstr "Propriedades do Sistema"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:145
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:136
 msgid "System log buffer size"
 msgstr "Tamanho do buffer de registro do sistema"
 
@@ -5157,15 +5300,17 @@ msgstr "Tamanho do buffer de registro do sistema"
 msgid "TCP:"
 msgstr "TCP:"
 
-#: 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:69
 msgid "TFTP Settings"
 msgstr "Configurações do TFTP"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:269
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
 msgid "TFTP server root"
 msgstr "Raiz do servidor TFTP"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:17
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:77
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:88
 msgid "TX"
@@ -5188,7 +5333,7 @@ msgstr "Tabela"
 msgid "Target"
 msgstr "Destino"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:77
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:103
 msgid "Target network"
 msgstr "Rede de destino"
 
@@ -5196,30 +5341,7 @@ msgstr "Rede de destino"
 msgid "Terminate"
 msgstr "Terminar"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:27
-msgid ""
-"The <em>Device Configuration</em> section covers physical settings of the "
-"radio hardware such as channel, transmit power or antenna selection which "
-"are shared among all defined wireless networks (if the radio hardware is "
-"multi-SSID capable). Per network settings like encryption or operation mode "
-"are grouped in the <em>Interface Configuration</em>."
-msgstr ""
-"A seção da <em>Configuração do Dispositivo</em> engloba as configurações "
-"físicas do rádio como canal, potência de transmissão ou seleção da antena. "
-"Estas configurações são compartilhadas entre todas as redes sem fio (se o "
-"hardware for capaz de utilizar múltiplas SSID). As configurações específicas "
-"de cada rede, como cifragem ou modo de operação estão agrupadas na "
-"<em>Configuração da Interface</em>."
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:79
-msgid ""
-"The <em>libiwinfo-lua</em> package is not installed. You must install this "
-"component for working wireless configuration!"
-msgstr ""
-"O pacote <em>libiwinfo-lua</em> não está instalado. Você precisa instalar "
-"este componente para ter uma configuração da rede sem fio funcional!"
-
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:66
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:77
 msgid ""
 "The HE.net endpoint update configuration changed, you must now use the plain "
 "username instead of the user ID!"
@@ -5227,20 +5349,19 @@ msgstr ""
 "A configuração da atualização de pontas HE.net mudou. Você deve agora usar o "
 "nome do usuário ao invés do identificador do usuário!"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:8
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:40
 msgid ""
 "The IPv4 address or the fully-qualified domain name of the remote tunnel end."
 msgstr "O endereço IPv4 ou o nome completo (FQDN) da ponta remota do túnel."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:27
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:38
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:59
 msgid ""
 "The IPv6 prefix assigned to the provider, usually ends with <code>::</code>"
 msgstr ""
 "O prefixo IPv6 atribuído pelo provedor, geralmente termina com<code>::</code>"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:18
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1808
 msgid ""
 "The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
 "code> and <code>_</code>"
@@ -5258,7 +5379,7 @@ msgid "The configuration file could not be loaded due to the following error:"
 msgstr ""
 "O arquivo de configuração não pode ser carregado devido ao seguinte erro:"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1849
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2396
 msgid ""
 "The device could not be reached within %d seconds after applying the pending "
 "changes, which caused the configuration to be rolled back for safety "
@@ -5278,6 +5399,12 @@ msgstr ""
 "O arquivo do dispositivo de armazenamento ou da partição (ex: <code>/dev/"
 "sda1</code>)"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:612
+msgid ""
+"The existing wireless configuration needs to be changed for LuCI to function "
+"properly."
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:127
 msgid ""
 "The filesystem that was used to format the memory (<abbr title=\"for example"
@@ -5303,46 +5430,50 @@ msgstr ""
 msgid "The following rules are currently active on this system."
 msgstr "As seguintes regras estão atualmente ativas neste sistema."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:144
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:154
+msgid "The gateway address must not be a local IP address"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:154
 msgid "The given SSH public key has already been added."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:150
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:160
 msgid ""
 "The given SSH public key is invalid. Please supply proper public RSA or "
 "ECDSA keys."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:67
-msgid "The given network name is not unique"
-msgstr "O nome de rede informado não é único"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:664
+msgid "The interface name is already used"
+msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:52
-msgid ""
-"The hardware is not multi-SSID capable and the existing configuration will "
-"be replaced if you proceed."
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:670
+msgid "The interface name is too long"
 msgstr ""
-"Este equipamento não é capaz de utilizar SSID múltiplos e as configurações "
-"existentes serão substituídas se você proceder."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:43
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:31
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:55
 msgid ""
 "The length of the IPv4 prefix in bits, the remainder is used in the IPv6 "
 "addresses."
 msgstr ""
 "O comprimento do prefixo IPv4 em bits, o restante é usado nos endereços IPv6."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:35
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:46
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:63
 msgid "The length of the IPv6 prefix in bits"
 msgstr "O comprimento do prefixo IPv6 em bits"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:12
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:44
 msgid "The local IPv4 address over which the tunnel is created (optional)."
 msgstr "O endereço IPv4 local sobre o qual o túnel será criado (opcional)."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:5
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1814
+msgid "The network name is already used"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:135
 msgid ""
 "The network ports on this device can be combined to several <abbr title="
 "\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
@@ -5359,16 +5490,15 @@ msgstr ""
 "uma porta para o enlace superior (uplink) e as demais portas são utilizadas "
 "para a rede local."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:77
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:395
-msgid "The selected protocol needs a device assigned"
-msgstr "O protocolo selecionado necessita estar associado a um dispositivo"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1149
+msgid "The selected %s mode is incompatible with %s encryption"
+msgstr ""
 
 #: modules/luci-base/luasrc/view/csrftoken.htm:11
 msgid "The submitted security token is invalid or already expired!"
 msgstr "A chave eletrônica enviada é inválida ou já expirou!"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:274
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:272
 msgid ""
 "The system is erasing the configuration partition now and will reboot itself "
 "when finished."
@@ -5376,7 +5506,7 @@ msgstr ""
 "O sistema está apagando agora a partição da configuração e irá reiniciar "
 "quando terminado."
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:195
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:193
 msgid ""
 "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
 "few minutes before you try to reconnect. It might be necessary to renew the "
@@ -5388,7 +5518,7 @@ msgstr ""
 "da sua configuração, pode ser necessário renovar o endereço do seu "
 "computador para poder conectar novamente ao roteador."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:15
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:80
 msgid "The system password has been successfully changed."
 msgstr ""
 
@@ -5400,7 +5530,7 @@ 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:403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:427
 msgid "There are no active leases"
 msgstr ""
 
@@ -5409,18 +5539,10 @@ msgstr ""
 msgid "There are no active leases."
 msgstr "Não existem alocações ativas."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1973
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2514
 msgid "There are no changes to apply"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:204
-msgid ""
-"There is no device assigned yet, please attach a network device in the "
-"\"Physical Settings\" tab"
-msgstr ""
-"Ainda não existe um dispositivo associado. Por favor, associe um dispositivo "
-"de rede na aba \"Configurações Físicas\""
-
 #: 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
@@ -5432,11 +5554,19 @@ msgstr ""
 "Não existem uma senha definida para este roteador. Por favor, configure uma "
 "senha para o root para proteger a interface WEB e habilitar o SSH."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:19
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:49
 msgid "This IPv4 address of the relay"
 msgstr "Este endereço IPv4 do repassar"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1448
+msgid "This authentication type is not applicable to the selected EAP method."
+msgstr ""
+
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:54
+msgid "This does not look like a valid PEM file"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
 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 "
@@ -5454,7 +5584,7 @@ msgstr ""
 "em /etc/config/ e alguns outros arquivos de configuração são automaticamente "
 "preservados."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:74
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:81
 msgid ""
 "This is either the \"Update Key\" configured for the tunnel or the account "
 "password if no update key has been configured"
@@ -5462,7 +5592,7 @@ msgstr ""
 "Isto é a \"Update Key\" configurada para o túnel ou a senha da cpnta se não "
 "tem uma \"Update Keu\" configurada"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:82
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:127
 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."
@@ -5470,7 +5600,7 @@ msgstr ""
 "Este é o conteúdo do /etc/rc.local. Insira seus próprios comandos aqui "
 "(antes de 'exit 0') para executá-los no final do processo de boot."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:27
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:54
 msgid ""
 "This is the local endpoint address assigned by the tunnel broker, it usually "
 "ends with <code>...:2/64</code>"
@@ -5478,7 +5608,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:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:79
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> in the local network"
@@ -5486,22 +5616,22 @@ msgstr ""
 "Este é o único <abbr title=\"Protocolo de Configuração Dinâmica de Hosts"
 "\">DHCP</abbr> na rede local"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:73
 msgid "This is the plain username for logging into the account"
 msgstr "Este é o nome do usuário em para se autenticar na sua conta"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:34
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:57
 msgid ""
 "This is the prefix routed to you by the tunnel broker for use by clients"
 msgstr ""
 "Este é o prefixo roteado pelo agente do tunel para você usar com seus "
 "clientes"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:9
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:41
 msgid "This is the system crontab in which scheduled tasks can be defined."
 msgstr "Este é o sistema de agendamento de tarefas."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:19
+#: 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 ""
@@ -5519,26 +5649,26 @@ msgstr ""
 msgid "This page gives an overview over currently active network connections."
 msgstr "Esta página fornece informações sobre as conexões de rede ativas."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:726
-#: modules/luci-base/htdocs/luci-static/resources/form.js:809
+#: modules/luci-base/htdocs/luci-static/resources/form.js:936
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1064
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:172
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:32
 msgid "This section contains no values yet"
 msgstr "Esta seção ainda não contêm valores"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:114
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:105
 msgid "Time Synchronization"
 msgstr "Sincronização de horário"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:525
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:968
 msgid "Time interval for rekeying GTK"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:128
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:119
 msgid "Timezone"
 msgstr "Fuso Horário"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:825
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:871
 msgid "To login…"
 msgstr ""
 
@@ -5553,7 +5683,7 @@ msgstr ""
 "clique em \"Restaurar as configurações iniciais\" (somente possível para "
 "imagens do tipo squashfs)."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:835
 msgid "Tone"
 msgstr "Tom"
 
@@ -5577,55 +5707,41 @@ msgstr "Tráfego"
 msgid "Transfer"
 msgstr "Transferências"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:595
-msgid "Transmission Rate"
-msgstr "Taxa de Transmissão"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:102
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:89
 msgid "Transmit"
 msgstr "Transmitir"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:211
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:273
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:345
-msgid "Transmit Power"
-msgstr "Potência de Transmissão"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:318
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:349
-msgid "Transmitter Antenna"
-msgstr "Antena de Transmissão"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:73
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:57
 msgid "Trigger"
 msgstr "Disparo"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:98
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:84
 msgid "Trigger Mode"
 msgstr "Modo de disparo"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:54
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:69
 msgid "Tunnel ID"
 msgstr "Identificador do Túnel"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1643
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1849
 #: modules/luci-base/luasrc/model/network.lua:1430
 msgid "Tunnel Interface"
 msgstr "Interface de Tunelamento"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:44
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:55
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:76
 msgid "Tunnel Link"
 msgstr "Enlace do túnel"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:46
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:131
 msgid "Tx-Power"
 msgstr "Potência de transmissão"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:32
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:185
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:11
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:43
 msgid "Type"
 msgstr "Tipo"
 
@@ -5633,19 +5749,20 @@ msgstr "Tipo"
 msgid "UDP:"
 msgstr "UDP:"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:28
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:90
 msgid "UMTS only"
 msgstr "UMTS somente"
 
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:43
 #: protocols/luci-proto-3g/luasrc/model/network/proto_3g.lua:10
 msgid "UMTS/GPRS/EV-DO"
 msgstr "UMTS/GPRS/EV-DO"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:106
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:93
 msgid "USB Device"
 msgstr "Dispositivo USB"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:122
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:110
 msgid "USB Ports"
 msgstr "Portas USB"
 
@@ -5675,10 +5792,12 @@ msgstr "Não foi possível determinar a interface com a rede externa"
 msgid "Unable to dispatch"
 msgstr "Não é possível a expedição"
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:22
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:54
 msgid "Unable to obtain client ID"
 msgstr "Não foi possível obter o identificador do cliente"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:61
 msgid "Unable to resolve AFTR host name"
 msgstr "Não foi possível resolver o nome do AFTR"
@@ -5688,23 +5807,33 @@ msgstr "Não foi possível resolver o nome do AFTR"
 msgid "Unable to resolve peer host name"
 msgstr "Não foi possível resolver o nome do parceiro"
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:33
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:68
+msgid "Unable to save contents: %s"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:132
 msgid "Unavailable Seconds (UAS)"
 msgstr ""
 "Segundos de indisponibilidade (<abbr title=\"Unavailable Seconds\">UAS</"
 "abbr>)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1196
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1386
 #: modules/luci-base/luasrc/model/network.lua:970
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1349
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1539
 #: modules/luci-base/luasrc/model/network.lua:1137
 msgid "Unknown error (%s)"
 msgstr "Erro desconhecido (%s)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1193
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:204
+msgid "Unknown error code"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1383
+#: modules/luci-base/htdocs/luci-static/resources/protocol/none.js:6
 #: modules/luci-base/luasrc/model/network.lua:964
 msgid "Unmanaged"
 msgstr "Não gerenciado"
@@ -5714,24 +5843,32 @@ msgstr "Não gerenciado"
 msgid "Unmount"
 msgstr "Desmontar"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:107
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:262
 msgid "Unnamed key"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1708
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2261
 msgid "Unsaved Changes"
 msgstr "Alterações Não Salvas"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:202
+msgid "Unspecified error"
+msgstr ""
+
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:64
 msgid "Unsupported MAP type"
 msgstr ""
 "Tipo de <abbr title=\"Mapeamento de Endereço e Porta/Mapping of Address and "
 "Port\">MAP</abbr> não suportado"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:27
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:69
 msgid "Unsupported modem"
 msgstr "Modem não suportado"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:219
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:119
 msgid "Unsupported protocol type."
 msgstr "Tipo de protocolo não suportado."
@@ -5754,58 +5891,72 @@ msgstr ""
 msgid "Upload archive..."
 msgstr "Enviar arquivo..."
 
-#: modules/luci-base/luasrc/view/cbi/upload.htm:8
-msgid "Uploaded File"
-msgstr "Arquivo Carregado"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1703
+msgid "Upload file"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1678
+msgid "Upload file…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1623
+msgid "Upload request failed: %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:613
+msgid ""
+"Upon pressing \"Continue\", anonymous \"wifi-iface\" sections will be "
+"assigned with a name in the form <em>wifinet#</em> and the network will be "
+"restarted to apply the updated configuration."
+msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:14
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:74
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:85
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:26
 msgid "Uptime"
 msgstr "Tempo de atividade"
 
-#: 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:83
 msgid "Use <code>/etc/ethers</code>"
 msgstr "Usar <code>/etc/ethers</code>"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:40
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:167
 msgid "Use DHCP gateway"
 msgstr "Use o roteador do DHCP"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:33
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:85
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:34
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:98
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:46
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:65
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:38
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:58
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:124
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:39
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:116
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:59
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:103
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:64
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:77
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:100
 msgid "Use DNS servers advertised by peer"
 msgstr "Use os servidores DNS anunciados pelo parceiro"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:227
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:233
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:479
 msgid "Use ISO/IEC 3166 alpha2 country codes."
 msgstr "Usar códigos de países ISO/IEC 3166 alpha2."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:31
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:100
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:70
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:35
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:51
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:86
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:56
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:97
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:77
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:75
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:92
 msgid "Use MTU on tunnel interface"
 msgstr ""
 "Use o <abbr title=\"Maximum Transmission Unit/Unidade Máxima de Transmissão"
 "\">MTU</abbr> na interface do túnel"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:95
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:65
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:30
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:46
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:81
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:93
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:73
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:88
 msgid "Use TTL on tunnel interface"
 msgstr "Use TTL na interface do túnel"
 
@@ -5817,68 +5968,65 @@ msgstr "Use como uma sobreposição externa (/overlay)"
 msgid "Use as root filesystem (/)"
 msgstr "Usar como o sistema de arquivos raiz (/)"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:19
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:31
 msgid "Use broadcast flag"
 msgstr "Use a marcação de broadcast"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:253
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:791
 msgid "Use builtin IPv6-management"
 msgstr "Use o gerenciamento do IPv6 embarcado"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:40
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:109
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:92
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:45
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:105
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:53
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:72
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:45
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:65
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:40
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:182
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:127
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:42
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:119
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:62
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:67
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:80
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:103
 msgid "Use custom DNS servers"
 msgstr "Use servidores DNS personalizados"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:26
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:70
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:16
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:28
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:84
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:24
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:50
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:23
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:43
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:116
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:33
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:74
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:97
 msgid "Use default gateway"
 msgstr "Use o roteador padrão"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:48
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:164
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:77
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:24
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:88
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:58
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:23
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:39
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:74
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:90
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:38
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:57
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:30
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:50
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:45
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:227
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:119
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:51
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:88
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:68
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:52
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:70
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:83
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:111
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:149
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:67
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:111
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:98
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:72
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:85
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:108
 msgid "Use gateway metric"
 msgstr "Use a métrica do roteador"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:64
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:179
 msgid "Use routing table"
 msgstr "Use a tabela de roteamento"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:309
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:310
 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 "
@@ -5896,11 +6044,11 @@ msgstr ""
 msgid "Used"
 msgstr "Usado"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:848
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1273
 msgid "Used Key Slot"
 msgstr "Posição da Chave Usada"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:913
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
 msgid ""
 "Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not "
 "needed with normal WPA(2)-PSK."
@@ -5908,67 +6056,68 @@ msgstr ""
 "Usado para dois diferentes propósitos: identificador do RADIUS NAS e do "
 "802.11r R0KH. Não necessário com o WPA(2)-PSK normal."
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:48
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:110
 msgid "User certificate (PEM encoded)"
 msgstr "Certificado do usuário (codificado em formato PEM)"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:61
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:122
 msgid "User key (PEM encoded)"
 msgstr "Chave do usuário (codificada em formato PEM)"
 
 #: modules/luci-base/luasrc/view/sysauth.htm:23
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:41
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:32
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:102
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:56
 msgid "Username"
 msgstr "Usuário"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:182
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:903
 msgid "VC-Mux"
 msgstr "VC-Mux"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:851
 msgid "VDSL"
 msgstr "VDSL"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:172
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:169
 msgid "VLANs on %q"
 msgstr "VLANs em %q"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:171
-msgid "VLANs on %q (%s)"
-msgstr "VLANs em %q (%s)"
+#: modules/luci-base/luasrc/controller/admin/index.lua:55
+msgid "VPN"
+msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:18
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:42
 msgid "VPN Local address"
 msgstr "Endereço Local da VPN"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:22
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:46
 msgid "VPN Local port"
 msgstr "Porta Local da VPN"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:15
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:11
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:15
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:58
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:39
 msgid "VPN Server"
 msgstr "Servidor VPN"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:18
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:96
 msgid "VPN Server port"
 msgstr "Porta do Servidor VPN"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:37
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:100
 msgid "VPN Server's certificate SHA1 hash"
 msgstr "Resumo digital SHA1 do certificado do servidor VPN"
 
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:9
 #: protocols/luci-proto-vpnc/luasrc/model/network/proto_vpnc.lua:9
 msgid "VPNC (CISCO 3000 (and others) VPN)"
 msgstr "VPNC (VPN do CISCO 3000 (e outros))"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:44
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:73
 msgid "Vendor"
 msgstr "Fabricante"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:60
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:52
 msgid "Vendor Class to send when requesting DHCP"
 msgstr "Classe do fabricante para enviar quando requisitar o DHCP"
 
@@ -5976,41 +6125,37 @@ msgstr "Classe do fabricante para enviar quando requisitar o DHCP"
 msgid "Verify"
 msgstr "Verificar"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:52
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:76
 msgid "Virtual dynamic interface"
 msgstr "Interface virtual dinâmica"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:470
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:471
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:553
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:576
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:908
 msgid "WDS"
 msgstr "WDS"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:667
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1160
 msgid "WEP Open System"
 msgstr "WEP Sistema Aberto"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:668
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1161
 msgid "WEP Shared Key"
 msgstr "WEP Chave Compartilhada"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "WEP passphrase"
 msgstr "WEP Senha"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:503
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:566
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:945
 msgid "WMM Mode"
 msgstr "Modo WMM"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "WPA passphrase"
 msgstr "WPA Senha"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:716
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:735
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:740
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1074
 msgid ""
 "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
 "and ad-hoc mode) to be installed."
@@ -6026,7 +6171,7 @@ msgstr "Esperando a aplicação das mudanças..."
 msgid "Waiting for command to complete..."
 msgstr "Esperando o término do comando..."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1940
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2481
 msgid "Waiting for configuration to get applied… %ds"
 msgstr ""
 
@@ -6034,8 +6179,8 @@ msgstr ""
 msgid "Waiting for device..."
 msgstr "Esperando pelo dispositivo..."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:172
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:163
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:173
 msgid "Warning"
 msgstr "Atenção"
 
@@ -6043,11 +6188,11 @@ msgstr "Atenção"
 msgid "Warning: There are unsaved changes that will get lost on reboot!"
 msgstr "Atenção: Existem mudanças não salvas que serão perdidas ao reiniciar!"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:20
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:34
 msgid "Weak"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:946
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1355
 msgid ""
 "When using a PSK, the PMK can be automatically generated. When enabled, the "
 "R0/R1 key options below are not applied. Disable this to use the R0 and R1 "
@@ -6055,78 +6200,85 @@ msgid ""
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:383
 msgid "Width"
 msgstr "Largura"
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:17
 #: protocols/luci-proto-wireguard/luasrc/model/network/proto_wireguard.lua:9
 msgid "WireGuard VPN"
 msgstr "VPN WireGuard"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:58
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:40
 #: modules/luci-mod-status/luasrc/controller/admin/status.lua:28
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:14
 msgid "Wireless"
 msgstr "Rede sem fio"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1631
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1837
 #: modules/luci-base/luasrc/model/network.lua:1418
 msgid "Wireless Adapter"
 msgstr "Dispositivo de Rede sem Fio"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1617
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2052
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1823
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2288
 #: modules/luci-base/luasrc/model/network.lua:1404
 #: modules/luci-base/luasrc/model/network.lua:1865
 msgid "Wireless Network"
 msgstr "Rede sem Fio"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:629
 msgid "Wireless Overview"
 msgstr "Visão Geral da Rede sem Fio"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:362
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:797
 msgid "Wireless Security"
 msgstr "Segurança da Rede sem Fio"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:54
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:611
+msgid "Wireless configuration migration"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:139
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:179
 msgid "Wireless is disabled"
 msgstr "Rede sem fio está desabilitada"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:54
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:139
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:179
 msgid "Wireless is not associated"
 msgstr "Rede sem fio está não conectada"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:15
-msgid "Wireless is restarting..."
-msgstr "A rede sem fio está reiniciando..."
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:752
 msgid "Wireless network is disabled"
 msgstr "A rede sem fio está desabilitada"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:752
 msgid "Wireless network is enabled"
 msgstr "A rede sem fio está habilitada"
 
-#: 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:182
 msgid "Write received DNS requests to syslog"
 msgstr "Escreva as requisições DNS para o servidor de registro (syslog)"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:164
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:155
 msgid "Write system log to file"
 msgstr "Escrever registro do sistema (log) no arquivo"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1507
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:85
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1754
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:109
 msgid "Yes"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:26
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:943
+msgid ""
+"You appear to be currently connected to the device via the \"%h\" interface. "
+"Do you really want to shut down the interface?"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:123
 msgid ""
 "You can enable or disable installed init scripts here. Changes will applied "
 "after a device reboot.<br /><strong>Warning: If you disable essential init "
@@ -6148,38 +6300,34 @@ msgstr ""
 "Você precisa habilitar o JavaScript no seu navegador ou o LuCI não irá "
 "funcionar corretamente."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:196
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:187
 msgid "ZRam Compression Algorithm"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:203
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:194
 msgid "ZRam Compression Streams"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:189
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:180
 msgid "ZRam Settings"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:191
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
 msgid "ZRam Size"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:229
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:230
 msgid "any"
 msgstr "qualquer"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:113
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:121
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:126
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:218
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:282
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:321
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:328
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:621
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:37
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:22
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:29
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:121
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:836
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:844
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:849
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1030
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:78
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:48
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:51
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:103
 msgid "auto"
 msgstr "automático"
 
@@ -6187,11 +6335,11 @@ msgstr "automático"
 msgid "automatic"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:45
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:78
 msgid "baseT"
 msgstr "baseT"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:909
 msgid "bridged"
 msgstr "em ponte"
 
@@ -6207,22 +6355,21 @@ msgstr "criar"
 msgid "create:"
 msgstr "criar:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:264
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:368
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:678
 msgid "creates a bridge over specified interface(s)"
 msgstr "cria uma ponte sobre determinada(s) interface(s)"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:277
 msgid "dB"
 msgstr "dB"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:34
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:35
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:46
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:47
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:48
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:131
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:132
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:133
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:277
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:279
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:331
@@ -6234,26 +6381,30 @@ msgstr "dB"
 msgid "dBm"
 msgstr "dBm"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:460
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:587
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:889
 msgid "disable"
 msgstr "desativar"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:119
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:524
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:530
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:536
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:18
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:578
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:584
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:590
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:25
 msgid "disabled"
 msgstr "desabilitado"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:433
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:467
+msgid "driver default"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/lease_status.htm:17
 #: modules/luci-base/luasrc/view/lease_status.htm:46
-#: 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:416
 msgid "expired"
 msgstr "expirado"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:88
 msgid ""
 "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr>-leases will be stored"
@@ -6267,25 +6418,21 @@ msgstr ""
 msgid "forward"
 msgstr "encaminhar"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:80
 msgid "full-duplex"
 msgstr "full-duplex"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:80
 msgid "half-duplex"
 msgstr "half-duplex"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:559
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:565
 msgid "hexadecimal encoded value"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:138
-msgid "hidden"
-msgstr "ocultar"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:527
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:533
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:538
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:581
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:587
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:592
 msgid "hybrid mode"
 msgstr "modo híbrido"
 
@@ -6293,6 +6440,10 @@ msgstr "modo híbrido"
 msgid "if target is a network"
 msgstr "se o destino for uma rede"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:63
+msgid "ignore"
+msgstr ""
+
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:177
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
@@ -6327,27 +6478,28 @@ msgstr ""
 msgid "key with either 5 or 13 characters"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:94
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:95
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr ""
 "arquivo local de <abbr title=\"Sistema de Nomes de Domínios\">DNS</abbr>"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:952
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1168
+msgid "medium security"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1360
 msgid "minutes"
 msgstr "minutos"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:43
-msgid "mixed WPA/WPA2"
-msgstr "WPA/WPA2 em modo misto"
-
 # Is this yes/no or no like in no one?
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:225
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:232
 msgid "no"
 msgstr "não"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:54
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:72
 msgid "no link"
 msgstr "sem link"
 
@@ -6355,7 +6507,7 @@ msgstr "sem link"
 msgid "non-empty value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1195
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1446
 msgid "none"
 msgstr "nenhum"
 
@@ -6365,7 +6517,9 @@ msgstr "nenhum"
 msgid "not present"
 msgstr "não presente"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:363
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:341
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:776
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:780
 #: 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
@@ -6380,9 +6534,9 @@ msgstr "desligado"
 msgid "on"
 msgstr "ligado"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
-msgid "open"
-msgstr "aberto"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1169
+msgid "open network"
+msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
@@ -6401,73 +6555,77 @@ msgstr ""
 msgid "positive integer value"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:34
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:56
 msgid "random"
 msgstr "aleatório"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:526
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:532
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:537
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:580
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:586
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:591
 msgid "relay mode"
 msgstr "modo retransmissor"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:910
 msgid "routed"
 msgstr "roteado"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:525
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:534
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:968
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:977
 msgid "sec"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:525
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:531
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:579
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:585
 msgid "server mode"
 msgstr "modo servidor"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:544
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:597
 msgid "stateful-only"
 msgstr "somente com estado"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:542
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:595
 msgid "stateless"
 msgstr "sem estado"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:543
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:596
 msgid "stateless + stateful"
 msgstr "sem estado + com estado"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:369
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1167
+msgid "strong security"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:346
 msgid "tagged"
 msgstr "etiquetado"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:932
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1343
 msgid "time units (TUs / 1.024 ms) [1000-65535]"
 msgstr "unidades de tempo (TUs / 1.024 ms) [1000-65535]"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:549
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:555
 msgid "unique value"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:448
 msgid "unknown"
 msgstr "desconhecido"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:15
 #: modules/luci-base/luasrc/view/lease_status.htm:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:238
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:390
+#: 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:414
 msgid "unlimited"
 msgstr "ilimitado"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1401
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1648
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:63
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:355
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:378
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:413
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:446
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:512
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:450
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:545
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:53
 #: modules/luci-base/luasrc/view/cbi/network_netlist.htm:38
 msgid "unspecified"
@@ -6477,7 +6635,7 @@ msgstr "não especificado"
 msgid "unspecified -or- create:"
 msgstr "não especificado -ou- criar:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:366
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:344
 msgid "untagged"
 msgstr "não etiquetado"
 
@@ -6558,8 +6716,8 @@ msgstr ""
 msgid "valid address:port"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:523
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:527
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:529
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:533
 msgid "valid date (YYYY-MM-DD)"
 msgstr ""
 
@@ -6596,7 +6754,7 @@ msgstr ""
 msgid "valid network in address/netmask notation"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:498
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:504
 msgid "valid phone digit (0-9, \"*\", \"#\", \"!\" or \".\")"
 msgstr ""
 
@@ -6609,11 +6767,11 @@ msgstr ""
 msgid "valid port value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:503
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:509
 msgid "valid time (HH:MM:SS)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:425
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:431
 msgid "value between %d and %d characters"
 msgstr ""
 
@@ -6629,14 +6787,23 @@ msgstr ""
 msgid "value smaller or equal to %f"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:430
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:425
+msgid "value with %d characters"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:436
 msgid "value with at least %d characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:435
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:441
 msgid "value with at most %d characters"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1169
+msgid "weak security"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:221
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:232
@@ -6647,6 +6814,244 @@ msgstr "sim"
 msgid "« Back"
 msgstr "« Voltar"
 
+#~ msgid "Disabled (default)"
+#~ msgstr "Desabilitado (padrão)"
+
+#~ msgid "Specifies the listening port of this <em>Dropbear</em> instance"
+#~ msgstr "Especifica a porta de escuta deste <em>Dropbear</em>"
+
+#~ msgid "Switch %q (%s)"
+#~ msgstr "Switch %q (%s)"
+
+#~ msgid "VLANs on %q (%s)"
+#~ msgstr "VLANs em %q (%s)"
+
+#~ msgid "Antenna 1"
+#~ msgstr "Antena 1"
+
+#~ msgid "Antenna 2"
+#~ msgstr "Antena 2"
+
+#~ msgid "Antenna Configuration"
+#~ msgstr "Configuração da antena"
+
+#~ msgid "Back to overview"
+#~ msgstr "Voltar para visão geral"
+
+#~ msgid "Back to scan results"
+#~ msgstr "Voltar para os resultados da busca"
+
+#~ msgid "Broadcom 802.11%s Wireless Controller"
+#~ msgstr "Controlador Wireless Broadcom 802.11%s"
+
+#~ msgid "Broadcom BCM%04x 802.11 Wireless Controller"
+#~ msgstr "Broadcom BCM%04x 802.11 Wireless Controlador"
+
+#~ msgid ""
+#~ "Channel %d is not available in the %s regulatory domain and has been auto-"
+#~ "adjusted to %d."
+#~ msgstr ""
+#~ "O canal %d não está disponível no domínio regulatório '%s' e foi ajustado "
+#~ "automaticamente para %d."
+
+#~ msgid "Common Configuration"
+#~ msgstr "Configuração Comum"
+
+#~ msgid "Connect"
+#~ msgstr "Conectar"
+
+#~ msgid "Connection Limit"
+#~ msgstr "Limite de conexão"
+
+#~ msgid "Cover the following interface"
+#~ msgstr "Utilizando a seguinte interface"
+
+#~ msgid "Cover the following interfaces"
+#~ msgstr "Utilizando as seguintes interfaces"
+
+#~ msgid "Create Interface"
+#~ msgstr "Criar Interface"
+
+#~ msgid "Create a bridge over multiple interfaces"
+#~ msgstr "Criar uma ponte juntando múltiplas interfaces"
+
+#~ msgid "Diversity"
+#~ msgstr "Diversidade"
+
+#~ msgid "Edit this interface"
+#~ msgstr "Editar esta interface"
+
+#~ msgid "Frame Bursting"
+#~ msgstr "Explosão de Quadros (Frame Bursting)"
+
+#~ msgid ""
+#~ "Further information about WireGuard interfaces and peers at <a href="
+#~ "\"http://wireguard.com\">wireguard.com</a>."
+#~ msgstr ""
+#~ "Mais informações sobre interfaces e parceiros WireGuard em <a href="
+#~ "\"http://wireguard.com\">wireguard.com</a>."
+
+#~ msgid "Generic 802.11%s Wireless Controller"
+#~ msgstr "Generico 802.11%s Wireless Controlador"
+
+#~ msgid "HT mode (802.11n)"
+#~ msgstr ""
+#~ "Modo <abbr title=\"High Throughput/Alta Taxa de Transferência\">HT</"
+#~ "abbr>  (802.11n)"
+
+#~ msgid "Install package %q"
+#~ msgstr "Instalar pacote %q"
+
+#~ msgid "Interface Overview"
+#~ msgstr "Visão Geral da Interface"
+
+#~ msgid "Locked to channel %s used by: %s"
+#~ msgstr "Travado no canal %s usado por: %s"
+
+#~ msgid ""
+#~ "Maximum length of the name is 15 characters including the automatic "
+#~ "protocol/bridge prefix (br-, 6in4-, pppoe- etc.)"
+#~ msgstr ""
+#~ "Comprimento máximo do nome é de 15 caracteres, incluindo o prefixo "
+#~ "automático do protocolo/ponte (br-, 6in4- pppoe-, etc.)"
+
+#~ msgid "Missing protocol extension for proto %q"
+#~ msgstr "Extensão para o protocolo %q está ausente"
+
+#~ msgid "Name of the new interface"
+#~ msgstr "Nome da nova interface"
+
+#~ msgid "No network configured on this device"
+#~ msgstr "Nenhuma rede configurada neste dispositivo"
+
+#~ msgid "No network name specified"
+#~ msgstr "Nenhum nome de rede foi especificado"
+
+#~ msgid "No scan results available yet..."
+#~ msgstr "Ainda não existem resultados do escaneamento..."
+
+#~ msgid "Not associated"
+#~ msgstr "Não conectado"
+
+#~ msgid "Note: interface name length"
+#~ msgstr "Aviso: tamanho do nome da interface"
+
+#~ msgid ""
+#~ "On this page you can configure the network interfaces. You can bridge "
+#~ "several interfaces by ticking the \"bridge interfaces\" field and enter "
+#~ "the names of several network interfaces separated by spaces. You can also "
+#~ "use <abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
+#~ "<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
+#~ "<samp>eth0.1</samp>)."
+#~ msgstr ""
+#~ "Nesta página pode configurar as interfaces de rede. Esta interface pode "
+#~ "formar uma ponte juntando várias interfaces. Para isto, marque o campo "
+#~ "\"Juntar interfaces em uma ponte\" e informar as várias interfaces de "
+#~ "rede. Pode também usar a notação para <abbr title=\"Rede Local Virtual"
+#~ "\">VLAN</abbr> <samp>INTERFACE.VLANNR</samp> (<abbr title=\"por exemplo"
+#~ "\">ex.</abbr>: <samp>eth0.1</samp>)."
+
+#~ msgid "Package libiwinfo required!"
+#~ msgstr "O pacote libiwinfo é necessário!"
+
+#~ msgid "Protocol of the new interface"
+#~ msgstr "Protocolo para a nova interface"
+
+#~ msgid "Protocol support is not installed"
+#~ msgstr "O suporte ao protocolo não está instalado"
+
+#~ msgid ""
+#~ "Really delete this wireless network? The deletion cannot be undone! You "
+#~ "might lose access to this device if you are connected via this network."
+#~ msgstr ""
+#~ "Realmente excluir esta interface Wireless? A exclusão não pode ser "
+#~ "desfeita!\n"
+#~ "Você poderá perder o acesso a este dispositivo se você estiver conectado "
+#~ "através desta interface."
+
+#~ msgid "Receiver Antenna"
+#~ msgstr "Antena de Recepção"
+
+#~ msgid "Repeat scan"
+#~ msgstr "Repetir busca"
+
+#~ msgid "Replace entry"
+#~ msgstr "Substituir entrada"
+
+#~ msgid "Scan request failed"
+#~ msgstr "O pedido de escaneamento falhou"
+
+#~ msgid "Separate Clients"
+#~ msgstr "Isolar Clientes"
+
+#~ msgid "Slot time"
+#~ msgstr "Intervalo de tempo"
+
+#~ msgid ""
+#~ "The <em>Device Configuration</em> section covers physical settings of the "
+#~ "radio hardware such as channel, transmit power or antenna selection which "
+#~ "are shared among all defined wireless networks (if the radio hardware is "
+#~ "multi-SSID capable). Per network settings like encryption or operation "
+#~ "mode are grouped in the <em>Interface Configuration</em>."
+#~ msgstr ""
+#~ "A seção da <em>Configuração do Dispositivo</em> engloba as configurações "
+#~ "físicas do rádio como canal, potência de transmissão ou seleção da "
+#~ "antena. Estas configurações são compartilhadas entre todas as redes sem "
+#~ "fio (se o hardware for capaz de utilizar múltiplas SSID). As "
+#~ "configurações específicas de cada rede, como cifragem ou modo de operação "
+#~ "estão agrupadas na <em>Configuração da Interface</em>."
+
+#~ msgid ""
+#~ "The <em>libiwinfo-lua</em> package is not installed. You must install "
+#~ "this component for working wireless configuration!"
+#~ msgstr ""
+#~ "O pacote <em>libiwinfo-lua</em> não está instalado. Você precisa instalar "
+#~ "este componente para ter uma configuração da rede sem fio funcional!"
+
+#~ msgid "The given network name is not unique"
+#~ msgstr "O nome de rede informado não é único"
+
+#~ msgid ""
+#~ "The hardware is not multi-SSID capable and the existing configuration "
+#~ "will be replaced if you proceed."
+#~ msgstr ""
+#~ "Este equipamento não é capaz de utilizar SSID múltiplos e as "
+#~ "configurações existentes serão substituídas se você proceder."
+
+#~ msgid "The selected protocol needs a device assigned"
+#~ msgstr "O protocolo selecionado necessita estar associado a um dispositivo"
+
+#~ msgid ""
+#~ "There is no device assigned yet, please attach a network device in the "
+#~ "\"Physical Settings\" tab"
+#~ msgstr ""
+#~ "Ainda não existe um dispositivo associado. Por favor, associe um "
+#~ "dispositivo de rede na aba \"Configurações Físicas\""
+
+#~ msgid "Transmission Rate"
+#~ msgstr "Taxa de Transmissão"
+
+#~ msgid "Transmit Power"
+#~ msgstr "Potência de Transmissão"
+
+#~ msgid "Transmitter Antenna"
+#~ msgstr "Antena de Transmissão"
+
+#~ msgid "Uploaded File"
+#~ msgstr "Arquivo Carregado"
+
+#~ msgid "Wireless is restarting..."
+#~ msgstr "A rede sem fio está reiniciando..."
+
+#~ msgid "hidden"
+#~ msgstr "ocultar"
+
+#~ msgid "mixed WPA/WPA2"
+#~ msgstr "WPA/WPA2 em modo misto"
+
+#~ msgid "open"
+#~ msgstr "aberto"
+
 #~ msgid "Apply anyway"
 #~ msgstr "Aplicar sem verificação"
 
@@ -6859,9 +7264,6 @@ msgstr "« Voltar"
 #~ msgid "Hermes 802.11b Wireless Controller"
 #~ msgstr "Hermes 802.11b Wireless Controlador"
 
-#~ msgid "Interface is shutting down..."
-#~ msgstr "A interface está desligando..."
-
 #~ msgid "Interface reconnected"
 #~ msgstr "Interface reconectada"
 
diff --git a/modules/luci-base/po/pt/base.po b/modules/luci-base/po/pt/base.po
index dc9cb398a..ba2553053 100644
--- a/modules/luci-base/po/pt/base.po
+++ b/modules/luci-base/po/pt/base.po
@@ -13,19 +13,20 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.6\n"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:133
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:857
 msgid "%.1f dB"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:109
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:122
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 msgid "%d Bit"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1641
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2194
 msgid "%d invalid field(s)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:281
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:31
 msgid "%s is untagged in multiple VLANs!"
 msgstr ""
 
@@ -63,19 +64,19 @@ msgid "-- Additional Field --"
 msgstr "-- Campo Adicional --"
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:258
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1401
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1533
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:250
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:350
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1114
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1648
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1780
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:314
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:414
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1178
 #: modules/luci-base/luasrc/view/cbi/header.htm:5
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:26
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:88
 msgid "-- Please choose --"
 msgstr "-- Por favor escolha --"
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:259
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:351
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1115
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:415
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1179
 #: modules/luci-base/luasrc/view/cbi/header.htm:6
 msgid "-- custom --"
 msgstr "-- personalizado --"
@@ -98,7 +99,7 @@ msgstr ""
 msgid "-- please select --"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:382
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:814
 msgid "0 = not using RSSI threshold, 1 = do not change driver default"
 msgstr ""
 
@@ -110,10 +111,11 @@ msgstr "Carga de 1 Minuto:"
 msgid "15 Minute Load:"
 msgstr "Carga de 15 minutos:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:924
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1337
 msgid "4-character hexadecimal ID"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:11
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:18
 msgid "464XLAT (CLAT)"
 msgstr ""
@@ -122,50 +124,50 @@ msgstr ""
 msgid "5 Minute Load:"
 msgstr "Carga 5 Minutos:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:960
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1366
 msgid "6-octet identifier as a hex string - no colons"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:891
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1310
 msgid "802.11r Fast Transition"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1157
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1567
 msgid "802.11w Association SA Query maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1574
 msgid "802.11w Association SA Query retry timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1133
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1533
 msgid "802.11w Management Frame Protection"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1156
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1567
 msgid "802.11w maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1165
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1574
 msgid "802.11w retry timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:399
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:831
 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:224
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:225
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
 msgstr ""
 "Porta de consulta de <abbr title=\"Servidor de Nomes de Domínio\">DNS</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:215
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:216
 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:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
 msgid ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
 "order of the resolvfile"
@@ -173,12 +175,12 @@ msgstr ""
 "Os servidores de <abbr title=\"Servidor de Nomes de Domínio\">DNS</abbr> "
 "serão consultados pela ordem no ficheiro resolv"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:388
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:820
 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:351
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:373
 #: 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>"
@@ -188,8 +190,8 @@ msgstr "Endereço <abbr title=\"Protocolo de Internet Versão 4\">IPv4</abbr>"
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
 msgstr "Gateway <abbr title=\"Protocolo de Internet Versão 4\">IPv4</abbr>"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:555
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:35
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:506
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr ""
 "Máscara de rede <abbr title=\"Protocolo de Internet Versão 4\">IPv4</abbr>"
@@ -206,29 +208,29 @@ 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:378
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:402
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:58
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:35
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:33
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "Configuração do <abbr title=\"Diodo Emissor de Luz\">LED</abbr>"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:67
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:51
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 msgstr "Nome da <abbr title=\"Diodo Emissor de Luz\">LED</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:328
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:329
 #: 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:372
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:233
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:234
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> leases"
@@ -236,7 +238,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:242
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> packet size"
@@ -244,65 +246,69 @@ 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:251
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:252
 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
 msgstr "<abbr title=\"máximo\">Max.</abbr> consultas concorrentes"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:10
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:42
 msgid ""
 "<br/>Note: you need to manually restart the cron service if the crontab file "
 "was empty before editing."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:817
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1605
+msgid "A directory with the same name already exists."
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:863
 msgid "A new login is required since the authentication session expired."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:114
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:837
 msgid "A43C + J43 + A43"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:838
 msgid "A43C + J43 + A43 + V43"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:850
 msgid "ADSL"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:826
 msgid "ANSI T1.413"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:33
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:47
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:23
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:94
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:86
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:67
 msgid "APN"
 msgstr "APN"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:56
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:175
 msgid "ARP retry threshold"
 msgstr "Limiar de tentativas ARP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:122
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:845
 msgid "ATM (Asynchronous Transfer Mode)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:144
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:866
 msgid "ATM Bridges"
 msgstr "Bridges ATM"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:178
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:21
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:898
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:66
 msgid "ATM Virtual Channel Identifier (VCI)"
 msgstr "Identificador Canais Virtuais ATM (VCI)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:179
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:26
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:899
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:70
 msgid "ATM Virtual Path Identifier (VPI)"
 msgstr "Identificador de Caminho Virtual ATM (VPI)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:866
 msgid ""
 "ATM bridges expose encapsulated ethernet in AAL5 connections as virtual "
 "Linux network interfaces which can be used in conjunction with DHCP or PPP "
@@ -312,8 +318,8 @@ msgstr ""
 "interface de Rede Virtual Linux que pode ser usada em conjugação com o DHCP "
 "ou PPP para marcar para a rede ISP."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:184
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:905
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:62
 msgid "ATM device number"
 msgstr "Número de Dispositivo ATM"
 
@@ -322,17 +328,17 @@ msgid "ATU-C System Vendor ID"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:251
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:495
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:499
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:528
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:532
 msgid "Absent Interface"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:19
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
 msgid "Access Concentrator"
 msgstr "Concentrador de Acesso"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:368
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:470
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:802
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
 msgid "Access Point"
 msgstr "Access Point (AP)"
 
@@ -357,7 +363,7 @@ msgid "Active Connections"
 msgstr "Ligações Ativas"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:68
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:30
 msgid "Active DHCP Leases"
 msgstr "Concessões DHCP Ativas"
 
@@ -365,57 +371,77 @@ msgstr "Concessões DHCP Ativas"
 msgid "Active DHCPv6 Leases"
 msgstr "Concessões DHCPv6 Ativas"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1951
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:370
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:12
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2190
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:804
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:23
 msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:650
-#: modules/luci-base/htdocs/luci-static/resources/form.js:651
-#: modules/luci-base/htdocs/luci-static/resources/form.js:666
-#: modules/luci-base/htdocs/luci-static/resources/form.js:667
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1290
+#: modules/luci-base/htdocs/luci-static/resources/form.js:902
+#: modules/luci-base/htdocs/luci-static/resources/form.js:904
+#: modules/luci-base/htdocs/luci-static/resources/form.js:917
+#: modules/luci-base/htdocs/luci-static/resources/form.js:918
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1539
 #: modules/luci-base/luasrc/view/cbi/nsection.htm:25
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:189
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:197
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:39
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:47
 #: modules/luci-base/luasrc/view/cbi/ucisection.htm:54
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:703
 msgid "Add"
 msgstr "Adicionar"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:60
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:870
+msgid "Add ATM Bridge"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:92
 msgid "Add IPv4 address…"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:129
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:204
 msgid "Add IPv6 address…"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:143
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:149
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:38
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:47
+msgid "Add LED action"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:215
+msgid "Add VLAN"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:14
+msgid "Add instance"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:153
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:159
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:250
 msgid "Add key"
 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:155
 msgid "Add local domain suffix to names served from hosts files"
 msgstr ""
 "Adicionar um sufixo de domínio local aos nomes servidos dos ficheiros de "
 "hosts"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:705
 msgid "Add new interface..."
 msgstr "Adicionar uma nova interface..."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:104
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:99
+msgid "Add peer"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:105
 msgid "Additional Hosts files"
 msgstr "Ficheiro Adicional de Hosts"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:161
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
 msgid "Additional servers file"
 msgstr ""
 
@@ -442,7 +468,7 @@ msgstr ""
 msgid "Address"
 msgstr "Endereço"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:12
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:151
 msgid "Address to access local relay bridge"
 msgstr ""
 
@@ -451,13 +477,13 @@ msgstr ""
 msgid "Administration"
 msgstr "Administração"
 
-#: 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:70
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:505
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:896
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:24
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:189
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:463
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:176
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:143
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:364
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:742
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:799
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:50
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:34
 msgid "Advanced Settings"
@@ -467,168 +493,168 @@ msgstr "Definições Avançadas"
 msgid "Aggregate Transmit Power(ACTATP)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:175
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:166
 msgid "Alert"
 msgstr "Alerta"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1628
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1834
 #: modules/luci-base/luasrc/model/network.lua:1416
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:54
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:78
 msgid "Alias Interface"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:138
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:66
 msgid "Alias of \"%s\""
 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:170
 msgid "All Servers"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:114
 msgid ""
 "Allocate IP addresses sequentially, starting from the lowest available "
 "address"
 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:113
 msgid "Allocate IP sequentially"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:24
 msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
 msgstr ""
 "Permitir autenticação <abbr title=\"Shell Seguro\">SSH</abbr> por senha"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:545
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:987
 msgid "Allow AP mode to disconnect STAs based on low ACK condition"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:462
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:589
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:891
 msgid "Allow all except listed"
 msgstr "Permitir todos, excepto os listados"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:236
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:767
 msgid "Allow legacy 802.11b rates"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:461
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:588
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:890
 msgid "Allow listed only"
 msgstr "Permitir somente os listados"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:198
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:199
 msgid "Allow localhost"
 msgstr "Permitir localhost"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:47
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:35
 msgid "Allow remote hosts to connect to local SSH forwarded ports"
 msgstr ""
 "Permitir que hosts remotos se conectem às portas encaminhadas do SSH local"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:38
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:30
 msgid "Allow root logins with password"
 msgstr "Permitir o login como root só com password"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:39
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:30
 msgid "Allow the <em>root</em> user to login with password"
 msgstr "Permitir que o utilizador <em>root</em> faça login só com password"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:199
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:200
 msgid ""
 "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
 msgstr ""
 "Permitir respostas a montante na gama 127.0.0.1/8, p.e. para serviços RBL"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:135
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:122
 msgid "Allowed IPs"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:549
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:602
 msgid "Always announce default router"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:259
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:782
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
 "option does not comply with IEEE 802.11n-2009!"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:95
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:818
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:119
 msgid "Annex"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:96
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:819
 msgid "Annex A + L + M (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:827
 msgid "Annex A G.992.1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:828
 msgid "Annex A G.992.2"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:829
 msgid "Annex A G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:830
 msgid "Annex A G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:97
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:820
 msgid "Annex B (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:823
 msgid "Annex B G.992.1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:824
 msgid "Annex B G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:102
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:825
 msgid "Annex B G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:98
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:821
 msgid "Annex J (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:831
 msgid "Annex L G.992.3 POTS 1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:99
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:822
 msgid "Annex M (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:109
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:832
 msgid "Annex M G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:833
 msgid "Annex M G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:550
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:602
 msgid "Announce as default router even if no public prefix is available."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:555
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:607
 msgid "Announced DNS domains"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:554
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:606
 msgid "Announced DNS servers"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1093
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1496
 msgid "Anonymous Identity"
 msgstr ""
 
@@ -640,20 +666,6 @@ msgstr ""
 msgid "Anonymous Swap"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:322
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:329
-msgid "Antenna 1"
-msgstr "Antena 1"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:323
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:330
-msgid "Antenna 2"
-msgstr "Antena 2"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:246
-msgid "Antenna Configuration"
-msgstr "Configuração das Antenas"
-
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:71
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:160
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:181
@@ -661,11 +673,11 @@ msgstr "Configuração das Antenas"
 msgid "Any zone"
 msgstr "Qualquer zona"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1981
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2522
 msgid "Apply request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1867
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2409
 msgid "Apply unchecked"
 msgstr ""
 
@@ -673,8 +685,8 @@ msgstr ""
 msgid "Architecture"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:19
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:184
+#: 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 ""
@@ -683,13 +695,13 @@ msgstr ""
 msgid "Assign interfaces..."
 msgstr "Atribuir interfaces..."
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:124
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:24
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:189
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:31
 msgid ""
 "Assign prefix parts using this hexadecimal subprefix ID for this interface."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:148
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1967
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:22
 msgid "Associated Stations"
 msgstr "Estações Associadas"
@@ -698,20 +710,20 @@ msgstr "Estações Associadas"
 msgid "Associations"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:39
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:37
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:101
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:64
 msgid "Auth Group"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1027
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1421
 msgid "Authentication"
 msgstr "Autenticação"
 
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:29
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:70
 msgid "Authentication Type"
 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:78
 msgid "Authoritative"
 msgstr "Autoritário"
 
@@ -729,17 +741,19 @@ msgstr "Autorização Requerida"
 msgid "Auto Refresh"
 msgstr "Actualização Automática"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:53
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:7
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:17
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:67
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:24
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:36
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:42
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:36
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:106
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:24
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:98
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:50
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:94
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:81
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:55
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:68
 msgid "Automatic"
 msgstr ""
 
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:7
 #: protocols/luci-proto-hnet/luasrc/model/network/proto_hnet.lua:7
 msgid "Automatic Homenet (HNCP)"
 msgstr ""
@@ -782,21 +796,21 @@ msgstr "Disponível"
 msgid "Average:"
 msgstr "Média:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:116
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:839
 msgid "B43 + B43C"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:840
 msgid "B43 + B43C + V43"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:48
 msgid "BR / DMR / AFTR"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:43
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:75
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1620
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:176
 msgid "BSSID"
 msgstr "BSSID"
@@ -810,19 +824,11 @@ msgstr "Voltar à Visão Global"
 msgid "Back to configuration"
 msgstr "Voltar à configuração"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:48
-msgid "Back to overview"
-msgstr "Voltar à vista global"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:20
-msgid "Back to scan results"
-msgstr "Voltar aos resultados do scan"
-
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:17
 msgid "Backup"
 msgstr "Backup"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:38
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:36
 msgid "Backup / Flash Firmware"
 msgstr "Backup / Flashar Firmware"
 
@@ -835,11 +841,11 @@ msgid "Bad address specified!"
 msgstr "Endereço mal especificado!"
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:158
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:288
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:368
 msgid "Band"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:261
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:785
 msgid "Beacon Interval"
 msgstr ""
 
@@ -853,79 +859,85 @@ 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:293
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:294
 msgid ""
 "Bind dynamically to interfaces rather than wildcard address (recommended as "
 "linux default)"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:16
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:48
 msgid "Bind interface"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:16
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:48
 msgid "Bind the tunnel to this interface (optional)."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:49
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:134
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:187
 msgid "Bitrate"
 msgstr "Taxa de bits"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:172
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
 msgid "Bogus NX Domain Override"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1634
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1840
 #: modules/luci-base/luasrc/model/network.lua:1420
 msgid "Bridge"
 msgstr "Bridge"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:264
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:368
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:678
 msgid "Bridge interfaces"
 msgstr "Ativar brigde nas interfaces"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:906
 msgid "Bridge unit number"
 msgstr "Número de unidade da bridge"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:250
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:364
 msgid "Bring up on boot"
 msgstr "Levantar no arranque"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:35
-msgid "Broadcom 802.11%s Wireless Controller"
-msgstr "Controlador Wireless Broadcom 802.11%s"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:45
-msgid "Broadcom BCM%04x 802.11 Wireless Controller"
-msgstr "Controlador Wireless Broadcom BCM%04x 802.11"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1697
+msgid "Browse…"
+msgstr ""
 
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:18
 msgid "Buffered"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:75
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:134
 msgid "CA certificate; if empty it will be saved after the first connection."
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:7
+msgid "CLAT configuration failed"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:13
 msgid "CPU usage (%)"
 msgstr "Uso da CPU (%)"
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:21
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:53
 msgid "Call failed"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1789
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:14
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:52
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:711
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:948
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1839
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:191
 #: modules/luci-mod-system/luasrc/view/admin_system/upgrade.htm:60
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:6
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:17
 msgid "Category"
 msgstr ""
 
@@ -943,13 +955,7 @@ msgstr ""
 msgid "Chain"
 msgstr "Cadeia"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:9
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:14
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:24
-msgid "Change login password"
-msgstr ""
-
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1744
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 msgid "Changes"
 msgstr "Alterações"
 
@@ -957,33 +963,23 @@ msgstr "Alterações"
 msgid "Changes applied."
 msgstr "Alterações aplicadas."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2004
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2545
 msgid "Changes have been reverted."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:43
 msgid "Changes the administrator password for accessing the device"
 msgstr "Altera a password de administrador para acesso ao dispositivo"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:10
-msgid "Changing password…"
-msgstr ""
-
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:162
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:45
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:87
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:174
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:376
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1618
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:186
 msgid "Channel"
 msgstr "Canal"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:119
-msgid ""
-"Channel %d is not available in the %s regulatory domain and has been auto-"
-"adjusted to %d."
-msgstr ""
-
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:229
 msgid "Check"
 msgstr "Verificar"
@@ -992,7 +988,7 @@ msgstr "Verificar"
 msgid "Check filesystems before mount"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1806
 msgid "Check this option to delete the existing networks from this radio."
 msgstr ""
 
@@ -1004,8 +1000,8 @@ msgstr "Checksum"
 msgid "Choose mtdblock"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:358
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:443
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1829
 msgid ""
 "Choose the firewall zone you want to assign to this interface. Select "
 "<em>unspecified</em> to remove the interface from the associated zone or "
@@ -1017,7 +1013,7 @@ msgstr ""
 "coloque em branco o campo <em>criar</em> para definir a nova zona e ligar-"
 "lhe a interface."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:834
 msgid ""
 "Choose the network(s) you want to attach to this wireless interface or fill "
 "out the <em>create</em> field to define a new network."
@@ -1025,11 +1021,11 @@ msgstr ""
 "Escolha a rede(s) à(s) qual(is) deseja ligar esta interface wireless ou "
 "preencha o campo <em>criar</em> para definir a nova rede."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:614
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1023
 msgid "Cipher"
 msgstr "Cifra"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:61
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:91
 msgid "Cisco UDP encapsulation"
 msgstr ""
 
@@ -1047,28 +1043,28 @@ msgid ""
 "FEATURE IS FOR PROFESSIONALS! )"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1950
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:369
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:471
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2189
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:803
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:908
 msgid "Client"
 msgstr "Cliente"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:55
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:52
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:47
 msgid "Client ID to send when requesting DHCP"
 msgstr "ID de cliente a enviar para pedidos de DHCP"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:145
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:151
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:155
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:161
 msgid "Close"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:146
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:119
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:125
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:127
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:98
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:119
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:157
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:141
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:115
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:138
 msgid ""
 "Close inactive connection after the given amount of seconds, use 0 to "
 "persist connection"
@@ -1083,12 +1079,9 @@ msgstr "Fechar lista..."
 #: modules/luci-base/luasrc/view/lease_status.htm:77
 #: modules/luci-base/luasrc/view/lease_status.htm:98
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:118
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:37
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:24
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1965
 #: modules/luci-mod-network/luasrc/view/admin_network/iface_status.htm:6
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:40
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:30
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:8
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:398
 #: modules/luci-mod-status/luasrc/view/admin_status/index/30-network.htm:11
 #: modules/luci-mod-status/luasrc/view/admin_status/index/50-dsl.htm:17
@@ -1102,15 +1095,19 @@ msgstr "A obter dados..."
 msgid "Command"
 msgstr "Comando"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:193
+msgid "Command OK"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:41
+msgid "Command failed"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:64
 msgid "Comment"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:185
-msgid "Common Configuration"
-msgstr "Configuração comum"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
 msgid ""
 "Complicates key reinstallation attacks on the client side by disabling "
 "retransmission of EAPOL-Key frames that are used to install keys. This "
@@ -1118,13 +1115,14 @@ msgid ""
 "negotiation especially in environments with heavy traffic load."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1744
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 #: modules/luci-base/luasrc/controller/admin/uci.lua:11
 #: modules/luci-mod-system/luasrc/view/admin_system/backupfiles.htm:9
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:13
 msgid "Configuration"
 msgstr "Configuração"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:21
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:63
 msgid "Configuration failed"
 msgstr ""
@@ -1133,89 +1131,89 @@ msgstr ""
 msgid "Configuration files will be kept"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1915
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2456
 msgid "Configuration has been applied."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1848
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2395
 msgid "Configuration has been rolled back!"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:43
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:942
+msgid "Confirm disconnect"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:50
 msgid "Confirmation"
 msgstr "Confirmação"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:32
-msgid "Connect"
-msgstr "Ligar"
-
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:72
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:105
 msgid "Connected"
 msgstr "Ligado"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:338
-msgid "Connection Limit"
-msgstr "Limite de Ligações"
-
 #: modules/luci-base/htdocs/luci-static/resources/network.js:7
 #: modules/luci-base/luasrc/model/network.lua:27
 msgid "Connection attempt failed"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:203
+msgid "Connection lost"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/controller/admin/status.lua:32
 msgid "Connections"
 msgstr "Ligações"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1890
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:66
+msgid "Contents have been saved."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:618
+msgid "Continue"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2431
 msgid ""
 "Could not regain access to the device after applying the configuration "
 "changes. You might need to reconnect if you modified network related "
 "settings such as the IP address or wireless security credentials."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:135
 msgid "Country"
 msgstr "País"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:227
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:233
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:337
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:764
 msgid "Country Code"
 msgstr "Código do País"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:36
-msgid "Cover the following interface"
-msgstr "Abranger a seguinte interface"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:43
-msgid "Cover the following interfaces"
-msgstr "Abranger as seguintes interfaces"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:357
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:86
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:443
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1829
 msgid "Create / Assign firewall-zone"
 msgstr "Criar / Atribuir a uma zona de firewall"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:9
-msgid "Create Interface"
-msgstr "Criar interface"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:33
-msgid "Create a bridge over multiple interfaces"
-msgstr "Criar uma bridge entre múltiplas interfaces "
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:735
+msgid "Create interface"
+msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:174
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:165
 msgid "Critical"
 msgstr "Critico"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:178
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:169
 msgid "Cron Log Level"
 msgstr "Nível de Log do Cron"
 
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:519
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:521
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:447
+msgid "Current power"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:552
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:554
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:51
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:53
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:82
@@ -1223,7 +1221,7 @@ msgstr "Nível de Log do Cron"
 msgid "Custom Interface"
 msgstr "Interface Personalizada"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:36
 msgid "Custom delegated IPv6-prefix"
 msgstr ""
 
@@ -1233,7 +1231,7 @@ msgid ""
 "this, perform a factory-reset first."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:59
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:41
 msgid ""
 "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
 "\">LED</abbr>s if possible."
@@ -1241,46 +1239,47 @@ msgstr ""
 "Customiza o comportamento dos <abbr title=\"Diodo Emissor de Luz\">LED</"
 "abbr>s, se possível."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:799
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1223
 msgid "DAE-Client"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:807
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1231
 msgid "DAE-Port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:815
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1239
 msgid "DAE-Secret"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:448
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:459
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:279
 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:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:61
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:62
 msgid "DHCP and DNS"
 msgstr "DHCP e DNS"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1195
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1385
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:16
 #: modules/luci-base/luasrc/model/network.lua:968
 msgid "DHCP client"
 msgstr "Cliente DHCP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:571
 msgid "DHCP-Options"
 msgstr "Opções DHCP"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_dhcpv6.lua:7
 msgid "DHCPv6 client"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:540
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:594
 msgid "DHCPv6-Mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:529
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:583
 msgid "DHCPv6-Service"
 msgstr ""
 
@@ -1297,31 +1296,31 @@ msgstr ""
 msgid "DNS"
 msgstr "DNS"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:183
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
 msgid "DNS forwardings"
 msgstr "Encaminhamentos DNS"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:30
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:37
 msgid "DNS-Label / FQDN"
 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:136
 msgid "DNSSEC"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:139
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
 msgid "DNSSEC check unsigned"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:73
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:99
 msgid "DPD Idle Timeout"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:14
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:41
 msgid "DS-Lite AFTR address"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:92
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:815
 #: modules/luci-mod-status/luasrc/view/admin_status/index/50-dsl.htm:14
 msgid "DSL"
 msgstr ""
@@ -1330,11 +1329,11 @@ msgstr ""
 msgid "DSL Status"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:125
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:848
 msgid "DSL line mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:519
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:963
 msgid "DTIM Interval"
 msgstr ""
 
@@ -1346,42 +1345,45 @@ msgstr "DUID"
 msgid "Data Rate"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:169
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:180
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:160
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:171
 msgid "Debug"
 msgstr "Depurar"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:759
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:783
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:807
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1183
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1207
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1231
 msgid "Default %d"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:82
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:107
 msgid "Default Route"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:17
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:81
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:51
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:32
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:48
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:85
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:65
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:80
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:108
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:146
 msgid "Default gateway"
 msgstr "Gateway predefinido"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:541
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:594
 msgid "Default is stateless + stateful"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:70
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:54
 msgid "Default state"
 msgstr "Estado predefinido"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:503
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:553
 msgid "Define a name for this network."
 msgstr "Definir um nome para esta rede."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:514
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:571
 msgid ""
 "Define additional DHCP options, for example "
 "\"<code>6,192.168.2.1,192.168.2.2</code>\" which advertises different DNS "
@@ -1391,35 +1393,47 @@ msgstr ""
 "\"<code>6,192.168.2.1,192.168.2.2</code>\" informa os clientes de diferentes "
 "servidores DNS."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:705
-#: modules/luci-base/htdocs/luci-static/resources/form.js:958
-#: modules/luci-base/htdocs/luci-static/resources/form.js:959
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1271
+#: modules/luci-base/htdocs/luci-static/resources/form.js:966
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1210
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1216
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1524
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1758
 #: modules/luci-base/luasrc/view/cbi/nsection.htm:11
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:162
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:16
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:41
 msgid "Delete"
 msgstr "Apagar"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:178
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:187
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:193
 msgid "Delete key"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:45
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1654
+msgid "Delete permission denied"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1656
+msgid "Delete request failed: %d %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:723
 msgid "Delete this network"
 msgstr "Apagar esta rede"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:519
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:963
 msgid "Delivery Traffic Indication Message Interval"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:102
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:108
 msgid "Description"
 msgstr "Descrição"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:224
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1754
+msgid "Deselect"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:215
 msgid "Design"
 msgstr "Tema"
 
@@ -1437,10 +1451,12 @@ msgstr ""
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:177
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:43
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:13
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:38
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:73
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:33
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:52
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:85
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:86
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:72
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:154
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:253
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:86
@@ -1448,15 +1464,24 @@ msgstr ""
 msgid "Device"
 msgstr "Dispositivo"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:138
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:737
 msgid "Device Configuration"
 msgstr "Configuração do Dispositivo"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:81
+msgid "Device is not active"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/reboot.htm:23
 msgid "Device is rebooting..."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1889
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:167
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:513
+msgid "Device is restarting…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2430
 msgid "Device unreachable!"
 msgstr ""
 
@@ -1464,26 +1489,26 @@ msgstr ""
 msgid "Device unreachable! Still waiting for device..."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:123
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:78
 #: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:61
 msgid "Diagnostics"
 msgstr "Diagnósticos"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:45
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:60
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:101
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:93
 msgid "Dial number"
 msgstr ""
 
-#: modules/luci-base/luasrc/view/cbi/filebrowser.htm:99
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1554
 msgid "Directory"
 msgstr "Directório"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:131
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:715
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:754
 msgid "Disable"
 msgstr "Desativar"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:472
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:531
 msgid ""
 "Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for "
 "this interface."
@@ -1491,71 +1516,66 @@ msgstr ""
 "Desativar <abbr title=\"Protocolo Configuração Dinâmica de Hosts\">DHCP</"
 "abbr> para esta interface."
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:64
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:93
 msgid "Disable Encryption"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:530
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:973
 msgid "Disable Inactivity Polling"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:713
 msgid "Disable this network"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:44
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:54
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:68
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:37
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:43
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:37
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1534
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:76
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:107
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:99
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:51
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:95
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:82
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:69
 msgid "Disabled"
 msgstr "Desativado"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1139
-msgid "Disabled (default)"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:544
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:987
 msgid "Disassociate On Low Acknowledgement"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:193
 msgid "Discard upstream RFC1918 responses"
 msgstr "Descartar respostas RFC1918 a montante"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:92
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:114
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:956
 msgid "Disconnect"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:22
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:64
 msgid "Disconnection attempt failed"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1121
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1762
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1855
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:17
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1375
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1995
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2314
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2401
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1634
 msgid "Dismiss"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:240
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:334
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:770
 msgid "Distance Optimization"
 msgstr "Optimização de Distância"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:241
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:770
 msgid "Distance to farthest network member in meters."
 msgstr "Distância para o último host da rede em metros."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:347
-msgid "Diversity"
-msgstr "Diversidade"
-
-#: 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:61
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
@@ -1567,38 +1587,46 @@ 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:158
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:159
 msgid "Do not cache negative replies, e.g. for not existing domains"
 msgstr ""
 "Não colocar em cache as respostas negativas, p.e. para dominios inexistentes"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:123
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:124
 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 servidor públicos "
 "de nomes"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:118
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
 msgid "Do not forward reverse lookups for local networks"
 msgstr "Não encaminhar lookups reversos para as redes locais"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:173
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1639
+msgid "Do you really want to delete \"%s\" ?"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:188
 msgid "Do you really want to delete the following SSH key?"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1637
+msgid "Do you really want to recursively delete the directory \"%s\" ?"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:74
 msgid "Domain required"
 msgstr "Requerer domínio"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:205
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:206
 msgid "Domain whitelist"
 msgstr "Lista Branca do Dominio"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:34
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:67
 msgid "Don't Fragment"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:74
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:75
 msgid ""
 "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
 "<abbr title=\"Domain Name System\">DNS</abbr>-Name"
@@ -1618,19 +1646,19 @@ msgstr "Descarregar backup"
 msgid "Download mtdblock"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:853
 msgid "Downstream SNR offset"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:914
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1169
 msgid "Drag to reorder"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:9
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:11
 msgid "Dropbear Instance"
 msgstr "Instância do Dropbear"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:6
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 msgid ""
 "Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access "
 "and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
@@ -1638,21 +1666,22 @@ msgstr ""
 "Dropbear oferece um acesso shell seguro à rede <abbr title=\"Shell Seguro"
 "\">SSH</abbr> e um servidor <abbr title=\"Cópia Segura\">SCP</abbr> integrado"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:11
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:14
 msgid "Dual-Stack Lite (RFC6333)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:493
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:547
 msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 msgstr ""
 "<abbr title=\"Protocolo de Configuração Dinâmica de Hosts\">DHCP</abbr> "
 "Dinâmico"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:60
 msgid "Dynamic tunnel"
 msgstr "Túnel dinâmico"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:494
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:547
 msgid ""
 "Dynamically allocate DHCP addresses for clients. If disabled, only clients "
 "having static leases will be served."
@@ -1660,21 +1689,21 @@ msgstr ""
 "Alocar dinamicamente endereços DHCP para clientes. Se desativado, só os "
 "clientes com reservas estáticas serão servidos."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:67
 msgid "EA-bits length"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:990
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1386
 msgid "EAP-Method"
 msgstr "Metodo-EAP"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:934
-#: modules/luci-base/htdocs/luci-static/resources/form.js:935
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1199
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1188
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1191
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1450
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:154
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:160
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:38
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:291
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:720
 msgid "Edit"
 msgstr "Editar"
 
@@ -1684,90 +1713,91 @@ msgid ""
 "reload the page."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:38
-msgid "Edit this interface"
-msgstr "Editar esta interface"
-
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:718
 msgid "Edit this network"
 msgstr "Editar esta rede"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:669
+msgid "Edit wireless network"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:167
 msgid "Emergency"
 msgstr "Emergência"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:127
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:715
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:754
 msgid "Enable"
 msgstr "Ativar"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:414
 msgid ""
 "Enable <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> "
 "snooping"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:271
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:412
 msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 msgstr "Ativar <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:41
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:60
 msgid "Enable HE.net dynamic endpoint update"
 msgstr "Ativar a atualização dinâmica de ponto final HE.net"
 
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:51
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:89
 msgid "Enable IPv6 negotiation"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:23
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:35
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:41
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:35
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:37
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:49
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:80
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:54
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:67
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:93
 msgid "Enable IPv6 negotiation on the PPP link"
 msgstr "Ativar a negociação IPv6 no link PPP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:143
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:188
 msgid "Enable Jumbo Frame passthrough"
 msgstr "Ativar a passagem de Jumbo Frames"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:244
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:235
 msgid "Enable NTP client"
 msgstr "Ativar o cliente NTP"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:69
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:96
 msgid "Enable Single DES"
 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:267
 msgid "Enable TFTP server"
 msgstr "Ativar o servidor TFTP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:134
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:180
 msgid "Enable VLAN functionality"
 msgstr "Ativar a funcionalidade VLAN"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1595
 msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1175
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
 msgid "Enable key reinstallation (KRACK) countermeasures"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:138
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:183
 msgid "Enable learning and aging"
 msgstr "Ativar aprendizagem e envelhecimento"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:194
 msgid "Enable mirroring of incoming packets"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:151
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:195
 msgid "Enable mirroring of outgoing packets"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:34
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:67
 msgid "Enable the DF (Don't Fragment) flag of the encapsulating packets."
 msgstr ""
 
@@ -1775,7 +1805,7 @@ msgstr ""
 msgid "Enable this mount"
 msgstr "Ativar este mount"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:713
 msgid "Enable this network"
 msgstr ""
 
@@ -1783,48 +1813,52 @@ msgstr ""
 msgid "Enable this swap"
 msgstr "Ativar esta swap"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:37
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:88
 msgid "Enable/Disable"
 msgstr "Ativar/Desativar"
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:76
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:152
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:251
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:41
 msgid "Enabled"
 msgstr "Ativado"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:277
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:414
 msgid "Enables IGMP snooping on this bridge"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:892
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1310
 msgid ""
 "Enables fast roaming among access points that belong to the same Mobility "
 "Domain"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:272
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:412
 msgid "Enables the Spanning Tree Protocol on this bridge"
 msgstr "Ativa o Spanning Tree nesta bridge"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:120
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:180
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:59
+msgid "Encapsulation limit"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:843
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:901
 msgid "Encapsulation mode"
 msgstr "Modo de encapsulamento"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:76
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:603
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:129
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:992
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1621
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:177
 msgid "Encryption"
 msgstr "Encriptação"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:155
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:128
 msgid "Endpoint Host"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:165
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:132
 msgid "Endpoint Port"
 msgstr ""
 
@@ -1836,16 +1870,21 @@ msgstr ""
 msgid "Enter custom values"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:273
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:271
 msgid "Erasing..."
 msgstr "A apagar..."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:95
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:96
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:97
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:98
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:99
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:106
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:107
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:108
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:109
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:110
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:173
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:164
 msgid "Error"
 msgstr "Erro"
 
@@ -1853,24 +1892,28 @@ msgstr "Erro"
 msgid "Errored seconds (ES)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1646
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1852
 #: modules/luci-base/luasrc/model/network.lua:1432
 msgid "Ethernet Adapter"
 msgstr "Adaptador Ethernet"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1637
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1843
 #: modules/luci-base/luasrc/model/network.lua:1422
 msgid "Ethernet Switch"
 msgstr "Switch Ethernet"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:303
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
 msgid "Exclude interfaces"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:153
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
 msgid "Expand hosts"
 msgstr "Expandir hosts"
 
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:195
+msgid "Expecting an hexadecimal assignment hint"
+msgstr ""
+
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:59
 msgid "Expecting: %s"
 msgstr ""
@@ -1879,7 +1922,7 @@ msgstr ""
 msgid "Expires"
 msgstr "Expira"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:488
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:543
 #, fuzzy
 msgid ""
 "Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
@@ -1887,55 +1930,71 @@ msgstr ""
 "O tempo de caducidade dos endereços concessionados, minimo de 2 minutos "
 "(<code>2m</code>)."
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:8
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:19
 msgid "External"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:971
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1377
 msgid "External R0 Key Holder List"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:980
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1381
 msgid "External R1 Key Holder List"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:150
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:141
 msgid "External system log server"
 msgstr "Servidor externo de logs de sistema"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:155
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:146
 msgid "External system log server port"
 msgstr "Porta do Servidor externo de logs de sistema"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:160
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:151
 msgid "External system log server protocol"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:18
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:79
 msgid "Extra SSH command options"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:940
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1351
 msgid "FT over DS"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:941
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1352
 msgid "FT over the Air"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:938
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1349
 msgid "FT protocol"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1842
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:82
+msgid "Failed to change the system password."
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2389
 msgid "Failed to confirm apply within %ds, waiting for rollback…"
 msgstr ""
 
-#: modules/luci-base/luasrc/view/cbi/filebrowser.htm:106
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:45
+msgid "Failed to execute \"/etc/init.d/%s %s\" action: %s"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1561
 msgid "File"
 msgstr "Ficheiro"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:279
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1514
+msgid "File not accessible"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1698
+msgid "Filename"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:280
 msgid "Filename of the boot image advertised to clients"
 msgstr "Nome de ficheiro da imagem de boot a anunciar aos clientes"
 
@@ -1945,14 +2004,15 @@ 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:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:118
 msgid "Filter private"
 msgstr "Filtrar endereços privados"
 
-#: 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:123
 msgid "Filter useless"
 msgstr "Filtro inútil"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:23
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:65
 msgid "Finalizing failed"
 msgstr ""
@@ -1963,7 +2023,7 @@ msgid ""
 "with defaults based on what was detected"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:696
 msgid "Find and join network"
 msgstr "Procurar e ligar rede"
 
@@ -1975,11 +2035,11 @@ msgstr "Terminar"
 msgid "Firewall"
 msgstr "Firewall"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:77
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:76
 msgid "Firewall Mark"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:193
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:278
 msgid "Firewall Settings"
 msgstr "Definições da Firewall"
 
@@ -1987,7 +2047,7 @@ msgstr "Definições da Firewall"
 msgid "Firewall Status"
 msgstr "Estado da Firewall"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:137
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:860
 msgid "Firmware File"
 msgstr ""
 
@@ -1995,7 +2055,7 @@ msgstr ""
 msgid "Firmware Version"
 msgstr "Versão do Firmware"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:225
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:226
 msgid "Fixed source port for outbound DNS queries"
 msgstr "Porta fixa de origem para saída das consultas DNS"
 
@@ -2015,35 +2075,35 @@ msgstr "Flashar nova imagem do firmware"
 msgid "Flash operations"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:194
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:192
 msgid "Flashing..."
 msgstr "A programar...."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:498
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:550
 msgid "Force"
 msgstr "Forçar"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:258
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:782
 msgid "Force 40MHz mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:622
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1031
 msgid "Force CCMP (AES)"
 msgstr "Forçar CCMP (AES)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:499
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:550
 msgid "Force DHCP on this network even if another server is detected."
 msgstr "Forçar DHCP nesta rede mesmo se outro servidor for detectado."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:623
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1032
 msgid "Force TKIP"
 msgstr "Forçar TKIP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:624
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1033
 msgid "Force TKIP and CCMP (AES)"
 msgstr "Forçar TKIP e CCMP (AES)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:795
 msgid "Force link"
 msgstr ""
 
@@ -2051,7 +2111,7 @@ msgstr ""
 msgid "Force upgrade"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:60
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:90
 msgid "Force use of NAT-T"
 msgstr ""
 
@@ -2059,7 +2119,7 @@ msgstr ""
 msgid "Form token mismatch"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:34
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:164
 msgid "Forward DHCP traffic"
 msgstr "Encaminhar tráfego DHCP"
 
@@ -2067,46 +2127,41 @@ msgstr "Encaminhar tráfego DHCP"
 msgid "Forward Error Correction Seconds (FECS)"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:28
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:161
 msgid "Forward broadcast traffic"
 msgstr "Encaminhar trafego de broadcast"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:375
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:809
 msgid "Forward mesh peer traffic"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:186
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:908
 msgid "Forwarding mode"
 msgstr "Modo de encaminhamento"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:255
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:596
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:774
 msgid "Fragmentation Threshold"
 msgstr "Margem de Fragmentação"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:332
-msgid "Frame Bursting"
-msgstr "Frame Bursting"
-
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:17
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:28
 msgid "Free"
 msgstr "Livre"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:91
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:89
 msgid ""
-"Further information about WireGuard interfaces and peers at <a href=\"http://"
-"wireguard.com\">wireguard.com</a>."
+"Further information about WireGuard interfaces and peers at <a href='http://"
+"wireguard.com'>wireguard.com</a>."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:45
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:130
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:186
 msgid "GHz"
 msgstr "GHz"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:29
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:36
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:91
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:77
 msgid "GPRS only"
 msgstr "Só GPRS"
 
@@ -2115,28 +2170,28 @@ msgstr "Só GPRS"
 msgid "Gateway"
 msgstr "Gateway"
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:35
+msgid "Gateway Ports"
+msgstr "Portas de gateway"
+
 #: modules/luci-base/htdocs/luci-static/resources/network.js:9
 #: modules/luci-base/luasrc/model/network.lua:29
 msgid "Gateway address is invalid"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:46
-msgid "Gateway ports"
-msgstr "Portas de gateway"
-
-#: 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:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:275
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:23
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:112
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:103
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:49
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:33
 msgid "General Settings"
 msgstr "Definições Gerais"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:188
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:462
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:175
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:141
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:361
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:504
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:895
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:741
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:796
 msgid "General Setup"
 msgstr "Configuração Geral"
 
@@ -2144,7 +2199,7 @@ msgstr "Configuração Geral"
 msgid "Generate Config"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:945
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1355
 msgid "Generate PMK locally"
 msgstr ""
 
@@ -2152,11 +2207,7 @@ msgstr ""
 msgid "Generate archive"
 msgstr "Gerar arquivo"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:63
-msgid "Generic 802.11%s Wireless Controller"
-msgstr "Controlador Wireless Genérico 802.11%s"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:26
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:74
 msgid "Given password confirmation did not match, password not changed!"
 msgstr ""
 "A confirmação de password não corresponde, a password não foi alterada!"
@@ -2165,7 +2216,7 @@ msgstr ""
 msgid "Global Settings"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:806
 msgid "Global network options"
 msgstr ""
 
@@ -2176,33 +2227,29 @@ msgstr ""
 msgid "Go to password configuration..."
 msgstr "Ir para a configuração da password"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:857
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1369
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1112
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1616
 #: modules/luci-base/luasrc/view/cbi/full_valueheader.htm:4
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:58
 msgid "Go to relevant configuration page"
 msgstr "Ir para a página respectiva de configuração"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:38
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:66
 msgid "Group Password"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:11
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:22
 msgid "Guest"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:73
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:81
 msgid "HE.net password"
 msgstr "Password HE.net"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:60
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:73
 msgid "HE.net username"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:310
-msgid "HT mode (802.11n)"
-msgstr ""
-
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:16
 msgid "Hang Up"
 msgstr "Suspender"
@@ -2211,7 +2258,7 @@ msgstr "Suspender"
 msgid "Header Error Code Errors (HEC)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:103
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 msgid ""
 "Here you can configure the basic aspects of your device like its hostname or "
 "the timezone."
@@ -2219,9 +2266,7 @@ msgstr ""
 "Aqui pode configurar os aspectos básicos do seu equipamento, como o nome do "
 "host ou o fuso horário."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:499
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:556
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:579
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:941
 msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr ""
 "Ocultar <abbr title=\"Identificador de Conjunto de Serviços Estendidos"
@@ -2234,14 +2279,15 @@ msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:92
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1959
 msgid "Host"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:20
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:21
 msgid "Host entries"
 msgstr "Entradas de hosts"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:48
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:171
 msgid "Host expiry timeout"
 msgstr ""
 
@@ -2250,45 +2296,45 @@ msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
 msgstr ""
 "<abbr title=\"Endereço do Protocolo de Internet\">IP</abbr> do host ou rede"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:118
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:102
 msgid "Host-Uniq tag content"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:71
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:31
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:316
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:25
+#: 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:317
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:26
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:17
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:125
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:116
 msgid "Hostname"
 msgstr "Hostname"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:12
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:22
 msgid "Hostname to send when requesting DHCP"
 msgstr "Hostname a enviar quando houver solicitação por DHCP"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:18
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:19
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:67
 msgid "Hostnames"
 msgstr "Hostnames"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:13
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:24
 msgid "Hybrid"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:45
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:75
 msgid "IKE DH Group"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:41
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:59
 msgid "IP Addresses"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:40
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:80
 msgid "IP Protocol"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:29
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:30
 msgid "IP address"
 msgstr "Endereço IP"
 
@@ -2307,6 +2353,11 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:20
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:21
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:22
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:79
+#: 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/network.js:89
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:90
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:91
@@ -2314,7 +2365,7 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:93
 #: 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/luasrc/model/cbi/admin_network/proto_ncm.lua:42
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:82
 msgid "IPv4"
 msgstr "IPv4"
 
@@ -2326,24 +2377,23 @@ msgstr "Firewall IPv4"
 msgid "IPv4 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:57
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:178
 msgid "IPv4 address"
 msgstr "Endereço IPv4"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:26
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:33
 msgid "IPv4 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:104
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:181
 msgid "IPv4 broadcast"
 msgstr "Broadcast IPv4"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:100
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:180
 msgid "IPv4 gateway"
 msgstr "Gateway IPv4"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:92
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:179
 msgid "IPv4 netmask"
 msgstr "Máscara IPv4"
 
@@ -2351,24 +2401,25 @@ msgstr "Máscara IPv4"
 msgid "IPv4 network in address/netmask notation"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:25
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:52
 msgid "IPv4 prefix"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:42
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:30
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:55
 msgid "IPv4 prefix length"
 msgstr "Comprimento do prefixo IPv4"
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:43
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:83
 msgid "IPv4+IPv6"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:72
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:34
 msgid "IPv4-Address"
 msgstr "Endereço-IPv4"
 
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:10
 #: protocols/luci-proto-ipip/luasrc/model/network/proto_ipip.lua:9
 msgid "IPv4-in-IPv4 (RFC2003)"
 msgstr ""
@@ -2383,6 +2434,16 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:30
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:31
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:32
+#: 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/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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:89
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:90
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:91
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:92
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:95
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:96
@@ -2395,7 +2456,7 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:103
 #: 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/luasrc/model/cbi/admin_network/proto_ncm.lua:44
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:84
 msgid "IPv6"
 msgstr "IPv6"
 
@@ -2407,11 +2468,11 @@ msgstr "Firewall IPv6"
 msgid "IPv6 Neighbours"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:464
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:506
 msgid "IPv6 Settings"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:195
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:810
 msgid "IPv6 ULA-Prefix"
 msgstr ""
 
@@ -2419,21 +2480,21 @@ msgstr ""
 msgid "IPv6 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:202
 msgid "IPv6 address"
 msgstr "Endereço IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:23
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:189
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:31
 msgid "IPv6 assignment hint"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:18
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:184
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:27
 msgid "IPv6 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:207
 msgid "IPv6 gateway"
 msgstr "Gateway IPv6"
 
@@ -2441,22 +2502,22 @@ msgstr "Gateway IPv6"
 msgid "IPv6 network in address/netmask notation"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:37
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:59
 msgid "IPv6 prefix"
 msgstr "Prefixo IPv6"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:34
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:45
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:63
 msgid "IPv6 prefix length"
 msgstr "Comprimento do prefixo IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:33
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:211
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:57
 msgid "IPv6 routed prefix"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:143
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:215
 msgid "IPv6 suffix"
 msgstr ""
 
@@ -2466,31 +2527,35 @@ msgid "IPv6-Address"
 msgstr "Endereço-IPv6"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:93
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:104
 msgid "IPv6-PD"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:10
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:13
 msgid "IPv6-in-IPv4 (RFC4213)"
 msgstr "IPv6-em-IPv4 (RFC4213)"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:17
 msgid "IPv6-over-IPv4 (6rd)"
 msgstr "IPv6-sobre-IPv4 (6rd)"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:15
 msgid "IPv6-over-IPv4 (6to4)"
 msgstr "IPv6-sobre-IPv4 (6to4)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1075
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1478
 msgid "Identity"
 msgstr "Identidade"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:70
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:96
 msgid "If checked, 1DES is enabled"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:65
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:93
 msgid "If checked, encryption is disabled"
 msgstr ""
 
@@ -2507,36 +2572,36 @@ msgid ""
 "device node"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:27
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:71
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:18
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:82
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:52
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:17
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:29
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:33
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:68
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:85
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:32
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:45
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:45
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:24
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:44
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:116
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:48
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:85
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:65
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:33
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:80
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:108
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:146
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:74
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:97
 msgid "If unchecked, no default route is configured"
 msgstr "Se desmarcado, não é configurada uma rota pré-definida"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:34
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:86
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:35
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:99
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:47
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:60
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:60
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:39
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:59
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:124
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:39
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:116
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:59
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:103
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:64
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:77
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:100
 msgid "If unchecked, the advertised DNS server addresses are ignored"
 msgstr "Se desmarcado, os endereços servidor DNS anunciados são ignorados "
 
@@ -2555,15 +2620,15 @@ msgstr ""
 "lento pois o dispositivo swap não pode ser acedido com um nível elevado de "
 "memória <abbr title=\"Memória de Acesso Aleatório\">RAM</abbr>."
 
-#: 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:102
 msgid "Ignore <code>/etc/hosts</code>"
 msgstr "Ignorar <code>/etc/hosts</code>"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:471
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:531
 msgid "Ignore interface"
 msgstr "Ignorar interface"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:90
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:91
 msgid "Ignore resolve file"
 msgstr "Ignorar ficheiro resolv.conf"
 
@@ -2581,12 +2646,12 @@ msgid ""
 "blocked. Click \"Continue »\" below to return to the previous page."
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:145
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:118
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:124
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:126
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:97
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:118
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:157
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:141
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:115
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:138
 msgid "Inactivity timeout"
 msgstr "Tempo de inatividade"
 
@@ -2594,23 +2659,25 @@ msgstr "Tempo de inatividade"
 msgid "Inbound:"
 msgstr "Entrada:"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:170
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:161
 msgid "Info"
 msgstr "Info"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:105
 msgid "Information"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:25
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:67
 msgid "Initialization failure"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:34
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:87
 msgid "Initscript"
 msgstr "Script de inicialização"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:26
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:122
 msgid "Initscripts"
 msgstr "Scripts de Inicialização"
 
@@ -2618,55 +2685,74 @@ msgstr "Scripts de Inicialização"
 msgid "Install iputils-traceroute6 for IPv6 traceroute"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:223
-msgid "Install package %q"
-msgstr "Instalar pacote %q"
-
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:220
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:120
 msgid "Install protocol extensions..."
 msgstr "Instalar extensões do protocolo..."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:416
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:423
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:683
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:687
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:26
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:284
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:342
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:47
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:134
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:14
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:16
 msgid "Interface"
 msgstr "Interface"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:58
 msgid "Interface %q device auto-migrated from %q to %q."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:356
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:792
 msgid "Interface Configuration"
 msgstr "Configuração da Interface"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:51
-msgid "Interface Overview"
-msgstr "Visão Geral da Interface"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:99
+msgid "Interface has %d pending changes"
+msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:57
+msgid "Interface is marked for deletion"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:162
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:3
 msgid "Interface is reconnecting..."
 msgstr "A interface está a religar..."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:162
+msgid "Interface is shutting down..."
+msgstr "A interface está a desligar..."
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:205
+msgid "Interface is starting..."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:208
+msgid "Interface is stopping..."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:954
 msgid "Interface name"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:34
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:224
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:131
 msgid "Interface not present or not connected yet."
 msgstr "Interface não presente ou ainda não ligada."
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:88
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:16
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:11
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:287
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:54
 msgid "Interfaces"
 msgstr "Interfaces"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:9
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:20
 msgid "Internal"
 msgstr ""
 
@@ -2679,20 +2765,36 @@ msgstr "Erro Interno do Servidor"
 msgid "Invalid"
 msgstr "Valor inválido"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:311
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:10
+msgid "Invalid Base64 key string"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:281
 msgid "Invalid VLAN ID given! Only IDs between %d and %d are allowed."
 msgstr ""
 "O ID de VLAN fornecido é inválido! Só os IDs entre %d e %d são permitidos."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:307
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:290
 msgid "Invalid VLAN ID given! Only unique IDs are allowed"
 msgstr "O ID de VLAN fornecido é inválido! Só os IDs únicos são permitidos."
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:195
+msgid "Invalid argument"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:194
+msgid "Invalid command"
+msgstr ""
+
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:80
+msgid "Invalid hexadecimal value"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/sysauth.htm:12
 msgid "Invalid username and/or password! Please try again."
 msgstr "Username inválido e/ou a password! Por favor, tente novamente."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:508
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:950
 msgid "Isolate Clients"
 msgstr ""
 
@@ -2712,15 +2814,15 @@ msgstr ""
 msgid "JavaScript required!"
 msgstr "É necessário JavaScript!"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:52
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1691
 msgid "Join Network"
 msgstr "Associar Rede"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:22
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1628
 msgid "Join Network: Wireless Scan"
 msgstr "Associar Rede: Procurar Redes Wireless"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:19
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1833
 msgid "Joining Network: %q"
 msgstr ""
 
@@ -2737,15 +2839,15 @@ msgstr "Registo do Kernel"
 msgid "Kernel Version"
 msgstr "Versão do Kernel"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:823
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1248
 msgid "Key"
 msgstr "Chave"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:851
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:852
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:853
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:854
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:870
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1277
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1278
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1279
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1291
 msgid "Key #%d"
 msgstr "Chave #%d"
 
@@ -2753,33 +2855,34 @@ msgstr "Chave #%d"
 msgid "Kill"
 msgstr "Matar"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:10
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:21
 msgid "L2TP"
 msgstr "L2TP"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:10
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:40
 msgid "L2TP Server"
 msgstr "Servidor L2TP"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:100
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:74
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:80
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:74
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:53
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:73
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:131
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:102
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:89
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:112
 msgid "LCP echo failure threshold"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:118
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:89
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:95
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:89
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:68
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:91
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:144
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:102
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:125
 msgid "LCP echo interval"
 msgstr "Intervalo de echo LCP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:181
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:902
 msgid "LLC"
 msgstr "LLC"
 
@@ -2788,11 +2891,11 @@ msgstr "LLC"
 msgid "Label"
 msgstr "Etiqueta"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:213
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:204
 msgid "Language"
 msgstr "Idioma"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:115
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:106
 msgid "Language and Style"
 msgstr "Língua e Tema"
 
@@ -2800,51 +2903,51 @@ msgstr "Língua e Tema"
 msgid "Latency"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:10
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:21
 msgid "Leaf"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:369
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:487
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:393
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:543
 msgid "Lease time"
 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:87
 msgid "Leasefile"
 msgstr "Ficheiro de concessões"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:74
 #: modules/luci-base/luasrc/view/lease_status.htm:95
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:34
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
 msgid "Leasetime remaining"
 msgstr "Tempo de atribuição restante"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:9
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:20
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:27
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:50
 msgid "Leave empty to autodetect"
 msgstr "Deixar em branco para auto-detecção"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:21
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:45
 msgid "Leave empty to use the current WAN address"
 msgstr "Deixar em branco para usar o endereço WAN actual"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1746
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2299
 msgid "Legend:"
 msgstr "Legenda:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:481
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:538
 msgid "Limit"
 msgstr "Limite"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:287
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:288
 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:299
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:300
 msgid "Limit listening to these interfaces, and loopback."
 msgstr ""
 
@@ -2864,11 +2967,11 @@ msgstr ""
 msgid "Line Uptime"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:101
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:88
 msgid "Link On"
 msgstr "Link Ativo"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:185
 msgid ""
 "List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
 "requests to"
@@ -2876,7 +2979,7 @@ msgstr ""
 "Lista de servidores <abbr title=\"Sistema Nomes de Domínio\">DNS</abbr> para "
 "onde encaminhar os pedidos"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:972
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1377
 msgid ""
 "List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-"
 "Identifier,128-bit key as hex string. <br />This list is used to map R0KH-ID "
@@ -2885,7 +2988,7 @@ msgid ""
 "Association."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:981
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1381
 msgid ""
 "List of R1KHs in the same Mobility Domain. <br />Format: MAC-address,R1KH-ID "
 "as 6 octets with colons,128-bit key as hex string. <br />This list is used "
@@ -2894,32 +2997,32 @@ msgid ""
 "PMK-R1 keys."
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:21
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:82
 msgid "List of SSH key files for auth"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:206
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:207
 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:173
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:174
 msgid "List of hosts that supply bogus NX domain results"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:298
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:299
 msgid "Listen Interfaces"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:30
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:54
 msgid "Listen Port"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:15
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:16
 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:216
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:217
 msgid "Listening port for inbound DNS queries"
 msgstr "Porta de escuta para entrada de consultas DNS"
 
@@ -2938,11 +3041,11 @@ msgstr "Carga Média"
 msgid "Loading"
 msgstr "A carregar"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:35
-msgid "Loading SSH keys…"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1819
+msgid "Loading directory contents…"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1204
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1296
 #: modules/luci-base/luasrc/view/view.htm:4
 msgid "Loading view…"
 msgstr ""
@@ -2952,41 +3055,41 @@ msgstr ""
 msgid "Local IP address is invalid"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:25
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:86
 msgid "Local IP address to assign"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:10
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:11
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:44
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:39
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:151
 msgid "Local IPv4 address"
 msgstr "Endereço IPv4 Local"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:20
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:54
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:45
 msgid "Local IPv6 address"
 msgstr "Endereço IPv6 Local"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:286
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:287
 msgid "Local Service Only"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:81
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:126
 msgid "Local Startup"
 msgstr "Arranque Local"
 
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:25
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:121
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:112
 msgid "Local Time"
 msgstr "Hora Local"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:149
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
 msgid "Local domain"
 msgstr "Domínio 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:147
 #, fuzzy
 msgid ""
 "Local domain specification. Names matching this domain are never forwarded "
@@ -2995,39 +3098,35 @@ msgstr ""
 "Especificação de dominio local. Os nomes que correspondam a este dominio "
 "nunca são encaminhados e resolvidos do DHCP ou do ficheiro de hosts"
 
-#: 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:151
 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:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
 msgid "Local server"
 msgstr "Servidor local"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:129
 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:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:128
 msgid "Localise queries"
 msgstr "Localizar consultas"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:175
-msgid "Locked to channel %s used by: %s"
-msgstr ""
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:168
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:159
 msgid "Log output level"
 msgstr "Nível de output do log"
 
-#: 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:181
 msgid "Log queries"
 msgstr "Registo das consultas"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:113
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:104
 msgid "Logging"
 msgstr ""
 
@@ -3035,7 +3134,7 @@ msgstr ""
 msgid "Login"
 msgstr "Login"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:95
+#: modules/luci-base/luasrc/controller/admin/index.lua:103
 msgid "Logout"
 msgstr "Logout"
 
@@ -3043,11 +3142,13 @@ msgstr "Logout"
 msgid "Loss of Signal Seconds (LOSS)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:476
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:533
 msgid "Lowest leased address as offset from the network address."
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:40
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:75
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:35
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:86
 msgid "MAC"
@@ -3055,32 +3156,32 @@ msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:73
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:109
-#: 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:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1958
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:86
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:133
 msgid "MAC-Address"
 msgstr "Endereço-MAC"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:457
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:586
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:886
 msgid "MAC-Address Filter"
 msgstr "Filtro de Endereço-MAC"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:142
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:363
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:798
 msgid "MAC-Filter"
 msgstr "Filtro-MAC"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:464
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:590
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:893
 msgid "MAC-List"
 msgstr "Lista-MAC"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:13
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:16
 msgid "MAP / LW4over6"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:62
 msgid "MAP rule is invalid"
 msgstr ""
@@ -3098,8 +3199,8 @@ msgid "MHz"
 msgstr "MHz"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:53
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:29
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:66
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:53
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:71
 msgid "MTU"
 msgstr "MTU"
 
@@ -3109,16 +3210,17 @@ msgid ""
 "below:"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:55
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:69
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:26
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:38
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:38
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:108
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:52
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:96
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:83
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:57
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:70
 msgid "Manual"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1949
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2188
 msgid "Master"
 msgstr ""
 
@@ -3126,48 +3228,46 @@ msgstr ""
 msgid "Max. Attainable Data Rate (ATTNDR)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:539
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:982
 msgid "Maximum allowed Listen Interval"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:234
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
 msgid "Maximum allowed number of active DHCP leases"
 msgstr "Número máximo permitido de concessões DHCP ativas"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:252
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:253
 msgid "Maximum allowed number of concurrent DNS queries"
 msgstr "Número máximo permitido de consultas DNS permitidas"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:244
 msgid "Maximum allowed size of EDNS.0 UDP packets"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:63
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:77
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:57
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:112
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:104
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:93
 msgid "Maximum amount of seconds to wait for the modem to become ready"
 msgstr "Número máximo de segundos a esperar pelo modem para ficar pronto"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:27
-msgid ""
-"Maximum length of the name is 15 characters including the automatic protocol/"
-"bridge prefix (br-, 6in4-, pppoe- etc.)"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:482
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:538
 msgid "Maximum number of leased addresses."
 msgstr "Número máximo de endereços concessionados."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:761
+msgid "Maximum transmit power"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:21
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:49
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:134
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:187
 #: modules/luci-mod-status/luasrc/view/admin_status/bandwidth.htm:79
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:284
 msgid "Mbit/s"
 msgstr "Mbit/s"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:18
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:32
 msgid "Medium"
 msgstr ""
 
@@ -3179,42 +3279,43 @@ msgstr "Memória"
 msgid "Memory usage (%)"
 msgstr "Uso de memória (%)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1952
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2191
 msgid "Mesh"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:372
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:806
 msgid "Mesh Id"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:196
+msgid "Method not found"
+msgstr ""
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:45
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:76
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:104
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:54
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:66
 msgid "Metric"
 msgstr "Métrica"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:154
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:198
 msgid "Mirror monitor port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:153
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:197
 msgid "Mirror source port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:408
-msgid "Missing protocol extension for proto %q"
-msgstr "Falta a extensão de protocolo para o protocolo %q"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:923
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1337
 msgid "Mobility Domain"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:154
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:41
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:74
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:366
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:31
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:360
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:801
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1619
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:175
 msgid "Mode"
 msgstr "Modo"
@@ -3223,39 +3324,38 @@ msgstr "Modo"
 msgid "Model"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:31
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:72
 msgid "Modem default"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:11
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:19
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:11
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:10
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:73
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:73
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:57
 msgid "Modem device"
 msgstr "Dispositivo do modem"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:24
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:66
 msgid "Modem information query failed"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:62
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:76
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:56
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:112
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:104
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:93
 msgid "Modem init timeout"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1953
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:452
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:554
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:577
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2192
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:880
 msgid "Monitor"
 msgstr "Monitor"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:14
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
 msgid "More Characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:802
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1057
 msgid "More…"
 msgstr ""
 
@@ -3268,7 +3368,7 @@ msgstr "Montar Entrada"
 msgid "Mount Point"
 msgstr "Ponto de Montagem"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:26
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:36
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:137
 msgid "Mount Points"
@@ -3318,46 +3418,44 @@ msgstr "Subir"
 msgid "Move up"
 msgstr "Descer"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:912
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
 msgid "NAS ID"
 msgstr "NAS ID"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:57
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:87
 msgid "NAT-T Mode"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:9
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 msgid "NAT64 Prefix"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:31
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:26
 msgid "NCM"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:535
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:589
 msgid "NDP-Proxy"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:43
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:72
 msgid "NT Domain"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:273
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:264
 msgid "NTP server candidates"
 msgstr "Candidatos a servidor NTP"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:837
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1092
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:27
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:502
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:65
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:553
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:658
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:49
 msgid "Name"
 msgstr "Nome"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:17
-msgid "Name of the new interface"
-msgstr "Nome da nova interface"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1808
 msgid "Name of the new network"
 msgstr "Nome da nova rede"
 
@@ -3365,9 +3463,10 @@ msgstr "Nome da nova rede"
 msgid "Navigation"
 msgstr "Navegação"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:62
+#: modules/luci-base/luasrc/controller/admin/index.lua:69
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:108
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:402
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:834
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1957
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:389
 #: modules/luci-mod-status/luasrc/view/admin_status/index/30-network.htm:8
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:73
@@ -3379,7 +3478,7 @@ msgstr "Rede"
 msgid "Network Utilities"
 msgstr "Ferramentas de Rede"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:278
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:279
 msgid "Network boot image"
 msgstr "Imagem de arranque via rede"
 
@@ -3392,53 +3491,59 @@ msgstr ""
 msgid "Network without interfaces."
 msgstr "Rede sem interfaces."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:661
+msgid "New interface name…"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:11
 msgid "Next »"
 msgstr "Seguinte »"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1507
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1754
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:108
 msgid "No"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:453
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:514
 msgid "No DHCP Server configured for this interface"
 msgstr "Sem Servidor DHCP configurado nesta interface"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1162
+msgid "No Encryption"
+msgstr ""
+
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:89
 msgid "No NAT-T"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:198
+msgid "No data received"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1764
+msgid "No entries in this directory"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/backupfiles.lua:82
 msgid "No files found"
 msgstr "Não foram encontrados ficheiros"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:550
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:191
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:180
 msgid "No information available"
 msgstr "Sem informação disponível"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:8
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:63
 msgid "No matching prefix delegation"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:157
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
 msgid "No negative cache"
 msgstr "Sem cache negativa"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:53
-msgid "No network configured on this device"
-msgstr "Nenhuma rede configurada no dispositivo"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:65
-msgid "No network name specified"
-msgstr "Nome de rede não especificado"
-
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:147
-msgid "No networks in range"
-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
@@ -3446,7 +3551,12 @@ msgstr ""
 msgid "No password set!"
 msgstr "Sem password definida!"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:116
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:104
+msgid "No peers defined yet"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:129
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:271
 msgid "No public keys present yet."
 msgstr ""
 
@@ -3454,19 +3564,19 @@ msgstr ""
 msgid "No rules in this chain."
 msgstr "Sem regras nesta cadeia"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:150
-msgid "No scan results available yet..."
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:53
+msgid "No signal"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:7
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:756
 msgid "No zone assigned"
 msgstr "Sem zona atribuída"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:111
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:35
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:48
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:133
 msgid "Noise"
 msgstr "Ruído"
 
@@ -3482,16 +3592,16 @@ msgstr "Ruído:"
 msgid "Non Pre-emtive CRC errors (CRC_P)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:292
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:293
 msgid "Non-wildcard"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:129
 msgid "None"
 msgstr "Nenhum"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:181
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:172
 msgid "Normal"
 msgstr "Normal"
 
@@ -3499,25 +3609,29 @@ msgstr "Normal"
 msgid "Not Found"
 msgstr "Não encontrado"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:27
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:5
-msgid "Not associated"
-msgstr "Não associado"
-
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:87
 msgid "Not connected"
 msgstr "Não ligado"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:38
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:139
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:232
+msgid "Not present"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:105
 msgid "Not started on boot"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:26
-msgid "Note: interface name length"
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:201
+msgid "Not supported"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:171
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:162
 msgid "Notice"
 msgstr "Reparo"
 
@@ -3525,63 +3639,50 @@ msgstr "Reparo"
 msgid "Nslookup"
 msgstr "Nslookup"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:261
 msgid "Number of cached DNS entries (max is 10000, 0 is no caching)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:203
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:194
 msgid "Number of parallel threads used for compression"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:40
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:69
 msgid "Obfuscated Group Password"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:35
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:61
 msgid "Obfuscated Password"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:22
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:34
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:40
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:105
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:97
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:49
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:80
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:54
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:67
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:93
 msgid "Obtain IPv6-Address"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:83
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:68
 msgid "Off-State Delay"
 msgstr "Atraso do Off-State"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:16
-msgid ""
-"On this page you can configure the network interfaces. You can bridge "
-"several interfaces by ticking the \"bridge interfaces\" field and enter the "
-"names of several network interfaces separated by spaces. You can also use "
-"<abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
-"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
-"<samp>eth0.1</samp>)."
-msgstr ""
-"Nesta página pode configurar as interfaces de rede. Pode ter várias "
-"interfaces do tipo bridge, assinalando o campo \"interfaces bridge\" e "
-"inserir os nomes de várias interfaces de rede separadas por espaços. Pode "
-"também usar a notação para <abbr title=\"Rede Local Virtual\">VLAN</abbr> "
-"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"por exemplo\">ex.</abbr>: "
-"<samp>eth0.1</samp>)."
-
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:95
 msgid "On-Link route"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:80
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:64
 msgid "On-State Delay"
 msgstr "Atraso do On-State"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:360
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:382
 msgid "One of hostname or mac address must be specified!"
 msgstr "Um nome de host ou endereço MAC deve ser especificado!"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:456
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:462
 msgid "One of the following: %s"
 msgstr ""
 
@@ -3603,34 +3704,35 @@ msgstr "Um ou mais campos obrigatórios não têm valores!"
 msgid "Open list..."
 msgstr "Abrir lista..."
 
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:61
 #: protocols/luci-proto-openconnect/luasrc/model/network/proto_openconnect.lua:9
 msgid "OpenConnect (CISCO AnyConnect)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:757
 msgid "Operating frequency"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1753
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2306
 msgid "Option changed"
 msgstr "Opção alterada"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1755
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2308
 msgid "Option removed"
 msgstr "Opção removida"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1140
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:55
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1535
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:66
 msgid "Optional"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:78
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:76
 msgid ""
 "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, "
 "starting with <code>0x</code>."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:144
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:215
 msgid ""
 "Optional. Allowed values: 'eui64', 'random', fixed value like '::1' or "
 "'::1:2'. When IPv6 prefix (like 'a:b:c:d::') is received from a delegating "
@@ -3638,41 +3740,41 @@ msgid ""
 "for the interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:123
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:117
 msgid ""
 "Optional. Base64-encoded preshared key. Adds in an additional layer of "
 "symmetric-key cryptography for post-quantum resistance."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:148
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:126
 msgid "Optional. Create routes for Allowed IPs for this peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:103
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:108
 msgid "Optional. Description of peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:156
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:128
 msgid ""
 "Optional. Host of peer. Names are resolved prior to bringing up the "
 "interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:67
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:71
 msgid "Optional. Maximum Transmission Unit of tunnel interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:166
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:132
 msgid "Optional. Port of peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:175
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:136
 msgid ""
 "Optional. Seconds between keep alive messages. Default is 0 (disabled). "
 "Recommended value if this device is behind a NAT is 25."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:31
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:54
 msgid "Optional. UDP port used for outgoing and incoming packets."
 msgstr ""
 
@@ -3693,7 +3795,7 @@ msgstr "Saída"
 msgid "Outbound:"
 msgstr "Saída:"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:26
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:50
 msgid "Output Interface"
 msgstr ""
 
@@ -3702,51 +3804,51 @@ msgstr ""
 msgid "Output zone"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:63
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:155
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:33
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:54
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:54
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:219
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:50
 msgid "Override MAC address"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:66
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:35
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:56
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:88
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:125
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:131
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:133
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:104
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:61
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:58
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:223
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:44
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:54
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:154
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:71
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:145
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:132
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:110
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:119
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:97
 msgid "Override MTU"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:30
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:63
 msgid "Override TOS"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:25
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:58
 msgid "Override TTL"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:954
 msgid "Override default interface name"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:41
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:167
 msgid "Override the gateway in DHCP responses"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:507
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:555
 msgid ""
 "Override the netmask sent to clients. Normally it is calculated from the "
 "subnet that is served."
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:65
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:179
 msgid "Override the table used for internal routes"
 msgstr ""
 
@@ -3754,29 +3856,33 @@ msgstr ""
 msgid "Overview"
 msgstr "Visão Geral"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1606
+msgid "Overwrite existing file \"%s\" ?"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:11
 msgid "Owner"
 msgstr "Dono"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:42
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:56
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:17
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:28
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:34
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:14
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:18
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:43
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:98
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:45
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:44
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:63
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:82
 msgid "PAP/CHAP password"
 msgstr "Password PAP/CHAP"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:39
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:53
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:14
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:11
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:15
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:96
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:88
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:43
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:74
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:42
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:61
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:77
 msgid "PAP/CHAP username"
 msgstr "Utilizador PAP/CHAP"
 
@@ -3784,9 +3890,9 @@ msgstr "Utilizador PAP/CHAP"
 msgid "PID"
 msgstr "PID"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:36
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:50
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:26
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:95
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:87
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:68
 msgid "PIN"
 msgstr "PIN"
 
@@ -3795,114 +3901,116 @@ msgstr "PIN"
 msgid "PIN code rejected"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:966
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1372
 msgid "PMK R1 Push"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:43
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:13
 msgid "PPP"
 msgstr "PPP"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:11
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:58
 msgid "PPPoA Encapsulation"
 msgstr "Encapsulamento PPPoA "
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:19
 msgid "PPPoATM"
 msgstr "PPPoATM"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:17
 msgid "PPPoE"
 msgstr "PPPoE"
 
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:28
 #: protocols/luci-proto-pppossh/luasrc/model/network/proto_pppossh.lua:9
 msgid "PPPoSSH"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:15
 msgid "PPtP"
 msgstr "PPtp"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:59
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:73
 msgid "PSID offset"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:56
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:70
 msgid "PSID-bits length"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:123
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:846
 msgid "PTM/EFM (Packet Transfer Mode)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:78
-msgid "Package libiwinfo required!"
-msgstr "O pacote libiwinfo é necessário!"
-
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:45
 msgid "Packets"
 msgstr "Pacotes"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:7
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:756
 msgid "Part of zone %q"
 msgstr "Parte da zona %q"
 
 #: modules/luci-base/luasrc/view/sysauth.htm:29
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1111
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:35
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:42
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1514
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:46
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:104
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:58
 msgid "Password"
 msgstr "Senha"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:29
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:24
 msgid "Password authentication"
 msgstr "Autenticação por senha"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1019
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1414
 msgid "Password of Private Key"
 msgstr "Senha da Chave Privada"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1067
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1471
 msgid "Password of inner Private Key"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:14
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:16
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:18
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:20
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:32
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:34
 msgid "Password strength"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:44
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:107
 msgid "Password2"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:37
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:244
 msgid "Paste or drag SSH key file…"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1000
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1396
 msgid "Path to CA-Certificate"
 msgstr "Directorio do Certificado CA"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1007
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1402
 msgid "Path to Client-Certificate"
 msgstr "Caminho para o Certificado de Cliente"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1013
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1408
 msgid "Path to Private Key"
 msgstr "Caminho da Chave Privada"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1049
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1453
 msgid "Path to inner CA-Certificate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1055
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1459
 msgid "Path to inner Client-Certificate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1061
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1465
 msgid "Path to inner Private Key"
 msgstr ""
 
@@ -3920,7 +4028,7 @@ msgstr ""
 msgid "Peak:"
 msgstr "Pico:"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:28
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:89
 msgid "Peer IP address to assign"
 msgstr ""
 
@@ -3929,11 +4037,11 @@ msgstr ""
 msgid "Peer address is missing"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:90
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:89
 msgid "Peers"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:50
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:80
 msgid "Perfect Forward Secrecy"
 msgstr ""
 
@@ -3945,7 +4053,11 @@ msgstr "Executar reinicialização"
 msgid "Perform reset"
 msgstr "Executar reset"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:174
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:199
+msgid "Permission denied"
+msgstr ""
+
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:136
 msgid "Persistent Keep Alive"
 msgstr ""
 
@@ -3953,7 +4065,7 @@ msgstr ""
 msgid "Phy Rate:"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:190
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:277
 msgid "Physical Settings"
 msgstr "Definições Físicas"
 
@@ -3964,6 +4076,10 @@ msgstr "Ping"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:16
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:17
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:41
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:77
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:87
@@ -3981,15 +4097,19 @@ msgstr "Insira o seu username e password."
 msgid "Policy"
 msgstr "Política"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:22
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:20
 msgid "Port"
 msgstr "Porta"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:18
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:133
+msgid "Port %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:274
 msgid "Port status:"
 msgstr "Estado da porta:"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:482
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:488
 msgid "Potential negation of: %s"
 msgstr ""
 
@@ -4001,11 +4121,11 @@ msgstr ""
 msgid "Pre-emtive CRC errors (CRCP_P)"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:32
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:73
 msgid "Prefer LTE"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:33
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:74
 msgid "Prefer UMTS"
 msgstr ""
 
@@ -4013,31 +4133,30 @@ msgstr ""
 msgid "Prefix Delegated"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:122
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:117
 msgid "Preshared Key"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:101
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:75
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:81
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:75
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:54
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:74
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:131
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:102
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:89
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:112
 msgid ""
 "Presume peer to be dead after given amount of LCP echo failures, use 0 to "
 "ignore failures"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:305
 msgid "Prevent listening on these interfaces."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:509
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:562
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:950
 msgid "Prevents client-to-client communication"
 msgstr "Impede a comunicação cliente-a-cliente"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:18
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:49
 msgid "Private Key"
 msgstr ""
 
@@ -4058,39 +4177,33 @@ msgstr ""
 msgid "Prot."
 msgstr "Protocolo"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:72
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:349
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:675
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:84
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:216
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:87
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:390
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:31
-msgid "Protocol of the new interface"
-msgstr "Protocolo da nova interface"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:222
-msgid "Protocol support is not installed"
-msgstr "O protocolo suportado não está instalado"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:269
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:260
 msgid "Provide NTP server"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:701
 msgid "Provide new network"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:451
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:879
 msgid "Pseudo Ad-Hoc (ahdemo)"
 msgstr "Pseudo Ad-Hoc (ahdemo)"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:112
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:113
 msgid "Public Key"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:278
 msgid ""
 "Public keys allow for the passwordless SSH logins with a higher security "
 "compared to the use of plain passwords. In order to upload a new key to the "
@@ -4098,47 +4211,48 @@ msgid ""
 "code> file into the input field."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:139
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:211
 msgid "Public prefix routed to this device for distribution to clients."
 msgstr ""
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:27
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:9
 msgid "QMI Cellular"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:173
 msgid "Quality"
 msgstr "Qualidade"
 
-#: 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:171
 msgid ""
 "Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> "
 "servers"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:952
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1360
 msgid "R0 Key Lifetime"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:959
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1366
 msgid "R1 Key Holder"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:58
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:88
 msgid "RFC3947 NAT-T mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:381
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:814
 msgid "RSSI threshold for joining"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:256
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:597
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:778
 msgid "RTS/CTS Threshold"
 msgstr "RTS/CTS Threshold"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:41
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:76
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:87
 msgid "RX"
@@ -4148,35 +4262,39 @@ msgstr "RX"
 msgid "RX Rate"
 msgstr "Taxa RX"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:783
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1961
+msgid "RX Rate / TX Rate"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1207
 msgid "Radius-Accounting-Port"
 msgstr "Porta-Conta-Radius"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:791
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1215
 msgid "Radius-Accounting-Secret"
 msgstr "Segredo-Conta-Radius"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:775
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1199
 msgid "Radius-Accounting-Server"
 msgstr "Servidor-Conta-Radius"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:759
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1183
 msgid "Radius-Authentication-Port"
 msgstr "Porta-Autenticação-Radius"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:767
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1191
 msgid "Radius-Authentication-Secret"
 msgstr "Segredo-Autenticação-Radius"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:751
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1175
 msgid "Radius-Authentication-Server"
 msgstr "Servidor-Autenticação-Radius"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:119
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:102
 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:83
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:84
 msgid ""
 "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-Server"
@@ -4190,19 +4308,11 @@ msgid ""
 "access to this device if you are connected via this interface"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2
-msgid ""
-"Really delete this wireless network? The deletion cannot be undone! You "
-"might lose access to this device if you are connected via this network."
-msgstr ""
-"Deseja mesmo apagar esta rede? A eliminação não poder desfeita!\n"
-"Pode perde a ligação ao dispositivo, caso esta ligado através desta rede."
-
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:40
 msgid "Really reset all changes?"
 msgstr "Deseja mesmo limpar todas as alterações?"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:237
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:354
 msgid "Really switch protocol?"
 msgstr "Deseja mesmo trocar o protocolo?"
 
@@ -4226,15 +4336,15 @@ msgstr "Tráfego em Tempo Real"
 msgid "Realtime Wireless"
 msgstr "Wireless em Tempo Real"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:931
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1343
 msgid "Reassociation Deadline"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:191
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
 msgid "Rebind protection"
 msgstr "Religar protecção"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:48
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:46
 #: modules/luci-mod-system/luasrc/view/admin_system/reboot.htm:9
 msgid "Reboot"
 msgstr "Reiniciar"
@@ -4248,21 +4358,15 @@ msgstr "A reiniciar..."
 msgid "Reboots the operating system of your device"
 msgstr "Reinicia o seu dispositivo"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:103
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:90
 msgid "Receive"
 msgstr "Receber"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:325
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:350
-msgid "Receiver Antenna"
-msgstr "Antena de Recepção"
-
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:42
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:59
 msgid "Recommended. IP addresses of the WireGuard interface."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:28
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:300
 msgid "Reconnect this interface"
 msgstr "Reconetar esta interface"
 
@@ -4270,92 +4374,134 @@ msgstr "Reconetar esta interface"
 msgid "References"
 msgstr "Referências"
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:39
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:153
 msgid "Relay"
 msgstr ""
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:36
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:157
 msgid "Relay Bridge"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:17
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:154
 msgid "Relay between networks"
 msgstr ""
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:64
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:12
 msgid "Relay bridge"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:18
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:50
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:49
 msgid "Remote IPv4 address"
 msgstr "Endereço IPv4 remoto"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:8
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:40
 msgid "Remote IPv4 address or FQDN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:45
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:725
 msgid "Remove"
 msgstr "Remover"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:53
-msgid "Repeat scan"
-msgstr "Repetir scan"
-
-#: modules/luci-base/luasrc/view/cbi/upload.htm:11
-msgid "Replace entry"
-msgstr "Substituir entrada"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:46
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:51
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1806
 msgid "Replace wireless configuration"
 msgstr "Substituir configuração wireless"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:8
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:17
 msgid "Request IPv6-address"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:16
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:23
 msgid "Request IPv6-prefix of length"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1141
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:200
+msgid "Request timeout"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1536
 msgid "Required"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:20
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:31
 msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3"
 msgstr "Necessário para certos ISPs, p.ex. Charter with DOCSIS 3"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:19
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:49
 msgid "Required. Base64-encoded private key for this interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:113
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:113
 msgid "Required. Base64-encoded public key of peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:136
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:122
 msgid ""
 "Required. IP addresses and prefixes that this peer is allowed to use inside "
 "the tunnel. Usually the peer's tunnel IP addresses and the networks the peer "
 "routes through the tunnel."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1134
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1095
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1096
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1097
+msgid "Requires hostapd"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1101
+msgid "Requires hostapd with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1102
+msgid "Requires hostapd with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1098
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1099
+msgid "Requires hostapd with SAE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1533
 msgid ""
 "Requires the 'full' version of wpad/hostapd and support from the wifi driver "
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:141
 msgid ""
 "Requires upstream supports DNSSEC; verify unsigned domain responses really "
 "come from unsigned domains"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1268
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1109
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1119
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1120
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1121
+msgid "Requires wpa-supplicant"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1113
+msgid "Requires wpa-supplicant with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1114
+msgid "Requires wpa-supplicant with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1111
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1124
+msgid "Requires wpa-supplicant with SAE support"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1355
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:17
 #: modules/luci-base/luasrc/view/cbi/footer.htm:30
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:66
@@ -4371,17 +4517,22 @@ msgstr "Limpar contadores"
 msgid "Reset to defaults"
 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:68
 msgid "Resolv and Hosts Files"
 msgstr "Ficheiros Resolv e Hosts"
 
-#: 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:94
 msgid "Resolve file"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:28
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:14
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:71
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:197
+msgid "Resource not found"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:302
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:693
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:90
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:112
 msgid "Restart"
 msgstr "Reiniciar"
 
@@ -4389,7 +4540,7 @@ msgstr "Reiniciar"
 msgid "Restart Firewall"
 msgstr "Reiniciar Firewall"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:14
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:691
 msgid "Restart radio interface"
 msgstr ""
 
@@ -4401,26 +4552,24 @@ msgstr "Restauração"
 msgid "Restore backup"
 msgstr "Restaurar backup"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:113
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:114
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:38
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:46
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:119
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:120
 msgid "Reveal/hide password"
 msgstr "Revelar/esconder password"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1774
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2322
 msgid "Revert"
 msgstr "Reverter"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1861
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2405
 msgid "Revert changes"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2013
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2554
 msgid "Revert request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1993
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2534
 msgid "Reverting configuration…"
 msgstr ""
 
@@ -4428,7 +4577,7 @@ msgstr ""
 msgid "Root"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:271
 msgid "Root directory for files served via TFTP"
 msgstr ""
 
@@ -4436,7 +4585,7 @@ msgstr ""
 msgid "Root preparation"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:147
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:126
 msgid "Route Allowed IPs"
 msgstr ""
 
@@ -4448,12 +4597,12 @@ msgstr ""
 msgid "Route type"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:523
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:577
 msgid "Router Advertisement-Service"
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:43
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:15
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:27
 msgid "Router Password"
 msgstr "Password do Router"
 
@@ -4484,7 +4633,7 @@ msgstr ""
 msgid "Run filesystem check"
 msgstr "Correr uma verificação do sistema de ficheiros"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:651
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:669
 msgid "Runtime error"
 msgstr ""
 
@@ -4496,31 +4645,31 @@ msgstr ""
 msgid "SNR"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:5
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:18
 msgid "SSH Access"
 msgstr "Acesso SSH"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:10
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:70
 msgid "SSH server address"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:13
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:74
 msgid "SSH server port"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:8
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:58
 msgid "SSH username"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:27
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:277
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
 msgid "SSH-Keys"
 msgstr "Chaves-SSH"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:42
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:73
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:29
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1617
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:174
 msgid "SSID"
 msgstr "SSID"
@@ -4529,17 +4678,17 @@ msgstr "SSID"
 msgid "SWAP"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1127
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1262
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1379
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1351
 #: modules/luci-base/luasrc/view/cbi/error.htm:17
 #: modules/luci-base/luasrc/view/cbi/footer.htm:26
 #: modules/luci-base/luasrc/view/cbi/header.htm:17
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:54
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:133
 msgid "Save"
 msgstr "Salvar"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1256
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1768
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1347
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2318
 #: modules/luci-base/luasrc/view/cbi/footer.htm:22
 msgid "Save & Apply"
 msgstr "Salvar & Aplicar"
@@ -4552,28 +4701,20 @@ msgstr ""
 msgid "Save mtdblock contents"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
-msgid "Saving keys…"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:698
 msgid "Scan"
 msgstr "Procurar"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:109
-msgid "Scan request failed"
-msgstr ""
-
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:8
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:39
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:23
 msgid "Scheduled Tasks"
 msgstr "Tarefas Agendadas"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1749
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2302
 msgid "Section added"
 msgstr "Secção adicionada"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1751
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2304
 msgid "Section removed"
 msgstr "Secção removida"
 
@@ -4588,61 +4729,66 @@ msgid ""
 "your device!"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:119
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:90
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:96
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:90
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:69
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:92
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1516
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1646
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1809
+msgid "Select file…"
+msgstr ""
+
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:144
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:102
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:125
 msgid ""
 "Send LCP echo requests at the given interval in seconds, only effective in "
 "conjunction with failure threshold"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:561
-msgid "Separate Clients"
-msgstr "Isolar Clientes"
-
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:62
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:63
 msgid "Server Settings"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:26
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:50
 msgid "Service Name"
 msgstr "Nome do Serviço"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:25
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:30
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:87
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:71
 msgid "Service Type"
 msgstr "Tipo de Serviço"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:55
+#: modules/luci-base/luasrc/controller/admin/index.lua:62
 msgid "Services"
 msgstr "Serviços"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:815
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:861
 msgid "Session expired"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:83
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:107
 msgid "Set VPN as Default Route"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:258
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:795
 msgid ""
 "Set interface properties regardless of the link carrier (If set, carrier "
 "sense events do not invoke hotplug handlers)."
 msgstr ""
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:23
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:55
 msgid "Setting PLMN failed"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:26
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:68
 msgid "Setting operation mode failed"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:454
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:517
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:527
 msgid "Setup DHCP Server"
 msgstr "Configurar Servidor DHCP"
 
@@ -4654,7 +4800,7 @@ msgstr ""
 msgid "Short GI"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:516
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:960
 msgid "Short Preamble"
 msgstr ""
 
@@ -4666,21 +4812,23 @@ msgstr "Mostrar lista ficheiros para backup"
 msgid "Show empty chains"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:306
 msgid "Shutdown this interface"
 msgstr "Desligar esta interface"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:111
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:34
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:47
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:132
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1616
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:173
 msgid "Signal"
 msgstr "Sinal"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1960
+msgid "Signal / Noise"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:125
 msgid "Signal Attenuation (SATN)"
 msgstr ""
@@ -4693,11 +4841,11 @@ msgstr "Sinal:"
 msgid "Size"
 msgstr "Tamanho"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:259
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:260
 msgid "Size of DNS query cache"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:191
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
 msgid "Size of the ZRam device in megabytes"
 msgstr ""
 
@@ -4714,11 +4862,7 @@ msgstr "Ir para o conteúdo"
 msgid "Skip to navigation"
 msgstr "Ir para a navegação"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:335
-msgid "Slot time"
-msgstr ""
-
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1640
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1846
 #: modules/luci-base/luasrc/model/network.lua:1427
 msgid "Software VLAN"
 msgstr ""
@@ -4756,61 +4900,65 @@ msgstr ""
 msgid "Specifies the directory the device is attached to"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:23
-msgid "Specifies the listening port of this <em>Dropbear</em> instance"
-msgstr "Especifica as portas de escuta desta instância <em>Dropbear</em>"
-
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:57
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:175
 msgid ""
 "Specifies the maximum amount of failed ARP requests until hosts are presumed "
 "to be dead"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:49
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:171
 msgid ""
 "Specifies the maximum amount of seconds after which hosts are presumed to be "
 "dead"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:761
+msgid ""
+"Specifies the maximum transmit power the wireless radio may use. Depending "
+"on regulatory requirements and wireless usage, the actual transmit power may "
+"be reduced by the driver."
+msgstr ""
+
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:63
 msgid "Specify a TOS (Type of Service)."
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:25
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:58
 msgid ""
 "Specify a TTL (Time to Live) for the encapsulating packet other than the "
 "default (64)."
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:53
 msgid ""
 "Specify an MTU (Maximum Transmission Unit) other than the default (1280 "
 "bytes)."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:60
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "Specify the secret encryption key here."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:475
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:64
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:533
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:89
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:111
 msgid "Start"
 msgstr "Iniciar"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:33
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:86
 msgid "Start priority"
 msgstr "Prioridade de inicialização"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1958
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2499
 msgid "Starting configuration apply…"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1626
 msgid "Starting wireless scan..."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:24
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:120
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
 msgid "Startup"
 msgstr ""
 
@@ -4822,59 +4970,62 @@ 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:70
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:71
 msgid "Static Leases"
 msgstr "Atribuições Estáticas"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:118
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:73
 msgid "Static Routes"
 msgstr "Rotas Estáticas"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1194
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1384
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:172
 #: modules/luci-base/luasrc/model/network.lua:966
 msgid "Static address"
 msgstr "Endereço estático"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:308
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:309
 msgid ""
 "Static leases are used to assign fixed IP addresses and symbolic hostnames "
 "to DHCP clients. They are also required for non-dynamic interface "
 "configurations where only hosts with a corresponding lease are served."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:534
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:977
 msgid "Station inactivity limit"
 msgstr ""
 
 #: modules/luci-base/luasrc/controller/admin/index.lua:40
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:197
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:337
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:746
 #: modules/luci-mod-status/luasrc/view/admin_status/index.htm:128
 msgid "Status"
 msgstr "Status"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:35
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:75
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:308
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:91
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:113
 msgid "Stop"
 msgstr "Parar"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:165
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Strict order"
 msgstr "Ordem exacta"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:16
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:30
 msgid "Strong"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1843
 msgid "Submit"
 msgstr "Enviar"
 
-#: 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:108
 msgid "Suppress logging"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:109
 msgid "Suppress logging of the routine operation of these protocols"
 msgstr ""
 
@@ -4886,42 +5037,44 @@ msgstr ""
 msgid "Swap Entry"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:23
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:5
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:135
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:21
 msgid "Switch"
 msgstr "Switch"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:129
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:168
 msgid "Switch %q"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:128
-msgid "Switch %q (%s)"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:66
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:146
 msgid ""
 "Switch %q has an unknown topology - the VLAN settings might not be accurate."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:146
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:142
 msgid "Switch Port Mask"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1640
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1846
 #: modules/luci-base/luasrc/model/network.lua:1425
 msgid "Switch VLAN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:238
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:355
 msgid "Switch protocol"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:103
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:104
 #: modules/luci-base/luasrc/view/cbi/ipaddr.htm:26
 msgid "Switch to CIDR list notation"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:77
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1547
+msgid "Symbolic link"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:71
 msgid "Sync with NTP-Server"
 msgstr ""
 
@@ -4931,7 +5084,7 @@ msgstr "Sincronizar com o browser"
 
 #: modules/luci-base/luasrc/controller/admin/index.lua:47
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:14
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:102
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:94
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
 #: modules/luci-mod-system/luasrc/view/admin_system/applyreboot.htm:39
 msgid "System"
@@ -4942,11 +5095,11 @@ msgstr "Sistema"
 msgid "System Log"
 msgstr "Registo do Sistema"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:108
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:99
 msgid "System Properties"
 msgstr "Propriedades do Sistema"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:145
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:136
 msgid "System log buffer size"
 msgstr ""
 
@@ -4954,15 +5107,17 @@ msgstr ""
 msgid "TCP:"
 msgstr "TCP:"
 
-#: 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:69
 msgid "TFTP Settings"
 msgstr "Definições TFTP"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:269
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
 msgid "TFTP server root"
 msgstr "Raíz do servidor TFTP"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:17
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:77
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:88
 msgid "TX"
@@ -4985,7 +5140,7 @@ msgstr "Tabela"
 msgid "Target"
 msgstr "Destino"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:77
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:103
 msgid "Target network"
 msgstr ""
 
@@ -4993,44 +5148,26 @@ msgstr ""
 msgid "Terminate"
 msgstr "Terminar"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:27
-msgid ""
-"The <em>Device Configuration</em> section covers physical settings of the "
-"radio hardware such as channel, transmit power or antenna selection which "
-"are shared among all defined wireless networks (if the radio hardware is "
-"multi-SSID capable). Per network settings like encryption or operation mode "
-"are grouped in the <em>Interface Configuration</em>."
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:79
-msgid ""
-"The <em>libiwinfo-lua</em> package is not installed. You must install this "
-"component for working wireless configuration!"
-msgstr ""
-"O pacote <em>libiwinfo-lua</em> não está instalado. Precisa de instalar este "
-"pacote para que a configuração wireless funcione!"
-
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:66
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:77
 msgid ""
 "The HE.net endpoint update configuration changed, you must now use the plain "
 "username instead of the user ID!"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:8
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:40
 msgid ""
 "The IPv4 address or the fully-qualified domain name of the remote tunnel end."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:27
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:38
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:59
 msgid ""
 "The IPv6 prefix assigned to the provider, usually ends with <code>::</code>"
 msgstr ""
 "O prefixo IPv6 atribuído ao provider, habitualmente termina com <code>::</"
 "code>"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:18
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1808
 msgid ""
 "The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
 "code> and <code>_</code>"
@@ -5046,7 +5183,7 @@ msgstr ""
 msgid "The configuration file could not be loaded due to the following error:"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1849
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2396
 msgid ""
 "The device could not be reached within %d seconds after applying the pending "
 "changes, which caused the configuration to be rolled back for safety "
@@ -5066,6 +5203,12 @@ msgstr ""
 "O arquivo do dispositivo de memória ou da partição (<abbr title=\"por exemplo"
 "\">ex.</abbr> <code>/dev/sda1</code>)"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:612
+msgid ""
+"The existing wireless configuration needs to be changed for LuCI to function "
+"properly."
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:127
 msgid ""
 "The filesystem that was used to format the memory (<abbr title=\"for example"
@@ -5090,47 +5233,50 @@ msgstr ""
 msgid "The following rules are currently active on this system."
 msgstr "As seguintes regras estão actualmente acivas neste sistema."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:144
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:154
+msgid "The gateway address must not be a local IP address"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:154
 msgid "The given SSH public key has already been added."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:150
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:160
 msgid ""
 "The given SSH public key is invalid. Please supply proper public RSA or "
 "ECDSA keys."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:67
-msgid "The given network name is not unique"
-msgstr "O nome dado não é único"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:664
+msgid "The interface name is already used"
+msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:52
-#, fuzzy
-msgid ""
-"The hardware is not multi-SSID capable and the existing configuration will "
-"be replaced if you proceed."
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:670
+msgid "The interface name is too long"
 msgstr ""
-"O hardware não é comporta multi-SSIDs a configuração será substituída se "
-"prosseguir."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:43
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:31
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:55
 msgid ""
 "The length of the IPv4 prefix in bits, the remainder is used in the IPv6 "
 "addresses."
 msgstr ""
 "O tamanho do perfico IPv4 em bits, o restante é usado em endereços IPv6."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:35
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:46
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:63
 msgid "The length of the IPv6 prefix in bits"
 msgstr "O comprimento do prefixo IPv6 em bits"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:12
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:44
 msgid "The local IPv4 address over which the tunnel is created (optional)."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:5
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1814
+msgid "The network name is already used"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:135
 msgid ""
 "The network ports on this device can be combined to several <abbr title="
 "\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
@@ -5146,16 +5292,15 @@ msgstr ""
 "diferentes. Muitas vezes existe por defeito uma porta de Uplink  para uma "
 "ligação para a rede acima como a internet ou outras portas de uma rede local."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:77
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:395
-msgid "The selected protocol needs a device assigned"
-msgstr "O protocolo escolhido precisa de um dispositivo atribuído."
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1149
+msgid "The selected %s mode is incompatible with %s encryption"
+msgstr ""
 
 #: modules/luci-base/luasrc/view/csrftoken.htm:11
 msgid "The submitted security token is invalid or already expired!"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:274
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:272
 msgid ""
 "The system is erasing the configuration partition now and will reboot itself "
 "when finished."
@@ -5163,7 +5308,7 @@ msgstr ""
 "O sistema está agora a limpar a partição de configuração e irá reiniciar-se "
 "quando terminar."
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:195
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:193
 #, fuzzy
 msgid ""
 "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
@@ -5176,7 +5321,7 @@ msgstr ""
 "da sua configuração, ode ser necessário renovar o endereço do seu computador "
 "para poder ligar novamente ao router."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:15
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:80
 msgid "The system password has been successfully changed."
 msgstr ""
 
@@ -5188,7 +5333,7 @@ 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:403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:427
 msgid "There are no active leases"
 msgstr ""
 
@@ -5197,18 +5342,10 @@ msgstr ""
 msgid "There are no active leases."
 msgstr "Não há concessões ativas."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1973
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2514
 msgid "There are no changes to apply"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:204
-msgid ""
-"There is no device assigned yet, please attach a network device in the "
-"\"Physical Settings\" tab"
-msgstr ""
-"Ainda não há um dispositivo atribuído, por favor ligue um dispositivo de "
-"rede nas \"Definições Físicas\""
-
 #: 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
@@ -5220,11 +5357,19 @@ msgstr ""
 "Não há uma password definida neste router. Por favor defina uma senha de "
 "root para proteger a interface web e ativar o SSH."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:19
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:49
 msgid "This IPv4 address of the relay"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1448
+msgid "This authentication type is not applicable to the selected EAP method."
+msgstr ""
+
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:54
+msgid "This does not look like a valid PEM file"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
 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 "
@@ -5238,13 +5383,13 @@ msgid ""
 "configurations are automatically preserved."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:74
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:81
 msgid ""
 "This is either the \"Update Key\" configured for the tunnel or the account "
 "password if no update key has been configured"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:82
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:127
 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."
@@ -5252,13 +5397,13 @@ msgstr ""
 "Este é o conteúdo de /etc/rc.local. Insira os seus próprios comandos aqui "
 "(antes de 'exit 0') para executá-los no final do processo de arranque."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:27
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:54
 msgid ""
 "This is the local endpoint address assigned by the tunnel broker, it usually "
 "ends with <code>...:2/64</code>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:79
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> in the local network"
@@ -5266,20 +5411,20 @@ msgstr ""
 "Este é o único <abbr title=\"Protocolo de Configuração Dinâmica de Hosts"
 "\">DHCP</abbr> na rede local"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:73
 msgid "This is the plain username for logging into the account"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:34
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:57
 msgid ""
 "This is the prefix routed to you by the tunnel broker for use by clients"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:9
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:41
 msgid "This is the system crontab in which scheduled tasks can be defined."
 msgstr "Este é o sistema de agendamento de tarefas."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:19
+#: 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 ""
@@ -5295,26 +5440,26 @@ msgstr ""
 msgid "This page gives an overview over currently active network connections."
 msgstr "Esta página fornece informações sobre as ligações de rede ativas."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:726
-#: modules/luci-base/htdocs/luci-static/resources/form.js:809
+#: modules/luci-base/htdocs/luci-static/resources/form.js:936
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1064
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:172
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:32
 msgid "This section contains no values yet"
 msgstr "Esta secção ainda não contêm valores"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:114
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:105
 msgid "Time Synchronization"
 msgstr "Sincronização Horária"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:525
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:968
 msgid "Time interval for rekeying GTK"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:128
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:119
 msgid "Timezone"
 msgstr "Fuso Horário"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:825
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:871
 msgid "To login…"
 msgstr ""
 
@@ -5328,7 +5473,7 @@ msgstr ""
 "de backup gerado anteriormente. Para voltar as definições originais do "
 "firmware, clique \" Fazer reset\" (só possível com imagens squashfs)."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:835
 msgid "Tone"
 msgstr ""
 
@@ -5352,55 +5497,41 @@ msgstr "Tráfego"
 msgid "Transfer"
 msgstr "Transferências"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:595
-msgid "Transmission Rate"
-msgstr "Taxa de Transmissão"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:102
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:89
 msgid "Transmit"
 msgstr "Transmitir"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:211
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:273
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:345
-msgid "Transmit Power"
-msgstr "Potência de Transmissão"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:318
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:349
-msgid "Transmitter Antenna"
-msgstr "Antena de Transmissão"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:73
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:57
 msgid "Trigger"
 msgstr "Trigger"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:98
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:84
 msgid "Trigger Mode"
 msgstr "Modo de Trigger"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:54
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:69
 msgid "Tunnel ID"
 msgstr "ID do Túnel"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1643
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1849
 #: modules/luci-base/luasrc/model/network.lua:1430
 msgid "Tunnel Interface"
 msgstr "Interface de Túnel"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:44
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:55
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:76
 msgid "Tunnel Link"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:46
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:131
 msgid "Tx-Power"
 msgstr "Potência de Tx"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:32
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:185
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:11
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:43
 msgid "Type"
 msgstr "Tipo"
 
@@ -5408,19 +5539,20 @@ msgstr "Tipo"
 msgid "UDP:"
 msgstr "UDP:"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:28
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:90
 msgid "UMTS only"
 msgstr "Só UMTS"
 
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:43
 #: protocols/luci-proto-3g/luasrc/model/network/proto_3g.lua:10
 msgid "UMTS/GPRS/EV-DO"
 msgstr "UMTS/GPRS/EV-DO"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:106
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:93
 msgid "USB Device"
 msgstr "Dispositivo USB"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:122
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:110
 msgid "USB Ports"
 msgstr ""
 
@@ -5450,10 +5582,12 @@ msgstr ""
 msgid "Unable to dispatch"
 msgstr ""
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:22
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:54
 msgid "Unable to obtain client ID"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:61
 msgid "Unable to resolve AFTR host name"
 msgstr ""
@@ -5463,21 +5597,31 @@ msgstr ""
 msgid "Unable to resolve peer host name"
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:33
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:68
+msgid "Unable to save contents: %s"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:132
 msgid "Unavailable Seconds (UAS)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1196
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1386
 #: modules/luci-base/luasrc/model/network.lua:970
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1349
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1539
 #: modules/luci-base/luasrc/model/network.lua:1137
 msgid "Unknown error (%s)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1193
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:204
+msgid "Unknown error code"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1383
+#: modules/luci-base/htdocs/luci-static/resources/protocol/none.js:6
 #: modules/luci-base/luasrc/model/network.lua:964
 msgid "Unmanaged"
 msgstr "Não gerido"
@@ -5487,22 +5631,30 @@ msgstr "Não gerido"
 msgid "Unmount"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:107
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:262
 msgid "Unnamed key"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1708
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2261
 msgid "Unsaved Changes"
 msgstr "Alterações não Guardadas"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:202
+msgid "Unspecified error"
+msgstr ""
+
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:64
 msgid "Unsupported MAP type"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:27
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:69
 msgid "Unsupported modem"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:219
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:119
 msgid "Unsupported protocol type."
 msgstr "Tipo de protocolo não suportado."
@@ -5522,56 +5674,70 @@ msgstr ""
 msgid "Upload archive..."
 msgstr "Carregar arquivo..."
 
-#: modules/luci-base/luasrc/view/cbi/upload.htm:8
-msgid "Uploaded File"
-msgstr "Ficheiro carregado"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1703
+msgid "Upload file"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1678
+msgid "Upload file…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1623
+msgid "Upload request failed: %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:613
+msgid ""
+"Upon pressing \"Continue\", anonymous \"wifi-iface\" sections will be "
+"assigned with a name in the form <em>wifinet#</em> and the network will be "
+"restarted to apply the updated configuration."
+msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:14
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:74
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:85
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:26
 msgid "Uptime"
 msgstr "Uptime"
 
-#: 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:83
 msgid "Use <code>/etc/ethers</code>"
 msgstr "Usar <code>/etc/ethers</code>"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:40
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:167
 msgid "Use DHCP gateway"
 msgstr "Usar a gateway do DHCP"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:33
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:85
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:34
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:98
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:46
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:65
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:38
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:58
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:124
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:39
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:116
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:59
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:103
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:64
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:77
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:100
 msgid "Use DNS servers advertised by peer"
 msgstr "Usar os servidores DNS fornecidos pelo parceiro"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:227
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:233
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:479
 msgid "Use ISO/IEC 3166 alpha2 country codes."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:31
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:100
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:70
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:35
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:51
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:86
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:56
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:97
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:77
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:75
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:92
 msgid "Use MTU on tunnel interface"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:95
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:65
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:30
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:46
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:81
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:93
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:73
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:88
 msgid "Use TTL on tunnel interface"
 msgstr ""
 
@@ -5583,68 +5749,65 @@ msgstr ""
 msgid "Use as root filesystem (/)"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:19
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:31
 msgid "Use broadcast flag"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:253
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:791
 msgid "Use builtin IPv6-management"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:40
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:109
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:92
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:45
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:105
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:53
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:72
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:45
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:65
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:40
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:182
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:127
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:42
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:119
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:62
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:67
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:80
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:103
 msgid "Use custom DNS servers"
 msgstr "Usar servidores DNS personalizados"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:26
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:70
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:16
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:28
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:84
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:24
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:50
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:23
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:43
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:116
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:33
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:74
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:97
 msgid "Use default gateway"
 msgstr "Usar gateway pre-definida"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:48
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:164
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:77
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:24
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:88
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:58
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:23
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:39
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:74
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:90
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:38
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:57
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:30
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:50
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:45
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:227
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:119
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:51
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:88
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:68
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:52
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:70
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:83
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:111
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:149
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:67
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:111
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:98
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:72
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:85
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:108
 msgid "Use gateway metric"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:64
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:179
 msgid "Use routing table"
 msgstr "Usar tabela de roteamento"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:309
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:310
 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 "
@@ -5657,77 +5820,78 @@ msgstr ""
 msgid "Used"
 msgstr "Usado"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:848
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1273
 msgid "Used Key Slot"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:913
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
 msgid ""
 "Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not "
 "needed with normal WPA(2)-PSK."
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:48
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:110
 msgid "User certificate (PEM encoded)"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:61
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:122
 msgid "User key (PEM encoded)"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/sysauth.htm:23
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:41
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:32
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:102
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:56
 msgid "Username"
 msgstr "Utilizador"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:182
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:903
 msgid "VC-Mux"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:851
 msgid "VDSL"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:172
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:169
 msgid "VLANs on %q"
 msgstr "VLANs em %q"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:171
-msgid "VLANs on %q (%s)"
-msgstr "VLANs em %q (%s)"
+#: modules/luci-base/luasrc/controller/admin/index.lua:55
+msgid "VPN"
+msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:18
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:42
 msgid "VPN Local address"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:22
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:46
 msgid "VPN Local port"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:15
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:11
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:15
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:58
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:39
 msgid "VPN Server"
 msgstr "Servidor VPN"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:18
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:96
 msgid "VPN Server port"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:37
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:100
 msgid "VPN Server's certificate SHA1 hash"
 msgstr ""
 
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:9
 #: protocols/luci-proto-vpnc/luasrc/model/network/proto_vpnc.lua:9
 msgid "VPNC (CISCO 3000 (and others) VPN)"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:44
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:73
 msgid "Vendor"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:60
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:52
 msgid "Vendor Class to send when requesting DHCP"
 msgstr ""
 
@@ -5735,41 +5899,37 @@ msgstr ""
 msgid "Verify"
 msgstr "Verificar"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:52
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:76
 msgid "Virtual dynamic interface"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:470
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:471
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:553
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:576
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:908
 msgid "WDS"
 msgstr "WDS"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:667
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1160
 msgid "WEP Open System"
 msgstr "Sistema Aberto WEP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:668
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1161
 msgid "WEP Shared Key"
 msgstr "Chave partilhada WEP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "WEP passphrase"
 msgstr "Palavra-Passe WEP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:503
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:566
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:945
 msgid "WMM Mode"
 msgstr "Modo WMM"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "WPA passphrase"
 msgstr "Palavra-Passe WPA"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:716
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:735
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:740
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1074
 msgid ""
 "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
 "and ad-hoc mode) to be installed."
@@ -5785,7 +5945,7 @@ msgstr "A aguardar que as mudanças sejam aplicadas..."
 msgid "Waiting for command to complete..."
 msgstr "A aguardar que o comando termine..."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1940
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2481
 msgid "Waiting for configuration to get applied… %ds"
 msgstr ""
 
@@ -5793,8 +5953,8 @@ msgstr ""
 msgid "Waiting for device..."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:172
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:163
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:173
 msgid "Warning"
 msgstr "Aviso"
 
@@ -5802,11 +5962,11 @@ msgstr "Aviso"
 msgid "Warning: There are unsaved changes that will get lost on reboot!"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:20
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:34
 msgid "Weak"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:946
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1355
 msgid ""
 "When using a PSK, the PMK can be automatically generated. When enabled, the "
 "R0/R1 key options below are not applied. Disable this to use the R0 and R1 "
@@ -5814,78 +5974,85 @@ msgid ""
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:383
 msgid "Width"
 msgstr ""
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:17
 #: protocols/luci-proto-wireguard/luasrc/model/network/proto_wireguard.lua:9
 msgid "WireGuard VPN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:58
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:40
 #: modules/luci-mod-status/luasrc/controller/admin/status.lua:28
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:14
 msgid "Wireless"
 msgstr "Rede Wireless"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1631
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1837
 #: modules/luci-base/luasrc/model/network.lua:1418
 msgid "Wireless Adapter"
 msgstr "Adaptador Wireless"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1617
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2052
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1823
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2288
 #: modules/luci-base/luasrc/model/network.lua:1404
 #: modules/luci-base/luasrc/model/network.lua:1865
 msgid "Wireless Network"
 msgstr "Rede Wireless"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:629
 msgid "Wireless Overview"
 msgstr "Vista Global Wireless"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:362
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:797
 msgid "Wireless Security"
 msgstr "Segurança Wireless"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:54
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:611
+msgid "Wireless configuration migration"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:139
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:179
 msgid "Wireless is disabled"
 msgstr "Wireless desativada"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:54
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:139
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:179
 msgid "Wireless is not associated"
 msgstr "Wireless não associada"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:15
-msgid "Wireless is restarting..."
-msgstr "A Wireless está a reiniciar..."
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:752
 msgid "Wireless network is disabled"
 msgstr "Wireless está desativado."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:752
 msgid "Wireless network is enabled"
 msgstr "A rede wireless está ativada"
 
-#: 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:182
 msgid "Write received DNS requests to syslog"
 msgstr "Escrever os pedidos de DNS para o syslog"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:164
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:155
 msgid "Write system log to file"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1507
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:85
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1754
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:109
 msgid "Yes"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:26
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:943
+msgid ""
+"You appear to be currently connected to the device via the \"%h\" interface. "
+"Do you really want to shut down the interface?"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:123
 msgid ""
 "You can enable or disable installed init scripts here. Changes will applied "
 "after a device reboot.<br /><strong>Warning: If you disable essential init "
@@ -5907,38 +6074,34 @@ msgstr ""
 "Tem de activar o JavaScript no seu browser ou a LuCI não funcionará "
 "corretamente."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:196
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:187
 msgid "ZRam Compression Algorithm"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:203
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:194
 msgid "ZRam Compression Streams"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:189
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:180
 msgid "ZRam Settings"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:191
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
 msgid "ZRam Size"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:229
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:230
 msgid "any"
 msgstr "qualquer"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:113
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:121
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:126
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:218
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:282
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:321
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:328
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:621
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:37
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:22
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:29
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:121
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:836
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:844
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:849
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1030
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:78
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:48
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:51
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:103
 msgid "auto"
 msgstr "automático"
 
@@ -5947,11 +6110,11 @@ msgstr "automático"
 msgid "automatic"
 msgstr "estático"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:45
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:78
 msgid "baseT"
 msgstr "baseT"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:909
 msgid "bridged"
 msgstr ""
 
@@ -5967,22 +6130,21 @@ msgstr ""
 msgid "create:"
 msgstr "criar:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:264
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:368
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:678
 msgid "creates a bridge over specified interface(s)"
 msgstr "cria uma bridge sobre determinada(s) interface(s)"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:277
 msgid "dB"
 msgstr "dB"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:34
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:35
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:46
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:47
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:48
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:131
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:132
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:133
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:277
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:279
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:331
@@ -5994,26 +6156,30 @@ msgstr "dB"
 msgid "dBm"
 msgstr "dBm"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:460
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:587
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:889
 msgid "disable"
 msgstr "desativar"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:119
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:524
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:530
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:536
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:18
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:578
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:584
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:590
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:25
 msgid "disabled"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:433
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:467
+msgid "driver default"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/lease_status.htm:17
 #: modules/luci-base/luasrc/view/lease_status.htm:46
-#: 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:416
 msgid "expired"
 msgstr "expirou"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:88
 msgid ""
 "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr>-leases will be stored"
@@ -6027,25 +6193,21 @@ msgstr ""
 msgid "forward"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:80
 msgid "full-duplex"
 msgstr "full-duplex"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:80
 msgid "half-duplex"
 msgstr "half-duplex"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:559
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:565
 msgid "hexadecimal encoded value"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:138
-msgid "hidden"
-msgstr "escondido"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:527
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:533
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:538
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:581
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:587
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:592
 msgid "hybrid mode"
 msgstr ""
 
@@ -6053,6 +6215,10 @@ msgstr ""
 msgid "if target is a network"
 msgstr "se o destino for uma rede"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:63
+msgid "ignore"
+msgstr ""
+
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:177
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
@@ -6087,26 +6253,27 @@ msgstr ""
 msgid "key with either 5 or 13 characters"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:94
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:95
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr ""
 "Ficheiro local de <abbr title=\"Sistema de Nomes de Domínios\">DNS</abbr>"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:952
-msgid "minutes"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1168
+msgid "medium security"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:43
-msgid "mixed WPA/WPA2"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1360
+msgid "minutes"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:225
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:232
 msgid "no"
 msgstr "não"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:54
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:72
 msgid "no link"
 msgstr "sem link"
 
@@ -6114,7 +6281,7 @@ msgstr "sem link"
 msgid "non-empty value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1195
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1446
 msgid "none"
 msgstr "nenhum"
 
@@ -6124,7 +6291,9 @@ msgstr "nenhum"
 msgid "not present"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:363
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:341
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:776
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:780
 #: 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
@@ -6139,9 +6308,9 @@ msgstr "desligado"
 msgid "on"
 msgstr "ligado"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
-msgid "open"
-msgstr "abrir"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1169
+msgid "open network"
+msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
@@ -6160,73 +6329,77 @@ msgstr ""
 msgid "positive integer value"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:34
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:56
 msgid "random"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:526
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:532
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:537
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:580
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:586
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:591
 msgid "relay mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:910
 msgid "routed"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:525
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:534
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:968
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:977
 msgid "sec"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:525
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:531
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:579
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:585
 msgid "server mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:544
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:597
 msgid "stateful-only"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:542
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:595
 msgid "stateless"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:543
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:596
 msgid "stateless + stateful"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:369
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1167
+msgid "strong security"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:346
 msgid "tagged"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:932
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1343
 msgid "time units (TUs / 1.024 ms) [1000-65535]"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:549
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:555
 msgid "unique value"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:448
 msgid "unknown"
 msgstr "desconhecido"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:15
 #: modules/luci-base/luasrc/view/lease_status.htm:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:238
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:390
+#: 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:414
 msgid "unlimited"
 msgstr "ilimitado"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1401
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1648
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:63
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:355
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:378
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:413
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:446
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:512
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:450
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:545
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:53
 #: modules/luci-base/luasrc/view/cbi/network_netlist.htm:38
 msgid "unspecified"
@@ -6236,7 +6409,7 @@ msgstr "não especificado"
 msgid "unspecified -or- create:"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:366
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:344
 msgid "untagged"
 msgstr ""
 
@@ -6317,8 +6490,8 @@ msgstr ""
 msgid "valid address:port"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:523
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:527
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:529
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:533
 msgid "valid date (YYYY-MM-DD)"
 msgstr ""
 
@@ -6355,7 +6528,7 @@ msgstr ""
 msgid "valid network in address/netmask notation"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:498
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:504
 msgid "valid phone digit (0-9, \"*\", \"#\", \"!\" or \".\")"
 msgstr ""
 
@@ -6368,11 +6541,11 @@ msgstr ""
 msgid "valid port value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:503
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:509
 msgid "valid time (HH:MM:SS)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:425
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:431
 msgid "value between %d and %d characters"
 msgstr ""
 
@@ -6388,14 +6561,23 @@ msgstr ""
 msgid "value smaller or equal to %f"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:430
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:425
+msgid "value with %d characters"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:436
 msgid "value with at least %d characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:435
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:441
 msgid "value with at most %d characters"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1169
+msgid "weak security"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:221
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:232
@@ -6406,6 +6588,179 @@ msgstr "sim"
 msgid "« Back"
 msgstr "« Voltar"
 
+#~ msgid "Specifies the listening port of this <em>Dropbear</em> instance"
+#~ msgstr "Especifica as portas de escuta desta instância <em>Dropbear</em>"
+
+#~ msgid "VLANs on %q (%s)"
+#~ msgstr "VLANs em %q (%s)"
+
+#~ msgid "Antenna 1"
+#~ msgstr "Antena 1"
+
+#~ msgid "Antenna 2"
+#~ msgstr "Antena 2"
+
+#~ msgid "Antenna Configuration"
+#~ msgstr "Configuração das Antenas"
+
+#~ msgid "Back to overview"
+#~ msgstr "Voltar à vista global"
+
+#~ msgid "Back to scan results"
+#~ msgstr "Voltar aos resultados do scan"
+
+#~ msgid "Broadcom 802.11%s Wireless Controller"
+#~ msgstr "Controlador Wireless Broadcom 802.11%s"
+
+#~ msgid "Broadcom BCM%04x 802.11 Wireless Controller"
+#~ msgstr "Controlador Wireless Broadcom BCM%04x 802.11"
+
+#~ msgid "Common Configuration"
+#~ msgstr "Configuração comum"
+
+#~ msgid "Connect"
+#~ msgstr "Ligar"
+
+#~ msgid "Connection Limit"
+#~ msgstr "Limite de Ligações"
+
+#~ msgid "Cover the following interface"
+#~ msgstr "Abranger a seguinte interface"
+
+#~ msgid "Cover the following interfaces"
+#~ msgstr "Abranger as seguintes interfaces"
+
+#~ msgid "Create Interface"
+#~ msgstr "Criar interface"
+
+#~ msgid "Create a bridge over multiple interfaces"
+#~ msgstr "Criar uma bridge entre múltiplas interfaces "
+
+#~ msgid "Diversity"
+#~ msgstr "Diversidade"
+
+#~ msgid "Edit this interface"
+#~ msgstr "Editar esta interface"
+
+#~ msgid "Frame Bursting"
+#~ msgstr "Frame Bursting"
+
+#~ msgid "Generic 802.11%s Wireless Controller"
+#~ msgstr "Controlador Wireless Genérico 802.11%s"
+
+#~ msgid "Install package %q"
+#~ msgstr "Instalar pacote %q"
+
+#~ msgid "Interface Overview"
+#~ msgstr "Visão Geral da Interface"
+
+#~ msgid "Missing protocol extension for proto %q"
+#~ msgstr "Falta a extensão de protocolo para o protocolo %q"
+
+#~ msgid "Name of the new interface"
+#~ msgstr "Nome da nova interface"
+
+#~ msgid "No network configured on this device"
+#~ msgstr "Nenhuma rede configurada no dispositivo"
+
+#~ msgid "No network name specified"
+#~ msgstr "Nome de rede não especificado"
+
+#~ msgid "Not associated"
+#~ msgstr "Não associado"
+
+#~ msgid ""
+#~ "On this page you can configure the network interfaces. You can bridge "
+#~ "several interfaces by ticking the \"bridge interfaces\" field and enter "
+#~ "the names of several network interfaces separated by spaces. You can also "
+#~ "use <abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
+#~ "<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
+#~ "<samp>eth0.1</samp>)."
+#~ msgstr ""
+#~ "Nesta página pode configurar as interfaces de rede. Pode ter várias "
+#~ "interfaces do tipo bridge, assinalando o campo \"interfaces bridge\" e "
+#~ "inserir os nomes de várias interfaces de rede separadas por espaços. Pode "
+#~ "também usar a notação para <abbr title=\"Rede Local Virtual\">VLAN</abbr> "
+#~ "<samp>INTERFACE.VLANNR</samp> (<abbr title=\"por exemplo\">ex.</abbr>: "
+#~ "<samp>eth0.1</samp>)."
+
+#~ msgid "Package libiwinfo required!"
+#~ msgstr "O pacote libiwinfo é necessário!"
+
+#~ msgid "Protocol of the new interface"
+#~ msgstr "Protocolo da nova interface"
+
+#~ msgid "Protocol support is not installed"
+#~ msgstr "O protocolo suportado não está instalado"
+
+#~ msgid ""
+#~ "Really delete this wireless network? The deletion cannot be undone! You "
+#~ "might lose access to this device if you are connected via this network."
+#~ msgstr ""
+#~ "Deseja mesmo apagar esta rede? A eliminação não poder desfeita!\n"
+#~ "Pode perde a ligação ao dispositivo, caso esta ligado através desta rede."
+
+#~ msgid "Receiver Antenna"
+#~ msgstr "Antena de Recepção"
+
+#~ msgid "Repeat scan"
+#~ msgstr "Repetir scan"
+
+#~ msgid "Replace entry"
+#~ msgstr "Substituir entrada"
+
+#~ msgid "Separate Clients"
+#~ msgstr "Isolar Clientes"
+
+#~ msgid ""
+#~ "The <em>libiwinfo-lua</em> package is not installed. You must install "
+#~ "this component for working wireless configuration!"
+#~ msgstr ""
+#~ "O pacote <em>libiwinfo-lua</em> não está instalado. Precisa de instalar "
+#~ "este pacote para que a configuração wireless funcione!"
+
+#~ msgid "The given network name is not unique"
+#~ msgstr "O nome dado não é único"
+
+#, fuzzy
+#~ msgid ""
+#~ "The hardware is not multi-SSID capable and the existing configuration "
+#~ "will be replaced if you proceed."
+#~ msgstr ""
+#~ "O hardware não é comporta multi-SSIDs a configuração será substituída se "
+#~ "prosseguir."
+
+#~ msgid "The selected protocol needs a device assigned"
+#~ msgstr "O protocolo escolhido precisa de um dispositivo atribuído."
+
+#~ msgid ""
+#~ "There is no device assigned yet, please attach a network device in the "
+#~ "\"Physical Settings\" tab"
+#~ msgstr ""
+#~ "Ainda não há um dispositivo atribuído, por favor ligue um dispositivo de "
+#~ "rede nas \"Definições Físicas\""
+
+#~ msgid "Transmission Rate"
+#~ msgstr "Taxa de Transmissão"
+
+#~ msgid "Transmit Power"
+#~ msgstr "Potência de Transmissão"
+
+#~ msgid "Transmitter Antenna"
+#~ msgstr "Antena de Transmissão"
+
+#~ msgid "Uploaded File"
+#~ msgstr "Ficheiro carregado"
+
+#~ msgid "Wireless is restarting..."
+#~ msgstr "A Wireless está a reiniciar..."
+
+#~ msgid "hidden"
+#~ msgstr "escondido"
+
+#~ msgid "open"
+#~ msgstr "abrir"
+
 #~ msgid "Back"
 #~ msgstr "Voltar"
 
@@ -6537,9 +6892,6 @@ msgstr "« Voltar"
 #~ msgid "Hermes 802.11b Wireless Controller"
 #~ msgstr "Controlador Wireless Hermes 802.11b"
 
-#~ msgid "Interface is shutting down..."
-#~ msgstr "A interface está a desligar..."
-
 #~ msgid "Interface reconnected"
 #~ msgstr "Interface religada"
 
diff --git a/modules/luci-base/po/ro/base.po b/modules/luci-base/po/ro/base.po
index 1019d133b..13bb97b13 100644
--- a/modules/luci-base/po/ro/base.po
+++ b/modules/luci-base/po/ro/base.po
@@ -12,19 +12,20 @@ msgstr ""
 "20)) ? 1 : 2);;\n"
 "X-Generator: Pootle 2.0.6\n"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:133
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:857
 msgid "%.1f dB"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:109
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:122
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 msgid "%d Bit"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1641
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2194
 msgid "%d invalid field(s)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:281
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:31
 msgid "%s is untagged in multiple VLANs!"
 msgstr ""
 
@@ -62,19 +63,19 @@ msgid "-- Additional Field --"
 msgstr "-- Camp suplimentar --"
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:258
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1401
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1533
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:250
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:350
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1114
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1648
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1780
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:314
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:414
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1178
 #: modules/luci-base/luasrc/view/cbi/header.htm:5
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:26
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:88
 msgid "-- Please choose --"
 msgstr "-- Te rog sa alegi --"
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:259
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:351
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1115
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:415
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1179
 #: modules/luci-base/luasrc/view/cbi/header.htm:6
 msgid "-- custom --"
 msgstr "-- particularizat --"
@@ -97,7 +98,7 @@ msgstr ""
 msgid "-- please select --"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:382
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:814
 msgid "0 = not using RSSI threshold, 1 = do not change driver default"
 msgstr ""
 
@@ -109,10 +110,11 @@ msgstr "Incarcarea in ultimul minut"
 msgid "15 Minute Load:"
 msgstr "Incarcarea in ultimele 15 minute"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:924
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1337
 msgid "4-character hexadecimal ID"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:11
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:18
 msgid "464XLAT (CLAT)"
 msgstr ""
@@ -121,47 +123,47 @@ msgstr ""
 msgid "5 Minute Load:"
 msgstr "Incarcarea in ultimele 5 minute"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:960
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1366
 msgid "6-octet identifier as a hex string - no colons"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:891
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1310
 msgid "802.11r Fast Transition"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1157
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1567
 msgid "802.11w Association SA Query maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1574
 msgid "802.11w Association SA Query retry timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1133
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1533
 msgid "802.11w Management Frame Protection"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1156
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1567
 msgid "802.11w maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1165
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1574
 msgid "802.11w retry timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:399
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:831
 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:224
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:225
 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:215
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:216
 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:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
 msgid ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
 "order of the resolvfile"
@@ -169,11 +171,11 @@ msgstr ""
 "<abbr title=\"Domain Name System\">DNS</abbr> serverul va interoga in "
 "vederea procesarii fisierului"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:388
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:820
 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:351
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:373
 #: 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>"
@@ -183,8 +185,8 @@ msgstr "Adresa <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
 msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Poarta Acces "
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:555
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:35
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:506
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr "Masca de retea <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
 
@@ -199,35 +201,35 @@ 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:378
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:402
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:58
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:35
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:33
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> Configurare"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:67
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:51
 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:328
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:329
 #: 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:372
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:233
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:234
 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:242
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> packet size"
@@ -235,65 +237,69 @@ 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:251
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:252
 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
 msgstr "<abbr title=\"maximal\">Max.</abbr> interogari simultane"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:10
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:42
 msgid ""
 "<br/>Note: you need to manually restart the cron service if the crontab file "
 "was empty before editing."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:817
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1605
+msgid "A directory with the same name already exists."
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:863
 msgid "A new login is required since the authentication session expired."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:114
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:837
 msgid "A43C + J43 + A43"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:838
 msgid "A43C + J43 + A43 + V43"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:850
 msgid "ADSL"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:826
 msgid "ANSI T1.413"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:33
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:47
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:23
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:94
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:86
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:67
 msgid "APN"
 msgstr "APN"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:56
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:175
 msgid "ARP retry threshold"
 msgstr "ARP prag reincercare"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:122
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:845
 msgid "ATM (Asynchronous Transfer Mode)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:144
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:866
 msgid "ATM Bridges"
 msgstr "Punti ATM"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:178
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:21
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:898
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:66
 msgid "ATM Virtual Channel Identifier (VCI)"
 msgstr "ATM Indentificator Canal Virtual (VCI)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:179
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:26
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:899
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:70
 msgid "ATM Virtual Path Identifier (VPI)"
 msgstr "ATM Indentificator Cale Virtual(VPI)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:866
 msgid ""
 "ATM bridges expose encapsulated ethernet in AAL5 connections as virtual "
 "Linux network interfaces which can be used in conjunction with DHCP or PPP "
@@ -303,8 +309,8 @@ msgstr ""
 "virtuale de rețea Linux care pot fi utilizate în asociere cu DHCP sau PPP "
 "pentru a forma în rețeaua furnizorului."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:184
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:905
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:62
 msgid "ATM device number"
 msgstr "ATM numar echipament"
 
@@ -313,17 +319,17 @@ msgid "ATU-C System Vendor ID"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:251
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:495
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:499
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:528
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:532
 msgid "Absent Interface"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:19
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
 msgid "Access Concentrator"
 msgstr "Concentrator de Access "
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:368
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:470
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:802
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
 msgid "Access Point"
 msgstr "Punct de Acces"
 
@@ -346,7 +352,7 @@ msgid "Active Connections"
 msgstr "Conexiuni active"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:68
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:30
 msgid "Active DHCP Leases"
 msgstr ""
 
@@ -354,55 +360,75 @@ msgstr ""
 msgid "Active DHCPv6 Leases"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1951
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:370
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:12
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2190
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:804
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:23
 msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:650
-#: modules/luci-base/htdocs/luci-static/resources/form.js:651
-#: modules/luci-base/htdocs/luci-static/resources/form.js:666
-#: modules/luci-base/htdocs/luci-static/resources/form.js:667
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1290
+#: modules/luci-base/htdocs/luci-static/resources/form.js:902
+#: modules/luci-base/htdocs/luci-static/resources/form.js:904
+#: modules/luci-base/htdocs/luci-static/resources/form.js:917
+#: modules/luci-base/htdocs/luci-static/resources/form.js:918
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1539
 #: modules/luci-base/luasrc/view/cbi/nsection.htm:25
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:189
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:197
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:39
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:47
 #: modules/luci-base/luasrc/view/cbi/ucisection.htm:54
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:703
 msgid "Add"
 msgstr "Adauga"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:60
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:870
+msgid "Add ATM Bridge"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:92
 msgid "Add IPv4 address…"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:129
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:204
 msgid "Add IPv6 address…"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:143
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:149
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:38
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:47
+msgid "Add LED action"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:215
+msgid "Add VLAN"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:14
+msgid "Add instance"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:153
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:159
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:250
 msgid "Add key"
 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:155
 msgid "Add local domain suffix to names served from hosts files"
 msgstr "Adauga un sufix local numelor servite din fisierele de tip hosts"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:705
 msgid "Add new interface..."
 msgstr "Adauga interfata noua.."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:104
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:99
+msgid "Add peer"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:105
 msgid "Additional Hosts files"
 msgstr "Fisiere de tip hosts aditionale"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:161
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
 msgid "Additional servers file"
 msgstr ""
 
@@ -429,7 +455,7 @@ msgstr ""
 msgid "Address"
 msgstr "Adresa"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:12
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:151
 msgid "Address to access local relay bridge"
 msgstr "Adresa de acces punte locala repetor"
 
@@ -438,13 +464,13 @@ msgstr "Adresa de acces punte locala repetor"
 msgid "Administration"
 msgstr "Administrare"
 
-#: 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:70
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:505
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:896
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:24
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:189
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:463
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:176
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:143
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:364
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:742
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:799
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:50
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:34
 msgid "Advanced Settings"
@@ -454,167 +480,167 @@ msgstr "Setari avansate"
 msgid "Aggregate Transmit Power(ACTATP)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:175
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:166
 msgid "Alert"
 msgstr "Alerta"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1628
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1834
 #: modules/luci-base/luasrc/model/network.lua:1416
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:54
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:78
 msgid "Alias Interface"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:138
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:66
 msgid "Alias of \"%s\""
 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:170
 msgid "All Servers"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:114
 msgid ""
 "Allocate IP addresses sequentially, starting from the lowest available "
 "address"
 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:113
 msgid "Allocate IP sequentially"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:24
 msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
 msgstr ""
 "Permite autentificarea prin parola a <abbr title=\"Secure Shell\">SSH</abbr> "
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:545
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:987
 msgid "Allow AP mode to disconnect STAs based on low ACK condition"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:462
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:589
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:891
 msgid "Allow all except listed"
 msgstr "Permite toate cu exceptia celor listate"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:236
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:767
 msgid "Allow legacy 802.11b rates"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:461
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:588
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:890
 msgid "Allow listed only"
 msgstr "Permite doar cele listate"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:198
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:199
 msgid "Allow localhost"
 msgstr "Permite localhost"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:47
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:35
 msgid "Allow remote hosts to connect to local SSH forwarded ports"
 msgstr "Permite statiilor externe sa se conecteze la porturile SSH locale"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:38
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:30
 msgid "Allow root logins with password"
 msgstr "Permite autentificarea contului root cu parola"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:39
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:30
 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:199
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:200
 msgid ""
 "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
 msgstr ""
 "Permite raspuns upstream in plaja 127.0.0.0/8, e.g. pentru serviciile RBL"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:135
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:122
 msgid "Allowed IPs"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:549
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:602
 msgid "Always announce default router"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:259
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:782
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
 "option does not comply with IEEE 802.11n-2009!"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:95
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:818
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:119
 msgid "Annex"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:96
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:819
 msgid "Annex A + L + M (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:827
 msgid "Annex A G.992.1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:828
 msgid "Annex A G.992.2"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:829
 msgid "Annex A G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:830
 msgid "Annex A G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:97
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:820
 msgid "Annex B (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:823
 msgid "Annex B G.992.1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:824
 msgid "Annex B G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:102
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:825
 msgid "Annex B G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:98
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:821
 msgid "Annex J (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:831
 msgid "Annex L G.992.3 POTS 1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:99
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:822
 msgid "Annex M (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:109
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:832
 msgid "Annex M G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:833
 msgid "Annex M G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:550
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:602
 msgid "Announce as default router even if no public prefix is available."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:555
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:607
 msgid "Announced DNS domains"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:554
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:606
 msgid "Announced DNS servers"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1093
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1496
 msgid "Anonymous Identity"
 msgstr ""
 
@@ -626,20 +652,6 @@ msgstr ""
 msgid "Anonymous Swap"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:322
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:329
-msgid "Antenna 1"
-msgstr "Antena 1"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:323
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:330
-msgid "Antenna 2"
-msgstr "Antena 2"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:246
-msgid "Antenna Configuration"
-msgstr "Configurarea Antenei"
-
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:71
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:160
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:181
@@ -647,11 +659,11 @@ msgstr "Configurarea Antenei"
 msgid "Any zone"
 msgstr "Orice Zona"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1981
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2522
 msgid "Apply request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1867
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2409
 msgid "Apply unchecked"
 msgstr ""
 
@@ -659,8 +671,8 @@ msgstr ""
 msgid "Architecture"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:19
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:184
+#: 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 ""
@@ -669,13 +681,13 @@ msgstr ""
 msgid "Assign interfaces..."
 msgstr "Inregistreaza interfetele"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:124
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:24
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:189
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:31
 msgid ""
 "Assign prefix parts using this hexadecimal subprefix ID for this interface."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:148
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1967
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:22
 msgid "Associated Stations"
 msgstr "Statiile asociate"
@@ -684,20 +696,20 @@ msgstr "Statiile asociate"
 msgid "Associations"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:39
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:37
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:101
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:64
 msgid "Auth Group"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1027
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1421
 msgid "Authentication"
 msgstr "Autentificare"
 
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:29
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:70
 msgid "Authentication Type"
 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:78
 msgid "Authoritative"
 msgstr "Autoritare"
 
@@ -715,17 +727,19 @@ msgstr "Necesita Autorizare"
 msgid "Auto Refresh"
 msgstr "Reimprospatare automata"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:53
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:7
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:17
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:67
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:24
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:36
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:42
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:36
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:106
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:24
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:98
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:50
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:94
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:81
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:55
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:68
 msgid "Automatic"
 msgstr ""
 
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:7
 #: protocols/luci-proto-hnet/luasrc/model/network/proto_hnet.lua:7
 msgid "Automatic Homenet (HNCP)"
 msgstr ""
@@ -768,21 +782,21 @@ msgstr "Disponibil"
 msgid "Average:"
 msgstr "Medie:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:116
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:839
 msgid "B43 + B43C"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:840
 msgid "B43 + B43C + V43"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:48
 msgid "BR / DMR / AFTR"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:43
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:75
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1620
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:176
 msgid "BSSID"
 msgstr "BSSID"
@@ -796,19 +810,11 @@ msgstr "Inapoi la sumar"
 msgid "Back to configuration"
 msgstr "Inapoi la Configurare"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:48
-msgid "Back to overview"
-msgstr "Inapoi la vedere generala"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:20
-msgid "Back to scan results"
-msgstr "Inapoi la rezultatele scanarii"
-
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:17
 msgid "Backup"
 msgstr "Salveaza"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:38
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:36
 msgid "Backup / Flash Firmware"
 msgstr "Salveaza / Scrie Firmware"
 
@@ -821,11 +827,11 @@ msgid "Bad address specified!"
 msgstr "Adresa specificata gresit !"
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:158
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:288
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:368
 msgid "Band"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:261
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:785
 msgid "Beacon Interval"
 msgstr ""
 
@@ -836,79 +842,85 @@ msgid ""
 "defined backup patterns."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:293
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:294
 msgid ""
 "Bind dynamically to interfaces rather than wildcard address (recommended as "
 "linux default)"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:16
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:48
 msgid "Bind interface"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:16
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:48
 msgid "Bind the tunnel to this interface (optional)."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:49
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:134
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:187
 msgid "Bitrate"
 msgstr "Bitrate"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:172
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
 msgid "Bogus NX Domain Override"
 msgstr "Bogus NX Domain Override"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1634
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1840
 #: modules/luci-base/luasrc/model/network.lua:1420
 msgid "Bridge"
 msgstr "Punte"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:264
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:368
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:678
 msgid "Bridge interfaces"
 msgstr "Leaga interfetele"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:906
 msgid "Bridge unit number"
 msgstr "Numarul unitatii in punte"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:250
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:364
 msgid "Bring up on boot"
 msgstr "Activeaza la pornire"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:35
-msgid "Broadcom 802.11%s Wireless Controller"
-msgstr "Broadcom 802.11%s Controller Fara Fir"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:45
-msgid "Broadcom BCM%04x 802.11 Wireless Controller"
-msgstr "Broadcom BCM%04x 802.11 Controller Fara Fir"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1697
+msgid "Browse…"
+msgstr ""
 
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:18
 msgid "Buffered"
 msgstr "Incarcat"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:75
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:134
 msgid "CA certificate; if empty it will be saved after the first connection."
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:7
+msgid "CLAT configuration failed"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:13
 msgid "CPU usage (%)"
 msgstr "Utilizarea procesorului (%)"
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:21
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:53
 msgid "Call failed"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1789
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:14
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:52
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:711
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:948
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1839
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:191
 #: modules/luci-mod-system/luasrc/view/admin_system/upgrade.htm:60
 msgid "Cancel"
 msgstr "Anuleaza"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:6
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:17
 msgid "Category"
 msgstr ""
 
@@ -926,13 +938,7 @@ msgstr ""
 msgid "Chain"
 msgstr "Lant"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:9
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:14
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:24
-msgid "Change login password"
-msgstr ""
-
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1744
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 msgid "Changes"
 msgstr "Modificari"
 
@@ -940,33 +946,23 @@ msgstr "Modificari"
 msgid "Changes applied."
 msgstr "Modificari aplicate."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2004
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2545
 msgid "Changes have been reverted."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:43
 msgid "Changes the administrator password for accessing the device"
 msgstr "Schimba parola administratorului pentru accesarea dispozitivului"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:10
-msgid "Changing password…"
-msgstr ""
-
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:162
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:45
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:87
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:174
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:376
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1618
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:186
 msgid "Channel"
 msgstr "Canal"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:119
-msgid ""
-"Channel %d is not available in the %s regulatory domain and has been auto-"
-"adjusted to %d."
-msgstr ""
-
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:229
 msgid "Check"
 msgstr "Verificare"
@@ -975,7 +971,7 @@ msgstr "Verificare"
 msgid "Check filesystems before mount"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1806
 msgid "Check this option to delete the existing networks from this radio."
 msgstr ""
 
@@ -987,8 +983,8 @@ msgstr "Suma de verificare"
 msgid "Choose mtdblock"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:358
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:443
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1829
 msgid ""
 "Choose the firewall zone you want to assign to this interface. Select "
 "<em>unspecified</em> to remove the interface from the associated zone or "
@@ -999,17 +995,17 @@ msgstr ""
 "<em>nespecificat</em> pentru a sterge interfata sau golire <em>creaza</em> "
 "camp ce defineste o zona noua asociata interfetei."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:834
 msgid ""
 "Choose the network(s) you want to attach to this wireless interface or fill "
 "out the <em>create</em> field to define a new network."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:614
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1023
 msgid "Cipher"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:61
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:91
 msgid "Cisco UDP encapsulation"
 msgstr ""
 
@@ -1025,28 +1021,28 @@ msgid ""
 "FEATURE IS FOR PROFESSIONALS! )"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1950
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:369
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:471
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2189
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:803
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:908
 msgid "Client"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:55
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:52
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:47
 msgid "Client ID to send when requesting DHCP"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:145
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:151
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:155
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:161
 msgid "Close"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:146
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:119
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:125
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:127
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:98
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:119
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:157
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:141
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:115
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:138
 msgid ""
 "Close inactive connection after the given amount of seconds, use 0 to "
 "persist connection"
@@ -1059,12 +1055,9 @@ msgstr ""
 #: modules/luci-base/luasrc/view/lease_status.htm:77
 #: modules/luci-base/luasrc/view/lease_status.htm:98
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:118
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:37
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:24
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1965
 #: modules/luci-mod-network/luasrc/view/admin_network/iface_status.htm:6
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:40
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:30
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:8
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:398
 #: modules/luci-mod-status/luasrc/view/admin_status/index/30-network.htm:11
 #: modules/luci-mod-status/luasrc/view/admin_status/index/50-dsl.htm:17
@@ -1078,15 +1071,19 @@ msgstr "Colectez datele.."
 msgid "Command"
 msgstr "Comanda"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:193
+msgid "Command OK"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:41
+msgid "Command failed"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:64
 msgid "Comment"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:185
-msgid "Common Configuration"
-msgstr "Configurarea obisnuita"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
 msgid ""
 "Complicates key reinstallation attacks on the client side by disabling "
 "retransmission of EAPOL-Key frames that are used to install keys. This "
@@ -1094,13 +1091,14 @@ msgid ""
 "negotiation especially in environments with heavy traffic load."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1744
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 #: modules/luci-base/luasrc/controller/admin/uci.lua:11
 #: modules/luci-mod-system/luasrc/view/admin_system/backupfiles.htm:9
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:13
 msgid "Configuration"
 msgstr "Configurare"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:21
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:63
 msgid "Configuration failed"
 msgstr ""
@@ -1109,89 +1107,89 @@ msgstr ""
 msgid "Configuration files will be kept"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1915
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2456
 msgid "Configuration has been applied."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1848
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2395
 msgid "Configuration has been rolled back!"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:43
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:942
+msgid "Confirm disconnect"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:50
 msgid "Confirmation"
 msgstr "Confirmare"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:32
-msgid "Connect"
-msgstr "Conectare"
-
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:72
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:105
 msgid "Connected"
 msgstr "Conectat"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:338
-msgid "Connection Limit"
-msgstr "Limita de conexiune"
-
 #: modules/luci-base/htdocs/luci-static/resources/network.js:7
 #: modules/luci-base/luasrc/model/network.lua:27
 msgid "Connection attempt failed"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:203
+msgid "Connection lost"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/controller/admin/status.lua:32
 msgid "Connections"
 msgstr "Conexiuni"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1890
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:66
+msgid "Contents have been saved."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:618
+msgid "Continue"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2431
 msgid ""
 "Could not regain access to the device after applying the configuration "
 "changes. You might need to reconnect if you modified network related "
 "settings such as the IP address or wireless security credentials."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:135
 msgid "Country"
 msgstr "Tara"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:227
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:233
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:337
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:764
 msgid "Country Code"
 msgstr "Codul de tara"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:36
-msgid "Cover the following interface"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:43
-msgid "Cover the following interfaces"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:357
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:86
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:443
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1829
 msgid "Create / Assign firewall-zone"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:9
-msgid "Create Interface"
-msgstr "Creaza interfata"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:33
-msgid "Create a bridge over multiple interfaces"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:735
+msgid "Create interface"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:174
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:165
 msgid "Critical"
 msgstr "Critic"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:178
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:169
 msgid "Cron Log Level"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:519
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:521
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:447
+msgid "Current power"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:552
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:554
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:51
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:53
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:82
@@ -1199,7 +1197,7 @@ msgstr ""
 msgid "Custom Interface"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:36
 msgid "Custom delegated IPv6-prefix"
 msgstr ""
 
@@ -1209,52 +1207,53 @@ msgid ""
 "this, perform a factory-reset first."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:59
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:41
 msgid ""
 "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
 "\">LED</abbr>s if possible."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:799
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1223
 msgid "DAE-Client"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:807
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1231
 msgid "DAE-Port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:815
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1239
 msgid "DAE-Secret"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:448
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:459
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:279
 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:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:61
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:62
 msgid "DHCP and DNS"
 msgstr "DHCP si DNS"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1195
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1385
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:16
 #: modules/luci-base/luasrc/model/network.lua:968
 msgid "DHCP client"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:571
 msgid "DHCP-Options"
 msgstr "Optiuni DHCP"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_dhcpv6.lua:7
 msgid "DHCPv6 client"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:540
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:594
 msgid "DHCPv6-Mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:529
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:583
 msgid "DHCPv6-Service"
 msgstr ""
 
@@ -1271,31 +1270,31 @@ msgstr ""
 msgid "DNS"
 msgstr "DNS"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:183
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
 msgid "DNS forwardings"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:30
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:37
 msgid "DNS-Label / FQDN"
 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:136
 msgid "DNSSEC"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:139
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
 msgid "DNSSEC check unsigned"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:73
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:99
 msgid "DPD Idle Timeout"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:14
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:41
 msgid "DS-Lite AFTR address"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:92
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:815
 #: modules/luci-mod-status/luasrc/view/admin_status/index/50-dsl.htm:14
 msgid "DSL"
 msgstr ""
@@ -1304,11 +1303,11 @@ msgstr ""
 msgid "DSL Status"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:125
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:848
 msgid "DSL line mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:519
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:963
 msgid "DTIM Interval"
 msgstr ""
 
@@ -1320,77 +1319,92 @@ msgstr ""
 msgid "Data Rate"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:169
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:180
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:160
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:171
 msgid "Debug"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:759
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:783
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:807
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1183
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1207
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1231
 msgid "Default %d"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:82
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:107
 msgid "Default Route"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:17
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:81
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:51
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:32
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:48
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:85
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:65
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:80
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:108
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:146
 msgid "Default gateway"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:541
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:594
 msgid "Default is stateless + stateful"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:70
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:54
 msgid "Default state"
 msgstr "Stare implicita"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:503
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:553
 msgid "Define a name for this network."
 msgstr "Definiti un nume pentru aceasta retea."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:514
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:571
 msgid ""
 "Define additional DHCP options, for example "
 "\"<code>6,192.168.2.1,192.168.2.2</code>\" which advertises different DNS "
 "servers to clients."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:705
-#: modules/luci-base/htdocs/luci-static/resources/form.js:958
-#: modules/luci-base/htdocs/luci-static/resources/form.js:959
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1271
+#: modules/luci-base/htdocs/luci-static/resources/form.js:966
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1210
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1216
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1524
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1758
 #: modules/luci-base/luasrc/view/cbi/nsection.htm:11
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:162
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:16
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:41
 msgid "Delete"
 msgstr "Sterge"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:178
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:187
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:193
 msgid "Delete key"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:45
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1654
+msgid "Delete permission denied"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1656
+msgid "Delete request failed: %d %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:723
 msgid "Delete this network"
 msgstr "Sterge aceasta retea"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:519
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:963
 msgid "Delivery Traffic Indication Message Interval"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:102
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:108
 msgid "Description"
 msgstr "Descriere"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:224
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1754
+msgid "Deselect"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:215
 msgid "Design"
 msgstr ""
 
@@ -1408,10 +1422,12 @@ msgstr ""
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:177
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:43
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:13
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:38
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:73
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:33
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:52
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:85
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:86
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:72
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:154
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:253
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:86
@@ -1419,15 +1435,24 @@ msgstr ""
 msgid "Device"
 msgstr "Dispozitiv"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:138
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:737
 msgid "Device Configuration"
 msgstr "Configurarea dispozitivului"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:81
+msgid "Device is not active"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/reboot.htm:23
 msgid "Device is rebooting..."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1889
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:167
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:513
+msgid "Device is restarting…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2430
 msgid "Device unreachable!"
 msgstr ""
 
@@ -1435,26 +1460,26 @@ msgstr ""
 msgid "Device unreachable! Still waiting for device..."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:123
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:78
 #: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:61
 msgid "Diagnostics"
 msgstr "Diagnosticuri"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:45
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:60
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:101
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:93
 msgid "Dial number"
 msgstr ""
 
-#: modules/luci-base/luasrc/view/cbi/filebrowser.htm:99
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1554
 msgid "Directory"
 msgstr "Director"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:131
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:715
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:754
 msgid "Disable"
 msgstr "Dezactiveaza"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:472
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:531
 msgid ""
 "Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for "
 "this interface."
@@ -1462,71 +1487,66 @@ msgstr ""
 "Dezactiveaza <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> "
 "pentru aceasta interfata."
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:64
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:93
 msgid "Disable Encryption"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:530
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:973
 msgid "Disable Inactivity Polling"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:713
 msgid "Disable this network"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:44
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:54
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:68
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:37
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:43
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:37
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1534
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:76
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:107
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:99
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:51
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:95
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:82
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:69
 msgid "Disabled"
 msgstr "Dezactivat"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1139
-msgid "Disabled (default)"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:544
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:987
 msgid "Disassociate On Low Acknowledgement"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:193
 msgid "Discard upstream RFC1918 responses"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:92
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:114
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:956
 msgid "Disconnect"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:22
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:64
 msgid "Disconnection attempt failed"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1121
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1762
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1855
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:17
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1375
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1995
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2314
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2401
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1634
 msgid "Dismiss"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:240
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:334
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:770
 msgid "Distance Optimization"
 msgstr "Optimizarea distantei"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:241
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:770
 msgid "Distance to farthest network member in meters."
 msgstr "Distanta catre cel mai departat membru din retea in metri."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:347
-msgid "Diversity"
-msgstr "Diversitate"
-
-#: 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:61
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
@@ -1534,35 +1554,43 @@ msgid ""
 "firewalls"
 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:159
 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:123
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:124
 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:118
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
 msgid "Do not forward reverse lookups for local networks"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:173
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1639
+msgid "Do you really want to delete \"%s\" ?"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:188
 msgid "Do you really want to delete the following SSH key?"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1637
+msgid "Do you really want to recursively delete the directory \"%s\" ?"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:74
 msgid "Domain required"
 msgstr "Domeniul necesar"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:205
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:206
 msgid "Domain whitelist"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:34
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:67
 msgid "Don't Fragment"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:74
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:75
 msgid ""
 "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
 "<abbr title=\"Domain Name System\">DNS</abbr>-Name"
@@ -1580,57 +1608,58 @@ msgstr "Descarca backup"
 msgid "Download mtdblock"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:853
 msgid "Downstream SNR offset"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:914
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1169
 msgid "Drag to reorder"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:9
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:11
 msgid "Dropbear Instance"
 msgstr "Instanta dropbear"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:6
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 msgid ""
 "Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access "
 "and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:11
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:14
 msgid "Dual-Stack Lite (RFC6333)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:493
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:547
 msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:60
 msgid "Dynamic tunnel"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:494
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:547
 msgid ""
 "Dynamically allocate DHCP addresses for clients. If disabled, only clients "
 "having static leases will be served."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:67
 msgid "EA-bits length"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:990
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1386
 msgid "EAP-Method"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:934
-#: modules/luci-base/htdocs/luci-static/resources/form.js:935
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1199
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1188
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1191
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1450
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:154
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:160
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:38
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:291
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:720
 msgid "Edit"
 msgstr "Editeaza"
 
@@ -1640,90 +1669,91 @@ msgid ""
 "reload the page."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:38
-msgid "Edit this interface"
-msgstr "Editeaza aceasta interfata"
-
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:718
 msgid "Edit this network"
 msgstr "Editeaza aceasta retea"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:669
+msgid "Edit wireless network"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:167
 msgid "Emergency"
 msgstr "Urgenta"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:127
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:715
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:754
 msgid "Enable"
 msgstr "Activeaza"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:414
 msgid ""
 "Enable <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> "
 "snooping"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:271
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:412
 msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 msgstr "Activeaza <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:41
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:60
 msgid "Enable HE.net dynamic endpoint update"
 msgstr ""
 
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:51
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:89
 msgid "Enable IPv6 negotiation"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:23
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:35
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:41
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:35
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:37
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:49
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:80
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:54
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:67
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:93
 msgid "Enable IPv6 negotiation on the PPP link"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:143
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:188
 msgid "Enable Jumbo Frame passthrough"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:244
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:235
 msgid "Enable NTP client"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:69
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:96
 msgid "Enable Single DES"
 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:267
 msgid "Enable TFTP server"
 msgstr "Activeaza serverul TFTP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:134
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:180
 msgid "Enable VLAN functionality"
 msgstr "Activeaza VLAN-urile"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1595
 msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1175
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
 msgid "Enable key reinstallation (KRACK) countermeasures"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:138
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:183
 msgid "Enable learning and aging"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:194
 msgid "Enable mirroring of incoming packets"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:151
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:195
 msgid "Enable mirroring of outgoing packets"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:34
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:67
 msgid "Enable the DF (Don't Fragment) flag of the encapsulating packets."
 msgstr ""
 
@@ -1731,7 +1761,7 @@ msgstr ""
 msgid "Enable this mount"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:713
 msgid "Enable this network"
 msgstr ""
 
@@ -1739,48 +1769,52 @@ msgstr ""
 msgid "Enable this swap"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:37
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:88
 msgid "Enable/Disable"
 msgstr "Activeaza/Dezactiveaza"
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:76
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:152
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:251
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:41
 msgid "Enabled"
 msgstr "Activat"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:277
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:414
 msgid "Enables IGMP snooping on this bridge"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:892
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1310
 msgid ""
 "Enables fast roaming among access points that belong to the same Mobility "
 "Domain"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:272
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:412
 msgid "Enables the Spanning Tree Protocol on this bridge"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:120
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:180
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:59
+msgid "Encapsulation limit"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:843
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:901
 msgid "Encapsulation mode"
 msgstr "Modul de incapsulare"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:76
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:603
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:129
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:992
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1621
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:177
 msgid "Encryption"
 msgstr "Criptare"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:155
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:128
 msgid "Endpoint Host"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:165
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:132
 msgid "Endpoint Port"
 msgstr ""
 
@@ -1792,16 +1826,21 @@ msgstr ""
 msgid "Enter custom values"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:273
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:271
 msgid "Erasing..."
 msgstr "Stergere..."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:95
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:96
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:97
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:98
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:99
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:106
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:107
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:108
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:109
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:110
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:173
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:164
 msgid "Error"
 msgstr "Eroare"
 
@@ -1809,24 +1848,28 @@ msgstr "Eroare"
 msgid "Errored seconds (ES)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1646
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1852
 #: modules/luci-base/luasrc/model/network.lua:1432
 msgid "Ethernet Adapter"
 msgstr "Adaptor de retea ethernet"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1637
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1843
 #: modules/luci-base/luasrc/model/network.lua:1422
 msgid "Ethernet Switch"
 msgstr "Switch-ul ethernet"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:303
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
 msgid "Exclude interfaces"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:153
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
 msgid "Expand hosts"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:195
+msgid "Expecting an hexadecimal assignment hint"
+msgstr ""
+
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:59
 msgid "Expecting: %s"
 msgstr ""
@@ -1835,60 +1878,76 @@ msgstr ""
 msgid "Expires"
 msgstr "Expira"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:488
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:543
 msgid ""
 "Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:8
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:19
 msgid "External"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:971
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1377
 msgid "External R0 Key Holder List"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:980
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1381
 msgid "External R1 Key Holder List"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:150
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:141
 msgid "External system log server"
 msgstr "Server de log-uri extern"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:155
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:146
 msgid "External system log server port"
 msgstr "Portul serverului de log-uri extern"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:160
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:151
 msgid "External system log server protocol"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:18
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:79
 msgid "Extra SSH command options"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:940
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1351
 msgid "FT over DS"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:941
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1352
 msgid "FT over the Air"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:938
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1349
 msgid "FT protocol"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1842
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:82
+msgid "Failed to change the system password."
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2389
 msgid "Failed to confirm apply within %ds, waiting for rollback…"
 msgstr ""
 
-#: modules/luci-base/luasrc/view/cbi/filebrowser.htm:106
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:45
+msgid "Failed to execute \"/etc/init.d/%s %s\" action: %s"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1561
 msgid "File"
 msgstr "Fisier"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:279
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1514
+msgid "File not accessible"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1698
+msgid "Filename"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:280
 msgid "Filename of the boot image advertised to clients"
 msgstr ""
 
@@ -1898,14 +1957,15 @@ msgstr ""
 msgid "Filesystem"
 msgstr "Sistem de fisiere"
 
-#: 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:118
 msgid "Filter private"
 msgstr "Filtreaza privatele"
 
-#: 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:123
 msgid "Filter useless"
 msgstr "Filtreaza nefolositele"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:23
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:65
 msgid "Finalizing failed"
 msgstr ""
@@ -1916,7 +1976,7 @@ msgid ""
 "with defaults based on what was detected"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:696
 msgid "Find and join network"
 msgstr "Gaseste si alatura in retea"
 
@@ -1928,11 +1988,11 @@ msgstr "Termina"
 msgid "Firewall"
 msgstr "Firewall"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:77
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:76
 msgid "Firewall Mark"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:193
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:278
 msgid "Firewall Settings"
 msgstr "Setarile firewall-ului"
 
@@ -1940,7 +2000,7 @@ msgstr "Setarile firewall-ului"
 msgid "Firewall Status"
 msgstr "Status la firewall"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:137
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:860
 msgid "Firmware File"
 msgstr ""
 
@@ -1948,7 +2008,7 @@ msgstr ""
 msgid "Firmware Version"
 msgstr "Versiunea de firmware"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:225
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:226
 msgid "Fixed source port for outbound DNS queries"
 msgstr "Portul sursa pentru intrebarile DNS catre exterior"
 
@@ -1968,36 +2028,36 @@ msgstr ""
 msgid "Flash operations"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:194
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:192
 msgid "Flashing..."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:498
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:550
 msgid "Force"
 msgstr "Forteaza"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:258
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:782
 msgid "Force 40MHz mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:622
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1031
 msgid "Force CCMP (AES)"
 msgstr "Forteaza CCMP (AES)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:499
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:550
 msgid "Force DHCP on this network even if another server is detected."
 msgstr ""
 "Forteaza facilitatea DHCP in aceasta retea chiar daca alt server DHCP exista."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:623
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1032
 msgid "Force TKIP"
 msgstr "Forteaza TKIP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:624
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1033
 msgid "Force TKIP and CCMP (AES)"
 msgstr "Forteaza TKIP si CCMP (AES)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:795
 msgid "Force link"
 msgstr ""
 
@@ -2005,7 +2065,7 @@ msgstr ""
 msgid "Force upgrade"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:60
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:90
 msgid "Force use of NAT-T"
 msgstr ""
 
@@ -2013,7 +2073,7 @@ msgstr ""
 msgid "Form token mismatch"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:34
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:164
 msgid "Forward DHCP traffic"
 msgstr ""
 
@@ -2021,46 +2081,41 @@ msgstr ""
 msgid "Forward Error Correction Seconds (FECS)"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:28
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:161
 msgid "Forward broadcast traffic"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:375
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:809
 msgid "Forward mesh peer traffic"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:186
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:908
 msgid "Forwarding mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:255
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:596
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:774
 msgid "Fragmentation Threshold"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:332
-msgid "Frame Bursting"
-msgstr ""
-
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:17
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:28
 msgid "Free"
 msgstr "Liber"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:91
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:89
 msgid ""
-"Further information about WireGuard interfaces and peers at <a href=\"http://"
-"wireguard.com\">wireguard.com</a>."
+"Further information about WireGuard interfaces and peers at <a href='http://"
+"wireguard.com'>wireguard.com</a>."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:45
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:130
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:186
 msgid "GHz"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:29
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:36
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:91
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:77
 msgid "GPRS only"
 msgstr "Doar GPRS"
 
@@ -2069,28 +2124,28 @@ msgstr "Doar GPRS"
 msgid "Gateway"
 msgstr "Gateway"
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:35
+msgid "Gateway Ports"
+msgstr "Porturile gateway"
+
 #: modules/luci-base/htdocs/luci-static/resources/network.js:9
 #: modules/luci-base/luasrc/model/network.lua:29
 msgid "Gateway address is invalid"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:46
-msgid "Gateway ports"
-msgstr "Porturile gateway"
-
-#: 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:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:275
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:23
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:112
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:103
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:49
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:33
 msgid "General Settings"
 msgstr "Setari principale"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:188
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:462
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:175
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:141
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:361
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:504
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:895
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:741
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:796
 msgid "General Setup"
 msgstr "Configurare generala"
 
@@ -2098,7 +2153,7 @@ msgstr "Configurare generala"
 msgid "Generate Config"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:945
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1355
 msgid "Generate PMK locally"
 msgstr ""
 
@@ -2106,11 +2161,7 @@ msgstr ""
 msgid "Generate archive"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:63
-msgid "Generic 802.11%s Wireless Controller"
-msgstr ""
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:26
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:74
 msgid "Given password confirmation did not match, password not changed!"
 msgstr "Confirmarea parolei nu se potriveste cu prima, parola neschimbata !"
 
@@ -2118,7 +2169,7 @@ msgstr "Confirmarea parolei nu se potriveste cu prima, parola neschimbata !"
 msgid "Global Settings"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:806
 msgid "Global network options"
 msgstr ""
 
@@ -2129,33 +2180,29 @@ msgstr ""
 msgid "Go to password configuration..."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:857
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1369
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1112
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1616
 #: modules/luci-base/luasrc/view/cbi/full_valueheader.htm:4
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:58
 msgid "Go to relevant configuration page"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:38
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:66
 msgid "Group Password"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:11
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:22
 msgid "Guest"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:73
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:81
 msgid "HE.net password"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:60
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:73
 msgid "HE.net username"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:310
-msgid "HT mode (802.11n)"
-msgstr ""
-
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:16
 msgid "Hang Up"
 msgstr ""
@@ -2164,7 +2211,7 @@ msgstr ""
 msgid "Header Error Code Errors (HEC)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:103
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 msgid ""
 "Here you can configure the basic aspects of your device like its hostname or "
 "the timezone."
@@ -2172,9 +2219,7 @@ msgstr ""
 "Aici poti configura aspectele de baza ale dispozitivului cum ar fi numele "
 "sau fusul orar."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:499
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:556
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:579
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:941
 msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "Ascunde <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 
@@ -2185,14 +2230,15 @@ msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:92
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1959
 msgid "Host"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:20
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:21
 msgid "Host entries"
 msgstr "Intrari de tip host"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:48
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:171
 msgid "Host expiry timeout"
 msgstr ""
 
@@ -2200,45 +2246,45 @@ msgstr ""
 msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:118
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:102
 msgid "Host-Uniq tag content"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:71
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:31
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:316
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:25
+#: 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:317
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:26
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:17
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:125
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:116
 msgid "Hostname"
 msgstr "Numele de host"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:12
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:22
 msgid "Hostname to send when requesting DHCP"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:18
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:19
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:67
 msgid "Hostnames"
 msgstr "Nume de host"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:13
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:24
 msgid "Hybrid"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:45
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:75
 msgid "IKE DH Group"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:41
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:59
 msgid "IP Addresses"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:40
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:80
 msgid "IP Protocol"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:29
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:30
 msgid "IP address"
 msgstr "Adresa IP"
 
@@ -2257,6 +2303,11 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:20
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:21
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:22
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:79
+#: 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/network.js:89
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:90
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:91
@@ -2264,7 +2315,7 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:93
 #: 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/luasrc/model/cbi/admin_network/proto_ncm.lua:42
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:82
 msgid "IPv4"
 msgstr "IPv4"
 
@@ -2276,24 +2327,23 @@ msgstr "Firewall IPv4"
 msgid "IPv4 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:57
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:178
 msgid "IPv4 address"
 msgstr "Adresa IPv4"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:26
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:33
 msgid "IPv4 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:104
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:181
 msgid "IPv4 broadcast"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:100
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:180
 msgid "IPv4 gateway"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:92
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:179
 msgid "IPv4 netmask"
 msgstr ""
 
@@ -2301,24 +2351,25 @@ msgstr ""
 msgid "IPv4 network in address/netmask notation"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:25
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:52
 msgid "IPv4 prefix"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:42
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:30
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:55
 msgid "IPv4 prefix length"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:43
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:83
 msgid "IPv4+IPv6"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:72
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:34
 msgid "IPv4-Address"
 msgstr "Adresa IPv4"
 
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:10
 #: protocols/luci-proto-ipip/luasrc/model/network/proto_ipip.lua:9
 msgid "IPv4-in-IPv4 (RFC2003)"
 msgstr ""
@@ -2333,6 +2384,16 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:30
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:31
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:32
+#: 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/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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:89
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:90
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:91
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:92
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:95
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:96
@@ -2345,7 +2406,7 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:103
 #: 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/luasrc/model/cbi/admin_network/proto_ncm.lua:44
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:84
 msgid "IPv6"
 msgstr "IPv6"
 
@@ -2357,11 +2418,11 @@ msgstr "Firewall IPv6"
 msgid "IPv6 Neighbours"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:464
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:506
 msgid "IPv6 Settings"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:195
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:810
 msgid "IPv6 ULA-Prefix"
 msgstr ""
 
@@ -2369,21 +2430,21 @@ msgstr ""
 msgid "IPv6 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:202
 msgid "IPv6 address"
 msgstr "Adresa IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:23
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:189
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:31
 msgid "IPv6 assignment hint"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:18
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:184
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:27
 msgid "IPv6 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:207
 msgid "IPv6 gateway"
 msgstr ""
 
@@ -2391,22 +2452,22 @@ msgstr ""
 msgid "IPv6 network in address/netmask notation"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:37
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:59
 msgid "IPv6 prefix"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:34
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:45
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:63
 msgid "IPv6 prefix length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:33
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:211
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:57
 msgid "IPv6 routed prefix"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:143
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:215
 msgid "IPv6 suffix"
 msgstr ""
 
@@ -2416,31 +2477,35 @@ msgid "IPv6-Address"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:93
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:104
 msgid "IPv6-PD"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:10
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:13
 msgid "IPv6-in-IPv4 (RFC4213)"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:17
 msgid "IPv6-over-IPv4 (6rd)"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:15
 msgid "IPv6-over-IPv4 (6to4)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1075
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1478
 msgid "Identity"
 msgstr "Identitate"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:70
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:96
 msgid "If checked, 1DES is enabled"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:65
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:93
 msgid "If checked, encryption is disabled"
 msgstr ""
 
@@ -2457,36 +2522,36 @@ msgid ""
 "device node"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:27
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:71
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:18
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:82
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:52
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:17
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:29
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:33
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:68
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:85
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:32
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:45
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:45
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:24
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:44
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:116
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:48
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:85
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:65
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:33
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:80
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:108
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:146
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:74
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:97
 msgid "If unchecked, no default route is configured"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:34
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:86
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:35
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:99
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:47
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:60
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:60
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:39
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:59
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:124
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:39
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:116
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:59
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:103
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:64
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:77
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:100
 msgid "If unchecked, the advertised DNS server addresses are ignored"
 msgstr ""
 
@@ -2499,15 +2564,15 @@ msgid ""
 "of the <abbr title=\"Random Access Memory\">RAM</abbr>."
 msgstr ""
 
-#: 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:102
 msgid "Ignore <code>/etc/hosts</code>"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:471
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:531
 msgid "Ignore interface"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:90
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:91
 msgid "Ignore resolve file"
 msgstr ""
 
@@ -2525,12 +2590,12 @@ msgid ""
 "blocked. Click \"Continue »\" below to return to the previous page."
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:145
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:118
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:124
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:126
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:97
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:118
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:157
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:141
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:115
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:138
 msgid "Inactivity timeout"
 msgstr ""
 
@@ -2538,23 +2603,25 @@ msgstr ""
 msgid "Inbound:"
 msgstr "Intrare:"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:170
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:161
 msgid "Info"
 msgstr "Informatii"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:105
 msgid "Information"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:25
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:67
 msgid "Initialization failure"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:34
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:87
 msgid "Initscript"
 msgstr "Script de initializare"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:26
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:122
 msgid "Initscripts"
 msgstr "Scripturi de initializare"
 
@@ -2562,55 +2629,74 @@ msgstr "Scripturi de initializare"
 msgid "Install iputils-traceroute6 for IPv6 traceroute"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:223
-msgid "Install package %q"
-msgstr "Instalati pachetul %q"
-
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:220
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:120
 msgid "Install protocol extensions..."
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:416
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:423
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:683
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:687
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:26
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:284
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:342
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:47
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:134
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:14
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:16
 msgid "Interface"
 msgstr "Interfata"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:58
 msgid "Interface %q device auto-migrated from %q to %q."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:356
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:792
 msgid "Interface Configuration"
 msgstr "Configurarea interfetei"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:51
-msgid "Interface Overview"
-msgstr "Prezentare interfata"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:99
+msgid "Interface has %d pending changes"
+msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:57
+msgid "Interface is marked for deletion"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:162
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:3
 msgid "Interface is reconnecting..."
 msgstr "Interfata se reconecteaza.."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:162
+msgid "Interface is shutting down..."
+msgstr "Interfata se opreste.."
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:205
+msgid "Interface is starting..."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:208
+msgid "Interface is stopping..."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:954
 msgid "Interface name"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:34
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:224
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:131
 msgid "Interface not present or not connected yet."
 msgstr "Interfata nu e prezenta sau nu este conectata inca."
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:88
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:16
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:11
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:287
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:54
 msgid "Interfaces"
 msgstr "Interfete"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:9
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:20
 msgid "Internal"
 msgstr ""
 
@@ -2623,19 +2709,35 @@ msgstr "Eroare interna de server"
 msgid "Invalid"
 msgstr "Invalid"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:311
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:10
+msgid "Invalid Base64 key string"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:281
 msgid "Invalid VLAN ID given! Only IDs between %d and %d are allowed."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:307
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:290
 msgid "Invalid VLAN ID given! Only unique IDs are allowed"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:195
+msgid "Invalid argument"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:194
+msgid "Invalid command"
+msgstr ""
+
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:80
+msgid "Invalid hexadecimal value"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/sysauth.htm:12
 msgid "Invalid username and/or password! Please try again."
 msgstr "Utilizator si/sau parola invalide! Incearcati din nou."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:508
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:950
 msgid "Isolate Clients"
 msgstr ""
 
@@ -2655,15 +2757,15 @@ msgstr ""
 msgid "JavaScript required!"
 msgstr "Ai nevoie de JavaScript !"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:52
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1691
 msgid "Join Network"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:22
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1628
 msgid "Join Network: Wireless Scan"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:19
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1833
 msgid "Joining Network: %q"
 msgstr ""
 
@@ -2680,15 +2782,15 @@ msgstr "Log-ul kernelului"
 msgid "Kernel Version"
 msgstr "Versiunea de kernel"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:823
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1248
 msgid "Key"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:851
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:852
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:853
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:854
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:870
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1277
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1278
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1279
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1291
 msgid "Key #%d"
 msgstr ""
 
@@ -2696,33 +2798,34 @@ msgstr ""
 msgid "Kill"
 msgstr "Opreste"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:10
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:21
 msgid "L2TP"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:10
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:40
 msgid "L2TP Server"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:100
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:74
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:80
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:74
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:53
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:73
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:131
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:102
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:89
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:112
 msgid "LCP echo failure threshold"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:118
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:89
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:95
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:89
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:68
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:91
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:144
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:102
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:125
 msgid "LCP echo interval"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:181
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:902
 msgid "LLC"
 msgstr ""
 
@@ -2731,11 +2834,11 @@ msgstr ""
 msgid "Label"
 msgstr "Eticheta"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:213
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:204
 msgid "Language"
 msgstr "Limba"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:115
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:106
 msgid "Language and Style"
 msgstr "Limba si stilul interfetei"
 
@@ -2743,51 +2846,51 @@ msgstr "Limba si stilul interfetei"
 msgid "Latency"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:10
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:21
 msgid "Leaf"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:369
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:487
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:393
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:543
 msgid "Lease time"
 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:87
 msgid "Leasefile"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:74
 #: modules/luci-base/luasrc/view/lease_status.htm:95
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:34
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
 msgid "Leasetime remaining"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:9
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:20
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:27
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:50
 msgid "Leave empty to autodetect"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:21
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:45
 msgid "Leave empty to use the current WAN address"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1746
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2299
 msgid "Legend:"
 msgstr "Legenda:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:481
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:538
 msgid "Limit"
 msgstr "Limita"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:287
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:288
 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:299
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:300
 msgid "Limit listening to these interfaces, and loopback."
 msgstr ""
 
@@ -2807,17 +2910,17 @@ msgstr ""
 msgid "Line Uptime"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:101
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:88
 msgid "Link On"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:185
 msgid ""
 "List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
 "requests to"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:972
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1377
 msgid ""
 "List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-"
 "Identifier,128-bit key as hex string. <br />This list is used to map R0KH-ID "
@@ -2826,7 +2929,7 @@ msgid ""
 "Association."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:981
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1381
 msgid ""
 "List of R1KHs in the same Mobility Domain. <br />Format: MAC-address,R1KH-ID "
 "as 6 octets with colons,128-bit key as hex string. <br />This list is used "
@@ -2835,31 +2938,31 @@ msgid ""
 "PMK-R1 keys."
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:21
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:82
 msgid "List of SSH key files for auth"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:206
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:207
 msgid "List of domains to allow RFC1918 responses for"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:174
 msgid "List of hosts that supply bogus NX domain results"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:298
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:299
 msgid "Listen Interfaces"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:30
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:54
 msgid "Listen Port"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:15
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:16
 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:216
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:217
 msgid "Listening port for inbound DNS queries"
 msgstr ""
 
@@ -2878,11 +2981,11 @@ msgstr "Incarcarea medie"
 msgid "Loading"
 msgstr "Incarcare"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:35
-msgid "Loading SSH keys…"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1819
+msgid "Loading directory contents…"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1204
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1296
 #: modules/luci-base/luasrc/view/view.htm:4
 msgid "Loading view…"
 msgstr ""
@@ -2892,77 +2995,73 @@ msgstr ""
 msgid "Local IP address is invalid"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:25
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:86
 msgid "Local IP address to assign"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:10
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:11
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:44
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:39
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:151
 msgid "Local IPv4 address"
 msgstr "Adresa IPv4 locala"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:20
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:54
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:45
 msgid "Local IPv6 address"
 msgstr "Adresa IPv6 locala"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:286
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:287
 msgid "Local Service Only"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:81
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:126
 msgid "Local Startup"
 msgstr ""
 
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:25
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:121
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:112
 msgid "Local Time"
 msgstr "Ora locala"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:149
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
 msgid "Local domain"
 msgstr "Domeniu 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:147
 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:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:151
 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:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
 msgid "Local server"
 msgstr "Server local"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:129
 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:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:128
 msgid "Localise queries"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:175
-msgid "Locked to channel %s used by: %s"
-msgstr ""
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:168
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:159
 msgid "Log output level"
 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:181
 msgid "Log queries"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:113
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:104
 msgid "Logging"
 msgstr ""
 
@@ -2970,7 +3069,7 @@ msgstr ""
 msgid "Login"
 msgstr "Autentificare"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:95
+#: modules/luci-base/luasrc/controller/admin/index.lua:103
 msgid "Logout"
 msgstr "Iesire"
 
@@ -2978,11 +3077,13 @@ msgstr "Iesire"
 msgid "Loss of Signal Seconds (LOSS)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:476
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:533
 msgid "Lowest leased address as offset from the network address."
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:40
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:75
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:35
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:86
 msgid "MAC"
@@ -2990,32 +3091,32 @@ msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:73
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:109
-#: 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:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1958
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:86
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:133
 msgid "MAC-Address"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:457
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:586
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:886
 msgid "MAC-Address Filter"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:142
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:363
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:798
 msgid "MAC-Filter"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:464
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:590
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:893
 msgid "MAC-List"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:13
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:16
 msgid "MAP / LW4over6"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:62
 msgid "MAP rule is invalid"
 msgstr ""
@@ -3033,8 +3134,8 @@ msgid "MHz"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:53
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:29
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:66
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:53
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:71
 msgid "MTU"
 msgstr ""
 
@@ -3044,16 +3145,17 @@ msgid ""
 "below:"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:55
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:69
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:26
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:38
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:38
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:108
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:52
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:96
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:83
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:57
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:70
 msgid "Manual"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1949
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2188
 msgid "Master"
 msgstr ""
 
@@ -3061,48 +3163,46 @@ msgstr ""
 msgid "Max. Attainable Data Rate (ATTNDR)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:539
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:982
 msgid "Maximum allowed Listen Interval"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:234
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
 msgid "Maximum allowed number of active DHCP leases"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:252
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:253
 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:243
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:244
 msgid "Maximum allowed size of EDNS.0 UDP packets"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:63
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:77
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:57
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:112
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:104
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:93
 msgid "Maximum amount of seconds to wait for the modem to become ready"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:27
-msgid ""
-"Maximum length of the name is 15 characters including the automatic protocol/"
-"bridge prefix (br-, 6in4-, pppoe- etc.)"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:538
+msgid "Maximum number of leased addresses."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:482
-msgid "Maximum number of leased addresses."
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:761
+msgid "Maximum transmit power"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:21
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:49
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:134
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:187
 #: modules/luci-mod-status/luasrc/view/admin_status/bandwidth.htm:79
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:284
 msgid "Mbit/s"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:18
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:32
 msgid "Medium"
 msgstr ""
 
@@ -3114,42 +3214,43 @@ msgstr "Memorie"
 msgid "Memory usage (%)"
 msgstr "Utilizarea memoriei (%)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1952
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2191
 msgid "Mesh"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:372
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:806
 msgid "Mesh Id"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:196
+msgid "Method not found"
+msgstr ""
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:45
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:76
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:104
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:54
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:66
 msgid "Metric"
 msgstr "Metrica"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:154
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:198
 msgid "Mirror monitor port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:153
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:197
 msgid "Mirror source port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:408
-msgid "Missing protocol extension for proto %q"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:923
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1337
 msgid "Mobility Domain"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:154
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:41
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:74
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:366
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:31
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:360
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:801
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1619
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:175
 msgid "Mode"
 msgstr "Mod"
@@ -3158,39 +3259,38 @@ msgstr "Mod"
 msgid "Model"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:31
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:72
 msgid "Modem default"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:11
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:19
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:11
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:10
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:73
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:73
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:57
 msgid "Modem device"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:24
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:66
 msgid "Modem information query failed"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:62
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:76
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:56
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:112
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:104
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:93
 msgid "Modem init timeout"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1953
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:452
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:554
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:577
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2192
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:880
 msgid "Monitor"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:14
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
 msgid "More Characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:802
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1057
 msgid "More…"
 msgstr ""
 
@@ -3203,7 +3303,7 @@ msgstr ""
 msgid "Mount Point"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:26
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:36
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:137
 msgid "Mount Points"
@@ -3251,46 +3351,44 @@ msgstr ""
 msgid "Move up"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:912
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
 msgid "NAS ID"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:57
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:87
 msgid "NAT-T Mode"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:9
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 msgid "NAT64 Prefix"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:31
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:26
 msgid "NCM"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:535
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:589
 msgid "NDP-Proxy"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:43
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:72
 msgid "NT Domain"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:273
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:264
 msgid "NTP server candidates"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:837
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1092
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:27
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:502
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:65
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:553
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:658
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:49
 msgid "Name"
 msgstr "Nume"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:17
-msgid "Name of the new interface"
-msgstr "Numele interfetei noi"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1808
 msgid "Name of the new network"
 msgstr "Numele interfetei noi"
 
@@ -3298,9 +3396,10 @@ msgstr "Numele interfetei noi"
 msgid "Navigation"
 msgstr "Navigare"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:62
+#: modules/luci-base/luasrc/controller/admin/index.lua:69
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:108
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:402
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:834
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1957
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:389
 #: modules/luci-mod-status/luasrc/view/admin_status/index/30-network.htm:8
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:73
@@ -3312,7 +3411,7 @@ msgstr "Retea"
 msgid "Network Utilities"
 msgstr "Utilitare de retea"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:278
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:279
 msgid "Network boot image"
 msgstr ""
 
@@ -3325,53 +3424,59 @@ msgstr ""
 msgid "Network without interfaces."
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:661
+msgid "New interface name…"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:11
 msgid "Next »"
 msgstr "Mai departe »"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1507
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1754
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:108
 msgid "No"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:453
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:514
 msgid "No DHCP Server configured for this interface"
 msgstr "Nici un server DHCP configurat pentru aceasta interfata"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1162
+msgid "No Encryption"
+msgstr ""
+
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:89
 msgid "No NAT-T"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:198
+msgid "No data received"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1764
+msgid "No entries in this directory"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/backupfiles.lua:82
 msgid "No files found"
 msgstr "Nici un fisier gasit"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:550
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:191
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:180
 msgid "No information available"
 msgstr "Nici o informatie disponibila"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:8
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:63
 msgid "No matching prefix delegation"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:157
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
 msgid "No negative cache"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:53
-msgid "No network configured on this device"
-msgstr "Nici o retea configurata pe acest dispozitiv"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:65
-msgid "No network name specified"
-msgstr ""
-
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:147
-msgid "No networks in range"
-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
@@ -3379,7 +3484,12 @@ msgstr ""
 msgid "No password set!"
 msgstr "Nici o parola setata !"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:116
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:104
+msgid "No peers defined yet"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:129
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:271
 msgid "No public keys present yet."
 msgstr ""
 
@@ -3387,19 +3497,19 @@ msgstr ""
 msgid "No rules in this chain."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:150
-msgid "No scan results available yet..."
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:53
+msgid "No signal"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:7
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:756
 msgid "No zone assigned"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:111
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:35
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:48
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:133
 msgid "Noise"
 msgstr "Zgomot"
 
@@ -3415,16 +3525,16 @@ msgstr "Zgomot:"
 msgid "Non Pre-emtive CRC errors (CRC_P)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:292
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:293
 msgid "Non-wildcard"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:129
 msgid "None"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:181
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:172
 msgid "Normal"
 msgstr "Normal"
 
@@ -3432,25 +3542,29 @@ msgstr "Normal"
 msgid "Not Found"
 msgstr "Nu a fost gasit"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:27
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:5
-msgid "Not associated"
-msgstr "Nu este asociat."
-
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:87
 msgid "Not connected"
 msgstr "Nu este conectat"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:38
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:139
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:232
+msgid "Not present"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:105
 msgid "Not started on boot"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:26
-msgid "Note: interface name length"
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:201
+msgid "Not supported"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:171
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:162
 msgid "Notice"
 msgstr "Notificare"
 
@@ -3458,57 +3572,50 @@ msgstr "Notificare"
 msgid "Nslookup"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:261
 msgid "Number of cached DNS entries (max is 10000, 0 is no caching)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:203
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:194
 msgid "Number of parallel threads used for compression"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:40
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:69
 msgid "Obfuscated Group Password"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:35
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:61
 msgid "Obfuscated Password"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:22
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:34
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:40
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:105
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:97
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:49
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:80
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:54
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:67
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:93
 msgid "Obtain IPv6-Address"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:83
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:68
 msgid "Off-State Delay"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:16
-msgid ""
-"On this page you can configure the network interfaces. You can bridge "
-"several interfaces by ticking the \"bridge interfaces\" field and enter the "
-"names of several network interfaces separated by spaces. You can also use "
-"<abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
-"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
-"<samp>eth0.1</samp>)."
-msgstr ""
-
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:95
 msgid "On-Link route"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:80
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:64
 msgid "On-State Delay"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:360
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:382
 msgid "One of hostname or mac address must be specified!"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:456
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:462
 msgid "One of the following: %s"
 msgstr ""
 
@@ -3530,34 +3637,35 @@ msgstr "Unul sau mai multe campuri nu contin valori !"
 msgid "Open list..."
 msgstr ""
 
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:61
 #: protocols/luci-proto-openconnect/luasrc/model/network/proto_openconnect.lua:9
 msgid "OpenConnect (CISCO AnyConnect)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:757
 msgid "Operating frequency"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1753
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2306
 msgid "Option changed"
 msgstr "Optiunea schimbata"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1755
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2308
 msgid "Option removed"
 msgstr "Optiunea eliminata"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1140
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:55
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1535
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:66
 msgid "Optional"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:78
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:76
 msgid ""
 "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, "
 "starting with <code>0x</code>."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:144
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:215
 msgid ""
 "Optional. Allowed values: 'eui64', 'random', fixed value like '::1' or "
 "'::1:2'. When IPv6 prefix (like 'a:b:c:d::') is received from a delegating "
@@ -3565,41 +3673,41 @@ msgid ""
 "for the interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:123
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:117
 msgid ""
 "Optional. Base64-encoded preshared key. Adds in an additional layer of "
 "symmetric-key cryptography for post-quantum resistance."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:148
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:126
 msgid "Optional. Create routes for Allowed IPs for this peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:103
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:108
 msgid "Optional. Description of peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:156
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:128
 msgid ""
 "Optional. Host of peer. Names are resolved prior to bringing up the "
 "interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:67
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:71
 msgid "Optional. Maximum Transmission Unit of tunnel interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:166
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:132
 msgid "Optional. Port of peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:175
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:136
 msgid ""
 "Optional. Seconds between keep alive messages. Default is 0 (disabled). "
 "Recommended value if this device is behind a NAT is 25."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:31
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:54
 msgid "Optional. UDP port used for outgoing and incoming packets."
 msgstr ""
 
@@ -3620,7 +3728,7 @@ msgstr "Iesire"
 msgid "Outbound:"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:26
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:50
 msgid "Output Interface"
 msgstr ""
 
@@ -3629,51 +3737,51 @@ msgstr ""
 msgid "Output zone"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:63
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:155
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:33
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:54
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:54
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:219
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:50
 msgid "Override MAC address"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:66
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:35
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:56
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:88
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:125
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:131
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:133
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:104
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:61
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:58
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:223
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:44
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:54
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:154
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:71
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:145
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:132
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:110
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:119
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:97
 msgid "Override MTU"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:30
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:63
 msgid "Override TOS"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:25
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:58
 msgid "Override TTL"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:954
 msgid "Override default interface name"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:41
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:167
 msgid "Override the gateway in DHCP responses"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:507
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:555
 msgid ""
 "Override the netmask sent to clients. Normally it is calculated from the "
 "subnet that is served."
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:65
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:179
 msgid "Override the table used for internal routes"
 msgstr ""
 
@@ -3681,29 +3789,33 @@ msgstr ""
 msgid "Overview"
 msgstr "Prezentare generala"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1606
+msgid "Overwrite existing file \"%s\" ?"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:11
 msgid "Owner"
 msgstr "Proprietar"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:42
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:56
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:17
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:28
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:34
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:14
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:18
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:43
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:98
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:45
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:44
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:63
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:82
 msgid "PAP/CHAP password"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:39
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:53
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:14
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:11
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:15
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:96
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:88
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:43
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:74
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:42
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:61
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:77
 msgid "PAP/CHAP username"
 msgstr ""
 
@@ -3711,9 +3823,9 @@ msgstr ""
 msgid "PID"
 msgstr "PID"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:36
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:50
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:26
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:95
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:87
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:68
 msgid "PIN"
 msgstr ""
 
@@ -3722,114 +3834,116 @@ msgstr ""
 msgid "PIN code rejected"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:966
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1372
 msgid "PMK R1 Push"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:43
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:13
 msgid "PPP"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:11
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:58
 msgid "PPPoA Encapsulation"
 msgstr "Incapsulare PPPoA"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:19
 msgid "PPPoATM"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:17
 msgid "PPPoE"
 msgstr ""
 
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:28
 #: protocols/luci-proto-pppossh/luasrc/model/network/proto_pppossh.lua:9
 msgid "PPPoSSH"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:15
 msgid "PPtP"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:59
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:73
 msgid "PSID offset"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:56
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:70
 msgid "PSID-bits length"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:123
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:846
 msgid "PTM/EFM (Packet Transfer Mode)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:78
-msgid "Package libiwinfo required!"
-msgstr "Pachetul libiwinfo este necesar !"
-
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:45
 msgid "Packets"
 msgstr "Pachete"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:7
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:756
 msgid "Part of zone %q"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/sysauth.htm:29
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1111
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:35
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:42
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1514
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:46
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:104
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:58
 msgid "Password"
 msgstr "Parola"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:29
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:24
 msgid "Password authentication"
 msgstr "Autentificarea cu parola"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1019
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1414
 msgid "Password of Private Key"
 msgstr "Parola cheii private"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1067
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1471
 msgid "Password of inner Private Key"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:14
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:16
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:18
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:20
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:32
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:34
 msgid "Password strength"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:44
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:107
 msgid "Password2"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:37
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:244
 msgid "Paste or drag SSH key file…"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1000
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1396
 msgid "Path to CA-Certificate"
 msgstr "Calea catre certificatul CA"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1007
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1402
 msgid "Path to Client-Certificate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1013
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1408
 msgid "Path to Private Key"
 msgstr "Calea catre cheia privata"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1049
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1453
 msgid "Path to inner CA-Certificate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1055
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1459
 msgid "Path to inner Client-Certificate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1061
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1465
 msgid "Path to inner Private Key"
 msgstr ""
 
@@ -3847,7 +3961,7 @@ msgstr ""
 msgid "Peak:"
 msgstr "Maxim:"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:28
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:89
 msgid "Peer IP address to assign"
 msgstr ""
 
@@ -3856,11 +3970,11 @@ msgstr ""
 msgid "Peer address is missing"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:90
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:89
 msgid "Peers"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:50
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:80
 msgid "Perfect Forward Secrecy"
 msgstr ""
 
@@ -3872,7 +3986,11 @@ msgstr "Restarteaza"
 msgid "Perform reset"
 msgstr "Reseteaza"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:174
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:199
+msgid "Permission denied"
+msgstr ""
+
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:136
 msgid "Persistent Keep Alive"
 msgstr ""
 
@@ -3880,7 +3998,7 @@ msgstr ""
 msgid "Phy Rate:"
 msgstr "Rata phy:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:190
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:277
 msgid "Physical Settings"
 msgstr "Setarile fizice"
 
@@ -3891,6 +4009,10 @@ msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:16
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:17
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:41
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:77
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:87
@@ -3908,15 +4030,19 @@ msgstr "Introdu utilizatorul si parola."
 msgid "Policy"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:22
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:20
 msgid "Port"
 msgstr "Port"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:18
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:133
+msgid "Port %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:274
 msgid "Port status:"
 msgstr "Stare port:"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:482
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:488
 msgid "Potential negation of: %s"
 msgstr ""
 
@@ -3928,11 +4054,11 @@ msgstr ""
 msgid "Pre-emtive CRC errors (CRCP_P)"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:32
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:73
 msgid "Prefer LTE"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:33
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:74
 msgid "Prefer UMTS"
 msgstr ""
 
@@ -3940,31 +4066,30 @@ msgstr ""
 msgid "Prefix Delegated"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:122
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:117
 msgid "Preshared Key"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:101
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:75
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:81
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:75
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:54
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:74
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:131
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:102
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:89
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:112
 msgid ""
 "Presume peer to be dead after given amount of LCP echo failures, use 0 to "
 "ignore failures"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:305
 msgid "Prevent listening on these interfaces."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:509
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:562
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:950
 msgid "Prevents client-to-client communication"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:18
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:49
 msgid "Private Key"
 msgstr ""
 
@@ -3985,39 +4110,33 @@ msgstr ""
 msgid "Prot."
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:72
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:349
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:675
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:84
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:216
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:87
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:390
 msgid "Protocol"
 msgstr "Protocol"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:31
-msgid "Protocol of the new interface"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:222
-msgid "Protocol support is not installed"
-msgstr ""
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:269
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:260
 msgid "Provide NTP server"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:701
 msgid "Provide new network"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:451
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:879
 msgid "Pseudo Ad-Hoc (ahdemo)"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:112
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:113
 msgid "Public Key"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:278
 msgid ""
 "Public keys allow for the passwordless SSH logins with a higher security "
 "compared to the use of plain passwords. In order to upload a new key to the "
@@ -4025,47 +4144,48 @@ msgid ""
 "code> file into the input field."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:139
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:211
 msgid "Public prefix routed to this device for distribution to clients."
 msgstr ""
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:27
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:9
 msgid "QMI Cellular"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:173
 msgid "Quality"
 msgstr "Calitate"
 
-#: 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:171
 msgid ""
 "Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> "
 "servers"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:952
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1360
 msgid "R0 Key Lifetime"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:959
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1366
 msgid "R1 Key Holder"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:58
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:88
 msgid "RFC3947 NAT-T mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:381
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:814
 msgid "RSSI threshold for joining"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:256
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:597
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:778
 msgid "RTS/CTS Threshold"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:41
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:76
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:87
 msgid "RX"
@@ -4075,35 +4195,39 @@ msgstr "RX"
 msgid "RX Rate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:783
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1961
+msgid "RX Rate / TX Rate"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1207
 msgid "Radius-Accounting-Port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:791
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1215
 msgid "Radius-Accounting-Secret"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:775
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1199
 msgid "Radius-Accounting-Server"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:759
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1183
 msgid "Radius-Authentication-Port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:767
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1191
 msgid "Radius-Authentication-Secret"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:751
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1175
 msgid "Radius-Authentication-Server"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:119
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:102
 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:83
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:84
 msgid ""
 "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-Server"
@@ -4117,17 +4241,11 @@ msgid ""
 "access to this device if you are connected via this interface"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2
-msgid ""
-"Really delete this wireless network? The deletion cannot be undone! You "
-"might lose access to this device if you are connected via this network."
-msgstr ""
-
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:40
 msgid "Really reset all changes?"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:237
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:354
 msgid "Really switch protocol?"
 msgstr ""
 
@@ -4151,15 +4269,15 @@ msgstr "Traficul in timp real"
 msgid "Realtime Wireless"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:931
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1343
 msgid "Reassociation Deadline"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:191
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
 msgid "Rebind protection"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:48
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:46
 #: modules/luci-mod-system/luasrc/view/admin_system/reboot.htm:9
 msgid "Reboot"
 msgstr "Rebooteaza"
@@ -4173,21 +4291,15 @@ msgstr ""
 msgid "Reboots the operating system of your device"
 msgstr "Rebooteaza sistemul de operare al dispozitivului tau"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:103
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:90
 msgid "Receive"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:325
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:350
-msgid "Receiver Antenna"
-msgstr "Antena receptorului"
-
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:42
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:59
 msgid "Recommended. IP addresses of the WireGuard interface."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:28
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:300
 msgid "Reconnect this interface"
 msgstr "Reconecteaza aceasta interfata"
 
@@ -4195,92 +4307,134 @@ msgstr "Reconecteaza aceasta interfata"
 msgid "References"
 msgstr "Referinte"
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:39
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:153
 msgid "Relay"
 msgstr ""
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:36
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:157
 msgid "Relay Bridge"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:17
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:154
 msgid "Relay between networks"
 msgstr ""
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:64
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:12
 msgid "Relay bridge"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:18
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:50
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:49
 msgid "Remote IPv4 address"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:8
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:40
 msgid "Remote IPv4 address or FQDN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:45
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:725
 msgid "Remove"
 msgstr "Elimina"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:53
-msgid "Repeat scan"
-msgstr "Repeta scanarea"
-
-#: modules/luci-base/luasrc/view/cbi/upload.htm:11
-msgid "Replace entry"
-msgstr "Inlocuieste intrarea"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:46
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:51
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1806
 msgid "Replace wireless configuration"
 msgstr "Inlocuieste configuratia wireless"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:8
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:17
 msgid "Request IPv6-address"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:16
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:23
 msgid "Request IPv6-prefix of length"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1141
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:200
+msgid "Request timeout"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1536
 msgid "Required"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:20
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:31
 msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:19
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:49
 msgid "Required. Base64-encoded private key for this interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:113
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:113
 msgid "Required. Base64-encoded public key of peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:136
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:122
 msgid ""
 "Required. IP addresses and prefixes that this peer is allowed to use inside "
 "the tunnel. Usually the peer's tunnel IP addresses and the networks the peer "
 "routes through the tunnel."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1134
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1095
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1096
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1097
+msgid "Requires hostapd"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1101
+msgid "Requires hostapd with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1102
+msgid "Requires hostapd with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1098
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1099
+msgid "Requires hostapd with SAE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1533
 msgid ""
 "Requires the 'full' version of wpad/hostapd and support from the wifi driver "
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:141
 msgid ""
 "Requires upstream supports DNSSEC; verify unsigned domain responses really "
 "come from unsigned domains"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1268
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1109
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1119
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1120
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1121
+msgid "Requires wpa-supplicant"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1113
+msgid "Requires wpa-supplicant with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1114
+msgid "Requires wpa-supplicant with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1111
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1124
+msgid "Requires wpa-supplicant with SAE support"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1355
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:17
 #: modules/luci-base/luasrc/view/cbi/footer.htm:30
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:66
@@ -4296,17 +4450,22 @@ msgstr "Reseteaza counterii"
 msgid "Reset to defaults"
 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:68
 msgid "Resolv and Hosts Files"
 msgstr "Fisierele de rezolvare si hosturi DNS"
 
-#: 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:94
 msgid "Resolve file"
 msgstr "Fisierul de rezolvare"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:28
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:14
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:71
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:197
+msgid "Resource not found"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:302
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:693
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:90
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:112
 msgid "Restart"
 msgstr "Restart"
 
@@ -4314,7 +4473,7 @@ msgstr "Restart"
 msgid "Restart Firewall"
 msgstr "Restarteaza firewallul"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:14
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:691
 msgid "Restart radio interface"
 msgstr ""
 
@@ -4326,26 +4485,24 @@ msgstr "Restaureaza"
 msgid "Restore backup"
 msgstr "Reface backup-ul"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:113
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:114
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:38
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:46
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:119
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:120
 msgid "Reveal/hide password"
 msgstr "Arata / ascunde parola"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1774
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2322
 msgid "Revert"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1861
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2405
 msgid "Revert changes"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2013
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2554
 msgid "Revert request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1993
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2534
 msgid "Reverting configuration…"
 msgstr ""
 
@@ -4353,7 +4510,7 @@ msgstr ""
 msgid "Root"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:271
 msgid "Root directory for files served via TFTP"
 msgstr ""
 
@@ -4361,7 +4518,7 @@ msgstr ""
 msgid "Root preparation"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:147
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:126
 msgid "Route Allowed IPs"
 msgstr ""
 
@@ -4373,12 +4530,12 @@ msgstr ""
 msgid "Route type"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:523
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:577
 msgid "Router Advertisement-Service"
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:43
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:15
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:27
 msgid "Router Password"
 msgstr "Parola routerului"
 
@@ -4406,7 +4563,7 @@ msgstr ""
 msgid "Run filesystem check"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:651
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:669
 msgid "Runtime error"
 msgstr ""
 
@@ -4418,31 +4575,31 @@ msgstr ""
 msgid "SNR"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:5
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:18
 msgid "SSH Access"
 msgstr "Acces SSH"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:10
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:70
 msgid "SSH server address"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:13
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:74
 msgid "SSH server port"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:8
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:58
 msgid "SSH username"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:27
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:277
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
 msgid "SSH-Keys"
 msgstr "Cheile SSH"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:42
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:73
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:29
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1617
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:174
 msgid "SSID"
 msgstr "SSID"
@@ -4451,17 +4608,17 @@ msgstr "SSID"
 msgid "SWAP"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1127
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1262
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1379
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1351
 #: modules/luci-base/luasrc/view/cbi/error.htm:17
 #: modules/luci-base/luasrc/view/cbi/footer.htm:26
 #: modules/luci-base/luasrc/view/cbi/header.htm:17
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:54
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:133
 msgid "Save"
 msgstr "Salveaza"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1256
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1768
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1347
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2318
 #: modules/luci-base/luasrc/view/cbi/footer.htm:22
 msgid "Save & Apply"
 msgstr "Salveaza si aplica"
@@ -4474,28 +4631,20 @@ msgstr ""
 msgid "Save mtdblock contents"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
-msgid "Saving keys…"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:698
 msgid "Scan"
 msgstr "Scan"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:109
-msgid "Scan request failed"
-msgstr ""
-
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:8
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:39
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:23
 msgid "Scheduled Tasks"
 msgstr "Operatiuni programate"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1749
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2302
 msgid "Section added"
 msgstr "Sectiune adaugata"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1751
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2304
 msgid "Section removed"
 msgstr "Sectiune eliminata"
 
@@ -4510,61 +4659,66 @@ msgid ""
 "your device!"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:119
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:90
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:96
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:90
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:69
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:92
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1516
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1646
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1809
+msgid "Select file…"
+msgstr ""
+
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:144
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:102
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:125
 msgid ""
 "Send LCP echo requests at the given interval in seconds, only effective in "
 "conjunction with failure threshold"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:561
-msgid "Separate Clients"
-msgstr ""
-
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:62
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:63
 msgid "Server Settings"
 msgstr "Setarile serverului"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:26
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:50
 msgid "Service Name"
 msgstr "Nume serviciu"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:25
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:30
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:87
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:71
 msgid "Service Type"
 msgstr "Tip de serviciu"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:55
+#: modules/luci-base/luasrc/controller/admin/index.lua:62
 msgid "Services"
 msgstr "Servicii"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:815
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:861
 msgid "Session expired"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:83
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:107
 msgid "Set VPN as Default Route"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:258
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:795
 msgid ""
 "Set interface properties regardless of the link carrier (If set, carrier "
 "sense events do not invoke hotplug handlers)."
 msgstr ""
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:23
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:55
 msgid "Setting PLMN failed"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:26
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:68
 msgid "Setting operation mode failed"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:454
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:517
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:527
 msgid "Setup DHCP Server"
 msgstr "Seteaza serverul DHCP"
 
@@ -4576,7 +4730,7 @@ msgstr ""
 msgid "Short GI"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:516
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:960
 msgid "Short Preamble"
 msgstr ""
 
@@ -4588,21 +4742,23 @@ msgstr ""
 msgid "Show empty chains"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:306
 msgid "Shutdown this interface"
 msgstr "Opreste aceasta interfata"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:111
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:34
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:47
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:132
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1616
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:173
 msgid "Signal"
 msgstr "Semnal"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1960
+msgid "Signal / Noise"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:125
 msgid "Signal Attenuation (SATN)"
 msgstr ""
@@ -4615,11 +4771,11 @@ msgstr "Semnal:"
 msgid "Size"
 msgstr "Marime"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:259
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:260
 msgid "Size of DNS query cache"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:191
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
 msgid "Size of the ZRam device in megabytes"
 msgstr ""
 
@@ -4636,11 +4792,7 @@ msgstr ""
 msgid "Skip to navigation"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:335
-msgid "Slot time"
-msgstr ""
-
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1640
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1846
 #: modules/luci-base/luasrc/model/network.lua:1427
 msgid "Software VLAN"
 msgstr ""
@@ -4678,61 +4830,65 @@ msgstr ""
 msgid "Specifies the directory the device is attached to"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:23
-msgid "Specifies the listening port of this <em>Dropbear</em> instance"
-msgstr ""
-
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:57
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:175
 msgid ""
 "Specifies the maximum amount of failed ARP requests until hosts are presumed "
 "to be dead"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:49
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:171
 msgid ""
 "Specifies the maximum amount of seconds after which hosts are presumed to be "
 "dead"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:761
+msgid ""
+"Specifies the maximum transmit power the wireless radio may use. Depending "
+"on regulatory requirements and wireless usage, the actual transmit power may "
+"be reduced by the driver."
+msgstr ""
+
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:63
 msgid "Specify a TOS (Type of Service)."
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:25
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:58
 msgid ""
 "Specify a TTL (Time to Live) for the encapsulating packet other than the "
 "default (64)."
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:53
 msgid ""
 "Specify an MTU (Maximum Transmission Unit) other than the default (1280 "
 "bytes)."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:60
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "Specify the secret encryption key here."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:475
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:64
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:533
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:89
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:111
 msgid "Start"
 msgstr "Start"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:33
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:86
 msgid "Start priority"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1958
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2499
 msgid "Starting configuration apply…"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1626
 msgid "Starting wireless scan..."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:24
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:120
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
 msgid "Startup"
 msgstr "Pornire"
 
@@ -4744,59 +4900,62 @@ msgstr "Rute statice IPv4"
 msgid "Static IPv6 Routes"
 msgstr "Rute statice IPv6"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:70
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:71
 msgid "Static Leases"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:118
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:73
 msgid "Static Routes"
 msgstr "Rute statice"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1194
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1384
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:172
 #: modules/luci-base/luasrc/model/network.lua:966
 msgid "Static address"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:308
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:309
 msgid ""
 "Static leases are used to assign fixed IP addresses and symbolic hostnames "
 "to DHCP clients. They are also required for non-dynamic interface "
 "configurations where only hosts with a corresponding lease are served."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:534
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:977
 msgid "Station inactivity limit"
 msgstr ""
 
 #: modules/luci-base/luasrc/controller/admin/index.lua:40
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:197
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:337
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:746
 #: modules/luci-mod-status/luasrc/view/admin_status/index.htm:128
 msgid "Status"
 msgstr "Status"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:35
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:75
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:308
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:91
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:113
 msgid "Stop"
 msgstr "Stop"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:165
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Strict order"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:16
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:30
 msgid "Strong"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1843
 msgid "Submit"
 msgstr "Trimite"
 
-#: 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:108
 msgid "Suppress logging"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:109
 msgid "Suppress logging of the routine operation of these protocols"
 msgstr ""
 
@@ -4808,42 +4967,44 @@ msgstr ""
 msgid "Swap Entry"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:23
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:5
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:135
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:21
 msgid "Switch"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:129
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:168
 msgid "Switch %q"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:128
-msgid "Switch %q (%s)"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:66
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:146
 msgid ""
 "Switch %q has an unknown topology - the VLAN settings might not be accurate."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:146
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:142
 msgid "Switch Port Mask"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1640
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1846
 #: modules/luci-base/luasrc/model/network.lua:1425
 msgid "Switch VLAN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:238
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:355
 msgid "Switch protocol"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:103
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:104
 #: modules/luci-base/luasrc/view/cbi/ipaddr.htm:26
 msgid "Switch to CIDR list notation"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:77
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1547
+msgid "Symbolic link"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:71
 msgid "Sync with NTP-Server"
 msgstr ""
 
@@ -4853,7 +5014,7 @@ msgstr ""
 
 #: modules/luci-base/luasrc/controller/admin/index.lua:47
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:14
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:102
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:94
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
 #: modules/luci-mod-system/luasrc/view/admin_system/applyreboot.htm:39
 msgid "System"
@@ -4864,11 +5025,11 @@ msgstr "Sistem"
 msgid "System Log"
 msgstr "Log de sistem"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:108
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:99
 msgid "System Properties"
 msgstr "Proprietati sistem"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:145
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:136
 msgid "System log buffer size"
 msgstr ""
 
@@ -4876,15 +5037,17 @@ msgstr ""
 msgid "TCP:"
 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:69
 msgid "TFTP Settings"
 msgstr "Setarile TFTP"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:269
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
 msgid "TFTP server root"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:17
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:77
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:88
 msgid "TX"
@@ -4907,7 +5070,7 @@ msgstr "Tabel"
 msgid "Target"
 msgstr "Tinta"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:77
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:103
 msgid "Target network"
 msgstr ""
 
@@ -4915,40 +5078,24 @@ msgstr ""
 msgid "Terminate"
 msgstr "Termina"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:27
-msgid ""
-"The <em>Device Configuration</em> section covers physical settings of the "
-"radio hardware such as channel, transmit power or antenna selection which "
-"are shared among all defined wireless networks (if the radio hardware is "
-"multi-SSID capable). Per network settings like encryption or operation mode "
-"are grouped in the <em>Interface Configuration</em>."
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:79
-msgid ""
-"The <em>libiwinfo-lua</em> package is not installed. You must install this "
-"component for working wireless configuration!"
-msgstr ""
-
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:66
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:77
 msgid ""
 "The HE.net endpoint update configuration changed, you must now use the plain "
 "username instead of the user ID!"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:8
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:40
 msgid ""
 "The IPv4 address or the fully-qualified domain name of the remote tunnel end."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:27
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:38
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:59
 msgid ""
 "The IPv6 prefix assigned to the provider, usually ends with <code>::</code>"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:18
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1808
 msgid ""
 "The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
 "code> and <code>_</code>"
@@ -4962,7 +5109,7 @@ msgstr ""
 msgid "The configuration file could not be loaded due to the following error:"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1849
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2396
 msgid ""
 "The device could not be reached within %d seconds after applying the pending "
 "changes, which caused the configuration to be rolled back for safety "
@@ -4980,6 +5127,12 @@ msgid ""
 "</abbr> <code>/dev/sda1</code>)"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:612
+msgid ""
+"The existing wireless configuration needs to be changed for LuCI to function "
+"properly."
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:127
 msgid ""
 "The filesystem that was used to format the memory (<abbr title=\"for example"
@@ -4998,43 +5151,49 @@ msgstr ""
 msgid "The following rules are currently active on this system."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:144
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:154
+msgid "The gateway address must not be a local IP address"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:154
 msgid "The given SSH public key has already been added."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:150
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:160
 msgid ""
 "The given SSH public key is invalid. Please supply proper public RSA or "
 "ECDSA keys."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:67
-msgid "The given network name is not unique"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:664
+msgid "The interface name is already used"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:52
-msgid ""
-"The hardware is not multi-SSID capable and the existing configuration will "
-"be replaced if you proceed."
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:670
+msgid "The interface name is too long"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:43
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:31
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:55
 msgid ""
 "The length of the IPv4 prefix in bits, the remainder is used in the IPv6 "
 "addresses."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:35
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:46
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:63
 msgid "The length of the IPv6 prefix in bits"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:12
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:44
 msgid "The local IPv4 address over which the tunnel is created (optional)."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:5
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1814
+msgid "The network name is already used"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:135
 msgid ""
 "The network ports on this device can be combined to several <abbr title="
 "\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
@@ -5044,22 +5203,21 @@ msgid ""
 "next greater network like the internet and other ports for a local network."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:77
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:395
-msgid "The selected protocol needs a device assigned"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1149
+msgid "The selected %s mode is incompatible with %s encryption"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/csrftoken.htm:11
 msgid "The submitted security token is invalid or already expired!"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:274
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:272
 msgid ""
 "The system is erasing the configuration partition now and will reboot itself "
 "when finished."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:195
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:193
 msgid ""
 "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
 "few minutes before you try to reconnect. It might be necessary to renew the "
@@ -5067,7 +5225,7 @@ msgid ""
 "settings."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:15
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:80
 msgid "The system password has been successfully changed."
 msgstr ""
 
@@ -5077,7 +5235,7 @@ msgid ""
 "you choose the generic image format for your platform."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:427
 msgid "There are no active leases"
 msgstr ""
 
@@ -5086,16 +5244,10 @@ msgstr ""
 msgid "There are no active leases."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1973
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2514
 msgid "There are no changes to apply"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:204
-msgid ""
-"There is no device assigned yet, please attach a network device in the "
-"\"Physical Settings\" tab"
-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
@@ -5107,11 +5259,19 @@ msgstr ""
 "Nu exista o parola pe acest router. Configureaza o parola la contul root "
 "pentru a proteja interfata web si porni SSH."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:19
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:49
 msgid "This IPv4 address of the relay"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1448
+msgid "This authentication type is not applicable to the selected EAP method."
+msgstr ""
+
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:54
+msgid "This does not look like a valid PEM file"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
 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 "
@@ -5125,44 +5285,44 @@ msgid ""
 "configurations are automatically preserved."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:74
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:81
 msgid ""
 "This is either the \"Update Key\" configured for the tunnel or the account "
 "password if no update key has been configured"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:82
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:127
 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 ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:27
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:54
 msgid ""
 "This is the local endpoint address assigned by the tunnel broker, it usually "
 "ends with <code>...:2/64</code>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:79
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> in the local network"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:73
 msgid "This is the plain username for logging into the account"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:34
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:57
 msgid ""
 "This is the prefix routed to you by the tunnel broker for use by clients"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:9
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:41
 msgid "This is the system crontab in which scheduled tasks can be defined."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:19
+#: 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 ""
@@ -5177,26 +5337,26 @@ msgstr ""
 msgid "This page gives an overview over currently active network connections."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:726
-#: modules/luci-base/htdocs/luci-static/resources/form.js:809
+#: modules/luci-base/htdocs/luci-static/resources/form.js:936
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1064
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:172
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:32
 msgid "This section contains no values yet"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:114
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:105
 msgid "Time Synchronization"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:525
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:968
 msgid "Time interval for rekeying GTK"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:128
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:119
 msgid "Timezone"
 msgstr "Fusul orar"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:825
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:871
 msgid "To login…"
 msgstr ""
 
@@ -5207,7 +5367,7 @@ msgid ""
 "reset\" (only possible with squashfs images)."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:835
 msgid "Tone"
 msgstr ""
 
@@ -5231,55 +5391,41 @@ msgstr "Trafic"
 msgid "Transfer"
 msgstr "Transfer"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:595
-msgid "Transmission Rate"
-msgstr "Rata de transmitere"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:102
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:89
 msgid "Transmit"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:211
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:273
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:345
-msgid "Transmit Power"
-msgstr "Puterea de transmitere"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:318
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:349
-msgid "Transmitter Antenna"
-msgstr "Antena de transmitere"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:73
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:57
 msgid "Trigger"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:98
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:84
 msgid "Trigger Mode"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:54
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:69
 msgid "Tunnel ID"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1643
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1849
 #: modules/luci-base/luasrc/model/network.lua:1430
 msgid "Tunnel Interface"
 msgstr "Interfata de tunel"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:44
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:55
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:76
 msgid "Tunnel Link"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:46
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:131
 msgid "Tx-Power"
 msgstr "Puterea TX"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:32
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:185
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:11
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:43
 msgid "Type"
 msgstr "Tip"
 
@@ -5287,19 +5433,20 @@ msgstr "Tip"
 msgid "UDP:"
 msgstr "UDP:"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:28
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:90
 msgid "UMTS only"
 msgstr "Doar UMTS"
 
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:43
 #: protocols/luci-proto-3g/luasrc/model/network/proto_3g.lua:10
 msgid "UMTS/GPRS/EV-DO"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:106
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:93
 msgid "USB Device"
 msgstr "Dispozitiv USB"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:122
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:110
 msgid "USB Ports"
 msgstr ""
 
@@ -5329,10 +5476,12 @@ msgstr ""
 msgid "Unable to dispatch"
 msgstr ""
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:22
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:54
 msgid "Unable to obtain client ID"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:61
 msgid "Unable to resolve AFTR host name"
 msgstr ""
@@ -5342,21 +5491,31 @@ msgstr ""
 msgid "Unable to resolve peer host name"
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:33
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:68
+msgid "Unable to save contents: %s"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:132
 msgid "Unavailable Seconds (UAS)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1196
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1386
 #: modules/luci-base/luasrc/model/network.lua:970
 msgid "Unknown"
 msgstr "Necunoscut"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1349
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1539
 #: modules/luci-base/luasrc/model/network.lua:1137
 msgid "Unknown error (%s)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1193
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:204
+msgid "Unknown error code"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1383
+#: modules/luci-base/htdocs/luci-static/resources/protocol/none.js:6
 #: modules/luci-base/luasrc/model/network.lua:964
 msgid "Unmanaged"
 msgstr "Neadministrate"
@@ -5366,22 +5525,30 @@ msgstr "Neadministrate"
 msgid "Unmount"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:107
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:262
 msgid "Unnamed key"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1708
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2261
 msgid "Unsaved Changes"
 msgstr "Modificari nesalvate"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:202
+msgid "Unspecified error"
+msgstr ""
+
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:64
 msgid "Unsupported MAP type"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:27
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:69
 msgid "Unsupported modem"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:219
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:119
 msgid "Unsupported protocol type."
 msgstr "Tipul de protocol neacceptat."
@@ -5401,56 +5568,70 @@ msgstr ""
 msgid "Upload archive..."
 msgstr ""
 
-#: modules/luci-base/luasrc/view/cbi/upload.htm:8
-msgid "Uploaded File"
-msgstr "Fisier incarcat"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1703
+msgid "Upload file"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1678
+msgid "Upload file…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1623
+msgid "Upload request failed: %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:613
+msgid ""
+"Upon pressing \"Continue\", anonymous \"wifi-iface\" sections will be "
+"assigned with a name in the form <em>wifinet#</em> and the network will be "
+"restarted to apply the updated configuration."
+msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:14
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:74
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:85
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:26
 msgid "Uptime"
 msgstr "Uptime"
 
-#: 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:83
 msgid "Use <code>/etc/ethers</code>"
 msgstr "Foloseste <code>/etc/ethers</code>"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:40
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:167
 msgid "Use DHCP gateway"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:33
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:85
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:34
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:98
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:46
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:65
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:38
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:58
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:124
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:39
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:116
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:59
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:103
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:64
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:77
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:100
 msgid "Use DNS servers advertised by peer"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:227
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:233
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:479
 msgid "Use ISO/IEC 3166 alpha2 country codes."
 msgstr "Foloseste codurile de tara ISO/IEC 3166 alpha2."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:31
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:100
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:70
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:35
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:51
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:86
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:56
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:97
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:77
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:75
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:92
 msgid "Use MTU on tunnel interface"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:95
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:65
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:30
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:46
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:81
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:93
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:73
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:88
 msgid "Use TTL on tunnel interface"
 msgstr ""
 
@@ -5462,68 +5643,65 @@ msgstr ""
 msgid "Use as root filesystem (/)"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:19
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:31
 msgid "Use broadcast flag"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:253
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:791
 msgid "Use builtin IPv6-management"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:40
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:109
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:92
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:45
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:105
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:53
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:72
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:45
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:65
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:40
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:182
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:127
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:42
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:119
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:62
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:67
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:80
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:103
 msgid "Use custom DNS servers"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:26
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:70
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:16
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:28
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:84
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:24
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:50
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:23
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:43
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:116
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:33
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:74
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:97
 msgid "Use default gateway"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:48
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:164
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:77
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:24
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:88
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:58
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:23
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:39
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:74
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:90
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:38
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:57
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:30
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:50
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:45
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:227
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:119
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:51
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:88
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:68
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:52
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:70
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:83
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:111
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:149
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:67
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:111
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:98
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:72
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:85
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:108
 msgid "Use gateway metric"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:64
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:179
 msgid "Use routing table"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:309
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:310
 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 "
@@ -5536,77 +5714,78 @@ msgstr ""
 msgid "Used"
 msgstr "Folosit"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:848
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1273
 msgid "Used Key Slot"
 msgstr "Slot de cheie folosit"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:913
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
 msgid ""
 "Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not "
 "needed with normal WPA(2)-PSK."
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:48
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:110
 msgid "User certificate (PEM encoded)"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:61
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:122
 msgid "User key (PEM encoded)"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/sysauth.htm:23
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:41
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:32
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:102
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:56
 msgid "Username"
 msgstr "Utilizator"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:182
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:903
 msgid "VC-Mux"
 msgstr "VC-Mux"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:851
 msgid "VDSL"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:172
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:169
 msgid "VLANs on %q"
 msgstr "VLANuri pe %q"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:171
-msgid "VLANs on %q (%s)"
+#: modules/luci-base/luasrc/controller/admin/index.lua:55
+msgid "VPN"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:18
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:42
 msgid "VPN Local address"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:22
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:46
 msgid "VPN Local port"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:15
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:11
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:15
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:58
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:39
 msgid "VPN Server"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:18
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:96
 msgid "VPN Server port"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:37
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:100
 msgid "VPN Server's certificate SHA1 hash"
 msgstr ""
 
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:9
 #: protocols/luci-proto-vpnc/luasrc/model/network/proto_vpnc.lua:9
 msgid "VPNC (CISCO 3000 (and others) VPN)"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:44
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:73
 msgid "Vendor"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:60
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:52
 msgid "Vendor Class to send when requesting DHCP"
 msgstr ""
 
@@ -5614,41 +5793,37 @@ msgstr ""
 msgid "Verify"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:52
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:76
 msgid "Virtual dynamic interface"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:470
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:471
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:553
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:576
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:908
 msgid "WDS"
 msgstr "WDS"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:667
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1160
 msgid "WEP Open System"
 msgstr "Sistem deschis WEP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:668
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1161
 msgid "WEP Shared Key"
 msgstr "Sistem de cheie impartasita WEP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "WEP passphrase"
 msgstr "Parola WEP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:503
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:566
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:945
 msgid "WMM Mode"
 msgstr "Mod WMM"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "WPA passphrase"
 msgstr "Parola WPA"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:716
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:735
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:740
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1074
 msgid ""
 "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
 "and ad-hoc mode) to be installed."
@@ -5664,7 +5839,7 @@ msgstr ""
 msgid "Waiting for command to complete..."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1940
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2481
 msgid "Waiting for configuration to get applied… %ds"
 msgstr ""
 
@@ -5672,8 +5847,8 @@ msgstr ""
 msgid "Waiting for device..."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:172
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:163
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:173
 msgid "Warning"
 msgstr "Avertizare"
 
@@ -5681,11 +5856,11 @@ msgstr "Avertizare"
 msgid "Warning: There are unsaved changes that will get lost on reboot!"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:20
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:34
 msgid "Weak"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:946
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1355
 msgid ""
 "When using a PSK, the PMK can be automatically generated. When enabled, the "
 "R0/R1 key options below are not applied. Disable this to use the R0 and R1 "
@@ -5693,78 +5868,85 @@ msgid ""
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:383
 msgid "Width"
 msgstr ""
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:17
 #: protocols/luci-proto-wireguard/luasrc/model/network/proto_wireguard.lua:9
 msgid "WireGuard VPN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:58
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:40
 #: modules/luci-mod-status/luasrc/controller/admin/status.lua:28
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:14
 msgid "Wireless"
 msgstr "Wireless"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1631
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1837
 #: modules/luci-base/luasrc/model/network.lua:1418
 msgid "Wireless Adapter"
 msgstr "Adaptorul wireless"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1617
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2052
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1823
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2288
 #: modules/luci-base/luasrc/model/network.lua:1404
 #: modules/luci-base/luasrc/model/network.lua:1865
 msgid "Wireless Network"
 msgstr "Retea wireless"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:629
 msgid "Wireless Overview"
 msgstr "Sumarul wireless"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:362
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:797
 msgid "Wireless Security"
 msgstr "Securitate wireless"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:54
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:611
+msgid "Wireless configuration migration"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:139
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:179
 msgid "Wireless is disabled"
 msgstr "Wireless-ul este dezactivat"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:54
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:139
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:179
 msgid "Wireless is not associated"
 msgstr "Wireless-ul este ne-asociat"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:15
-msgid "Wireless is restarting..."
-msgstr "Wireless-ul se restarteaza.."
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:752
 msgid "Wireless network is disabled"
 msgstr "Reteaua wireless este dezactivata"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:752
 msgid "Wireless network is enabled"
 msgstr "Reteaua wireless este activata"
 
-#: 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:182
 msgid "Write received DNS requests to syslog"
 msgstr "Scrie cererile DNS primite in syslog"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:164
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:155
 msgid "Write system log to file"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1507
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:85
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1754
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:109
 msgid "Yes"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:26
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:943
+msgid ""
+"You appear to be currently connected to the device via the \"%h\" interface. "
+"Do you really want to shut down the interface?"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:123
 msgid ""
 "You can enable or disable installed init scripts here. Changes will applied "
 "after a device reboot.<br /><strong>Warning: If you disable essential init "
@@ -5779,38 +5961,34 @@ msgid ""
 "You must enable JavaScript in your browser or LuCI will not work properly."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:196
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:187
 msgid "ZRam Compression Algorithm"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:203
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:194
 msgid "ZRam Compression Streams"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:189
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:180
 msgid "ZRam Settings"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:191
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
 msgid "ZRam Size"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:229
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:230
 msgid "any"
 msgstr "oricare"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:113
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:121
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:126
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:218
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:282
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:321
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:328
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:621
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:37
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:22
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:29
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:121
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:836
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:844
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:849
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1030
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:78
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:48
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:51
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:103
 msgid "auto"
 msgstr "auto"
 
@@ -5818,11 +5996,11 @@ msgstr "auto"
 msgid "automatic"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:45
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:78
 msgid "baseT"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:909
 msgid "bridged"
 msgstr ""
 
@@ -5838,22 +6016,21 @@ msgstr ""
 msgid "create:"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:264
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:368
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:678
 msgid "creates a bridge over specified interface(s)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:277
 msgid "dB"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:34
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:35
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:46
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:47
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:48
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:131
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:132
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:133
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:277
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:279
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:331
@@ -5865,26 +6042,30 @@ msgstr ""
 msgid "dBm"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:460
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:587
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:889
 msgid "disable"
 msgstr "dezactiveaza"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:119
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:524
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:530
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:536
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:18
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:578
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:584
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:590
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:25
 msgid "disabled"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:433
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:467
+msgid "driver default"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/lease_status.htm:17
 #: modules/luci-base/luasrc/view/lease_status.htm:46
-#: 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:416
 msgid "expired"
 msgstr "expirat"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:88
 msgid ""
 "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr>-leases will be stored"
@@ -5896,25 +6077,21 @@ msgstr ""
 msgid "forward"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:80
 msgid "full-duplex"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:80
 msgid "half-duplex"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:559
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:565
 msgid "hexadecimal encoded value"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:138
-msgid "hidden"
-msgstr "ascuns"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:527
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:533
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:538
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:581
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:587
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:592
 msgid "hybrid mode"
 msgstr ""
 
@@ -5922,6 +6099,10 @@ msgstr ""
 msgid "if target is a network"
 msgstr "daca tinta este o retea"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:63
+msgid "ignore"
+msgstr ""
+
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:177
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
@@ -5956,25 +6137,26 @@ msgstr ""
 msgid "key with either 5 or 13 characters"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:94
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:95
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:952
-msgid "minutes"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1168
+msgid "medium security"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:43
-msgid "mixed WPA/WPA2"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1360
+msgid "minutes"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:225
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:232
 msgid "no"
 msgstr "nu"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:54
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:72
 msgid "no link"
 msgstr ""
 
@@ -5982,7 +6164,7 @@ msgstr ""
 msgid "non-empty value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1195
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1446
 msgid "none"
 msgstr ""
 
@@ -5992,7 +6174,9 @@ msgstr ""
 msgid "not present"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:363
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:341
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:776
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:780
 #: 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
@@ -6007,8 +6191,8 @@ msgstr ""
 msgid "on"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
-msgid "open"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1169
+msgid "open network"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
@@ -6028,73 +6212,77 @@ msgstr ""
 msgid "positive integer value"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:34
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:56
 msgid "random"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:526
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:532
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:537
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:580
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:586
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:591
 msgid "relay mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:910
 msgid "routed"
 msgstr "rutat"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:525
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:534
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:968
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:977
 msgid "sec"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:525
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:531
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:579
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:585
 msgid "server mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:544
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:597
 msgid "stateful-only"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:542
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:595
 msgid "stateless"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:543
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:596
 msgid "stateless + stateful"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:369
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1167
+msgid "strong security"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:346
 msgid "tagged"
 msgstr "etichetat"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:932
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1343
 msgid "time units (TUs / 1.024 ms) [1000-65535]"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:549
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:555
 msgid "unique value"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:448
 msgid "unknown"
 msgstr "necunoscut"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:15
 #: modules/luci-base/luasrc/view/lease_status.htm:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:238
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:390
+#: 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:414
 msgid "unlimited"
 msgstr "nelimitat"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1401
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1648
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:63
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:355
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:378
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:413
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:446
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:512
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:450
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:545
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:53
 #: modules/luci-base/luasrc/view/cbi/network_netlist.htm:38
 msgid "unspecified"
@@ -6104,7 +6292,7 @@ msgstr "nespecificat"
 msgid "unspecified -or- create:"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:366
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:344
 msgid "untagged"
 msgstr "neetichetat"
 
@@ -6185,8 +6373,8 @@ msgstr ""
 msgid "valid address:port"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:523
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:527
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:529
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:533
 msgid "valid date (YYYY-MM-DD)"
 msgstr ""
 
@@ -6223,7 +6411,7 @@ msgstr ""
 msgid "valid network in address/netmask notation"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:498
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:504
 msgid "valid phone digit (0-9, \"*\", \"#\", \"!\" or \".\")"
 msgstr ""
 
@@ -6236,11 +6424,11 @@ msgstr ""
 msgid "valid port value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:503
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:509
 msgid "valid time (HH:MM:SS)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:425
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:431
 msgid "value between %d and %d characters"
 msgstr ""
 
@@ -6256,14 +6444,23 @@ msgstr ""
 msgid "value smaller or equal to %f"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:430
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:425
+msgid "value with %d characters"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:436
 msgid "value with at least %d characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:435
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:441
 msgid "value with at most %d characters"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1169
+msgid "weak security"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:221
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:232
@@ -6274,6 +6471,90 @@ msgstr "da"
 msgid "« Back"
 msgstr "« Inapoi"
 
+#~ msgid "Antenna 1"
+#~ msgstr "Antena 1"
+
+#~ msgid "Antenna 2"
+#~ msgstr "Antena 2"
+
+#~ msgid "Antenna Configuration"
+#~ msgstr "Configurarea Antenei"
+
+#~ msgid "Back to overview"
+#~ msgstr "Inapoi la vedere generala"
+
+#~ msgid "Back to scan results"
+#~ msgstr "Inapoi la rezultatele scanarii"
+
+#~ msgid "Broadcom 802.11%s Wireless Controller"
+#~ msgstr "Broadcom 802.11%s Controller Fara Fir"
+
+#~ msgid "Broadcom BCM%04x 802.11 Wireless Controller"
+#~ msgstr "Broadcom BCM%04x 802.11 Controller Fara Fir"
+
+#~ msgid "Common Configuration"
+#~ msgstr "Configurarea obisnuita"
+
+#~ msgid "Connect"
+#~ msgstr "Conectare"
+
+#~ msgid "Connection Limit"
+#~ msgstr "Limita de conexiune"
+
+#~ msgid "Create Interface"
+#~ msgstr "Creaza interfata"
+
+#~ msgid "Diversity"
+#~ msgstr "Diversitate"
+
+#~ msgid "Edit this interface"
+#~ msgstr "Editeaza aceasta interfata"
+
+#~ msgid "Install package %q"
+#~ msgstr "Instalati pachetul %q"
+
+#~ msgid "Interface Overview"
+#~ msgstr "Prezentare interfata"
+
+#~ msgid "Name of the new interface"
+#~ msgstr "Numele interfetei noi"
+
+#~ msgid "No network configured on this device"
+#~ msgstr "Nici o retea configurata pe acest dispozitiv"
+
+#~ msgid "Not associated"
+#~ msgstr "Nu este asociat."
+
+#~ msgid "Package libiwinfo required!"
+#~ msgstr "Pachetul libiwinfo este necesar !"
+
+#~ msgid "Receiver Antenna"
+#~ msgstr "Antena receptorului"
+
+#~ msgid "Repeat scan"
+#~ msgstr "Repeta scanarea"
+
+#~ msgid "Replace entry"
+#~ msgstr "Inlocuieste intrarea"
+
+#~ msgid "Transmission Rate"
+#~ msgstr "Rata de transmitere"
+
+#~ msgid "Transmit Power"
+#~ msgstr "Puterea de transmitere"
+
+#~ msgid "Transmitter Antenna"
+#~ msgstr "Antena de transmitere"
+
+#~ msgid "Uploaded File"
+#~ msgstr "Fisier incarcat"
+
+#~ msgid "Wireless is restarting..."
+#~ msgstr "Wireless-ul se restarteaza.."
+
+#~ msgid "hidden"
+#~ msgstr "ascuns"
+
 #~ msgid "Back"
 #~ msgstr "Inapoi"
 
@@ -6359,9 +6640,6 @@ msgstr "« Inapoi"
 #~ msgid "Activate this network"
 #~ msgstr "Activeaza aceasta retea"
 
-#~ msgid "Interface is shutting down..."
-#~ msgstr "Interfata se opreste.."
-
 #~ msgid "Interface reconnected"
 #~ msgstr "Interfata reconectata"
 
diff --git a/modules/luci-base/po/ru/base.po b/modules/luci-base/po/ru/base.po
index ccce5733d..62b5d2947 100644
--- a/modules/luci-base/po/ru/base.po
+++ b/modules/luci-base/po/ru/base.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LuCI: base\n"
 "POT-Creation-Date: 2010-05-09 01:01+0300\n"
-"PO-Revision-Date: 2019-07-27 23:18+0300\n"
+"PO-Revision-Date: 2019-09-13 00:12+0300\n"
 "Last-Translator: Anton Kikin <a.kikin@tano-systems.com>\n"
 "Language-Team: http://cyber-place.ru\n"
 "Language: ru\n"
@@ -15,19 +15,20 @@ msgstr ""
 "Project-Info: Это технический перевод, не дословный. Главное-удобный русский "
 "интерфейс, все проверялось в графическом режиме, совместим с другими apps\n"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:133
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:857
 msgid "%.1f dB"
 msgstr "%.1f дБ"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:109
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:122
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 msgid "%d Bit"
 msgstr "%d бит"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1641
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2194
 msgid "%d invalid field(s)"
 msgstr "%d неверных полей"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:281
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:31
 msgid "%s is untagged in multiple VLANs!"
 msgstr "%s не тегирован в множестве VLAN!"
 
@@ -65,19 +66,19 @@ msgid "-- Additional Field --"
 msgstr "-- Дополнительно --"
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:258
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1401
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1533
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:250
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:350
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1114
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1648
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1780
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:314
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:414
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1178
 #: modules/luci-base/luasrc/view/cbi/header.htm:5
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:26
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:88
 msgid "-- Please choose --"
 msgstr "-- Сделайте выбор --"
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:259
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:351
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1115
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:415
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1179
 #: modules/luci-base/luasrc/view/cbi/header.htm:6
 msgid "-- custom --"
 msgstr "-- пользовательский --"
@@ -100,7 +101,7 @@ msgstr "-- проверка по uuid --"
 msgid "-- please select --"
 msgstr "-- сделайте выбор --"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:382
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:814
 msgid "0 = not using RSSI threshold, 1 = do not change driver default"
 msgstr ""
 "0 = не использовать порог RSSI, 1 = не изменять значение по умолчанию "
@@ -114,10 +115,11 @@ msgstr "Загрузка за 1 минуту:"
 msgid "15 Minute Load:"
 msgstr "Загрузка за 15 минут:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:924
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1337
 msgid "4-character hexadecimal ID"
 msgstr "4-х значный шестнадцатеричный ID"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:11
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:18
 msgid "464XLAT (CLAT)"
 msgstr "464XLAT (CLAT)"
@@ -126,47 +128,47 @@ msgstr "464XLAT (CLAT)"
 msgid "5 Minute Load:"
 msgstr "Загрузка за 5 минут:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:960
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1366
 msgid "6-octet identifier as a hex string - no colons"
 msgstr "6-октетный идентификатор в виде шестнадцатеричной строки без двоеточий"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:891
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1310
 msgid "802.11r Fast Transition"
 msgstr "802.11r Быстрый Роуминг"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1157
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1567
 msgid "802.11w Association SA Query maximum timeout"
 msgstr "802.11w Association SA Query максимальное время ожидания"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1574
 msgid "802.11w Association SA Query retry timeout"
 msgstr "802.11w время ожидания повтора Association SA Query"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1133
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1533
 msgid "802.11w Management Frame Protection"
 msgstr "802.11w Management Frame Protection"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1156
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1567
 msgid "802.11w maximum timeout"
 msgstr "802.11w максимальное время ожидания"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1165
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1574
 msgid "802.11w retry timeout"
 msgstr "802.11w время ожидания повтора"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:399
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:831
 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:224
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:225
 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:215
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:216
 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:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
 msgid ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
 "order of the resolvfile"
@@ -174,11 +176,11 @@ msgstr ""
 "<abbr title=\"Система доменных имен\">DNS</abbr> сервера будут опрошены в "
 "порядке, определенном в resolvfile файле"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:388
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:820
 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:351
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:373
 #: 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>-адрес"
@@ -188,8 +190,8 @@ msgstr "<abbr title=\"Интернет протокол версии 4\">IPv4</a
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
 msgstr "<abbr title=\"Интернет протокол версии 4\">IPv4</abbr>-шлюз"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:555
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:35
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:506
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr "<abbr title=\"Интернет протокол версии 4\">IPv4</abbr>-маска сети"
 
@@ -204,29 +206,29 @@ 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:378
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:402
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
 msgstr "<abbr title=\"Интернет протокол версии 6\">IPv6</abbr>-суффикс (hex)"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:58
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:35
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:33
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "Настройка <abbr title=\"Светодиод\">LED</abbr> индикации"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:67
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:51
 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:328
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:329
 #: 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:372
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 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:233
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:234
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> leases"
@@ -234,7 +236,7 @@ msgstr ""
 "<abbr title=\"максимальное\">Макс.</abbr> кол-во аренд <abbr title="
 "\"Протокол динамической настройки узла\">DHCP</abbr> аренды"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:242
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> packet size"
@@ -242,12 +244,12 @@ 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:251
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:252
 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
 msgstr ""
 "<abbr title=\"максимальное\">Макс.</abbr> кол-во одновременных запросов"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:10
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:42
 msgid ""
 "<br/>Note: you need to manually restart the cron service if the crontab file "
 "was empty before editing."
@@ -255,55 +257,59 @@ msgstr ""
 "<br />Внимание: вы должны вручную перезапустить службу cron, если этот файл "
 "был пустым перед внесением ваших изменений."
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:817
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1605
+msgid "A directory with the same name already exists."
+msgstr "Директория с таким же именем уже существует."
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:863
 msgid "A new login is required since the authentication session expired."
 msgstr "Время сессии истекло, требуется повторная аутентификация."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:114
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:837
 msgid "A43C + J43 + A43"
 msgstr "A43C + J43 + A43"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:838
 msgid "A43C + J43 + A43 + V43"
 msgstr "A43C + J43 + A43 + V43"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:850
 msgid "ADSL"
 msgstr "ADSL"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:826
 msgid "ANSI T1.413"
 msgstr "ANSI T1.413"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:33
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:47
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:23
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:94
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:86
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:67
 msgid "APN"
 msgstr "APN"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:56
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:175
 msgid "ARP retry threshold"
 msgstr "Порог повтора ARP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:122
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:845
 msgid "ATM (Asynchronous Transfer Mode)"
 msgstr "ATM (режим асинхронной передачи)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:144
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:866
 msgid "ATM Bridges"
 msgstr "ATM мосты"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:178
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:21
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:898
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:66
 msgid "ATM Virtual Channel Identifier (VCI)"
 msgstr "ATM идентификатор виртуального канала (VCI)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:179
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:26
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:899
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:70
 msgid "ATM Virtual Path Identifier (VPI)"
 msgstr "ATM идентификатор виртуального пути (VPI)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:866
 msgid ""
 "ATM bridges expose encapsulated ethernet in AAL5 connections as virtual "
 "Linux network interfaces which can be used in conjunction with DHCP or PPP "
@@ -313,8 +319,8 @@ msgstr ""
 "как виртуальные сетевые интерфейсы Linux, которые могут использоваться "
 "совместно с DHCP или PPP для набора номера в сети провайдера."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:184
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:905
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:62
 msgid "ATM device number"
 msgstr "ATM номер устройства"
 
@@ -323,17 +329,17 @@ msgid "ATU-C System Vendor ID"
 msgstr "ATU-C идентификатор производителя"
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:251
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:495
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:499
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:528
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:532
 msgid "Absent Interface"
 msgstr "Отсутствующий интерфейс"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:19
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
 msgid "Access Concentrator"
 msgstr "Концентратор доступа"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:368
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:470
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:802
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
 msgid "Access Point"
 msgstr "Точка доступа"
 
@@ -358,7 +364,7 @@ msgid "Active Connections"
 msgstr "Активные соединения"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:68
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:30
 msgid "Active DHCP Leases"
 msgstr "Активные DHCP аренды"
 
@@ -366,56 +372,76 @@ msgstr "Активные DHCP аренды"
 msgid "Active DHCPv6 Leases"
 msgstr "Активные DHCPv6 аренды"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1951
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:370
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:12
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2190
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:804
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:23
 msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:650
-#: modules/luci-base/htdocs/luci-static/resources/form.js:651
-#: modules/luci-base/htdocs/luci-static/resources/form.js:666
-#: modules/luci-base/htdocs/luci-static/resources/form.js:667
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1290
+#: modules/luci-base/htdocs/luci-static/resources/form.js:902
+#: modules/luci-base/htdocs/luci-static/resources/form.js:904
+#: modules/luci-base/htdocs/luci-static/resources/form.js:917
+#: modules/luci-base/htdocs/luci-static/resources/form.js:918
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1539
 #: modules/luci-base/luasrc/view/cbi/nsection.htm:25
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:189
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:197
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:39
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:47
 #: modules/luci-base/luasrc/view/cbi/ucisection.htm:54
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:703
 msgid "Add"
 msgstr "Добавить"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:60
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:870
+msgid "Add ATM Bridge"
+msgstr "Добавить ATM мост"
+
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:92
 msgid "Add IPv4 address…"
 msgstr "Добавить IPv4 адрес..."
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:129
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:204
 msgid "Add IPv6 address…"
 msgstr "Добавить IPv6 адрес..."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:143
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:149
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:38
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:47
+msgid "Add LED action"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:215
+msgid "Add VLAN"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:14
+msgid "Add instance"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:153
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:159
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:250
 msgid "Add key"
 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:155
 msgid "Add local domain suffix to names served from hosts files"
 msgstr ""
 "Добавить локальный суффикс домена для имен из файла хостов (/etc/hosts)"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:705
 msgid "Add new interface..."
 msgstr "Добавить новый интерфейс..."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:104
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:99
+msgid "Add peer"
+msgstr "Добавить узел (peer)"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:105
 msgid "Additional Hosts files"
 msgstr "Дополнительный hosts файл"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:161
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
 msgid "Additional servers file"
 msgstr "Дополнительные файлы серверов"
 
@@ -442,7 +468,7 @@ msgstr "Дополнительные файлы серверов"
 msgid "Address"
 msgstr "Адрес"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:12
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:151
 msgid "Address to access local relay bridge"
 msgstr "Адрес для доступа к локальному мосту-ретранслятору"
 
@@ -451,13 +477,13 @@ msgstr "Адрес для доступа к локальному мосту-ре
 msgid "Administration"
 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:70
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:505
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:896
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:24
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:189
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:463
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:176
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:143
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:364
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:742
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:799
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:50
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:34
 msgid "Advanced Settings"
@@ -467,96 +493,96 @@ msgstr "Дополнительные настройки"
 msgid "Aggregate Transmit Power(ACTATP)"
 msgstr "Aggregate Transmit Power (ACTATP)"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:175
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:166
 msgid "Alert"
 msgstr "Тревога"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1628
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1834
 #: modules/luci-base/luasrc/model/network.lua:1416
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:54
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:78
 msgid "Alias Interface"
 msgstr "Псевдоним"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:138
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:66
 msgid "Alias of \"%s\""
 msgstr "Псевдоним интерфейса \"%s\""
 
-#: 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:170
 msgid "All Servers"
 msgstr "Все серверы"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:114
 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:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:113
 msgid "Allocate IP sequentially"
 msgstr "Выделять IP-адреса последовательно"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:24
 msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
 msgstr ""
 "Разрешить <abbr title=\"Secure Shell\">SSH</abbr> аутентификацию с помощью "
 "пароля"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:545
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:987
 msgid "Allow AP mode to disconnect STAs based on low ACK condition"
 msgstr ""
 "Разрешить режиму AP отключение абонентов на основании низкого уровня "
 "подтверждения (Acknowledge) успешности получения TCP-сегментов"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:462
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:589
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:891
 msgid "Allow all except listed"
 msgstr "Разрешить все, кроме перечисленных"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:236
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:767
 msgid "Allow legacy 802.11b rates"
 msgstr "Разрешить использование стандарта 802.11b"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:461
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:588
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:890
 msgid "Allow listed only"
 msgstr "Разрешить только перечисленные"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:198
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:199
 msgid "Allow localhost"
 msgstr "Разрешить локальный хост"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:47
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:35
 msgid "Allow remote hosts to connect to local SSH forwarded ports"
 msgstr ""
 "Разрешить удаленным хостам подключаться к локальным перенаправленным портам "
 "SSH"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:38
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:30
 msgid "Allow root logins with password"
 msgstr "Root входит по паролю"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:39
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:30
 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:199
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:200
 msgid ""
 "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
 msgstr ""
 "Разрешить ответы внешней сети в диапазоне 127.0.0.0/8, например, для RBL-"
 "сервисов"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:135
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:122
 msgid "Allowed IPs"
 msgstr "Разрешенные IP-адреса"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:549
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:602
 msgid "Always announce default router"
 msgstr "Объявлять всегда, как маршрутизатор по умолчанию"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:259
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:782
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
 "option does not comply with IEEE 802.11n-2009!"
@@ -564,82 +590,82 @@ msgstr ""
 "Всегда использовать каналы 40 МГц, даже если вторичный канал перекрывается. "
 "Использование этой опции не соответствует стандарту IEEE 802.11n-2009!"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:95
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:818
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:119
 msgid "Annex"
 msgstr "Annex"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:96
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:819
 msgid "Annex A + L + M (all)"
 msgstr "Annex A + L + M (all)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:827
 msgid "Annex A G.992.1"
 msgstr "Annex A G.992.1"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:828
 msgid "Annex A G.992.2"
 msgstr "Annex A G.992.2"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:829
 msgid "Annex A G.992.3"
 msgstr "Annex A G.992.3"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:830
 msgid "Annex A G.992.5"
 msgstr "Annex A G.992.5"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:97
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:820
 msgid "Annex B (all)"
 msgstr "Annex B (all)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:823
 msgid "Annex B G.992.1"
 msgstr "Annex B G.992.1"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:824
 msgid "Annex B G.992.3"
 msgstr "Annex B G.992.3"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:102
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:825
 msgid "Annex B G.992.5"
 msgstr "Annex B G.992.5"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:98
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:821
 msgid "Annex J (all)"
 msgstr "Annex J (all)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:831
 msgid "Annex L G.992.3 POTS 1"
 msgstr "Annex L G.992.3 POTS 1"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:99
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:822
 msgid "Annex M (all)"
 msgstr "Annex M (all)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:109
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:832
 msgid "Annex M G.992.3"
 msgstr "Annex M G.992.3"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:833
 msgid "Annex M G.992.5"
 msgstr "Annex M G.992.5"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:550
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:602
 msgid "Announce as default router even if no public prefix is available."
 msgstr ""
 "Объявить маршрутизатором по умолчанию, даже если общедоступный префикс "
 "недоступен."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:555
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:607
 msgid "Announced DNS domains"
 msgstr "Объявить DNS домены"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:554
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:606
 msgid "Announced DNS servers"
 msgstr "Объявить DNS сервера"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1093
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1496
 msgid "Anonymous Identity"
 msgstr "Анонимная идентификация"
 
@@ -651,20 +677,6 @@ msgstr "Неизвестный раздел"
 msgid "Anonymous Swap"
 msgstr "Неизвестный swap"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:322
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:329
-msgid "Antenna 1"
-msgstr "Антенна 1"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:323
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:330
-msgid "Antenna 2"
-msgstr "Антенна 2"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:246
-msgid "Antenna Configuration"
-msgstr "Настройка антенн"
-
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:71
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:160
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:181
@@ -672,11 +684,11 @@ msgstr "Настройка антенн"
 msgid "Any zone"
 msgstr "Любая зона"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1981
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2522
 msgid "Apply request failed with status <code>%h</code>"
 msgstr "Ошибка <code>%h</code> запроса на применение"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1867
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2409
 msgid "Apply unchecked"
 msgstr "Применить без проверки"
 
@@ -684,8 +696,8 @@ msgstr "Применить без проверки"
 msgid "Architecture"
 msgstr "Архитектура"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:19
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:184
+#: 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 ""
@@ -695,15 +707,15 @@ msgstr ""
 msgid "Assign interfaces..."
 msgstr "Назначить интерфейсы..."
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:124
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:24
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:189
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:31
 msgid ""
 "Assign prefix parts using this hexadecimal subprefix ID for this interface."
 msgstr ""
 "Назначьте префикс части, используя этот шестнадцатеричный ID вложенного "
 "исправления для этого интерфейса."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:148
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1967
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:22
 msgid "Associated Stations"
 msgstr "Подключенные клиенты"
@@ -712,20 +724,20 @@ msgstr "Подключенные клиенты"
 msgid "Associations"
 msgstr "Ассоциации"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:39
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:37
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:101
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:64
 msgid "Auth Group"
 msgstr "Группа аутентификации"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1027
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1421
 msgid "Authentication"
 msgstr "Аутентификация"
 
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:29
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:70
 msgid "Authentication Type"
 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:78
 msgid "Authoritative"
 msgstr "Основной"
 
@@ -743,17 +755,19 @@ msgstr "Выполните аутентификацию"
 msgid "Auto Refresh"
 msgstr "Автообновление"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:53
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:7
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:17
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:67
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:24
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:36
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:42
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:36
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:106
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:24
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:98
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:50
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:94
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:81
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:55
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:68
 msgid "Automatic"
 msgstr "Автоматически"
 
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:7
 #: protocols/luci-proto-hnet/luasrc/model/network/proto_hnet.lua:7
 msgid "Automatic Homenet (HNCP)"
 msgstr "Автоматическая Homenet (HNCP)"
@@ -802,21 +816,21 @@ msgstr "Доступно"
 msgid "Average:"
 msgstr "Средняя:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:116
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:839
 msgid "B43 + B43C"
 msgstr "B43 + B43C"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:840
 msgid "B43 + B43C + V43"
 msgstr "B43 + B43C + V43"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:48
 msgid "BR / DMR / AFTR"
 msgstr "BR / DMR / AFTR"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:43
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:75
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1620
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:176
 msgid "BSSID"
 msgstr "BSSID"
@@ -830,19 +844,11 @@ msgstr "Назад к обзору"
 msgid "Back to configuration"
 msgstr "Назад к настройкам"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:48
-msgid "Back to overview"
-msgstr "Назад к обзору"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:20
-msgid "Back to scan results"
-msgstr "Назад к результатам поиска"
-
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:17
 msgid "Backup"
 msgstr "Резервное копирование"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:38
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:36
 msgid "Backup / Flash Firmware"
 msgstr "Резервное копирование / Перепрошивка"
 
@@ -855,11 +861,11 @@ msgid "Bad address specified!"
 msgstr "Указан неправильный адрес!"
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:158
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:288
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:368
 msgid "Band"
 msgstr "Диапазон"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:261
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:785
 msgid "Beacon Interval"
 msgstr "Интервал рассылки пакетов Beacon"
 
@@ -873,7 +879,7 @@ msgstr ""
 "состоит из измененных config файлов, отмеченных opkg, необходимых базовых "
 "файлов, а также шаблонов резервного копирования, определенных пользователем."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:293
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:294
 msgid ""
 "Bind dynamically to interfaces rather than wildcard address (recommended as "
 "linux default)"
@@ -881,74 +887,80 @@ msgstr ""
 "Привязывать динамически к интерфейсам, а не по шаблону адреса (рекомендуется "
 "по умолчанию для Linux)"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:16
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:48
 msgid "Bind interface"
 msgstr "Открытый интерфейс"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:16
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:48
 msgid "Bind the tunnel to this interface (optional)."
 msgstr "Открытый туннель для этого интерфейса (необязательно)."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:49
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:134
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:187
 msgid "Bitrate"
 msgstr "Скорость"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:172
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
 msgid "Bogus NX Domain Override"
 msgstr "Переопределение поддельного NX-домена"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1634
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1840
 #: modules/luci-base/luasrc/model/network.lua:1420
 msgid "Bridge"
 msgstr "Мост"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:264
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:368
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:678
 msgid "Bridge interfaces"
 msgstr "Объединить в мост"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:906
 msgid "Bridge unit number"
 msgstr "Номер моста"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:250
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:364
 msgid "Bring up on boot"
 msgstr "Запустить при загрузке"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:35
-msgid "Broadcom 802.11%s Wireless Controller"
-msgstr "Беспроводной 802.11%s контроллер Broadcom"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:45
-msgid "Broadcom BCM%04x 802.11 Wireless Controller"
-msgstr "Беспроводной 802.11 контроллер Broadcom BCM%04x"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1697
+msgid "Browse…"
+msgstr "Обзор..."
 
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:18
 msgid "Buffered"
 msgstr "Буферизировано"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:75
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:134
 msgid "CA certificate; if empty it will be saved after the first connection."
 msgstr ""
 "CA сертификат; если отсутствует, будет сохранен после первого соединения."
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:7
+msgid "CLAT configuration failed"
+msgstr "Ошибка конфигурации CLAT"
+
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:13
 msgid "CPU usage (%)"
 msgstr "Загрузка ЦП (%)"
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:21
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:53
 msgid "Call failed"
 msgstr "Ошибка вызова"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1789
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:14
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:52
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:711
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:948
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1839
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:191
 #: modules/luci-mod-system/luasrc/view/admin_system/upgrade.htm:60
 msgid "Cancel"
 msgstr "Отменить"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:6
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:17
 msgid "Category"
 msgstr "Категория"
 
@@ -966,13 +978,7 @@ msgstr "Внимание: выбрано принудительное обнов
 msgid "Chain"
 msgstr "Цепочка"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:9
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:14
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:24
-msgid "Change login password"
-msgstr "Изменить пароль"
-
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1744
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 msgid "Changes"
 msgstr "Изменения"
 
@@ -980,35 +986,23 @@ msgstr "Изменения"
 msgid "Changes applied."
 msgstr "Изменения приняты."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2004
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2545
 msgid "Changes have been reverted."
 msgstr "Изменения были возвращены назад."
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:43
 msgid "Changes the administrator password for accessing the device"
 msgstr "Изменить пароль администратора для доступа к устройству"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:10
-msgid "Changing password…"
-msgstr "Изменение пароля..."
-
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:162
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:45
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:87
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:174
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:376
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1618
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:186
 msgid "Channel"
 msgstr "Канал"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:119
-msgid ""
-"Channel %d is not available in the %s regulatory domain and has been auto-"
-"adjusted to %d."
-msgstr ""
-"Канал %d не доступен в регуляторном домене %s и был автоматически изменен на "
-"%d."
-
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:229
 msgid "Check"
 msgstr "Проверить"
@@ -1017,7 +1011,7 @@ msgstr "Проверить"
 msgid "Check filesystems before mount"
 msgstr "Проверка файловых систем перед монтированием"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1806
 msgid "Check this option to delete the existing networks from this radio."
 msgstr ""
 "Проверьте эту опцию, чтобы удалить существующие сети беспроводного "
@@ -1031,8 +1025,8 @@ msgstr "Контрольная сумма"
 msgid "Choose mtdblock"
 msgstr "Выберите MTD раздел"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:358
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:443
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1829
 msgid ""
 "Choose the firewall zone you want to assign to this interface. Select "
 "<em>unspecified</em> to remove the interface from the associated zone or "
@@ -1044,7 +1038,7 @@ msgstr ""
 "заполните поле <em>'создать'</em>, чтобы определить новую зону и прикрепить "
 "к ней этот интерфейс."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:834
 msgid ""
 "Choose the network(s) you want to attach to this wireless interface or fill "
 "out the <em>create</em> field to define a new network."
@@ -1053,11 +1047,11 @@ msgstr ""
 "беспроводной сети или заполните поле <em>создать</em>, чтобы создать новый "
 "интерфейс."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:614
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1023
 msgid "Cipher"
 msgstr "Алгоритм шифрования"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:61
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:91
 msgid "Cisco UDP encapsulation"
 msgstr "Формирование пакетов данных Cisco UDP "
 
@@ -1077,28 +1071,28 @@ msgstr ""
 "Нажмите \"Сохранить MTD раздел\" для скачивания образа указанного MTD "
 "раздела (ВНИМАНИЕ: ДАННЫЙ ФУНКЦИОНАЛ ТОЛЬКО ДЛЯ ОПЫТНЫХ ПОЛЬЗОВАТЕЛЕЙ)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1950
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:369
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:471
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2189
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:803
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:908
 msgid "Client"
 msgstr "Клиент"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:55
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:52
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:47
 msgid "Client ID to send when requesting DHCP"
 msgstr "ID клиента при DHCP-запросе"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:145
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:151
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:155
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:161
 msgid "Close"
 msgstr "Закрыть"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:146
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:119
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:125
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:127
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:98
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:119
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:157
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:141
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:115
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:138
 msgid ""
 "Close inactive connection after the given amount of seconds, use 0 to "
 "persist connection"
@@ -1113,12 +1107,9 @@ msgstr "Закрыть список..."
 #: modules/luci-base/luasrc/view/lease_status.htm:77
 #: modules/luci-base/luasrc/view/lease_status.htm:98
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:118
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:37
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:24
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1965
 #: modules/luci-mod-network/luasrc/view/admin_network/iface_status.htm:6
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:40
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:30
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:8
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:398
 #: modules/luci-mod-status/luasrc/view/admin_status/index/30-network.htm:11
 #: modules/luci-mod-status/luasrc/view/admin_status/index/50-dsl.htm:17
@@ -1132,15 +1123,19 @@ msgstr "Сбор данных..."
 msgid "Command"
 msgstr "Команда"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:193
+msgid "Command OK"
+msgstr "Успешное выполнение"
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:41
+msgid "Command failed"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:64
 msgid "Comment"
 msgstr "Комментарий"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:185
-msgid "Common Configuration"
-msgstr "Общие настройки"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
 msgid ""
 "Complicates key reinstallation attacks on the client side by disabling "
 "retransmission of EAPOL-Key frames that are used to install keys. This "
@@ -1152,13 +1147,14 @@ msgstr ""
 "Может вызвать проблемы совместимости и снижение надежности согласования "
 "нового ключа, при наличии большого трафика."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1744
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 #: modules/luci-base/luasrc/controller/admin/uci.lua:11
 #: modules/luci-mod-system/luasrc/view/admin_system/backupfiles.htm:9
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:13
 msgid "Configuration"
 msgstr "Настройка config файла"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:21
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:63
 msgid "Configuration failed"
 msgstr "Ошибка конфигурации"
@@ -1167,42 +1163,52 @@ msgstr "Ошибка конфигурации"
 msgid "Configuration files will be kept"
 msgstr "Конфигурационные файлы будут сохранены"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1915
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2456
 msgid "Configuration has been applied."
 msgstr "Конфигурация применена"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1848
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2395
 msgid "Configuration has been rolled back!"
 msgstr "Конфигурация возвращена назад!"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:43
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:942
+msgid "Confirm disconnect"
+msgstr "Подтверждение отключения"
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:50
 msgid "Confirmation"
 msgstr "Подтверждение пароля"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:32
-msgid "Connect"
-msgstr "Соединить"
-
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:72
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:105
 msgid "Connected"
 msgstr "Подключен"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:338
-msgid "Connection Limit"
-msgstr "Ограничение соединений"
-
 #: modules/luci-base/htdocs/luci-static/resources/network.js:7
 #: modules/luci-base/luasrc/model/network.lua:27
 msgid "Connection attempt failed"
 msgstr "Ошибка попытки соединения"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:203
+msgid "Connection lost"
+msgstr "Подключение потеряно"
+
 #: modules/luci-mod-status/luasrc/controller/admin/status.lua:32
 msgid "Connections"
 msgstr "Соединения"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1890
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:66
+msgid "Contents have been saved."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:618
+msgid "Continue"
+msgstr "Продолжить"
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2431
 msgid ""
 "Could not regain access to the device after applying the configuration "
 "changes. You might need to reconnect if you modified network related "
@@ -1212,47 +1218,37 @@ msgstr ""
 "Возможно вам придется подключиться заново, если вы изменили сетевые "
 "настройки, такие как IP-адрес или параметры доступа к беспроводной сети."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:135
 msgid "Country"
 msgstr "Страна"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:227
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:233
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:337
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:764
 msgid "Country Code"
 msgstr "Код страны"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:36
-msgid "Cover the following interface"
-msgstr "Включить следующий интерфейс"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:43
-msgid "Cover the following interfaces"
-msgstr "Включить следующие интерфейсы"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:357
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:86
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:443
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1829
 msgid "Create / Assign firewall-zone"
 msgstr "Создать / назначить зону сетевого экрана"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:9
-msgid "Create Interface"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:735
+msgid "Create interface"
 msgstr "Создать интерфейс"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:33
-msgid "Create a bridge over multiple interfaces"
-msgstr "Создать мост над несколькими интерфейсами"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:174
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:165
 msgid "Critical"
 msgstr "Критическая ситуация"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:178
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:169
 msgid "Cron Log Level"
 msgstr "Запись событий cron"
 
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:519
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:521
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:447
+msgid "Current power"
+msgstr "Текущая мощность"
+
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:552
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:554
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:51
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:53
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:82
@@ -1260,7 +1256,7 @@ msgstr "Запись событий cron"
 msgid "Custom Interface"
 msgstr "Пользовательский интерфейс"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:36
 msgid "Custom delegated IPv6-prefix"
 msgstr "Установленный пользователем IPv6-prefix"
 
@@ -1272,7 +1268,7 @@ msgstr ""
 "Пользовательские файлы (сертификаты, скрипты) могут остаться в системе. "
 "Чтобы этого не произошло, выполните сначала сброс к заводским настройкам."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:59
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:41
 msgid ""
 "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
 "\">LED</abbr>s if possible."
@@ -1280,46 +1276,47 @@ msgstr ""
 "Настройка поведения светодиодной индикации <abbr title=\"Светодиод\">LED</"
 "abbr> устройства, если это возможно."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:799
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1223
 msgid "DAE-Client"
 msgstr "DAE-клиент"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:807
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1231
 msgid "DAE-Port"
 msgstr "DAE-порт"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:815
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1239
 msgid "DAE-Secret"
 msgstr "DAE-секрет"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:448
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:459
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:279
 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:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:61
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:62
 msgid "DHCP and DNS"
 msgstr "DHCP и DNS"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1195
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1385
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:16
 #: modules/luci-base/luasrc/model/network.lua:968
 msgid "DHCP client"
 msgstr "DHCP-клиент"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:571
 msgid "DHCP-Options"
 msgstr "DHCP настройки"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_dhcpv6.lua:7
 msgid "DHCPv6 client"
 msgstr "DHCPv6 клиент"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:540
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:594
 msgid "DHCPv6-Mode"
 msgstr "DHCPv6 режим"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:529
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:583
 msgid "DHCPv6-Service"
 msgstr "DHCPv6 сервис"
 
@@ -1336,31 +1333,31 @@ msgstr "DHCPv6 сервис"
 msgid "DNS"
 msgstr "DNS"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:183
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
 msgid "DNS forwardings"
 msgstr "Перенаправление запросов DNS"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:30
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:37
 msgid "DNS-Label / FQDN"
 msgstr "DNS-Label / FQDN"
 
-#: 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:136
 msgid "DNSSEC"
 msgstr "DNSSEC"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:139
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
 msgid "DNSSEC check unsigned"
 msgstr "DNSSEC проверка без знака"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:73
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:99
 msgid "DPD Idle Timeout"
 msgstr "DPD время простоя"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:14
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:41
 msgid "DS-Lite AFTR address"
 msgstr "DS-Lite AFTR-адрес"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:92
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:815
 #: modules/luci-mod-status/luasrc/view/admin_status/index/50-dsl.htm:14
 msgid "DSL"
 msgstr "DSL"
@@ -1369,11 +1366,11 @@ msgstr "DSL"
 msgid "DSL Status"
 msgstr "Состояние DSL"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:125
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:848
 msgid "DSL line mode"
 msgstr "DSL линейный режим"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:519
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:963
 msgid "DTIM Interval"
 msgstr "Интервал DTIM"
 
@@ -1385,42 +1382,45 @@ msgstr "DUID"
 msgid "Data Rate"
 msgstr "Скорость передачи данных"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:169
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:180
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:160
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:171
 msgid "Debug"
 msgstr "Отладка"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:759
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:783
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:807
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1183
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1207
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1231
 msgid "Default %d"
 msgstr "По умолчанию %d"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:82
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:107
 msgid "Default Route"
 msgstr "Маршрут по умолчанию"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:17
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:81
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:51
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:32
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:48
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:85
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:65
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:80
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:108
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:146
 msgid "Default gateway"
 msgstr "Шлюз по умолчанию"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:541
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:594
 msgid "Default is stateless + stateful"
 msgstr "Значение по умолчанию — 'stateless + stateful'"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:70
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:54
 msgid "Default state"
 msgstr "Начальное состояние"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:503
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:553
 msgid "Define a name for this network."
 msgstr "Укажите имя этой сети."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:514
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:571
 msgid ""
 "Define additional DHCP options, for example "
 "\"<code>6,192.168.2.1,192.168.2.2</code>\" which advertises different DNS "
@@ -1430,35 +1430,47 @@ msgstr ""
 "\"<code>6,192.168.2.1,192.168.2.2</code>\", чтобы известить клиентов о DNS-"
 "серверах."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:705
-#: modules/luci-base/htdocs/luci-static/resources/form.js:958
-#: modules/luci-base/htdocs/luci-static/resources/form.js:959
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1271
+#: modules/luci-base/htdocs/luci-static/resources/form.js:966
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1210
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1216
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1524
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1758
 #: modules/luci-base/luasrc/view/cbi/nsection.htm:11
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:162
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:16
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:41
 msgid "Delete"
 msgstr "Удалить"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:178
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:187
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:193
 msgid "Delete key"
 msgstr "Удалить ключ"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:45
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1654
+msgid "Delete permission denied"
+msgstr "Нет разрешений на удаление"
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1656
+msgid "Delete request failed: %d %s"
+msgstr "Ошибка запроса на удаление: %d %s"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:723
 msgid "Delete this network"
 msgstr "Удалить эту сеть"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:519
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:963
 msgid "Delivery Traffic Indication Message Interval"
 msgstr "Интервал сообщений, регламентирующий доставку трафика"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:102
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:108
 msgid "Description"
 msgstr "Описание"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:224
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1754
+msgid "Deselect"
+msgstr "Отменить выбор"
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:215
 msgid "Design"
 msgstr "Тема оформления"
 
@@ -1476,10 +1488,12 @@ msgstr "Зона назначения"
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:177
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:43
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:13
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:38
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:73
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:33
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:52
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:85
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:86
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:72
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:154
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:253
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:86
@@ -1487,15 +1501,24 @@ msgstr "Зона назначения"
 msgid "Device"
 msgstr "Устройство"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:138
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:737
 msgid "Device Configuration"
 msgstr "Настройка устройства"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:81
+msgid "Device is not active"
+msgstr "Устройство не активно"
+
 #: modules/luci-mod-system/luasrc/view/admin_system/reboot.htm:23
 msgid "Device is rebooting..."
 msgstr "Перезагрузка..."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1889
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:167
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:513
+msgid "Device is restarting…"
+msgstr "Устройство перезапускается..."
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2430
 msgid "Device unreachable!"
 msgstr "Устройство недоступно!"
 
@@ -1503,26 +1526,26 @@ msgstr "Устройство недоступно!"
 msgid "Device unreachable! Still waiting for device..."
 msgstr "Устройство недоступно! Ожидание устройства..."
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:123
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:78
 #: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:61
 msgid "Diagnostics"
 msgstr "Диагностика"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:45
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:60
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:101
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:93
 msgid "Dial number"
 msgstr "Dial номер"
 
-#: modules/luci-base/luasrc/view/cbi/filebrowser.htm:99
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1554
 msgid "Directory"
 msgstr "Папка"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:131
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:715
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:754
 msgid "Disable"
 msgstr "Отключить"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:472
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:531
 msgid ""
 "Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for "
 "this interface."
@@ -1530,71 +1553,66 @@ msgstr ""
 "Отключить <abbr title=\"Протокол динамической настройки узла\">DHCP</abbr> "
 "для этого интерфейса."
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:64
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:93
 msgid "Disable Encryption"
 msgstr "Отключить шифрование"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:530
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:973
 msgid "Disable Inactivity Polling"
 msgstr "Отключить отслеживание неактивности клиентов"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:713
 msgid "Disable this network"
 msgstr "Отключить данную сеть"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:44
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:54
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:68
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:37
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:43
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:37
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1534
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:76
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:107
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:99
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:51
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:95
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:82
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:69
 msgid "Disabled"
 msgstr "Отключено"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1139
-msgid "Disabled (default)"
-msgstr "Отключено (по умолчанию)"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:544
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:987
 msgid "Disassociate On Low Acknowledgement"
 msgstr "Не ассоциировать при низком подтверждении"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:193
 msgid "Discard upstream RFC1918 responses"
 msgstr "Отбрасывать ответы внешней сети RFC1918"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:92
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:114
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:956
 msgid "Disconnect"
 msgstr "Отключить"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:22
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:64
 msgid "Disconnection attempt failed"
 msgstr "Ошибка попытки отключения"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1121
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1762
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1855
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:17
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1375
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1995
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2314
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2401
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1634
 msgid "Dismiss"
 msgstr "Отклонить"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:240
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:334
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:770
 msgid "Distance Optimization"
 msgstr "Оптимизация расстояния"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:241
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:770
 msgid "Distance to farthest network member in meters."
 msgstr "Расстояние до самого удалённого сетевого узла в метрах."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:347
-msgid "Diversity"
-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:61
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
@@ -1606,37 +1624,45 @@ msgstr ""
 "прокси для сетевых экранов <abbr title=\"Преобразование сетевых адресов"
 "\">NAT</abbr>"
 
-#: 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:159
 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:123
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:124
 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:118
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
 msgid "Do not forward reverse lookups for local networks"
 msgstr "Не перенаправлять обратные DNS-запросы для локальных сетей"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:173
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1639
+msgid "Do you really want to delete \"%s\" ?"
+msgstr "Вы действительно хотите удалить «%s»?"
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:188
 msgid "Do you really want to delete the following SSH key?"
 msgstr "Вы действительно хотите удалить следующий SSH ключ?"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1637
+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:74
 msgid "Domain required"
 msgstr "Требуется домен"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:205
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:206
 msgid "Domain whitelist"
 msgstr "Белый список доменов"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:34
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:67
 msgid "Don't Fragment"
 msgstr "Не фрагментировать"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:74
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:75
 msgid ""
 "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
 "<abbr title=\"Domain Name System\">DNS</abbr>-Name"
@@ -1656,19 +1682,19 @@ msgstr "Загрузить резервную копию"
 msgid "Download mtdblock"
 msgstr "Скачать MTD раздел"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:853
 msgid "Downstream SNR offset"
 msgstr "SNR offset внутренней сети"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:914
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1169
 msgid "Drag to reorder"
 msgstr "Перетащите, чтобы изменить порядок"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:9
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:11
 msgid "Dropbear Instance"
 msgstr "Экземпляр Dropbear"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:6
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 msgid ""
 "Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access "
 "and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
@@ -1676,20 +1702,21 @@ msgstr ""
 "Dropbear — это <abbr title=\"Secure Shell\">SSH</abbr>-сервер со встроенным "
 "<abbr title=\"Secure Copy\">SCP</abbr>"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:11
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:14
 msgid "Dual-Stack Lite (RFC6333)"
 msgstr "Dual-Stack Lite (RFC6333)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:493
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:547
 msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 msgstr ""
 "Динамический <abbr title=\"Протокол динамической настройки узла\">DHCP</abbr>"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:60
 msgid "Dynamic tunnel"
 msgstr "Динамический туннель"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:494
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:547
 msgid ""
 "Dynamically allocate DHCP addresses for clients. If disabled, only clients "
 "having static leases will be served."
@@ -1697,21 +1724,21 @@ msgstr ""
 "Динамически выделять DHCP-адреса клиентам. Если выключено, то будут "
 "обслужены только клиенты с постоянно арендованными адресами."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:67
 msgid "EA-bits length"
 msgstr "EA-bits длина"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:990
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1386
 msgid "EAP-Method"
 msgstr "Метод EAP"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:934
-#: modules/luci-base/htdocs/luci-static/resources/form.js:935
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1199
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1188
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1191
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1450
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:154
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:160
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:38
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:291
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:720
 msgid "Edit"
 msgstr "Изменить"
 
@@ -1723,24 +1750,24 @@ msgstr ""
 "Изменить данные конфигурации raw выше, чтобы исправить любую ошибку и "
 "нажмите 'Сохранить', чтобы перезагрузить страницу."
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:38
-msgid "Edit this interface"
-msgstr "Изменить этот интерфейс"
-
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:718
 msgid "Edit this network"
 msgstr "Редактировать эту сеть"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:669
+msgid "Edit wireless network"
+msgstr "Редактировать беспроводную сеть"
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:167
 msgid "Emergency"
 msgstr "Чрезвычайная ситуация"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:127
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:715
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:754
 msgid "Enable"
 msgstr "Включить"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:414
 msgid ""
 "Enable <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> "
 "snooping"
@@ -1748,67 +1775,68 @@ msgstr ""
 "Включить <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> "
 "snooping"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:271
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:412
 msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 msgstr "Включить <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:41
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:60
 msgid "Enable HE.net dynamic endpoint update"
 msgstr "Включить динамическое обновление оконечной точки HE.net"
 
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:51
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:89
 msgid "Enable IPv6 negotiation"
 msgstr "Включить IPv6 negotiation"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:23
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:35
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:41
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:35
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:37
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:49
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:80
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:54
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:67
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:93
 msgid "Enable IPv6 negotiation on the PPP link"
 msgstr "Включить IPv6-согласование на PPP-соединении"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:143
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:188
 msgid "Enable Jumbo Frame passthrough"
 msgstr "Пропускать Jumbo-кадры"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:244
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:235
 msgid "Enable NTP client"
 msgstr "Включить NTP-клиент"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:69
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:96
 msgid "Enable Single DES"
 msgstr "Включить Single DES"
 
-#: 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:267
 msgid "Enable TFTP server"
 msgstr "Включить TFTP-сервер"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:134
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:180
 msgid "Enable VLAN functionality"
 msgstr "Включить поддержку VLAN"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1595
 msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
 msgstr "Включить WPS при нажатии на кнопку, в режиме WPA(2)-PSK"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1175
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
 msgid "Enable key reinstallation (KRACK) countermeasures"
 msgstr "Включить защиту от атаки KRACK"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:138
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:183
 msgid "Enable learning and aging"
 msgstr "Включить изучение и устаревание (learning/aging)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:194
 msgid "Enable mirroring of incoming packets"
 msgstr "Включить отражение входящих пакетов"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:151
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:195
 msgid "Enable mirroring of outgoing packets"
 msgstr "Включить отражение исходящих пакетов"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:34
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:67
 msgid "Enable the DF (Don't Fragment) flag of the encapsulating packets."
 msgstr "Включите флаг DF (не Фрагментировать) инкапсулирующих пакетов."
 
@@ -1816,7 +1844,7 @@ msgstr "Включите флаг DF (не Фрагментировать) ин
 msgid "Enable this mount"
 msgstr "Включить эту точку монтирования"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:713
 msgid "Enable this network"
 msgstr "Включить данную сеть"
 
@@ -1824,21 +1852,21 @@ msgstr "Включить данную сеть"
 msgid "Enable this swap"
 msgstr "Включить этот раздел подкачки"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:37
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:88
 msgid "Enable/Disable"
 msgstr "Включить/выключить"
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:76
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:152
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:251
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:41
 msgid "Enabled"
 msgstr "Включено"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:277
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:414
 msgid "Enables IGMP snooping on this bridge"
 msgstr "Включает IGMP snooping на данном мосту"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:892
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1310
 msgid ""
 "Enables fast roaming among access points that belong to the same Mobility "
 "Domain"
@@ -1846,28 +1874,32 @@ msgstr ""
 "Включить быстрый роуминг между точками доступа, принадлежащими к тому же "
 "домену мобильности"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:272
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:412
 msgid "Enables the Spanning Tree Protocol on this bridge"
 msgstr "Включает Spanning Tree Protocol на этом мосту"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:120
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:180
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:59
+msgid "Encapsulation limit"
+msgstr "Предел инкапсуляции"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:843
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:901
 msgid "Encapsulation mode"
 msgstr "Режим инкапсуляции"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:76
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:603
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:129
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:992
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1621
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:177
 msgid "Encryption"
 msgstr "Шифрование"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:155
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:128
 msgid "Endpoint Host"
 msgstr "Конечный узел"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:165
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:132
 msgid "Endpoint Port"
 msgstr "Порт конечного узла"
 
@@ -1879,16 +1911,21 @@ msgstr "Введите пользовательское значение"
 msgid "Enter custom values"
 msgstr "Введите пользовательские значения"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:273
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:271
 msgid "Erasing..."
 msgstr "Стирание..."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:95
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:96
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:97
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:98
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:99
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:106
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:107
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:108
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:109
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:110
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:173
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:164
 msgid "Error"
 msgstr "Ошибка"
 
@@ -1896,24 +1933,28 @@ msgstr "Ошибка"
 msgid "Errored seconds (ES)"
 msgstr "Ошибочные секунды (ES)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1646
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1852
 #: modules/luci-base/luasrc/model/network.lua:1432
 msgid "Ethernet Adapter"
 msgstr "Ethernet-адаптер"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1637
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1843
 #: modules/luci-base/luasrc/model/network.lua:1422
 msgid "Ethernet Switch"
 msgstr "Ethernet-коммутатор"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:303
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
 msgid "Exclude interfaces"
 msgstr "Исключите интерфейсы"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:153
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
 msgid "Expand hosts"
 msgstr "Расширять имена узлов"
 
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:195
+msgid "Expecting an hexadecimal assignment hint"
+msgstr ""
+
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:59
 msgid "Expecting: %s"
 msgstr "Ожидается: %s"
@@ -1922,63 +1963,79 @@ msgstr "Ожидается: %s"
 msgid "Expires"
 msgstr "Истекает"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:488
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:543
 msgid ""
 "Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
 msgstr ""
 "Время истечения срока аренды арендованных адресов, минимум 2 минуты "
 "(<code>2m</code>)."
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:8
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:19
 msgid "External"
 msgstr "Внешний"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:971
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1377
 msgid "External R0 Key Holder List"
 msgstr "Внешний R0 Key Holder List"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:980
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1381
 msgid "External R1 Key Holder List"
 msgstr "Внешний R0 Key Holder List"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:150
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:141
 msgid "External system log server"
 msgstr "Внешний сервер системного журнала"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:155
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:146
 msgid "External system log server port"
 msgstr "Порт внешнего сервера системного журнала"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:160
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:151
 msgid "External system log server protocol"
 msgstr "Внешний протокол лог-сервера"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:18
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:79
 msgid "Extra SSH command options"
 msgstr "Дополнительные опции команды SSH"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:940
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1351
 msgid "FT over DS"
 msgstr "FT над DS"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:941
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1352
 msgid "FT over the Air"
 msgstr "FT над the Air"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:938
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1349
 msgid "FT protocol"
 msgstr "FT протокол"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1842
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:82
+msgid "Failed to change the system password."
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2389
 msgid "Failed to confirm apply within %ds, waiting for rollback…"
 msgstr ""
 "Не удалось подтвердить применение в течении %d сек., ожидание отката..."
 
-#: modules/luci-base/luasrc/view/cbi/filebrowser.htm:106
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:45
+msgid "Failed to execute \"/etc/init.d/%s %s\" action: %s"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1561
 msgid "File"
 msgstr "Файл"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:279
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1514
+msgid "File not accessible"
+msgstr "Файл не доступен"
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1698
+msgid "Filename"
+msgstr "Имя файла"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:280
 msgid "Filename of the boot image advertised to clients"
 msgstr "Имя загрузочного образа, извещаемого клиентам"
 
@@ -1988,14 +2045,15 @@ msgstr "Имя загрузочного образа, извещаемого к
 msgid "Filesystem"
 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:118
 msgid "Filter private"
 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:123
 msgid "Filter useless"
 msgstr "Фильтровать бесполезные"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:23
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:65
 msgid "Finalizing failed"
 msgstr "Ошибка финализации"
@@ -2009,7 +2067,7 @@ msgstr ""
 "информацию об обнаруженных разделах, т.е. выполнить команду 'block detect > /"
 "etc/config/fstab'"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:696
 msgid "Find and join network"
 msgstr "Найти и присоединиться к сети"
 
@@ -2021,11 +2079,11 @@ msgstr "Завершить"
 msgid "Firewall"
 msgstr "Межсетевой экран"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:77
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:76
 msgid "Firewall Mark"
 msgstr "Метка межсетевого экрана"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:193
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:278
 msgid "Firewall Settings"
 msgstr "Настройки межсетевого экрана"
 
@@ -2033,7 +2091,7 @@ msgstr "Настройки межсетевого экрана"
 msgid "Firewall Status"
 msgstr "Состояние межсетевого экрана"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:137
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:860
 msgid "Firmware File"
 msgstr "Файл прошивки"
 
@@ -2041,7 +2099,7 @@ msgstr "Файл прошивки"
 msgid "Firmware Version"
 msgstr "Версия прошивки"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:225
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:226
 msgid "Fixed source port for outbound DNS queries"
 msgstr "Фиксированный порт для исходящих DNS-запросов"
 
@@ -2061,35 +2119,35 @@ msgstr "Установить новый образ прошивки"
 msgid "Flash operations"
 msgstr "Операции с прошивкой"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:194
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:192
 msgid "Flashing..."
 msgstr "Прошивка..."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:498
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:550
 msgid "Force"
 msgstr "Назначить"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:258
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:782
 msgid "Force 40MHz mode"
 msgstr "Принудительно использовать режим 40 МГц"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:622
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1031
 msgid "Force CCMP (AES)"
 msgstr "Назначить CCMP (AES)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:499
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:550
 msgid "Force DHCP on this network even if another server is detected."
 msgstr "Назначить DHCP в этой сети, даже если найден другой сервер."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:623
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1032
 msgid "Force TKIP"
 msgstr "Назначить TKIP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:624
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1033
 msgid "Force TKIP and CCMP (AES)"
 msgstr "Назначить TKIP и CCMP (AES)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:795
 msgid "Force link"
 msgstr "Активировать соединение"
 
@@ -2097,7 +2155,7 @@ msgstr "Активировать соединение"
 msgid "Force upgrade"
 msgstr "Принудительная прошивка"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:60
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:90
 msgid "Force use of NAT-T"
 msgstr "Принудительно использовать NAT-T"
 
@@ -2105,7 +2163,7 @@ msgstr "Принудительно использовать NAT-T"
 msgid "Form token mismatch"
 msgstr "Несоответствие маркеров формы"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:34
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:164
 msgid "Forward DHCP traffic"
 msgstr "Перенаправлять трафик DHCP"
 
@@ -2113,48 +2171,43 @@ msgstr "Перенаправлять трафик DHCP"
 msgid "Forward Error Correction Seconds (FECS)"
 msgstr "Секунды прямой коррекции ошибок (FECS)"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:28
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:161
 msgid "Forward broadcast traffic"
-msgstr "Перенаправлять широковещательный траффик"
+msgstr "Перенаправлять широковещательный трафик"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:375
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:809
 msgid "Forward mesh peer traffic"
 msgstr "Перенаправлять запросы трафика Mesh"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:186
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:908
 msgid "Forwarding mode"
 msgstr "Режим перенаправления"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:255
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:596
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:774
 msgid "Fragmentation Threshold"
 msgstr "Порог фрагментации"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:332
-msgid "Frame Bursting"
-msgstr "Пакетная передача кадров"
-
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:17
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:28
 msgid "Free"
 msgstr "Свободно"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:91
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:89
 msgid ""
-"Further information about WireGuard interfaces and peers at <a href=\"http://"
-"wireguard.com\">wireguard.com</a>."
+"Further information about WireGuard interfaces and peers at <a href='http://"
+"wireguard.com'>wireguard.com</a>."
 msgstr ""
-"Дополнительная информация о интерфейсах и партнерах WireGuard приведена в <a "
-"href=\"http://wireguard.com\">wireguard.com</a>."
+"Дополнительная информация об WireGuard интерфейсах и узлах приведена по "
+"адресу <a href='http://wireguard.com'>wireguard.com</a>."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:45
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:130
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:186
 msgid "GHz"
 msgstr "ГГц"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:29
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:36
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:91
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:77
 msgid "GPRS only"
 msgstr "Только GPRS"
 
@@ -2163,28 +2216,28 @@ msgstr "Только GPRS"
 msgid "Gateway"
 msgstr "Шлюз"
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:35
+msgid "Gateway Ports"
+msgstr "Порты шлюза"
+
 #: modules/luci-base/htdocs/luci-static/resources/network.js:9
 #: modules/luci-base/luasrc/model/network.lua:29
 msgid "Gateway address is invalid"
 msgstr "Неверный адрес шлюза"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:46
-msgid "Gateway ports"
-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:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:275
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:23
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:112
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:103
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:49
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:33
 msgid "General Settings"
 msgstr "Основные настройки"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:188
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:462
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:175
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:141
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:361
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:504
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:895
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:741
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:796
 msgid "General Setup"
 msgstr "Основные настройки"
 
@@ -2192,7 +2245,7 @@ msgstr "Основные настройки"
 msgid "Generate Config"
 msgstr "Создать config"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:945
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1355
 msgid "Generate PMK locally"
 msgstr "Создать PMK локально"
 
@@ -2200,11 +2253,7 @@ msgstr "Создать PMK локально"
 msgid "Generate archive"
 msgstr "Создать архив"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:63
-msgid "Generic 802.11%s Wireless Controller"
-msgstr "Беспроводной 802.11%s контроллер"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:26
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:74
 msgid "Given password confirmation did not match, password not changed!"
 msgstr "Введённые пароли не совпадают, пароль не изменён!"
 
@@ -2212,7 +2261,7 @@ msgstr "Введённые пароли не совпадают, пароль н
 msgid "Global Settings"
 msgstr "Основные настройки"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:806
 msgid "Global network options"
 msgstr "Основные настройки сети"
 
@@ -2223,33 +2272,29 @@ msgstr "Основные настройки сети"
 msgid "Go to password configuration..."
 msgstr "Перейти к настройке пароля..."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:857
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1369
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1112
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1616
 #: modules/luci-base/luasrc/view/cbi/full_valueheader.htm:4
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:58
 msgid "Go to relevant configuration page"
 msgstr "Перейти к странице настройки"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:38
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:66
 msgid "Group Password"
 msgstr "Групповой пароль"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:11
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:22
 msgid "Guest"
 msgstr "Гость"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:73
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:81
 msgid "HE.net password"
 msgstr "Пароль HE.net"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:60
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:73
 msgid "HE.net username"
 msgstr "HE.net логин"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:310
-msgid "HT mode (802.11n)"
-msgstr "HT режим (802.11n)"
-
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:16
 msgid "Hang Up"
 msgstr "Перезапустить"
@@ -2258,7 +2303,7 @@ msgstr "Перезапустить"
 msgid "Header Error Code Errors (HEC)"
 msgstr "Ошибки контроля ошибок заголовка (HEC)"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:103
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 msgid ""
 "Here you can configure the basic aspects of your device like its hostname or "
 "the timezone."
@@ -2266,9 +2311,7 @@ msgstr ""
 "Здесь вы можете настроить основные параметры вашего устройства, такие как "
 "имя хоста или часовой пояс."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:499
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:556
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:579
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:941
 msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "Скрыть <abbr title=\"Расширенный идентификатор сети\">ESSID</abbr>"
 
@@ -2279,14 +2322,15 @@ msgstr "Скрыть пустые цепочки"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:92
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1959
 msgid "Host"
 msgstr "Хост"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:20
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:21
 msgid "Host entries"
 msgstr "Список хостов"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:48
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:171
 msgid "Host expiry timeout"
 msgstr "Время ожидания хоста"
 
@@ -2294,45 +2338,45 @@ msgstr "Время ожидания хоста"
 msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
 msgstr "<abbr title=\"Адрес Интернет протокола\">IP</abbr>-адрес или сеть"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:118
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:102
 msgid "Host-Uniq tag content"
 msgstr "Содержимое Host-Uniq тега"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:71
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:31
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:316
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:25
+#: 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:317
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:26
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:17
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:125
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:116
 msgid "Hostname"
 msgstr "Имя хоста"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:12
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:22
 msgid "Hostname to send when requesting DHCP"
 msgstr "Имя хоста в DHCP-запросах"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:18
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:19
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:67
 msgid "Hostnames"
 msgstr "Имена хостов"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:13
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:24
 msgid "Hybrid"
 msgstr "Гибрид"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:45
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:75
 msgid "IKE DH Group"
 msgstr "IKE DH Group"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:41
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:59
 msgid "IP Addresses"
 msgstr "IP-адреса"
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:40
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:80
 msgid "IP Protocol"
 msgstr "IP-протокол"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:29
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:30
 msgid "IP address"
 msgstr "IP-адрес"
 
@@ -2351,6 +2395,11 @@ msgstr "IP-адрес не указан"
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:20
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:21
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:22
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:79
+#: 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/network.js:89
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:90
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:91
@@ -2358,7 +2407,7 @@ msgstr "IP-адрес не указан"
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:93
 #: 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/luasrc/model/cbi/admin_network/proto_ncm.lua:42
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:82
 msgid "IPv4"
 msgstr "IPv4"
 
@@ -2370,24 +2419,23 @@ msgstr "Межсетевой экран IPv4"
 msgid "IPv4 Upstream"
 msgstr "Основной IPv4"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:57
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:178
 msgid "IPv4 address"
 msgstr "IPv4-адрес"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:26
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:33
 msgid "IPv4 assignment length"
 msgstr "IPv4 assignment length"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:104
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:181
 msgid "IPv4 broadcast"
 msgstr "Широковещательный IPv4-адрес"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:100
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:180
 msgid "IPv4 gateway"
 msgstr "IPv4-адрес шлюза"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:92
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:179
 msgid "IPv4 netmask"
 msgstr "Маска сети IPv4"
 
@@ -2395,24 +2443,25 @@ msgstr "Маска сети IPv4"
 msgid "IPv4 network in address/netmask notation"
 msgstr "Сеть IPv4 в формате адрес/маска подсети"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:25
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:52
 msgid "IPv4 prefix"
 msgstr "IPv4 префикс"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:42
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:30
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:55
 msgid "IPv4 prefix length"
 msgstr "Длина префикса IPv4"
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:43
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:83
 msgid "IPv4+IPv6"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:72
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:34
 msgid "IPv4-Address"
 msgstr "IPv4-адрес"
 
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:10
 #: protocols/luci-proto-ipip/luasrc/model/network/proto_ipip.lua:9
 msgid "IPv4-in-IPv4 (RFC2003)"
 msgstr "IPv4-в-IPv4 (RFC2003)"
@@ -2427,6 +2476,16 @@ msgstr "IPv4-в-IPv4 (RFC2003)"
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:30
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:31
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:32
+#: 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/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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:89
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:90
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:91
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:92
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:95
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:96
@@ -2439,7 +2498,7 @@ msgstr "IPv4-в-IPv4 (RFC2003)"
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:103
 #: 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/luasrc/model/cbi/admin_network/proto_ncm.lua:44
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:84
 msgid "IPv6"
 msgstr "IPv6"
 
@@ -2451,11 +2510,11 @@ msgstr "Межсетевой экран IPv6"
 msgid "IPv6 Neighbours"
 msgstr "IPv6 соседи (neighbours)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:464
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:506
 msgid "IPv6 Settings"
 msgstr "Настройки IPv6"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:195
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:810
 msgid "IPv6 ULA-Prefix"
 msgstr "IPv6 ULA-префикс"
 
@@ -2463,21 +2522,21 @@ msgstr "IPv6 ULA-префикс"
 msgid "IPv6 Upstream"
 msgstr "Основной IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:202
 msgid "IPv6 address"
 msgstr "IPv6-адрес"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:23
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:189
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:31
 msgid "IPv6 assignment hint"
 msgstr "IPv6 подсказка присвоения"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:18
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:184
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:27
 msgid "IPv6 assignment length"
 msgstr "IPv6 назначение длины"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:207
 msgid "IPv6 gateway"
 msgstr "IPv6-адрес шлюза"
 
@@ -2485,22 +2544,22 @@ msgstr "IPv6-адрес шлюза"
 msgid "IPv6 network in address/netmask notation"
 msgstr "Сеть IPv6 в формате адрес/маска подсети"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:37
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:59
 msgid "IPv6 prefix"
 msgstr "Префикс IPv6"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:34
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:45
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:63
 msgid "IPv6 prefix length"
 msgstr "Длина префикса IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:33
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:211
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:57
 msgid "IPv6 routed prefix"
 msgstr "IPv6 направление префикса"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:143
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:215
 msgid "IPv6 suffix"
 msgstr "IPv6 суффикс"
 
@@ -2510,31 +2569,35 @@ msgid "IPv6-Address"
 msgstr "IPv6-адрес"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:93
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:104
 msgid "IPv6-PD"
 msgstr "IPv6-PD"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:10
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:13
 msgid "IPv6-in-IPv4 (RFC4213)"
 msgstr "IPv6 в IPv4 (RFC4213)"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:17
 msgid "IPv6-over-IPv4 (6rd)"
 msgstr "IPv6 через IPv4 (6rd)"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:15
 msgid "IPv6-over-IPv4 (6to4)"
 msgstr "IPv6 через IPv4 (6to4)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1075
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1478
 msgid "Identity"
 msgstr "Идентификация EAP"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:70
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:96
 msgid "If checked, 1DES is enabled"
 msgstr "Если выбрано, то 1DES включено"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:65
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:93
 msgid "If checked, encryption is disabled"
 msgstr "Если выбрано, то шифрование выключено"
 
@@ -2555,36 +2618,36 @@ msgstr ""
 "Если выбрано, монтировать устройство используя название его раздела, а не "
 "фиксированный файл устройства"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:27
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:71
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:18
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:82
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:52
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:17
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:29
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:33
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:68
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:85
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:32
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:45
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:45
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:24
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:44
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:116
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:48
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:85
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:65
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:33
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:80
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:108
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:146
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:74
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:97
 msgid "If unchecked, no default route is configured"
 msgstr "Если не выбрано, то маршрут по умолчанию не настраивается"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:34
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:86
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:35
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:99
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:47
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:60
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:60
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:39
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:59
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:124
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:39
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:116
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:59
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:103
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:64
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:77
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:100
 msgid "If unchecked, the advertised DNS server addresses are ignored"
 msgstr "Если не выбрано, то извещаемые адреса DNS серверов игнорируются"
 
@@ -2603,15 +2666,15 @@ msgstr ""
 "устройство, на котором располагается раздел подкачки, работает гораздо "
 "медленнее, чем <abbr title=\"Random Access Memory\">RAM</abbr>."
 
-#: 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:102
 msgid "Ignore <code>/etc/hosts</code>"
 msgstr "Игнорировать <code>/etc/hosts</code>"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:471
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:531
 msgid "Ignore interface"
 msgstr "Игнорировать интерфейс"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:90
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:91
 msgid "Ignore resolve file"
 msgstr "Игнорировать файл resolv"
 
@@ -2632,12 +2695,12 @@ msgstr ""
 "заблокирован. Нажмите кнопку 'Продолжить' ниже, чтобы вернуться на "
 "предыдущую страницу."
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:145
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:118
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:124
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:126
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:97
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:118
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:157
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:141
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:115
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:138
 msgid "Inactivity timeout"
 msgstr "Промежуток времени бездействия"
 
@@ -2645,23 +2708,25 @@ msgstr "Промежуток времени бездействия"
 msgid "Inbound:"
 msgstr "Входящий:"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:170
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:161
 msgid "Info"
 msgstr "Информация"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:105
 msgid "Information"
 msgstr "Информация"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:25
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:67
 msgid "Initialization failure"
 msgstr "Ошибка инициализации"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:34
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:87
 msgid "Initscript"
 msgstr "Скрипт инициализации"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:26
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:122
 msgid "Initscripts"
 msgstr "Скрипты инициализации"
 
@@ -2669,55 +2734,74 @@ msgstr "Скрипты инициализации"
 msgid "Install iputils-traceroute6 for IPv6 traceroute"
 msgstr "Для поддержки IPv6, установите пакет iputils-traceroute6"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:223
-msgid "Install package %q"
-msgstr "Установить пакет %q"
-
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:220
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:120
 msgid "Install protocol extensions..."
 msgstr "Установить расширения протокола..."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:416
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:423
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:683
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:687
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:26
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:284
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:342
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:47
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:134
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:14
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:16
 msgid "Interface"
 msgstr "Интерфейс"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:58
 msgid "Interface %q device auto-migrated from %q to %q."
 msgstr "Интерфейс %q устройство авт.перемещается из %q в %q."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:356
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:792
 msgid "Interface Configuration"
 msgstr "Настройка сети"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:51
-msgid "Interface Overview"
-msgstr "Список интерфейсов"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:99
+msgid "Interface has %d pending changes"
+msgstr "Интерфейс имеет %d ожидающих применения изменений"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:57
+msgid "Interface is marked for deletion"
+msgstr "Интерфейс помечен для удаления"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:162
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:3
 msgid "Interface is reconnecting..."
 msgstr "Интерфейс переподключается..."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:162
+msgid "Interface is shutting down..."
+msgstr "Интерфейс отключается..."
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:205
+msgid "Interface is starting..."
+msgstr "Интерфейс запускается..."
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:208
+msgid "Interface is stopping..."
+msgstr "Интерфейс останавливается..."
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:954
 msgid "Interface name"
 msgstr "Имя интерфейса"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:34
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:224
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:131
 msgid "Interface not present or not connected yet."
 msgstr "Интерфейс не существует или пока не подключен."
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:88
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:16
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:11
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:287
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:54
 msgid "Interfaces"
 msgstr "Интерфейсы"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:9
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:20
 msgid "Internal"
 msgstr "Внутренний"
 
@@ -2730,21 +2814,37 @@ msgstr "Внутренняя ошибка сервера"
 msgid "Invalid"
 msgstr "Неверно"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:311
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:10
+msgid "Invalid Base64 key string"
+msgstr "Неверная строка Base64 ключа"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:281
 msgid "Invalid VLAN ID given! Only IDs between %d and %d are allowed."
 msgstr ""
 "Указан неверный VLAN ID! Доступны только идентификаторы в диапазоне от %d до "
 "%d."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:307
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:290
 msgid "Invalid VLAN ID given! Only unique IDs are allowed"
 msgstr "Указан неверный VLAN ID! Доступны только уникальные ID"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:195
+msgid "Invalid argument"
+msgstr "Неверный аргумент"
+
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:194
+msgid "Invalid command"
+msgstr "Неверная команда"
+
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:80
+msgid "Invalid hexadecimal value"
+msgstr "Неверное шестнадцатеричное значение"
+
 #: modules/luci-base/luasrc/view/sysauth.htm:12
 msgid "Invalid username and/or password! Please try again."
 msgstr "Неверный логин и/или пароль! Попробуйте снова."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:508
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:950
 msgid "Isolate Clients"
 msgstr "Изолировать клиентов"
 
@@ -2763,15 +2863,15 @@ msgstr ""
 msgid "JavaScript required!"
 msgstr "Требуется JavaScript!"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:52
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1691
 msgid "Join Network"
 msgstr "Подключение к сети"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:22
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1628
 msgid "Join Network: Wireless Scan"
 msgstr "Найденные точки доступа Wi-Fi"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:19
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1833
 msgid "Joining Network: %q"
 msgstr "Подключение к сети: %q"
 
@@ -2788,15 +2888,15 @@ msgstr "Журнал ядра"
 msgid "Kernel Version"
 msgstr "Версия ядра"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:823
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1248
 msgid "Key"
 msgstr "Пароль (ключ)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:851
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:852
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:853
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:854
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:870
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1277
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1278
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1279
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1291
 msgid "Key #%d"
 msgstr "Ключ №%d"
 
@@ -2804,33 +2904,34 @@ msgstr "Ключ №%d"
 msgid "Kill"
 msgstr "Принудительно завершить"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:10
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:21
 msgid "L2TP"
 msgstr "L2TP"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:10
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:40
 msgid "L2TP Server"
 msgstr "L2TP-сервер"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:100
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:74
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:80
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:74
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:53
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:73
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:131
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:102
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:89
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:112
 msgid "LCP echo failure threshold"
 msgstr "Порог ошибок эхо-запросов LCP"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:118
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:89
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:95
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:89
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:68
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:91
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:144
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:102
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:125
 msgid "LCP echo interval"
 msgstr "Интервал эхо-запросов LCP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:181
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:902
 msgid "LLC"
 msgstr "LLC"
 
@@ -2839,11 +2940,11 @@ msgstr "LLC"
 msgid "Label"
 msgstr "Метка"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:213
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:204
 msgid "Language"
 msgstr "Язык"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:115
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:106
 msgid "Language and Style"
 msgstr "Язык и тема"
 
@@ -2851,51 +2952,51 @@ msgstr "Язык и тема"
 msgid "Latency"
 msgstr "Задержка"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:10
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:21
 msgid "Leaf"
 msgstr "Лист"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:369
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:487
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:393
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:543
 msgid "Lease time"
 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:87
 msgid "Leasefile"
 msgstr "Файл аренд"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:74
 #: modules/luci-base/luasrc/view/lease_status.htm:95
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:34
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
 msgid "Leasetime remaining"
 msgstr "Оставшееся время аренды"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:9
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:20
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:27
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:50
 msgid "Leave empty to autodetect"
 msgstr "Оставьте поле пустым для автоопределения"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:21
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:45
 msgid "Leave empty to use the current WAN address"
 msgstr "Оставьте пустым для использования текущего адреса WAN"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1746
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2299
 msgid "Legend:"
 msgstr "События:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:481
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:538
 msgid "Limit"
 msgstr "Предел"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:287
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:288
 msgid "Limit DNS service to subnets interfaces on which we are serving DNS."
-msgstr "Ограничение сервиса DNS, для подсетей интерфейса используещего DNS."
+msgstr "Ограничение сервиса DNS, для подсетей интерфейса использующего DNS."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:299
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:300
 msgid "Limit listening to these interfaces, and loopback."
 msgstr "Ограничьте прослушивание этих интерфейсов и замыкание на себя."
 
@@ -2915,11 +3016,11 @@ msgstr "Состояние Линии"
 msgid "Line Uptime"
 msgstr "Время бесперебойной работы линии"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:101
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:88
 msgid "Link On"
 msgstr "Подключение"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:185
 msgid ""
 "List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
 "requests to"
@@ -2927,7 +3028,7 @@ msgstr ""
 "Список <abbr title=\"Domain Name System\">DNS</abbr>-серверов для "
 "перенаправления запросов"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:972
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1377
 msgid ""
 "List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-"
 "Identifier,128-bit key as hex string. <br />This list is used to map R0KH-ID "
@@ -2941,7 +3042,7 @@ msgstr ""
 "PMK-R1 из R0KH , который использовался STA во время начальной ассоциации "
 "доменов Mobility."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:981
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1381
 msgid ""
 "List of R1KHs in the same Mobility Domain. <br />Format: MAC-address,R1KH-ID "
 "as 6 octets with colons,128-bit key as hex string. <br />This list is used "
@@ -2955,33 +3056,33 @@ msgstr ""
 "адресом при отправке ключа PMK-R1 из R0KH. Это также список авторизованных "
 "R1KHs в MD, которые могут запросить PMK-R1 ключи."
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:21
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:82
 msgid "List of SSH key files for auth"
 msgstr "Список файлов ключей SSH для авторизации"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:206
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:207
 msgid "List of domains to allow RFC1918 responses for"
 msgstr "Список доменов, для которых разрешены ответы RFC1918"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:174
 msgid "List of hosts that supply bogus NX domain results"
 msgstr "Список хостов, поставляющих поддельные результаты домена NX"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:298
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:299
 msgid "Listen Interfaces"
 msgstr "Интерфейс для входящих соединений"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:30
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:54
 msgid "Listen Port"
 msgstr "Порт для входящих соединений"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:15
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:16
 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:216
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:217
 msgid "Listening port for inbound DNS queries"
 msgstr "Порт для входящих DNS-запросов"
 
@@ -3000,11 +3101,11 @@ msgstr "Средняя загрузка"
 msgid "Loading"
 msgstr "Загрузка"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:35
-msgid "Loading SSH keys…"
-msgstr "Загрузка SSH ключей..."
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1819
+msgid "Loading directory contents…"
+msgstr "Загрузка содержимого директории..."
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1204
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1296
 #: modules/luci-base/luasrc/view/view.htm:4
 msgid "Loading view…"
 msgstr "Загрузка страницы..."
@@ -3014,41 +3115,41 @@ msgstr "Загрузка страницы..."
 msgid "Local IP address is invalid"
 msgstr "Неверный локальный IP-адрес"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:25
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:86
 msgid "Local IP address to assign"
 msgstr "Присвоение локального IP-адреса"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:10
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:11
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:44
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:39
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:151
 msgid "Local IPv4 address"
 msgstr "Локальный IPv4-адрес"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:20
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:54
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:45
 msgid "Local IPv6 address"
 msgstr "Локальный IPv6-адрес"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:286
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:287
 msgid "Local Service Only"
 msgstr "Только локальный DNS"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:81
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:126
 msgid "Local Startup"
 msgstr "Запуск пакетов и служб пользователя, при включении устройства"
 
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:25
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:121
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:112
 msgid "Local Time"
 msgstr "Дата и время"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:149
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
 msgid "Local domain"
 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:147
 msgid ""
 "Local domain specification. Names matching this domain are never forwarded "
 "and are resolved from DHCP or hosts files only"
@@ -3057,17 +3158,17 @@ msgstr ""
 "передаются. И разрешаются только из файла DHCP (/etc/config/dhcp) или файла "
 "хостов (/etc/hosts)"
 
-#: 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:151
 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:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
 msgid "Local server"
 msgstr "Локальный сервер"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:129
 msgid ""
 "Localise hostname depending on the requesting subnet if multiple IPs are "
 "available"
@@ -3075,23 +3176,19 @@ msgstr ""
 "Локализировать имя хоста в зависимости от запрашиваемой подсети, если "
 "доступно несколько IP-адресов"
 
-#: 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:128
 msgid "Localise queries"
 msgstr "Локализовывать запросы"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:175
-msgid "Locked to channel %s used by: %s"
-msgstr "Блокировать канал %s используемый: %s"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:168
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:159
 msgid "Log output level"
 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:181
 msgid "Log queries"
 msgstr "Запись запросов"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:113
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:104
 msgid "Logging"
 msgstr "Настройка журнала"
 
@@ -3099,7 +3196,7 @@ msgstr "Настройка журнала"
 msgid "Login"
 msgstr "Войти"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:95
+#: modules/luci-base/luasrc/controller/admin/index.lua:103
 msgid "Logout"
 msgstr "Выйти"
 
@@ -3107,11 +3204,13 @@ msgstr "Выйти"
 msgid "Loss of Signal Seconds (LOSS)"
 msgstr "Потеря сигнала в секундах (LOSS)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:476
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:533
 msgid "Lowest leased address as offset from the network address."
 msgstr "Минимальный адрес аренды."
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:40
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:75
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:35
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:86
 msgid "MAC"
@@ -3119,32 +3218,32 @@ msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:73
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:109
-#: 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:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1958
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:86
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:133
 msgid "MAC-Address"
 msgstr "MAC-адрес"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:457
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:586
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:886
 msgid "MAC-Address Filter"
 msgstr "Фильтр MAC-адресов"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:142
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:363
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:798
 msgid "MAC-Filter"
 msgstr "MAC-фильтр"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:464
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:590
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:893
 msgid "MAC-List"
 msgstr "Список MAC"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:13
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:16
 msgid "MAP / LW4over6"
 msgstr "MAP / LW4over6"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:62
 msgid "MAP rule is invalid"
 msgstr "Неверное MAP правило"
@@ -3162,8 +3261,8 @@ msgid "MHz"
 msgstr "МГц"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:53
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:29
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:66
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:53
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:71
 msgid "MTU"
 msgstr "MTU"
 
@@ -3175,16 +3274,17 @@ msgstr ""
 "Прежде чем перенести корневую файловую систему на внешний носитель, "
 "используйте команды приведенные ниже:"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:55
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:69
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:26
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:38
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:38
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:108
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:52
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:96
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:83
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:57
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:70
 msgid "Manual"
 msgstr "Вручную"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1949
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2188
 msgid "Master"
 msgstr "Мастер"
 
@@ -3192,50 +3292,46 @@ msgstr "Мастер"
 msgid "Max. Attainable Data Rate (ATTNDR)"
 msgstr "Max. Attainable Data Rate (ATTNDR)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:539
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:982
 msgid "Maximum allowed Listen Interval"
 msgstr "Максимально разрешенное значение интервала прослушивания клиента"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:234
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
 msgid "Maximum allowed number of active DHCP leases"
 msgstr "Максимальное количество активных арендованных DHCP-адресов"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:252
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:253
 msgid "Maximum allowed number of concurrent DNS queries"
 msgstr "Максимально допустимое количество одновременных DNS-запросов"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:244
 msgid "Maximum allowed size of EDNS.0 UDP packets"
 msgstr "Максимально допустимый размер UDP пакетов EDNS.0"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:63
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:77
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:57
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:112
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:104
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:93
 msgid "Maximum amount of seconds to wait for the modem to become ready"
 msgstr "Максимальное время ожидания готовности модема (секунды)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:27
-msgid ""
-"Maximum length of the name is 15 characters including the automatic protocol/"
-"bridge prefix (br-, 6in4-, pppoe- etc.)"
-msgstr ""
-"Максимальная длина имени составляет 15 символов, включая префикс "
-"автоматического протокола/моста (br-, 6in4-, pppoe- etc.)"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:482
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:538
 msgid "Maximum number of leased addresses."
 msgstr "Максимальное количество арендованных адресов"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:761
+msgid "Maximum transmit power"
+msgstr "Максимальная мощность передачи"
+
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:21
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:49
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:134
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:187
 #: modules/luci-mod-status/luasrc/view/admin_status/bandwidth.htm:79
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:284
 msgid "Mbit/s"
 msgstr "Мбит/с"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:18
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:32
 msgid "Medium"
 msgstr "Средняя"
 
@@ -3247,42 +3343,43 @@ msgstr "Оперативная память (RAM)"
 msgid "Memory usage (%)"
 msgstr "Использование памяти (%)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1952
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2191
 msgid "Mesh"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:372
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:806
 msgid "Mesh Id"
 msgstr "Mesh ID"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:196
+msgid "Method not found"
+msgstr "Метод не найден"
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:45
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:76
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:104
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:54
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:66
 msgid "Metric"
 msgstr "Метрика"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:154
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:198
 msgid "Mirror monitor port"
 msgstr "Зеркальный порт наблюдения"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:153
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:197
 msgid "Mirror source port"
 msgstr "Зеркальный исходящий порт"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:408
-msgid "Missing protocol extension for proto %q"
-msgstr "Отсутствует расширение протокола %q"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:923
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1337
 msgid "Mobility Domain"
 msgstr "Мобильный домен"
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:154
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:41
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:74
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:366
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:31
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:360
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:801
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1619
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:175
 msgid "Mode"
 msgstr "Режим"
@@ -3291,39 +3388,38 @@ msgstr "Режим"
 msgid "Model"
 msgstr "Модель"
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:31
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:72
 msgid "Modem default"
 msgstr "Настройки модема по умолчанию"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:11
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:19
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:11
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:10
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:73
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:73
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:57
 msgid "Modem device"
 msgstr "Модем"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:24
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:66
 msgid "Modem information query failed"
 msgstr "Ошибка запроса информации о модеме"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:62
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:76
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:56
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:112
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:104
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:93
 msgid "Modem init timeout"
 msgstr "Время ожидания инициализации модема"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1953
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:452
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:554
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:577
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2192
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:880
 msgid "Monitor"
 msgstr "Монитор"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:14
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
 msgid "More Characters"
 msgstr "Слишком мало символов"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:802
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1057
 msgid "More…"
 msgstr "Больше..."
 
@@ -3336,7 +3432,7 @@ msgstr "Настройка config файла fstab (/etc/config/fstab)"
 msgid "Mount Point"
 msgstr "Точка монтирования"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:26
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:36
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:137
 msgid "Mount Points"
@@ -3360,7 +3456,7 @@ msgstr ""
 
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:53
 msgid "Mount filesystems not specifically configured"
-msgstr "Монтирование несконфигурированного раздела"
+msgstr "Монтирование не сконфигурированного раздела"
 
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:147
 msgid "Mount options"
@@ -3372,7 +3468,7 @@ msgstr "Точка монтирования"
 
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:49
 msgid "Mount swap not specifically configured"
-msgstr "Монтирование несконфигурированного раздела подкачки"
+msgstr "Монтирование не сконфигурированного раздела подкачки"
 
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:96
 msgid "Mounted file systems"
@@ -3386,46 +3482,44 @@ msgstr "Переместить вниз"
 msgid "Move up"
 msgstr "Переместить вверх"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:912
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
 msgid "NAS ID"
 msgstr "NAS ID"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:57
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:87
 msgid "NAT-T Mode"
 msgstr "NAT-T режим"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:9
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 msgid "NAT64 Prefix"
 msgstr "NAT64 префикс"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:31
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:26
 msgid "NCM"
 msgstr "NCM"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:535
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:589
 msgid "NDP-Proxy"
 msgstr "NDP-прокси"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:43
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:72
 msgid "NT Domain"
 msgstr "NT домен"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:273
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:264
 msgid "NTP server candidates"
 msgstr "Список NTP-серверов"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:837
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1092
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:27
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:502
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:65
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:553
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:658
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:49
 msgid "Name"
 msgstr "Имя"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:17
-msgid "Name of the new interface"
-msgstr "Имя нового интерфейса"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1808
 msgid "Name of the new network"
 msgstr "Имя новой сети"
 
@@ -3433,9 +3527,10 @@ msgstr "Имя новой сети"
 msgid "Navigation"
 msgstr "Навигация"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:62
+#: modules/luci-base/luasrc/controller/admin/index.lua:69
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:108
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:402
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:834
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1957
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:389
 #: modules/luci-mod-status/luasrc/view/admin_status/index/30-network.htm:8
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:73
@@ -3447,7 +3542,7 @@ msgstr "Сеть"
 msgid "Network Utilities"
 msgstr "Сетевые утилиты"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:278
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:279
 msgid "Network boot image"
 msgstr "Образ системы для сетевой загрузки"
 
@@ -3460,53 +3555,59 @@ msgstr "Нет сетевого устройства"
 msgid "Network without interfaces."
 msgstr "Сеть без интерфейсов."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:661
+msgid "New interface name…"
+msgstr "Новое имя интерфейса..."
+
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:11
 msgid "Next »"
 msgstr "Следующий »"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1507
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1754
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:108
 msgid "No"
 msgstr "Нет"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:453
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:514
 msgid "No DHCP Server configured for this interface"
 msgstr "DHCP-сервер не настроен для этого интерфейса"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1162
+msgid "No Encryption"
+msgstr "Без шифрования"
+
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:89
 msgid "No NAT-T"
 msgstr "Без NAT-T"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:198
+msgid "No data received"
+msgstr "Данные не получены"
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1764
+msgid "No entries in this directory"
+msgstr "Нет элементов в этом каталоге"
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/backupfiles.lua:82
 msgid "No files found"
 msgstr "Файлы не найдены"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:550
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:191
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:180
 msgid "No information available"
 msgstr "Нет доступной информации"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:8
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:63
 msgid "No matching prefix delegation"
 msgstr "Отсутствует соответствующая делегация префикса"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:157
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
 msgid "No negative cache"
 msgstr "Отключить кэш отрицательных ответов"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:53
-msgid "No network configured on this device"
-msgstr "Не настроена сеть на устройстве"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:65
-msgid "No network name specified"
-msgstr "Не задано имя сети"
-
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:147
-msgid "No networks in range"
-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
@@ -3514,7 +3615,12 @@ msgstr "Нет сетей в радиусе действия"
 msgid "No password set!"
 msgstr "Пароль не установлен!"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:116
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:104
+msgid "No peers defined yet"
+msgstr "Узлы ещё не определены"
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:129
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:271
 msgid "No public keys present yet."
 msgstr "Нет публичных ключей"
 
@@ -3522,19 +3628,19 @@ msgstr "Нет публичных ключей"
 msgid "No rules in this chain."
 msgstr "Нет правил в данной цепочке"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:150
-msgid "No scan results available yet..."
-msgstr "Результаты сканирования пока недоступны..."
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:53
+msgid "No signal"
+msgstr "Нет сигнала"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:7
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:756
 msgid "No zone assigned"
 msgstr "Зона не присвоена"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:111
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:35
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:48
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:133
 msgid "Noise"
 msgstr "Шум"
 
@@ -3550,16 +3656,16 @@ msgstr "Шум:"
 msgid "Non Pre-emtive CRC errors (CRC_P)"
 msgstr "Non Pre-emtive CRC errors (CRC_P)"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:292
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:293
 msgid "Non-wildcard"
 msgstr "Не использовать wildcard"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:129
 msgid "None"
 msgstr "Ничего"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:181
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:172
 msgid "Normal"
 msgstr "Нормально"
 
@@ -3567,25 +3673,29 @@ msgstr "Нормально"
 msgid "Not Found"
 msgstr "Не найдено"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:27
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:5
-msgid "Not associated"
-msgstr "Не связанный"
-
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:87
 msgid "Not connected"
 msgstr "Не подключено"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:38
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:139
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:232
+msgid "Not present"
+msgstr "Не существует"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:105
 msgid "Not started on boot"
 msgstr "Не запускается при загрузке"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:26
-msgid "Note: interface name length"
-msgstr "Внимание: длина имени интерфейса"
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:201
+msgid "Not supported"
+msgstr "Не поддерживается"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:171
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:162
 msgid "Notice"
 msgstr "Заметка"
 
@@ -3593,65 +3703,52 @@ msgstr "Заметка"
 msgid "Nslookup"
 msgstr "DNS-запрос"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:261
 msgid "Number of cached DNS entries (max is 10000, 0 is no caching)"
 msgstr ""
 "Количество кэшированных DNS записей (максимум — 10000, 0 — отключить "
 "кэширование)"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:203
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:194
 msgid "Number of parallel threads used for compression"
 msgstr "Количество параллельных потоков используемых для компрессии"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:40
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:69
 msgid "Obfuscated Group Password"
 msgstr "Obfuscated Group Password"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:35
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:61
 msgid "Obfuscated Password"
 msgstr "Obfuscated Password"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:22
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:34
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:40
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:105
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:97
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:49
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:80
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:54
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:67
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:93
 msgid "Obtain IPv6-Address"
 msgstr "Получение IPv6-адреса"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:83
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:68
 msgid "Off-State Delay"
 msgstr "Задержка выключенного состояния"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:16
-msgid ""
-"On this page you can configure the network interfaces. You can bridge "
-"several interfaces by ticking the \"bridge interfaces\" field and enter the "
-"names of several network interfaces separated by spaces. You can also use "
-"<abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
-"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
-"<samp>eth0.1</samp>)."
-msgstr ""
-"На этой странице вы можете настроить сетевые интерфейсы. Вы можете "
-"объединить несколько интерфейсов в мост, выбрав опцию 'Объединить в мост' и "
-"введя список интерфейсов, разделенных пробелами. Вы также можете "
-"использовать <abbr title=\"Виртуальные локальные сети\">VLAN</abbr>-"
-"обозначения вида <samp>ИНТЕРФЕЙС.НОМЕРVLAN</samp> (<abbr title=\"например"
-"\">напр.</abbr>: <samp>eth0.1</samp>)."
-
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:95
 msgid "On-Link route"
 msgstr "On-link маршрут"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:80
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:64
 msgid "On-State Delay"
 msgstr "Задержка включенного состояния"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:360
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:382
 msgid "One of hostname or mac address must be specified!"
 msgstr "Должен быть указан либо MAC-адрес, либо имя хоста!"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:456
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:462
 msgid "One of the following: %s"
 msgstr "Одно из: %s"
 
@@ -3673,28 +3770,29 @@ msgstr "Одно или несколько обязательных полей 
 msgid "Open list..."
 msgstr "Открыть список..."
 
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:61
 #: protocols/luci-proto-openconnect/luasrc/model/network/proto_openconnect.lua:9
 msgid "OpenConnect (CISCO AnyConnect)"
 msgstr "OpenConnect (CISCO AnyConnect)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:757
 msgid "Operating frequency"
 msgstr "Настройка частоты"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1753
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2306
 msgid "Option changed"
 msgstr "Опция изменена"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1755
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2308
 msgid "Option removed"
 msgstr "Опция удалена"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1140
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:55
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1535
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:66
 msgid "Optional"
 msgstr "Необязательно"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:78
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:76
 msgid ""
 "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, "
 "starting with <code>0x</code>."
@@ -3702,7 +3800,7 @@ msgstr ""
 "Необязательно. 32-разрядная метка для исходящих зашифрованных пакетов. "
 "Введите значение в шестнадцатеричной форме, начиная с <code>0x</code>."
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:144
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:215
 msgid ""
 "Optional. Allowed values: 'eui64', 'random', fixed value like '::1' or "
 "'::1:2'. When IPv6 prefix (like 'a:b:c:d::') is received from a delegating "
@@ -3714,7 +3812,7 @@ msgstr ""
 "d::'), используйте суффикс на вроде ('::1') для этого IPv6 адреса ('a:b:c:"
 "d::1') для этого интерфейса."
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:123
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:117
 msgid ""
 "Optional. Base64-encoded preshared key. Adds in an additional layer of "
 "symmetric-key cryptography for post-quantum resistance."
@@ -3722,31 +3820,31 @@ msgstr ""
 "Необязательно. Base64-шифрованный общий ключ. Добавляет дополнительный слой "
 "криптографии с симметричным ключом для постквантовой устойчивости."
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:148
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:126
 msgid "Optional. Create routes for Allowed IPs for this peer."
 msgstr ""
 "Необязательно. Создавать маршруты для разрешенных IP адресов для этого узла."
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:103
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:108
 msgid "Optional. Description of peer."
 msgstr "Необязательно. Описание узла."
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:156
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:128
 msgid ""
 "Optional. Host of peer. Names are resolved prior to bringing up the "
 "interface."
 msgstr ""
 "Необязательно. Имя хоста пира. Имена разрешаются до появления интерфейса."
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:67
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:71
 msgid "Optional. Maximum Transmission Unit of tunnel interface."
 msgstr "Необязательно. MTU туннельного интерфейса."
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:166
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:132
 msgid "Optional. Port of peer."
 msgstr "Необязательно. Порт узла."
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:175
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:136
 msgid ""
 "Optional. Seconds between keep alive messages. Default is 0 (disabled). "
 "Recommended value if this device is behind a NAT is 25."
@@ -3755,7 +3853,7 @@ msgstr ""
 "'0' (отключено). Рекомендуемое значение, если это устройство находится за "
 "NAT 25."
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:31
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:54
 msgid "Optional. UDP port used for outgoing and incoming packets."
 msgstr ""
 "Необязательно. Udp-порт, используемый для исходящих и входящих пакетов."
@@ -3777,7 +3875,7 @@ msgstr "Вне"
 msgid "Outbound:"
 msgstr "Исходящий:"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:26
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:50
 msgid "Output Interface"
 msgstr "Исходящий интерфейс"
 
@@ -3786,45 +3884,45 @@ msgstr "Исходящий интерфейс"
 msgid "Output zone"
 msgstr "Исходящая зона"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:63
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:155
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:33
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:54
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:54
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:219
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:50
 msgid "Override MAC address"
 msgstr "Назначить MAC-адрес"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:66
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:35
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:56
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:88
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:125
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:131
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:133
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:104
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:61
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:58
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:223
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:44
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:54
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:154
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:71
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:145
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:132
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:110
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:119
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:97
 msgid "Override MTU"
 msgstr "Назначить MTU"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:30
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:63
 msgid "Override TOS"
 msgstr "Отвергать TOS"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:25
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:58
 msgid "Override TTL"
 msgstr "Отвергать TTL"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:954
 msgid "Override default interface name"
 msgstr "Назначить имя интерфейса по умолчанию"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:41
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:167
 msgid "Override the gateway in DHCP responses"
 msgstr "Назначить шлюз в ответах DHCP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:507
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:555
 msgid ""
 "Override the netmask sent to clients. Normally it is calculated from the "
 "subnet that is served."
@@ -3832,7 +3930,7 @@ msgstr ""
 "Переопределите сетевую маску, отправленную клиентам. Обычно это вычислено от "
 "подсети, которая подана."
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:65
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:179
 msgid "Override the table used for internal routes"
 msgstr "Назначить таблицу внутренних маршрутов"
 
@@ -3840,29 +3938,33 @@ msgstr "Назначить таблицу внутренних маршруто
 msgid "Overview"
 msgstr "Обзор"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1606
+msgid "Overwrite existing file \"%s\" ?"
+msgstr "Перезаписать существующий файл «%s»?"
+
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:11
 msgid "Owner"
 msgstr "Пользователь"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:42
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:56
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:17
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:28
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:34
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:14
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:18
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:43
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:98
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:45
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:44
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:63
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:82
 msgid "PAP/CHAP password"
 msgstr "Пароль PAP/CHAP"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:39
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:53
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:14
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:11
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:15
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:96
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:88
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:43
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:74
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:42
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:61
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:77
 msgid "PAP/CHAP username"
 msgstr "Имя пользователя PAP/CHAP"
 
@@ -3870,9 +3972,9 @@ msgstr "Имя пользователя PAP/CHAP"
 msgid "PID"
 msgstr "PID"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:36
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:50
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:26
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:95
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:87
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:68
 msgid "PIN"
 msgstr "PIN"
 
@@ -3881,114 +3983,116 @@ msgstr "PIN"
 msgid "PIN code rejected"
 msgstr "PIN код отвергнут"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:966
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1372
 msgid "PMK R1 Push"
 msgstr "PMK R1 Push"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:43
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:13
 msgid "PPP"
 msgstr "PPP"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:11
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:58
 msgid "PPPoA Encapsulation"
 msgstr "Инкапсуляция PPPoA"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:19
 msgid "PPPoATM"
 msgstr "PPPoATM"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:17
 msgid "PPPoE"
 msgstr "PPPoE"
 
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:28
 #: protocols/luci-proto-pppossh/luasrc/model/network/proto_pppossh.lua:9
 msgid "PPPoSSH"
 msgstr "PPPoSSH"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:15
 msgid "PPtP"
 msgstr "PPtP"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:59
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:73
 msgid "PSID offset"
 msgstr "PSID смещение"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:56
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:70
 msgid "PSID-bits length"
 msgstr "PSID длина в битах"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:123
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:846
 msgid "PTM/EFM (Packet Transfer Mode)"
 msgstr "PTM/EFM (Packet Transfer Mode)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:78
-msgid "Package libiwinfo required!"
-msgstr "Требуется пакет libiwinfo!"
-
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:45
 msgid "Packets"
 msgstr "Пакеты"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:7
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:756
 msgid "Part of zone %q"
 msgstr "Часть зоны %q"
 
 #: modules/luci-base/luasrc/view/sysauth.htm:29
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1111
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:35
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:42
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1514
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:46
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:104
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:58
 msgid "Password"
 msgstr "Пароль"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:29
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:24
 msgid "Password authentication"
 msgstr "С помощью пароля"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1019
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1414
 msgid "Password of Private Key"
 msgstr "Пароль к Приватному ключу"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1067
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1471
 msgid "Password of inner Private Key"
 msgstr "Пароль к внутреннему Приватному ключу"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:14
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:16
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:18
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:20
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:32
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:34
 msgid "Password strength"
 msgstr "Сложность пароля"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:44
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:107
 msgid "Password2"
 msgstr "Пароль2"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:37
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:244
 msgid "Paste or drag SSH key file…"
 msgstr "Перетащите файл SSH ключа или вставьте содержимое..."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1000
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1396
 msgid "Path to CA-Certificate"
 msgstr "Путь к CA-сертификату"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1007
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1402
 msgid "Path to Client-Certificate"
 msgstr "Путь к Client-сертификату"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1013
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1408
 msgid "Path to Private Key"
 msgstr "Путь к Приватному ключу"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1049
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1453
 msgid "Path to inner CA-Certificate"
 msgstr "Путь к внутренним CA-сертификатам"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1055
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1459
 msgid "Path to inner Client-Certificate"
 msgstr "Путь к внутренним Client-сертификатам"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1061
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1465
 msgid "Path to inner Private Key"
 msgstr "Путь к внутреннему Приватному ключу"
 
@@ -4006,7 +4110,7 @@ msgstr "Путь к внутреннему Приватному ключу"
 msgid "Peak:"
 msgstr "Пиковая:"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:28
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:89
 msgid "Peer IP address to assign"
 msgstr "Запрос IP адреса назначения"
 
@@ -4015,11 +4119,11 @@ msgstr "Запрос IP адреса назначения"
 msgid "Peer address is missing"
 msgstr "Отсутствует адрес пира"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:90
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:89
 msgid "Peers"
 msgstr "Пиры"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:50
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:80
 msgid "Perfect Forward Secrecy"
 msgstr "Perfect Forward Secrecy"
 
@@ -4031,7 +4135,11 @@ msgstr "Выполнить перезагрузку"
 msgid "Perform reset"
 msgstr "Выполнить сброс"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:174
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:199
+msgid "Permission denied"
+msgstr "Доступ запрещён"
+
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:136
 msgid "Persistent Keep Alive"
 msgstr "Постоянно держать включенным"
 
@@ -4039,7 +4147,7 @@ msgstr "Постоянно держать включенным"
 msgid "Phy Rate:"
 msgstr "Скорость:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:190
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:277
 msgid "Physical Settings"
 msgstr "Настройки канала"
 
@@ -4050,6 +4158,10 @@ msgstr "Пинг-запрос"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:16
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:17
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:41
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:77
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:87
@@ -4067,15 +4179,19 @@ msgstr "Введите логин и пароль."
 msgid "Policy"
 msgstr "Политика"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:22
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:20
 msgid "Port"
 msgstr "Порт"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:18
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:133
+msgid "Port %s"
+msgstr "Порт %s"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:274
 msgid "Port status:"
 msgstr "Состояние порта:"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:482
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:488
 msgid "Potential negation of: %s"
 msgstr "Потенциальное отрицание: %s"
 
@@ -4087,11 +4203,11 @@ msgstr "Режим управления питанием"
 msgid "Pre-emtive CRC errors (CRCP_P)"
 msgstr "Pre-emtive CRC errors (CRCP_P)"
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:32
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:73
 msgid "Prefer LTE"
 msgstr "Предпочитать LTE"
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:33
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:74
 msgid "Prefer UMTS"
 msgstr "Предпочитать UMTS"
 
@@ -4099,16 +4215,16 @@ msgstr "Предпочитать UMTS"
 msgid "Prefix Delegated"
 msgstr "Делегированный префикс"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:122
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:117
 msgid "Preshared Key"
 msgstr "Предварительный ключ"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:101
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:75
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:81
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:75
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:54
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:74
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:131
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:102
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:89
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:112
 msgid ""
 "Presume peer to be dead after given amount of LCP echo failures, use 0 to "
 "ignore failures"
@@ -4116,16 +4232,15 @@ msgstr ""
 "Предполагать, что узел недоступен после указанного количества ошибок "
 "получения эхо-пакета LCP, введите '0' для игнорирования ошибок"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:305
 msgid "Prevent listening on these interfaces."
 msgstr "Запретить прослушивание этих интерфейсов."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:509
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:562
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:950
 msgid "Prevents client-to-client communication"
 msgstr "Не позволяет клиентам обмениваться друг с другом информацией"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:18
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:49
 msgid "Private Key"
 msgstr "Приватный ключ"
 
@@ -4146,39 +4261,33 @@ msgstr "Профиль"
 msgid "Prot."
 msgstr "Прот."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:72
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:349
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:675
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:84
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:216
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:87
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:390
 msgid "Protocol"
 msgstr "Протокол"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:31
-msgid "Protocol of the new interface"
-msgstr "Протокол нового интерфейса"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:222
-msgid "Protocol support is not installed"
-msgstr "Поддержка протокола не установлена"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:269
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:260
 msgid "Provide NTP server"
 msgstr "Включить NTP-сервер"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:701
 msgid "Provide new network"
 msgstr "Предоставлять новую сеть"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:451
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:879
 msgid "Pseudo Ad-Hoc (ahdemo)"
 msgstr "Псевдо Ad-Hoc (ahdemo)"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:112
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:113
 msgid "Public Key"
 msgstr "Публичный ключ"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:278
 msgid ""
 "Public keys allow for the passwordless SSH logins with a higher security "
 "compared to the use of plain passwords. In order to upload a new key to the "
@@ -4190,22 +4299,22 @@ msgstr ""
 "загрузить новый публичный SSH ключ, вставьте строку публичного OpenSSH ключа "
 "или перетащите <code>.pub</code> файл в поле ввода ключа."
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:139
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:211
 msgid "Public prefix routed to this device for distribution to clients."
 msgstr ""
 "Публичный префикс, направляемый на это устройство для распространения среди "
 "клиентов."
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:27
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:9
 msgid "QMI Cellular"
 msgstr "QMI сотовый"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:173
 msgid "Quality"
 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:171
 msgid ""
 "Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> "
 "servers"
@@ -4213,28 +4322,29 @@ msgstr ""
 "Опрашивать все имеющиеся внешние <abbr title=\"Domain Name System\">DNS</"
 "abbr>-серверы"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:952
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1360
 msgid "R0 Key Lifetime"
 msgstr "R0 Key время жизни"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:959
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1366
 msgid "R1 Key Holder"
 msgstr "R1 Key Holder"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:58
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:88
 msgid "RFC3947 NAT-T mode"
 msgstr "RFC3947 NAT-T режим"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:381
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:814
 msgid "RSSI threshold for joining"
 msgstr "Порог RSSI для присоединения"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:256
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:597
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:778
 msgid "RTS/CTS Threshold"
 msgstr "Порог RTS/CTS"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:41
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:76
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:87
 msgid "RX"
@@ -4244,37 +4354,41 @@ msgstr "Получение (RX)"
 msgid "RX Rate"
 msgstr "Скорость получения"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:783
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1961
+msgid "RX Rate / TX Rate"
+msgstr "Скорость получения / Скорость отправки"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1207
 msgid "Radius-Accounting-Port"
 msgstr "Порт Radius-Accounting"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:791
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1215
 msgid "Radius-Accounting-Secret"
 msgstr "Секрет Radius-Accounting"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:775
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1199
 msgid "Radius-Accounting-Server"
 msgstr "Сервер Radius-Accounting"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:759
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1183
 msgid "Radius-Authentication-Port"
 msgstr "Порт Radius-Authentication"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:767
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1191
 msgid "Radius-Authentication-Secret"
 msgstr "Секрет Radius-Authentication"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:751
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1175
 msgid "Radius-Authentication-Server"
 msgstr "Сервер Radius-Authentication"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:119
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:102
 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:83
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:84
 msgid ""
 "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-Server"
@@ -4291,20 +4405,11 @@ msgstr ""
 "можете потерять доступ к этому устройству, если вы подключены через данный "
 "интерфейс"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2
-msgid ""
-"Really delete this wireless network? The deletion cannot be undone! You "
-"might lose access to this device if you are connected via this network."
-msgstr ""
-"Действительно удалить эту беспроводную сеть? Удаление не может быть отменено!"
-"\\nВы можете потерять доступ к этому устройству, если вы подключены через "
-"эту сеть."
-
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:40
 msgid "Really reset all changes?"
 msgstr "Действительно сбросить все изменения?"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:237
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:354
 msgid "Really switch protocol?"
 msgstr "Вы действительно хотите изменить протокол?"
 
@@ -4328,15 +4433,15 @@ msgstr "Трафик в реальном времени"
 msgid "Realtime Wireless"
 msgstr "Беспроводная сеть в реальном времени"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:931
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1343
 msgid "Reassociation Deadline"
-msgstr "Срок Реассоциации"
+msgstr "Срок реассоциации"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:191
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
 msgid "Rebind protection"
 msgstr "Защита от DNS Rebinding"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:48
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:46
 #: modules/luci-mod-system/luasrc/view/admin_system/reboot.htm:9
 msgid "Reboot"
 msgstr "Перезагрузка"
@@ -4351,21 +4456,15 @@ msgid "Reboots the operating system of your device"
 msgstr ""
 "Программная перезагрузка вашего устройства, т.е. выполнить команду 'reboot'"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:103
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:90
 msgid "Receive"
 msgstr "Приём"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:325
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:350
-msgid "Receiver Antenna"
-msgstr "Приёмная антенна"
-
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:42
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:59
 msgid "Recommended. IP addresses of the WireGuard interface."
 msgstr "Рекомендуемый. IP адреса интерфейса WireGuard."
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:28
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:300
 msgid "Reconnect this interface"
 msgstr "Переподключить этот интерфейс"
 
@@ -4373,74 +4472,72 @@ msgstr "Переподключить этот интерфейс"
 msgid "References"
 msgstr "Ссылки"
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:39
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:153
 msgid "Relay"
 msgstr "Ретранслятор"
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:36
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:157
 msgid "Relay Bridge"
 msgstr "Мост-Ретранслятор"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:17
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:154
 msgid "Relay between networks"
 msgstr "Ретранслятор между сетями"
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:64
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:12
 msgid "Relay bridge"
 msgstr "Мост-ретранслятор"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:18
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:50
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:49
 msgid "Remote IPv4 address"
 msgstr "Удалённый IPv4-адрес"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:8
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:40
 msgid "Remote IPv4 address or FQDN"
 msgstr "Удалённый IPv4-адрес или FQDN"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:45
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:725
 msgid "Remove"
 msgstr "Удалить"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:53
-msgid "Repeat scan"
-msgstr "Повторить поиск"
-
-#: modules/luci-base/luasrc/view/cbi/upload.htm:11
-msgid "Replace entry"
-msgstr "Заменить запись"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:46
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:51
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1806
 msgid "Replace wireless configuration"
 msgstr "Заменить настройку беспроводного соединения"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:8
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:17
 msgid "Request IPv6-address"
 msgstr "Запрос IPv6 адреса"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:16
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:23
 msgid "Request IPv6-prefix of length"
 msgstr "Запрос IPv6 префикс длины"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1141
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:200
+msgid "Request timeout"
+msgstr "Таймаут запроса"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1536
 msgid "Required"
 msgstr "Обязательно"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:20
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:31
 msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3"
 msgstr ""
 "Требуется для некоторых Интернет провайдеров, например использующих DOCSIS 3"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:19
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:49
 msgid "Required. Base64-encoded private key for this interface."
 msgstr "Обязательно. Приватный ключ в кодировке Base64 для этого интерфейса."
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:113
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:113
 msgid "Required. Base64-encoded public key of peer."
 msgstr "Обязательно. Публичный ключ узла в кодировке Base64."
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:136
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:122
 msgid ""
 "Required. IP addresses and prefixes that this peer is allowed to use inside "
 "the tunnel. Usually the peer's tunnel IP addresses and the networks the peer "
@@ -4449,7 +4546,27 @@ msgstr ""
 "Обязательно. IP-адреса и префиксы, которые разрешено использовать этому пиру "
 "внутри туннеля. Обычно IP-адреса и сети пира маршрутизируются через туннель."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1134
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1095
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1096
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1097
+msgid "Requires hostapd"
+msgstr "Требуется hostapd"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1101
+msgid "Requires hostapd with EAP support"
+msgstr "Требуется hostapd с поддержкой EAP"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1102
+msgid "Requires hostapd with OWE support"
+msgstr "Требуется hostapd с поддержкой OWE"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1098
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1099
+msgid "Requires hostapd with SAE support"
+msgstr "Требуется hostapd с поддержкой SAE"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1533
 msgid ""
 "Requires the 'full' version of wpad/hostapd and support from the wifi driver "
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
@@ -4457,15 +4574,39 @@ 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:140
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:141
 msgid ""
 "Requires upstream supports DNSSEC; verify unsigned domain responses really "
 "come from unsigned domains"
 msgstr ""
-"Требуется поддержка внешней сетью DNSSEC; убедитесь, что ответы "
-"неподписанного домена действительно поступают от неподписанных доменов"
-
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1268
+"Требуется поддержка внешней сетью DNSSEC; убедитесь, что ответы не "
+"подписанного домена действительно поступают от не подписанных доменов"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1109
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1119
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1120
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1121
+msgid "Requires wpa-supplicant"
+msgstr "Требуется wpa-supplicant"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1113
+msgid "Requires wpa-supplicant with EAP support"
+msgstr "Требуется wpa-supplicant с поддержкой EAP"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1114
+msgid "Requires wpa-supplicant with OWE support"
+msgstr "Требуется wpa-supplicant с поддержкой OWE"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1111
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1124
+msgid "Requires wpa-supplicant with SAE support"
+msgstr "Требуется wpa-supplicant с поддержкой SAE"
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1355
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:17
 #: modules/luci-base/luasrc/view/cbi/footer.htm:30
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:66
@@ -4481,17 +4622,22 @@ msgstr "Сбросить счётчики"
 msgid "Reset to defaults"
 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:68
 msgid "Resolv and Hosts Files"
 msgstr "Файлы resolv и hosts"
 
-#: 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:94
 msgid "Resolve file"
 msgstr "Файл resolv"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:28
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:14
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:71
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:197
+msgid "Resource not found"
+msgstr "Ресурс не найден"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:302
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:693
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:90
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:112
 msgid "Restart"
 msgstr "Перезапустить"
 
@@ -4499,7 +4645,7 @@ msgstr "Перезапустить"
 msgid "Restart Firewall"
 msgstr "Перезапустить межсетевой экран"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:14
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:691
 msgid "Restart radio interface"
 msgstr "Перезапустить радио-интерфейс"
 
@@ -4511,26 +4657,24 @@ msgstr "Восстановление"
 msgid "Restore backup"
 msgstr "Восстановить резервную копию"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:113
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:114
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:38
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:46
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:119
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:120
 msgid "Reveal/hide password"
 msgstr "Показать/скрыть пароль"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1774
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2322
 msgid "Revert"
 msgstr "Вернуть"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1861
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2405
 msgid "Revert changes"
 msgstr "Вернуть изменения"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2013
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2554
 msgid "Revert request failed with status <code>%h</code>"
 msgstr "Ошибка <code>%h</code> отмены конфигурации"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1993
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2534
 msgid "Reverting configuration…"
 msgstr "Отмена конфигурации..."
 
@@ -4538,7 +4682,7 @@ msgstr "Отмена конфигурации..."
 msgid "Root"
 msgstr "Корень"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:271
 msgid "Root directory for files served via TFTP"
 msgstr "Корневая директория для файлов сервера, вроде TFTP"
 
@@ -4546,7 +4690,7 @@ msgstr "Корневая директория для файлов сервера
 msgid "Root preparation"
 msgstr "Подготовка корневой директории"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:147
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:126
 msgid "Route Allowed IPs"
 msgstr "Маршрутизировать разрешенные IP-адреса"
 
@@ -4558,12 +4702,12 @@ msgstr "Таблица маршрутизации"
 msgid "Route type"
 msgstr "Тип маршрута"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:523
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:577
 msgid "Router Advertisement-Service"
 msgstr "Доступные режимы работы"
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:43
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:15
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:27
 msgid "Router Password"
 msgstr "Пароль маршрутизатора"
 
@@ -4593,7 +4737,7 @@ msgstr "Проверять файловую систему перед монти
 msgid "Run filesystem check"
 msgstr "Проверить"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:651
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:669
 msgid "Runtime error"
 msgstr "Ошибка исполнения"
 
@@ -4605,31 +4749,31 @@ msgstr "SHA256"
 msgid "SNR"
 msgstr "SNR"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:5
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:18
 msgid "SSH Access"
 msgstr "Доступ по SSH"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:10
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:70
 msgid "SSH server address"
 msgstr "Адрес сервера SSH"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:13
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:74
 msgid "SSH server port"
 msgstr "Порт сервера SSH"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:8
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:58
 msgid "SSH username"
 msgstr "SSH логин"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:27
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:277
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
 msgid "SSH-Keys"
 msgstr "SSH ключи"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:42
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:73
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:29
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1617
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:174
 msgid "SSID"
 msgstr "SSID"
@@ -4638,17 +4782,17 @@ msgstr "SSID"
 msgid "SWAP"
 msgstr "Разделы подкачки (swap)"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1127
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1262
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1379
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1351
 #: modules/luci-base/luasrc/view/cbi/error.htm:17
 #: modules/luci-base/luasrc/view/cbi/footer.htm:26
 #: modules/luci-base/luasrc/view/cbi/header.htm:17
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:54
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:133
 msgid "Save"
 msgstr "Сохранить"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1256
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1768
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1347
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2318
 #: modules/luci-base/luasrc/view/cbi/footer.htm:22
 msgid "Save & Apply"
 msgstr "Сохранить и применить"
@@ -4661,28 +4805,20 @@ msgstr "Сохранить MTD раздел"
 msgid "Save mtdblock contents"
 msgstr "Сохранить содержимое MTD раздела"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
-msgid "Saving keys…"
-msgstr "Сохранение ключей..."
-
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:698
 msgid "Scan"
 msgstr "Поиск"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:109
-msgid "Scan request failed"
-msgstr "Ошибка запроса на сканирование"
-
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:8
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:39
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:23
 msgid "Scheduled Tasks"
 msgstr "Запланированные задания"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1749
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2302
 msgid "Section added"
 msgstr "Строки добавлены"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1751
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2304
 msgid "Section removed"
 msgstr "Строки удалены"
 
@@ -4700,12 +4836,18 @@ msgstr ""
 "формата завершается с ошибкой. Используйте эту опцию только если уверены, "
 "что файл образа корректный и предназначен именно для данного устройства!"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:119
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:90
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:96
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:90
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:69
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:92
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1516
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1646
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1809
+msgid "Select file…"
+msgstr "Выбрать файл..."
+
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:144
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:102
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:125
 msgid ""
 "Send LCP echo requests at the given interval in seconds, only effective in "
 "conjunction with failure threshold"
@@ -4713,51 +4855,50 @@ msgstr ""
 "Отправлять эхо-пакеты LCP с указанным интервалом (секунды), эффективно "
 "только в сочетании с порогом ошибок"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:561
-msgid "Separate Clients"
-msgstr "Разделять клиентов"
-
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:62
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:63
 msgid "Server Settings"
 msgstr "Настройки сервера"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:26
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:50
 msgid "Service Name"
 msgstr "Имя службы"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:25
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:30
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:87
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:71
 msgid "Service Type"
 msgstr "Тип службы"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:55
+#: modules/luci-base/luasrc/controller/admin/index.lua:62
 msgid "Services"
 msgstr "Сервисы"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:815
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:861
 msgid "Session expired"
 msgstr "Сессия истекла"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:83
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:107
 msgid "Set VPN as Default Route"
 msgstr "Установить VPN в качестве маршрута по умолчанию"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:258
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:795
 msgid ""
 "Set interface properties regardless of the link carrier (If set, carrier "
 "sense events do not invoke hotplug handlers)."
 msgstr ""
 "Автоматически активировать соединение, при подключении в разъем кабеля."
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:23
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:55
 msgid "Setting PLMN failed"
 msgstr "Ошибка установки PLMN"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:26
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:68
 msgid "Setting operation mode failed"
 msgstr "Ошибка установки режима работы"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:454
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:517
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:527
 msgid "Setup DHCP Server"
 msgstr "Настроить сервер DHCP"
 
@@ -4769,7 +4910,7 @@ msgstr "Секунды с большим числом ошибок (SES)."
 msgid "Short GI"
 msgstr "Short GI"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:516
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:960
 msgid "Short Preamble"
 msgstr "Короткая преамбула"
 
@@ -4781,21 +4922,23 @@ msgstr "Показать текущий список файлов резервн
 msgid "Show empty chains"
 msgstr "Показать пустые цепочки"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:306
 msgid "Shutdown this interface"
 msgstr "Выключить этот интерфейс"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:111
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:34
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:47
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:132
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1616
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:173
 msgid "Signal"
 msgstr "Сигнал"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1960
+msgid "Signal / Noise"
+msgstr "Сигнал / шум"
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:125
 msgid "Signal Attenuation (SATN)"
 msgstr "Затухание сигнала (SATN)"
@@ -4808,11 +4951,11 @@ msgstr "Сигнал:"
 msgid "Size"
 msgstr "Размер"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:259
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:260
 msgid "Size of DNS query cache"
 msgstr "Размер кэша DNS запроса"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:191
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
 msgid "Size of the ZRam device in megabytes"
 msgstr "Размер ZRam в мегабайтах"
 
@@ -4829,11 +4972,7 @@ msgstr "Перейти к содержимому"
 msgid "Skip to navigation"
 msgstr "Перейти к навигации"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:335
-msgid "Slot time"
-msgstr "Время слота"
-
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1640
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1846
 #: modules/luci-base/luasrc/model/network.lua:1427
 msgid "Software VLAN"
 msgstr "Программное обеспечение VLAN"
@@ -4874,11 +5013,7 @@ msgstr "Адрес источника"
 msgid "Specifies the directory the device is attached to"
 msgstr "Папка, к которой монтируется раздел устройства"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:23
-msgid "Specifies the listening port of this <em>Dropbear</em> instance"
-msgstr "Порт данного процесса <em>Dropbear</em>"
-
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:57
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:175
 msgid ""
 "Specifies the maximum amount of failed ARP requests until hosts are presumed "
 "to be dead"
@@ -4886,18 +5021,29 @@ msgstr ""
 "Максимальное количество неудачных запросов ARP, после которого узлы "
 "считаются отключенными"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:49
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:171
 msgid ""
 "Specifies the maximum amount of seconds after which hosts are presumed to be "
 "dead"
 msgstr ""
 "Максимальное количество секунд, после которого узлы считаются отключёнными"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:761
+msgid ""
+"Specifies the maximum transmit power the wireless radio may use. Depending "
+"on regulatory requirements and wireless usage, the actual transmit power may "
+"be reduced by the driver."
+msgstr ""
+"Указание максимальной мощности передачи, которую может использовать "
+"беспроводной интерфейс. В зависимости от регуляторных требований и "
+"использования беспроводной связи, фактическая мощность передачи данных может "
+"быть снижена драйвером."
+
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:63
 msgid "Specify a TOS (Type of Service)."
 msgstr "Укажите TOS (Тип обслуживания)."
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:25
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:58
 msgid ""
 "Specify a TTL (Time to Live) for the encapsulating packet other than the "
 "default (64)."
@@ -4905,7 +5051,7 @@ msgstr ""
 "Укажите значение TTL (Время Жизни) для инкапсуляции пакетов, по умолчанию "
 "(64)."
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:53
 msgid ""
 "Specify an MTU (Maximum Transmission Unit) other than the default (1280 "
 "bytes)."
@@ -4913,29 +5059,30 @@ msgstr ""
 "Укажите MTU (Максимальный Объем Данных), отличный от стандартного (1280 "
 "байт)."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:60
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "Specify the secret encryption key here."
 msgstr "Укажите закрытый ключ."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:475
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:64
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:533
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:89
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:111
 msgid "Start"
 msgstr "Старт"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:33
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:86
 msgid "Start priority"
 msgstr "Приоритет"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1958
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2499
 msgid "Starting configuration apply…"
 msgstr "Применение конфигурации..."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1626
 msgid "Starting wireless scan..."
 msgstr "Начато сканирование беспроводных сетей..."
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:24
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:120
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
 msgid "Startup"
 msgstr "Загрузка"
 
@@ -4947,20 +5094,21 @@ msgstr "Статические маршруты IPv4"
 msgid "Static IPv6 Routes"
 msgstr "Статические маршруты IPv6"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:70
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:71
 msgid "Static Leases"
 msgstr "Постоянные аренды"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:118
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:73
 msgid "Static Routes"
 msgstr "Статические маршруты"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1194
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1384
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:172
 #: modules/luci-base/luasrc/model/network.lua:966
 msgid "Static address"
 msgstr "Статический адрес"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:308
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:309
 msgid ""
 "Static leases are used to assign fixed IP addresses and symbolic hostnames "
 "to DHCP clients. They are also required for non-dynamic interface "
@@ -4970,39 +5118,41 @@ msgstr ""
 "имён DHCP-клиентам. Постоянная аренда также необходима для статических "
 "интерфейсов, в которых обслуживаются только клиенты с присвоенными адресами."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:534
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:977
 msgid "Station inactivity limit"
 msgstr "Максимально допустимое время бездействия клиента"
 
 #: modules/luci-base/luasrc/controller/admin/index.lua:40
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:197
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:337
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:746
 #: modules/luci-mod-status/luasrc/view/admin_status/index.htm:128
 msgid "Status"
 msgstr "Состояние"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:35
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:75
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:308
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:91
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:113
 msgid "Stop"
 msgstr "Остановить"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:165
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Strict order"
 msgstr "Строгий порядок"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:16
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:30
 msgid "Strong"
 msgstr "Сильная"
 
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1843
 msgid "Submit"
 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:108
 msgid "Suppress logging"
 msgstr "Подавить логирование"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:109
 msgid "Suppress logging of the routine operation of these protocols"
 msgstr "Подавить логирование стандартной работы этих протоколов"
 
@@ -5014,44 +5164,46 @@ msgstr "Раздел подкачки (swap)"
 msgid "Swap Entry"
 msgstr "Настройка config файла fstab (/etc/config/fstab)"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:23
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:5
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:135
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:21
 msgid "Switch"
 msgstr "Коммутатор"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:129
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:168
 msgid "Switch %q"
 msgstr "Коммутатор %q"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:128
-msgid "Switch %q (%s)"
-msgstr "Коммутатор %q (%s)"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:66
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:146
 msgid ""
 "Switch %q has an unknown topology - the VLAN settings might not be accurate."
 msgstr ""
 "Коммутатор %q имеет неизвестную топологию — настройки VLAN не могут быть "
 "точными."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:146
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:142
 msgid "Switch Port Mask"
 msgstr "Изменить маску порта"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1640
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1846
 #: modules/luci-base/luasrc/model/network.lua:1425
 msgid "Switch VLAN"
 msgstr "Изменить VLAN"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:238
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:355
 msgid "Switch protocol"
 msgstr "Изменить протокол"
 
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:103
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:104
 #: modules/luci-base/luasrc/view/cbi/ipaddr.htm:26
 msgid "Switch to CIDR list notation"
 msgstr "Переключить в формат CIDR"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:77
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1547
+msgid "Symbolic link"
+msgstr "Символическая ссылка"
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:71
 msgid "Sync with NTP-Server"
 msgstr "Синхронизировать с NTP-сервером"
 
@@ -5061,7 +5213,7 @@ msgstr "Синхронизировать с браузером"
 
 #: modules/luci-base/luasrc/controller/admin/index.lua:47
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:14
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:102
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:94
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
 #: modules/luci-mod-system/luasrc/view/admin_system/applyreboot.htm:39
 msgid "System"
@@ -5072,11 +5224,11 @@ msgstr "Система"
 msgid "System Log"
 msgstr "Системный журнал"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:108
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:99
 msgid "System Properties"
 msgstr "Свойства системы"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:145
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:136
 msgid "System log buffer size"
 msgstr "Размер системного журнала"
 
@@ -5084,15 +5236,17 @@ msgstr "Размер системного журнала"
 msgid "TCP:"
 msgstr "TCP:"
 
-#: 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:69
 msgid "TFTP Settings"
 msgstr "Настройки TFTP"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:269
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
 msgid "TFTP server root"
 msgstr "TFTP сервер root"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:17
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:77
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:88
 msgid "TX"
@@ -5115,7 +5269,7 @@ msgstr "Таблица"
 msgid "Target"
 msgstr "Назначение"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:77
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:103
 msgid "Target network"
 msgstr "Сеть назначения"
 
@@ -5123,29 +5277,7 @@ msgstr "Сеть назначения"
 msgid "Terminate"
 msgstr "Завершить"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:27
-msgid ""
-"The <em>Device Configuration</em> section covers physical settings of the "
-"radio hardware such as channel, transmit power or antenna selection which "
-"are shared among all defined wireless networks (if the radio hardware is "
-"multi-SSID capable). Per network settings like encryption or operation mode "
-"are grouped in the <em>Interface Configuration</em>."
-msgstr ""
-"Вкладка меню <em>'Настройка устройства'</em> содержит физические настройки "
-"радиооборудования, такие как канал, мощность передачи или выбор антенны, "
-"которые совместно используются всеми настроенными беспроводными сетями (если "
-"радиооборудование поддерживает несколько SSID). Параметры сети, такие как "
-"шифрование или режим работы, смотрите на вкладке <em>'Настройка сети'</em>."
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:79
-msgid ""
-"The <em>libiwinfo-lua</em> package is not installed. You must install this "
-"component for working wireless configuration!"
-msgstr ""
-"Пакет <em>libiwinfo-lua</em> не установлен. Для включения настроек "
-"беспроводных сетей, вам необходимо установить этот компонент!"
-
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:66
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:77
 msgid ""
 "The HE.net endpoint update configuration changed, you must now use the plain "
 "username instead of the user ID!"
@@ -5153,20 +5285,19 @@ msgstr ""
 "HE.net конфигурация обновления конечной точки изменена, теперь вы должны "
 "использовать простое имя пользователя вместо ID пользователя!"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:8
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:40
 msgid ""
 "The IPv4 address or the fully-qualified domain name of the remote tunnel end."
 msgstr "IPv4-адрес или полное доменное имя удаленного конца туннеля."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:27
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:38
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:59
 msgid ""
 "The IPv6 prefix assigned to the provider, usually ends with <code>::</code>"
 msgstr ""
 "Назначенный провайдеру префикс IPv6, обычно заканчивается на <code>::</code>"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:18
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1808
 msgid ""
 "The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
 "code> and <code>_</code>"
@@ -5182,7 +5313,7 @@ msgstr "Архив резервной копии не является прав
 msgid "The configuration file could not be loaded due to the following error:"
 msgstr "Не удалось загрузить config файл из-за следующей ошибки:"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1849
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2396
 msgid ""
 "The device could not be reached within %d seconds after applying the pending "
 "changes, which caused the configuration to be rolled back for safety "
@@ -5208,6 +5339,14 @@ msgstr ""
 "Устройство или раздел (<abbr title=\"например\">напр.</abbr> <code>/dev/"
 "sda1</code>)"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:612
+msgid ""
+"The existing wireless configuration needs to be changed for LuCI to function "
+"properly."
+msgstr ""
+"Для правильной работы LuCI необходимо изменить существующую конфигурацию "
+"беспроводной связи."
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:127
 msgid ""
 "The filesystem that was used to format the memory (<abbr title=\"for example"
@@ -5231,47 +5370,51 @@ msgstr ""
 msgid "The following rules are currently active on this system."
 msgstr "На данном устройстве активны следующие правила."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:144
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:154
+msgid "The gateway address must not be a local IP address"
+msgstr "Адрес шлюза не должен быть локальным IP-адресом."
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:154
 msgid "The given SSH public key has already been added."
 msgstr "Указанный публичный SSH ключ уже добавлен."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:150
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:160
 msgid ""
 "The given SSH public key is invalid. Please supply proper public RSA or "
 "ECDSA keys."
 msgstr ""
 "Указанный публичный SSH ключ неверный. Укажите правильный RSA или ECDSA ключ."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:67
-msgid "The given network name is not unique"
-msgstr "Заданное имя сети не является уникальным"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:664
+msgid "The interface name is already used"
+msgstr "Имя интерфейса уже используется"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:52
-msgid ""
-"The hardware is not multi-SSID capable and the existing configuration will "
-"be replaced if you proceed."
-msgstr ""
-"Аппаратное обеспечение не поддерживает Multi-SSID, и существующие настройки "
-"будут изаменены, если вы продолжите."
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:670
+msgid "The interface name is too long"
+msgstr "Имя интерфейса слишком длинное"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:43
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:31
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:55
 msgid ""
 "The length of the IPv4 prefix in bits, the remainder is used in the IPv6 "
 "addresses."
 msgstr ""
 "Длина префикса IPv4 в битах, оставшееся будет использоваться в IPv6-адресах."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:35
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:46
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:63
 msgid "The length of the IPv6 prefix in bits"
 msgstr "Длина префикса IPv6 в битах"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:12
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:44
 msgid "The local IPv4 address over which the tunnel is created (optional)."
 msgstr "Локальный адрес IPv4, по которому создается туннель (необязательно)."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:5
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1814
+msgid "The network name is already used"
+msgstr "Имя сети уже используется"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:135
 msgid ""
 "The network ports on this device can be combined to several <abbr title="
 "\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
@@ -5288,22 +5431,21 @@ msgstr ""
 "внешней сети, например к Интернету и другие порты предназначенные для "
 "внутренней — локальной сети."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:77
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:395
-msgid "The selected protocol needs a device assigned"
-msgstr "Для выбранного протокола необходимо задать устройство"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1149
+msgid "The selected %s mode is incompatible with %s encryption"
+msgstr "Выбранный режим %s несовместим с шифрованием %s"
 
 #: modules/luci-base/luasrc/view/csrftoken.htm:11
 msgid "The submitted security token is invalid or already expired!"
 msgstr "Представленный маркер безопасности недействителен или уже истек!"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:274
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:272
 msgid ""
 "The system is erasing the configuration partition now and will reboot itself "
 "when finished."
 msgstr "Идёт удаление настроек раздела с последующей перезагрузкой системы."
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:195
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:193
 msgid ""
 "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
 "few minutes before you try to reconnect. It might be necessary to renew the "
@@ -5315,7 +5457,7 @@ msgstr ""
 "потребуется обновить адрес компьютера, чтобы снова подключиться к "
 "устройству, в зависимости от настроек."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:15
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:80
 msgid "The system password has been successfully changed."
 msgstr "Пароль администратора успешно изменен."
 
@@ -5327,7 +5469,7 @@ msgstr ""
 "Загруженный файл прошивки не поддерживается. Проверьте, что вы загрузили "
 "подходящую прошивку для чипа вашего устройства."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:427
 msgid "There are no active leases"
 msgstr "Нет активных арендованных адресов"
 
@@ -5336,18 +5478,10 @@ msgstr "Нет активных арендованных адресов"
 msgid "There are no active leases."
 msgstr "Нет активных арендованных адресов."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1973
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2514
 msgid "There are no changes to apply"
 msgstr "Нет изменений для применения"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:204
-msgid ""
-"There is no device assigned yet, please attach a network device in the "
-"\"Physical Settings\" tab"
-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
@@ -5359,11 +5493,19 @@ msgstr ""
 "Пароль пользователя root не установлен. Установите пароль, чтобы защитить "
 "веб-интерфейс и включить SSH."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:19
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:49
 msgid "This IPv4 address of the relay"
 msgstr "IPv4-адрес ретранслятора"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1448
+msgid "This authentication type is not applicable to the selected EAP method."
+msgstr "Этот тип аутентификации не применим к выбранному методу EAP"
+
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:54
+msgid "This does not look like a valid PEM file"
+msgstr "Это не похоже на корректный PEM файл"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
 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 "
@@ -5384,7 +5526,7 @@ msgstr ""
 "некоторые другие. При перепрошивке устройства sysupgrade-совместимым "
 "образом, вы сможете воспользоваться резервной копией своих настроек."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:74
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:81
 msgid ""
 "This is either the \"Update Key\" configured for the tunnel or the account "
 "password if no update key has been configured"
@@ -5392,7 +5534,7 @@ msgstr ""
 "Это либо \"Update Key\", настроенный для туннеля, либо пароль учетной "
 "записи, если ключ обновления не был настроен"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:82
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:127
 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."
@@ -5400,7 +5542,7 @@ msgstr ""
 "Cодержимое config файла /etc/rc.local. Вы можете добавить свои команды "
 "(перед 'exit 0'), чтобы выполнить их во время загрузки устройства."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:27
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:54
 msgid ""
 "This is the local endpoint address assigned by the tunnel broker, it usually "
 "ends with <code>...:2/64</code>"
@@ -5408,7 +5550,7 @@ msgstr ""
 "Это локальный адрес, назначенный туннельным брокером, обычно заканчивается "
 "на <code>...:2/64</code>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:79
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> in the local network"
@@ -5416,23 +5558,23 @@ msgstr ""
 "Это единственный <abbr title=\"Протокол динамической настройки узла\">DHCP</"
 "abbr>-сервер в локальной сети"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:73
 msgid "This is the plain username for logging into the account"
 msgstr "Это просто имя пользователя, для входа в учетную запись"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:34
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:57
 msgid ""
 "This is the prefix routed to you by the tunnel broker for use by clients"
 msgstr ""
 "Это префикс, направлен вам брокером туннелей для использования клиентами"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:9
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:41
 msgid "This is the system crontab in which scheduled tasks can be defined."
 msgstr ""
 "Содержимое файла /etc/crontabs/root (задания crontab). Здесь вы можете "
 "запланировать ваши задания."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:19
+#: 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 "Это адрес ближайшей точки присутствия туннельного брокера"
@@ -5448,26 +5590,26 @@ msgid "This page gives an overview over currently active network connections."
 msgstr ""
 "Страница содержит список всех активных на данный момент сетевых соединений."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:726
-#: modules/luci-base/htdocs/luci-static/resources/form.js:809
+#: modules/luci-base/htdocs/luci-static/resources/form.js:936
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1064
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:172
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:32
 msgid "This section contains no values yet"
 msgstr "Здесь не содержатся необходимые значения"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:114
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:105
 msgid "Time Synchronization"
 msgstr "Синхронизация времени"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:525
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:968
 msgid "Time interval for rekeying GTK"
 msgstr "Интервал регенерации ключей GTK"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:128
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:119
 msgid "Timezone"
 msgstr "Часовой пояс"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:825
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:871
 msgid "To login…"
 msgstr "Аутентификация..."
 
@@ -5482,7 +5624,7 @@ msgstr ""
 "прошивки к исходному состоянию нажмите 'Выполнить сброс' (возможно только "
 "для squashfs-образов)."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:835
 msgid "Tone"
 msgstr "Тон"
 
@@ -5506,55 +5648,41 @@ msgstr "Трафик"
 msgid "Transfer"
 msgstr "Передача"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:595
-msgid "Transmission Rate"
-msgstr "Скорость передачи"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:102
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:89
 msgid "Transmit"
 msgstr "Передача"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:211
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:273
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:345
-msgid "Transmit Power"
-msgstr "Мощность передатчика"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:318
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:349
-msgid "Transmitter Antenna"
-msgstr "Передающая антенна"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:73
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:57
 msgid "Trigger"
 msgstr "Назначить"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:98
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:84
 msgid "Trigger Mode"
 msgstr "Режим работы"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:54
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:69
 msgid "Tunnel ID"
 msgstr "Идентификатор туннеля"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1643
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1849
 #: modules/luci-base/luasrc/model/network.lua:1430
 msgid "Tunnel Interface"
 msgstr "Интерфейс туннеля"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:44
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:55
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:76
 msgid "Tunnel Link"
 msgstr "Ссылка на туннель"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:46
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:131
 msgid "Tx-Power"
 msgstr "Мощность передатчика"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:32
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:185
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:11
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:43
 msgid "Type"
 msgstr "Тип"
 
@@ -5562,19 +5690,20 @@ msgstr "Тип"
 msgid "UDP:"
 msgstr "UDP:"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:28
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:90
 msgid "UMTS only"
 msgstr "Только UMTS"
 
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:43
 #: protocols/luci-proto-3g/luasrc/model/network/proto_3g.lua:10
 msgid "UMTS/GPRS/EV-DO"
 msgstr "UMTS/GPRS/EV-DO"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:106
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:93
 msgid "USB Device"
 msgstr "USB устройство"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:122
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:110
 msgid "USB Ports"
 msgstr "USB порты"
 
@@ -5604,10 +5733,12 @@ msgstr "Невозможно определить основной интерф
 msgid "Unable to dispatch"
 msgstr "Невозможно обработать запрос для"
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:22
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:54
 msgid "Unable to obtain client ID"
 msgstr "Невозможно получить идентификатор клиента"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:61
 msgid "Unable to resolve AFTR host name"
 msgstr "Не удалось разрешить AFTR имя хоста"
@@ -5617,21 +5748,31 @@ msgstr "Не удалось разрешить AFTR имя хоста"
 msgid "Unable to resolve peer host name"
 msgstr "Не удалось разрешить имя хоста пира"
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:33
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:68
+msgid "Unable to save contents: %s"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:132
 msgid "Unavailable Seconds (UAS)"
 msgstr "Секунды неготовности (UAS)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1196
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1386
 #: modules/luci-base/luasrc/model/network.lua:970
 msgid "Unknown"
 msgstr "Неизвестно"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1349
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1539
 #: modules/luci-base/luasrc/model/network.lua:1137
 msgid "Unknown error (%s)"
 msgstr "Неизвестная ошибка (%s)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1193
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:204
+msgid "Unknown error code"
+msgstr "Неизвестный код ошибки"
+
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1383
+#: modules/luci-base/htdocs/luci-static/resources/protocol/none.js:6
 #: modules/luci-base/luasrc/model/network.lua:964
 msgid "Unmanaged"
 msgstr "Неуправляемый"
@@ -5641,25 +5782,33 @@ msgstr "Неуправляемый"
 msgid "Unmount"
 msgstr "Отмонтировать"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:107
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:262
 msgid "Unnamed key"
 msgstr "Ключ без имени"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1708
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2261
 msgid "Unsaved Changes"
-msgstr "Непринятые изменения"
+msgstr "Не принятые изменения"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:202
+msgid "Unspecified error"
+msgstr "Неопознанная ошибка"
+
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:64
 msgid "Unsupported MAP type"
-msgstr "Неподдерживаемый тип MAP"
+msgstr "Не поддерживаемый тип MAP"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:27
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:69
 msgid "Unsupported modem"
-msgstr "Неподдерживаемый модем"
+msgstr "Не поддерживаемый модем"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:219
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:119
 msgid "Unsupported protocol type."
-msgstr "Неподдерживаемый тип протокола."
+msgstr "Не поддерживаемый тип протокола."
 
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:151
 msgid "Up"
@@ -5680,56 +5829,73 @@ msgstr ""
 msgid "Upload archive..."
 msgstr "Загрузка архива..."
 
-#: modules/luci-base/luasrc/view/cbi/upload.htm:8
-msgid "Uploaded File"
-msgstr "Загруженный файл"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1703
+msgid "Upload file"
+msgstr "Загрузка файла"
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1678
+msgid "Upload file…"
+msgstr "Загрузка файла..."
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1623
+msgid "Upload request failed: %s"
+msgstr "Ошибка запроса на загрузку: %d %s"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:613
+msgid ""
+"Upon pressing \"Continue\", anonymous \"wifi-iface\" sections will be "
+"assigned with a name in the form <em>wifinet#</em> and the network will be "
+"restarted to apply the updated configuration."
+msgstr ""
+"При нажатии кнопки «Продолжить» анонимным разделам «wifi-iface» будут "
+"назначены имена в виде «wifinet#» и сеть будет перезапущена для применения "
+"обновлённой конфигурации."
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:14
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:74
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:85
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:26
 msgid "Uptime"
 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:83
 msgid "Use <code>/etc/ethers</code>"
 msgstr "Использовать <code>/etc/ethers</code>"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:40
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:167
 msgid "Use DHCP gateway"
 msgstr "Использовать шлюз DHCP"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:33
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:85
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:34
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:98
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:46
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:65
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:38
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:58
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:124
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:39
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:116
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:59
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:103
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:64
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:77
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:100
 msgid "Use DNS servers advertised by peer"
 msgstr "Использовать объявляемые узлом DNS сервера"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:227
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:233
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:479
 msgid "Use ISO/IEC 3166 alpha2 country codes."
 msgstr "Использовать коды стран ISO/IEC 3166 alpha2."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:31
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:100
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:70
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:35
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:51
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:86
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:56
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:97
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:77
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:75
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:92
 msgid "Use MTU on tunnel interface"
 msgstr "Использовать MTU на интерфейсе туннеля"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:95
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:65
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:30
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:46
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:81
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:93
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:73
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:88
 msgid "Use TTL on tunnel interface"
 msgstr "Использовать TTL на интерфейсе туннеля"
 
@@ -5741,68 +5907,65 @@ msgstr "Использовать как внешний overlay (/overlay)"
 msgid "Use as root filesystem (/)"
 msgstr "Использовать как корень (/)"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:19
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:31
 msgid "Use broadcast flag"
 msgstr "Использовать широковещательный флаг"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:253
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:791
 msgid "Use builtin IPv6-management"
 msgstr "Использовать встроенный IPv6-менеджмент"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:40
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:109
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:92
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:45
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:105
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:53
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:72
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:45
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:65
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:40
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:182
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:127
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:42
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:119
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:62
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:67
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:80
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:103
 msgid "Use custom DNS servers"
 msgstr "Использовать собственные DNS сервера"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:26
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:70
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:16
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:28
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:84
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:24
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:50
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:23
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:43
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:116
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:33
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:74
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:97
 msgid "Use default gateway"
 msgstr "Использовать шлюз по умолчанию"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:48
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:164
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:77
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:24
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:88
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:58
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:23
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:39
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:74
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:90
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:38
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:57
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:30
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:50
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:45
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:227
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:119
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:51
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:88
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:68
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:52
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:70
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:83
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:111
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:149
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:67
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:111
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:98
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:72
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:85
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:108
 msgid "Use gateway metric"
 msgstr "Использовать метрику шлюза"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:64
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:179
 msgid "Use routing table"
 msgstr "Использовать таблицу маршрутизации"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:309
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:310
 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 "
@@ -5821,11 +5984,11 @@ msgstr ""
 msgid "Used"
 msgstr "Использовано"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:848
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1273
 msgid "Used Key Slot"
 msgstr "Используемый слот ключа"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:913
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
 msgid ""
 "Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not "
 "needed with normal WPA(2)-PSK."
@@ -5833,67 +5996,68 @@ msgstr ""
 "Используется для двух различных целей: RADIUS NAS ID и 802.11r R0KH-ID. Не "
 "используется с обычным WPA(2)-PSK."
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:48
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:110
 msgid "User certificate (PEM encoded)"
 msgstr "Сертификат пользователя (PEM encoded)"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:61
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:122
 msgid "User key (PEM encoded)"
 msgstr "Ключ пользователя (PEM encoded)"
 
 #: modules/luci-base/luasrc/view/sysauth.htm:23
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:41
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:32
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:102
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:56
 msgid "Username"
 msgstr "Имя пользователя"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:182
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:903
 msgid "VC-Mux"
 msgstr "VC-Mux"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:851
 msgid "VDSL"
 msgstr "VDSL"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:172
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:169
 msgid "VLANs on %q"
 msgstr "VLANы на %q"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:171
-msgid "VLANs on %q (%s)"
-msgstr "VLANы на %q (%s)"
+#: modules/luci-base/luasrc/controller/admin/index.lua:55
+msgid "VPN"
+msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:18
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:42
 msgid "VPN Local address"
 msgstr "Локальный адрес VPN"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:22
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:46
 msgid "VPN Local port"
 msgstr "Локальный порт VPN"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:15
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:11
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:15
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:58
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:39
 msgid "VPN Server"
 msgstr "Сервер VPN"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:18
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:96
 msgid "VPN Server port"
 msgstr "Порт VPN сервера"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:37
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:100
 msgid "VPN Server's certificate SHA1 hash"
 msgstr "Сертификат SHA1 hash VPN сервера"
 
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:9
 #: protocols/luci-proto-vpnc/luasrc/model/network/proto_vpnc.lua:9
 msgid "VPNC (CISCO 3000 (and others) VPN)"
 msgstr "VPNC (CISCO 3000 (and others) VPN)"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:44
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:73
 msgid "Vendor"
 msgstr "Производитель (Vendor)"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:60
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:52
 msgid "Vendor Class to send when requesting DHCP"
 msgstr ""
 "Класс производителя (Vendor class), который отправлять при DHCP-запросах"
@@ -5902,41 +6066,37 @@ msgstr ""
 msgid "Verify"
 msgstr "Проверить"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:52
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:76
 msgid "Virtual dynamic interface"
-msgstr "Виртуальный динамический винтерфейс"
+msgstr "Виртуальный динамический интерфейс"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:470
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:471
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:553
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:576
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:908
 msgid "WDS"
 msgstr "WDS"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:667
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1160
 msgid "WEP Open System"
 msgstr "Открытая система WEP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:668
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1161
 msgid "WEP Shared Key"
 msgstr "Общий ключ WEP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "WEP passphrase"
 msgstr "Пароль WEP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:503
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:566
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:945
 msgid "WMM Mode"
 msgstr "Режим WMM"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "WPA passphrase"
 msgstr "Пароль WPA"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:716
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:735
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:740
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1074
 msgid ""
 "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
 "and ad-hoc mode) to be installed."
@@ -5952,7 +6112,7 @@ msgstr "Ожидание применения изменений..."
 msgid "Waiting for command to complete..."
 msgstr "Ожидание завершения выполнения команды..."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1940
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2481
 msgid "Waiting for configuration to get applied… %ds"
 msgstr "Ожидание применения конфигурации... %d сек"
 
@@ -5960,8 +6120,8 @@ msgstr "Ожидание применения конфигурации... %d с
 msgid "Waiting for device..."
 msgstr "Ожидание подключения устройства..."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:172
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:163
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:173
 msgid "Warning"
 msgstr "Внимание"
 
@@ -5971,11 +6131,11 @@ msgstr ""
 "Предупреждение: Есть не сохраненные изменения, которые будут потеряны при "
 "перезагрузке!"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:20
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:34
 msgid "Weak"
 msgstr "Слабая"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:946
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1355
 msgid ""
 "When using a PSK, the PMK can be automatically generated. When enabled, the "
 "R0/R1 key options below are not applied. Disable this to use the R0 and R1 "
@@ -5986,78 +6146,87 @@ msgstr ""
 "использования опций ключей R0/R1 отключите данную опцию."
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:383
 msgid "Width"
 msgstr "Ширина"
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:17
 #: protocols/luci-proto-wireguard/luasrc/model/network/proto_wireguard.lua:9
 msgid "WireGuard VPN"
 msgstr "WireGuard VPN"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:58
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:40
 #: modules/luci-mod-status/luasrc/controller/admin/status.lua:28
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:14
 msgid "Wireless"
 msgstr "Wi-Fi"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1631
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1837
 #: modules/luci-base/luasrc/model/network.lua:1418
 msgid "Wireless Adapter"
 msgstr "Беспроводной адаптер"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1617
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2052
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1823
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2288
 #: modules/luci-base/luasrc/model/network.lua:1404
 #: modules/luci-base/luasrc/model/network.lua:1865
 msgid "Wireless Network"
 msgstr "Беспроводная сеть"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:629
 msgid "Wireless Overview"
 msgstr "Список беспроводных сетей"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:362
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:797
 msgid "Wireless Security"
 msgstr "Безопасность беспроводной сети"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:54
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:611
+msgid "Wireless configuration migration"
+msgstr "Миграция беспроводной конфигурации"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:139
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:179
 msgid "Wireless is disabled"
 msgstr "Беспроводная сеть отключена"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:54
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:139
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:179
 msgid "Wireless is not associated"
 msgstr "Беспроводная сеть не связана"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:15
-msgid "Wireless is restarting..."
-msgstr "Беспроводная сеть перезапускается..."
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:752
 msgid "Wireless network is disabled"
 msgstr "Беспроводная сеть отключена"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:752
 msgid "Wireless network is enabled"
 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:182
 msgid "Write received DNS requests to syslog"
 msgstr "Записывать полученные DNS-запросы в системный журнал"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:164
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:155
 msgid "Write system log to file"
 msgstr "Записывать системные события в файл"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1507
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:85
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1754
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:109
 msgid "Yes"
 msgstr "Да"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:26
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:943
+msgid ""
+"You appear to be currently connected to the device via the \"%h\" interface. "
+"Do you really want to shut down the interface?"
+msgstr ""
+"Похоже вы подключены к устройству через интерфейс «%h». Вы действительно "
+"хотите его выключить?"
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:123
 msgid ""
 "You can enable or disable installed init scripts here. Changes will applied "
 "after a device reboot.<br /><strong>Warning: If you disable essential init "
@@ -6078,38 +6247,34 @@ msgstr ""
 "Вам необходимо включить JavaScript в вашем браузере для корректной работы "
 "LuCI."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:196
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:187
 msgid "ZRam Compression Algorithm"
 msgstr "Алгоритм компрессии ZRam"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:203
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:194
 msgid "ZRam Compression Streams"
 msgstr "Потоки компрессии ZRam"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:189
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:180
 msgid "ZRam Settings"
 msgstr "Настройки ZRam"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:191
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
 msgid "ZRam Size"
 msgstr "Размер ZRam"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:229
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:230
 msgid "any"
 msgstr "любой"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:113
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:121
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:126
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:218
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:282
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:321
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:328
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:621
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:37
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:22
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:29
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:121
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:836
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:844
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:849
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1030
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:78
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:48
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:51
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:103
 msgid "auto"
 msgstr "авто"
 
@@ -6117,11 +6282,11 @@ msgstr "авто"
 msgid "automatic"
 msgstr "автоматически"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:45
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:78
 msgid "baseT"
 msgstr "baseT"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:909
 msgid "bridged"
 msgstr "соед. мостом"
 
@@ -6137,22 +6302,21 @@ msgstr "создать"
 msgid "create:"
 msgstr "создать:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:264
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:368
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:678
 msgid "creates a bridge over specified interface(s)"
 msgstr "Создаёт мост для выбранных сетевых интерфейсов"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:277
 msgid "dB"
 msgstr "дБ"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:34
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:35
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:46
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:47
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:48
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:131
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:132
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:133
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:277
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:279
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:331
@@ -6164,26 +6328,30 @@ msgstr "дБ"
 msgid "dBm"
 msgstr "дБм"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:460
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:587
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:889
 msgid "disable"
 msgstr "отключить"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:119
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:524
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:530
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:536
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:18
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:578
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:584
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:590
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:25
 msgid "disabled"
 msgstr "отключено"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:433
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:467
+msgid "driver default"
+msgstr "умолчания драйвера"
+
 #: modules/luci-base/luasrc/view/lease_status.htm:17
 #: modules/luci-base/luasrc/view/lease_status.htm:46
-#: 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:416
 msgid "expired"
 msgstr "истекло"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:88
 msgid ""
 "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr>-leases will be stored"
@@ -6197,25 +6365,21 @@ msgstr ""
 msgid "forward"
 msgstr "перенаправить"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:80
 msgid "full-duplex"
 msgstr "полный дуплекс"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:80
 msgid "half-duplex"
 msgstr "полудуплекс"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:559
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:565
 msgid "hexadecimal encoded value"
 msgstr "значение в шестнадцатеричном представлении"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:138
-msgid "hidden"
-msgstr "скрытый"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:527
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:533
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:538
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:581
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:587
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:592
 msgid "hybrid mode"
 msgstr "гибридный режим"
 
@@ -6223,6 +6387,10 @@ msgstr "гибридный режим"
 msgid "if target is a network"
 msgstr "если сеть"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:63
+msgid "ignore"
+msgstr "игнорировать"
+
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:177
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
@@ -6257,25 +6425,26 @@ 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:94
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:95
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr "Локальный <abbr title=\"Служба доменных имён\">DNS</abbr>-файл"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:952
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1168
+msgid "medium security"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1360
 msgid "minutes"
 msgstr "минут(ы)"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:43
-msgid "mixed WPA/WPA2"
-msgstr "смешанный WPA/WPA2"
-
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:225
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:232
 msgid "no"
 msgstr "нет"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:54
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:72
 msgid "no link"
 msgstr "нет соединения"
 
@@ -6283,7 +6452,7 @@ msgstr "нет соединения"
 msgid "non-empty value"
 msgstr "не пустое значение"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1195
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1446
 msgid "none"
 msgstr "нет"
 
@@ -6293,7 +6462,9 @@ msgstr "нет"
 msgid "not present"
 msgstr "не существует"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:363
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:341
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:776
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:780
 #: 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
@@ -6308,9 +6479,9 @@ msgstr "выключено"
 msgid "on"
 msgstr "включено"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
-msgid "open"
-msgstr "открыть"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1169
+msgid "open network"
+msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
@@ -6329,73 +6500,77 @@ msgstr "положительное десятичное число"
 msgid "positive integer value"
 msgstr "положительное целое число"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:34
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:56
 msgid "random"
 msgstr "случайно"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:526
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:532
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:537
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:580
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:586
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:591
 msgid "relay mode"
 msgstr "режим передачи"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:910
 msgid "routed"
 msgstr "маршрутизируемый"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:525
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:534
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:968
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:977
 msgid "sec"
 msgstr "секунды"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:525
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:531
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:579
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:585
 msgid "server mode"
 msgstr "режим сервера"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:544
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:597
 msgid "stateful-only"
 msgstr "stateful-only"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:542
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:595
 msgid "stateless"
 msgstr "stateless"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:543
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:596
 msgid "stateless + stateful"
 msgstr "stateless + stateful"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:369
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1167
+msgid "strong security"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:346
 msgid "tagged"
 msgstr "с тегом"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:932
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1343
 msgid "time units (TUs / 1.024 ms) [1000-65535]"
 msgstr "единицы измерения времени (TUs / 1.024 ms) [1000-65535]"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:549
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:555
 msgid "unique value"
 msgstr "уникальное значение"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:448
 msgid "unknown"
 msgstr "неизвестный"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:15
 #: modules/luci-base/luasrc/view/lease_status.htm:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:238
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:390
+#: 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:414
 msgid "unlimited"
 msgstr "неограниченный"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1401
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1648
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:63
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:355
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:378
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:413
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:446
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:512
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:450
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:545
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:53
 #: modules/luci-base/luasrc/view/cbi/network_netlist.htm:38
 msgid "unspecified"
@@ -6405,7 +6580,7 @@ msgstr "не определено"
 msgid "unspecified -or- create:"
 msgstr "не определено -или- создать:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:366
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:344
 msgid "untagged"
 msgstr "без тега"
 
@@ -6486,8 +6661,8 @@ msgstr "верный UCI идентификатор, имя хоста или IP
 msgid "valid address:port"
 msgstr "верный адрес:порт"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:523
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:527
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:529
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:533
 msgid "valid date (YYYY-MM-DD)"
 msgstr "верная дата (ГГГГ-ММ-ДД)"
 
@@ -6524,7 +6699,7 @@ msgstr "верное целое число"
 msgid "valid network in address/netmask notation"
 msgstr "верная сеть в формате адрес/маска подсети"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:498
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:504
 msgid "valid phone digit (0-9, \"*\", \"#\", \"!\" or \".\")"
 msgstr "верный символ номера телефона (0-9, \"*\", \"#\", \"!\" or \".\")"
 
@@ -6537,11 +6712,11 @@ msgstr "верный порт или диапазон портов (порт1-п
 msgid "valid port value"
 msgstr "верное значение порта"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:503
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:509
 msgid "valid time (HH:MM:SS)"
 msgstr "верное время (ЧЧ:ММ:СС)"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:425
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:431
 msgid "value between %d and %d characters"
 msgstr "значение длиной от %d до %d символов"
 
@@ -6557,14 +6732,23 @@ msgstr "значение больше или равное %f"
 msgid "value smaller or equal to %f"
 msgstr "значение меньше или равное %f"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:430
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:425
+msgid "value with %d characters"
+msgstr "значение с %d символами"
+
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:436
 msgid "value with at least %d characters"
 msgstr "значение длиной %d или менее символов"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:435
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:441
 msgid "value with at most %d characters"
 msgstr "значение длиной %d или более символов"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1169
+msgid "weak security"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:221
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:232
@@ -6574,3 +6758,27 @@ msgstr "да"
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:20
 msgid "« Back"
 msgstr "« Назад"
+
+#~ msgid "Change login password"
+#~ msgstr "Изменить пароль"
+
+#~ msgid "Changing password…"
+#~ msgstr "Изменение пароля..."
+
+#~ msgid "Disabled (default)"
+#~ msgstr "Отключено (по умолчанию)"
+
+#~ msgid "Loading SSH keys…"
+#~ msgstr "Загрузка SSH ключей..."
+
+#~ msgid "Saving keys…"
+#~ msgstr "Сохранение ключей..."
+
+#~ msgid "Specifies the listening port of this <em>Dropbear</em> instance"
+#~ msgstr "Порт данного процесса <em>Dropbear</em>"
+
+#~ msgid "Switch %q (%s)"
+#~ msgstr "Коммутатор %q (%s)"
+
+#~ msgid "VLANs on %q (%s)"
+#~ msgstr "VLANы на %q (%s)"
diff --git a/modules/luci-base/po/sk/base.po b/modules/luci-base/po/sk/base.po
index db26865da..726427eb1 100644
--- a/modules/luci-base/po/sk/base.po
+++ b/modules/luci-base/po/sk/base.po
@@ -9,19 +9,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:133
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:857
 msgid "%.1f dB"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:109
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:122
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 msgid "%d Bit"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1641
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2194
 msgid "%d invalid field(s)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:281
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:31
 msgid "%s is untagged in multiple VLANs!"
 msgstr ""
 
@@ -59,19 +60,19 @@ msgid "-- Additional Field --"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:258
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1401
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1533
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:250
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:350
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1114
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1648
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1780
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:314
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:414
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1178
 #: modules/luci-base/luasrc/view/cbi/header.htm:5
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:26
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:88
 msgid "-- Please choose --"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:259
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:351
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1115
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:415
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1179
 #: modules/luci-base/luasrc/view/cbi/header.htm:6
 msgid "-- custom --"
 msgstr ""
@@ -94,7 +95,7 @@ msgstr ""
 msgid "-- please select --"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:382
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:814
 msgid "0 = not using RSSI threshold, 1 = do not change driver default"
 msgstr ""
 
@@ -106,10 +107,11 @@ msgstr ""
 msgid "15 Minute Load:"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:924
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1337
 msgid "4-character hexadecimal ID"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:11
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:18
 msgid "464XLAT (CLAT)"
 msgstr ""
@@ -118,57 +120,57 @@ msgstr ""
 msgid "5 Minute Load:"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:960
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1366
 msgid "6-octet identifier as a hex string - no colons"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:891
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1310
 msgid "802.11r Fast Transition"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1157
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1567
 msgid "802.11w Association SA Query maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1574
 msgid "802.11w Association SA Query retry timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1133
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1533
 msgid "802.11w Management Frame Protection"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1156
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1567
 msgid "802.11w maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1165
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1574
 msgid "802.11w retry timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:399
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:831
 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:224
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:225
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:215
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:216
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
 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:167
 msgid ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
 "order of the resolvfile"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:388
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:820
 msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:351
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:373
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:45
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
 msgstr ""
@@ -178,8 +180,8 @@ msgstr ""
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:555
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:35
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:506
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr ""
 
@@ -193,107 +195,111 @@ msgstr ""
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 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:402
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:58
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:35
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:33
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:67
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:51
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:328
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:329
 #: 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:372
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:233
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:234
 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:242
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
 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:251
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:252
 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:10
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:42
 msgid ""
 "<br/>Note: you need to manually restart the cron service if the crontab file "
 "was empty before editing."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:817
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1605
+msgid "A directory with the same name already exists."
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:863
 msgid "A new login is required since the authentication session expired."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:114
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:837
 msgid "A43C + J43 + A43"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:838
 msgid "A43C + J43 + A43 + V43"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:850
 msgid "ADSL"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:826
 msgid "ANSI T1.413"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:33
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:47
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:23
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:94
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:86
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:67
 msgid "APN"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:56
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:175
 msgid "ARP retry threshold"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:122
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:845
 msgid "ATM (Asynchronous Transfer Mode)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:144
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:866
 msgid "ATM Bridges"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:178
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:21
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:898
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:66
 msgid "ATM Virtual Channel Identifier (VCI)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:179
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:26
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:899
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:70
 msgid "ATM Virtual Path Identifier (VPI)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:866
 msgid ""
 "ATM bridges expose encapsulated ethernet in AAL5 connections as virtual "
 "Linux network interfaces which can be used in conjunction with DHCP or PPP "
 "to dial into the provider network."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:184
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:905
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:62
 msgid "ATM device number"
 msgstr ""
 
@@ -302,17 +308,17 @@ msgid "ATU-C System Vendor ID"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:251
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:495
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:499
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:528
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:532
 msgid "Absent Interface"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:19
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
 msgid "Access Concentrator"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:368
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:470
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:802
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
 msgid "Access Point"
 msgstr ""
 
@@ -335,7 +341,7 @@ msgid "Active Connections"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:68
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:30
 msgid "Active DHCP Leases"
 msgstr ""
 
@@ -343,55 +349,75 @@ msgstr ""
 msgid "Active DHCPv6 Leases"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1951
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:370
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:12
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2190
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:804
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:23
 msgid "Ad-Hoc"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:650
-#: modules/luci-base/htdocs/luci-static/resources/form.js:651
-#: modules/luci-base/htdocs/luci-static/resources/form.js:666
-#: modules/luci-base/htdocs/luci-static/resources/form.js:667
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1290
+#: modules/luci-base/htdocs/luci-static/resources/form.js:902
+#: modules/luci-base/htdocs/luci-static/resources/form.js:904
+#: modules/luci-base/htdocs/luci-static/resources/form.js:917
+#: modules/luci-base/htdocs/luci-static/resources/form.js:918
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1539
 #: modules/luci-base/luasrc/view/cbi/nsection.htm:25
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:189
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:197
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:39
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:47
 #: modules/luci-base/luasrc/view/cbi/ucisection.htm:54
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:703
 msgid "Add"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:60
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:870
+msgid "Add ATM Bridge"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:92
 msgid "Add IPv4 address…"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:129
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:204
 msgid "Add IPv6 address…"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:143
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:149
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:38
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:47
+msgid "Add LED action"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:215
+msgid "Add VLAN"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:14
+msgid "Add instance"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:153
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:159
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:250
 msgid "Add key"
 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:155
 msgid "Add local domain suffix to names served from hosts files"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:705
 msgid "Add new interface..."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:104
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:99
+msgid "Add peer"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:105
 msgid "Additional Hosts files"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:161
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
 msgid "Additional servers file"
 msgstr ""
 
@@ -418,7 +444,7 @@ msgstr ""
 msgid "Address"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:12
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:151
 msgid "Address to access local relay bridge"
 msgstr ""
 
@@ -427,13 +453,13 @@ msgstr ""
 msgid "Administration"
 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:70
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:505
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:896
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:24
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:189
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:463
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:176
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:143
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:364
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:742
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:799
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:50
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:34
 msgid "Advanced Settings"
@@ -443,165 +469,165 @@ msgstr ""
 msgid "Aggregate Transmit Power(ACTATP)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:175
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:166
 msgid "Alert"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1628
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1834
 #: modules/luci-base/luasrc/model/network.lua:1416
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:54
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:78
 msgid "Alias Interface"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:138
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:66
 msgid "Alias of \"%s\""
 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:170
 msgid "All Servers"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:114
 msgid ""
 "Allocate IP addresses sequentially, starting from the lowest available "
 "address"
 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:113
 msgid "Allocate IP sequentially"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:24
 msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:545
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:987
 msgid "Allow AP mode to disconnect STAs based on low ACK condition"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:462
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:589
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:891
 msgid "Allow all except listed"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:236
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:767
 msgid "Allow legacy 802.11b rates"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:461
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:588
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:890
 msgid "Allow listed only"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:198
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:199
 msgid "Allow localhost"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:47
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:35
 msgid "Allow remote hosts to connect to local SSH forwarded ports"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:38
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:30
 msgid "Allow root logins with password"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:39
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:30
 msgid "Allow the <em>root</em> user to login with password"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:199
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:200
 msgid ""
 "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:135
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:122
 msgid "Allowed IPs"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:549
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:602
 msgid "Always announce default router"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:259
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:782
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
 "option does not comply with IEEE 802.11n-2009!"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:95
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:818
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:119
 msgid "Annex"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:96
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:819
 msgid "Annex A + L + M (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:827
 msgid "Annex A G.992.1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:828
 msgid "Annex A G.992.2"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:829
 msgid "Annex A G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:830
 msgid "Annex A G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:97
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:820
 msgid "Annex B (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:823
 msgid "Annex B G.992.1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:824
 msgid "Annex B G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:102
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:825
 msgid "Annex B G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:98
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:821
 msgid "Annex J (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:831
 msgid "Annex L G.992.3 POTS 1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:99
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:822
 msgid "Annex M (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:109
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:832
 msgid "Annex M G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:833
 msgid "Annex M G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:550
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:602
 msgid "Announce as default router even if no public prefix is available."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:555
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:607
 msgid "Announced DNS domains"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:554
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:606
 msgid "Announced DNS servers"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1093
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1496
 msgid "Anonymous Identity"
 msgstr ""
 
@@ -613,20 +639,6 @@ msgstr ""
 msgid "Anonymous Swap"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:322
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:329
-msgid "Antenna 1"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:323
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:330
-msgid "Antenna 2"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:246
-msgid "Antenna Configuration"
-msgstr ""
-
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:71
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:160
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:181
@@ -634,11 +646,11 @@ msgstr ""
 msgid "Any zone"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1981
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2522
 msgid "Apply request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1867
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2409
 msgid "Apply unchecked"
 msgstr ""
 
@@ -646,8 +658,8 @@ msgstr ""
 msgid "Architecture"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:19
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:184
+#: 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 ""
@@ -656,13 +668,13 @@ msgstr ""
 msgid "Assign interfaces..."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:124
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:24
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:189
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:31
 msgid ""
 "Assign prefix parts using this hexadecimal subprefix ID for this interface."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:148
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1967
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:22
 msgid "Associated Stations"
 msgstr ""
@@ -671,20 +683,20 @@ msgstr ""
 msgid "Associations"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:39
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:37
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:101
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:64
 msgid "Auth Group"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1027
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1421
 msgid "Authentication"
 msgstr ""
 
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:29
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:70
 msgid "Authentication Type"
 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:78
 msgid "Authoritative"
 msgstr ""
 
@@ -702,17 +714,19 @@ msgstr ""
 msgid "Auto Refresh"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:53
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:7
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:17
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:67
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:24
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:36
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:42
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:36
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:106
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:24
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:98
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:50
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:94
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:81
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:55
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:68
 msgid "Automatic"
 msgstr ""
 
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:7
 #: protocols/luci-proto-hnet/luasrc/model/network/proto_hnet.lua:7
 msgid "Automatic Homenet (HNCP)"
 msgstr ""
@@ -755,21 +769,21 @@ msgstr ""
 msgid "Average:"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:116
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:839
 msgid "B43 + B43C"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:840
 msgid "B43 + B43C + V43"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:48
 msgid "BR / DMR / AFTR"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:43
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:75
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1620
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:176
 msgid "BSSID"
 msgstr ""
@@ -783,19 +797,11 @@ msgstr ""
 msgid "Back to configuration"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:48
-msgid "Back to overview"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:20
-msgid "Back to scan results"
-msgstr ""
-
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:17
 msgid "Backup"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:38
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:36
 msgid "Backup / Flash Firmware"
 msgstr ""
 
@@ -808,11 +814,11 @@ msgid "Bad address specified!"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:158
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:288
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:368
 msgid "Band"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:261
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:785
 msgid "Beacon Interval"
 msgstr ""
 
@@ -823,79 +829,85 @@ msgid ""
 "defined backup patterns."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:293
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:294
 msgid ""
 "Bind dynamically to interfaces rather than wildcard address (recommended as "
 "linux default)"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:16
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:48
 msgid "Bind interface"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:16
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:48
 msgid "Bind the tunnel to this interface (optional)."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:49
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:134
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:187
 msgid "Bitrate"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:172
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
 msgid "Bogus NX Domain Override"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1634
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1840
 #: modules/luci-base/luasrc/model/network.lua:1420
 msgid "Bridge"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:264
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:368
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:678
 msgid "Bridge interfaces"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:906
 msgid "Bridge unit number"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:250
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:364
 msgid "Bring up on boot"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:35
-msgid "Broadcom 802.11%s Wireless Controller"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:45
-msgid "Broadcom BCM%04x 802.11 Wireless Controller"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1697
+msgid "Browse…"
 msgstr ""
 
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:18
 msgid "Buffered"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:75
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:134
 msgid "CA certificate; if empty it will be saved after the first connection."
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:7
+msgid "CLAT configuration failed"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:13
 msgid "CPU usage (%)"
 msgstr ""
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:21
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:53
 msgid "Call failed"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1789
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:14
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:52
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:711
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:948
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1839
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:191
 #: modules/luci-mod-system/luasrc/view/admin_system/upgrade.htm:60
 msgid "Cancel"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:6
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:17
 msgid "Category"
 msgstr ""
 
@@ -913,13 +925,7 @@ msgstr ""
 msgid "Chain"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:9
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:14
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:24
-msgid "Change login password"
-msgstr ""
-
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1744
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 msgid "Changes"
 msgstr ""
 
@@ -927,33 +933,23 @@ msgstr ""
 msgid "Changes applied."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2004
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2545
 msgid "Changes have been reverted."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:43
 msgid "Changes the administrator password for accessing the device"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:10
-msgid "Changing password…"
-msgstr ""
-
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:162
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:45
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:87
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:174
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:376
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1618
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:186
 msgid "Channel"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:119
-msgid ""
-"Channel %d is not available in the %s regulatory domain and has been auto-"
-"adjusted to %d."
-msgstr ""
-
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:229
 msgid "Check"
 msgstr ""
@@ -962,7 +958,7 @@ msgstr ""
 msgid "Check filesystems before mount"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1806
 msgid "Check this option to delete the existing networks from this radio."
 msgstr ""
 
@@ -974,8 +970,8 @@ msgstr ""
 msgid "Choose mtdblock"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:358
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:443
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1829
 msgid ""
 "Choose the firewall zone you want to assign to this interface. Select "
 "<em>unspecified</em> to remove the interface from the associated zone or "
@@ -983,17 +979,17 @@ msgid ""
 "interface to it."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:834
 msgid ""
 "Choose the network(s) you want to attach to this wireless interface or fill "
 "out the <em>create</em> field to define a new network."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:614
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1023
 msgid "Cipher"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:61
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:91
 msgid "Cisco UDP encapsulation"
 msgstr ""
 
@@ -1009,28 +1005,28 @@ msgid ""
 "FEATURE IS FOR PROFESSIONALS! )"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1950
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:369
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:471
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2189
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:803
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:908
 msgid "Client"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:55
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:52
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:47
 msgid "Client ID to send when requesting DHCP"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:145
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:151
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:155
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:161
 msgid "Close"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:146
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:119
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:125
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:127
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:98
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:119
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:157
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:141
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:115
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:138
 msgid ""
 "Close inactive connection after the given amount of seconds, use 0 to "
 "persist connection"
@@ -1043,12 +1039,9 @@ msgstr ""
 #: modules/luci-base/luasrc/view/lease_status.htm:77
 #: modules/luci-base/luasrc/view/lease_status.htm:98
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:118
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:37
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:24
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1965
 #: modules/luci-mod-network/luasrc/view/admin_network/iface_status.htm:6
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:40
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:30
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:8
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:398
 #: modules/luci-mod-status/luasrc/view/admin_status/index/30-network.htm:11
 #: modules/luci-mod-status/luasrc/view/admin_status/index/50-dsl.htm:17
@@ -1062,15 +1055,19 @@ msgstr ""
 msgid "Command"
 msgstr ""
 
-#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:64
-msgid "Comment"
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:193
+msgid "Command OK"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:185
-msgid "Common Configuration"
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:41
+msgid "Command failed"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1176
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:64
+msgid "Comment"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
 msgid ""
 "Complicates key reinstallation attacks on the client side by disabling "
 "retransmission of EAPOL-Key frames that are used to install keys. This "
@@ -1078,13 +1075,14 @@ msgid ""
 "negotiation especially in environments with heavy traffic load."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1744
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 #: modules/luci-base/luasrc/controller/admin/uci.lua:11
 #: modules/luci-mod-system/luasrc/view/admin_system/backupfiles.htm:9
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:13
 msgid "Configuration"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:21
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:63
 msgid "Configuration failed"
 msgstr ""
@@ -1093,89 +1091,89 @@ msgstr ""
 msgid "Configuration files will be kept"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1915
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2456
 msgid "Configuration has been applied."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1848
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2395
 msgid "Configuration has been rolled back!"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:43
-msgid "Confirmation"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:942
+msgid "Confirm disconnect"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:32
-msgid "Connect"
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:50
+msgid "Confirmation"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:72
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:105
 msgid "Connected"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:338
-msgid "Connection Limit"
-msgstr ""
-
 #: modules/luci-base/htdocs/luci-static/resources/network.js:7
 #: modules/luci-base/luasrc/model/network.lua:27
 msgid "Connection attempt failed"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:203
+msgid "Connection lost"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/controller/admin/status.lua:32
 msgid "Connections"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1890
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:66
+msgid "Contents have been saved."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:618
+msgid "Continue"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2431
 msgid ""
 "Could not regain access to the device after applying the configuration "
 "changes. You might need to reconnect if you modified network related "
 "settings such as the IP address or wireless security credentials."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:135
 msgid "Country"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:227
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:233
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:337
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:764
 msgid "Country Code"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:36
-msgid "Cover the following interface"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:43
-msgid "Cover the following interfaces"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:357
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:86
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:443
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1829
 msgid "Create / Assign firewall-zone"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:9
-msgid "Create Interface"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:735
+msgid "Create interface"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:33
-msgid "Create a bridge over multiple interfaces"
-msgstr ""
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:174
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:165
 msgid "Critical"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:178
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:169
 msgid "Cron Log Level"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:519
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:521
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:447
+msgid "Current power"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:552
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:554
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:51
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:53
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:82
@@ -1183,7 +1181,7 @@ msgstr ""
 msgid "Custom Interface"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:36
 msgid "Custom delegated IPv6-prefix"
 msgstr ""
 
@@ -1193,52 +1191,53 @@ msgid ""
 "this, perform a factory-reset first."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:59
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:41
 msgid ""
 "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
 "\">LED</abbr>s if possible."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:799
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1223
 msgid "DAE-Client"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:807
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1231
 msgid "DAE-Port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:815
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1239
 msgid "DAE-Secret"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:448
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:459
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:279
 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:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:61
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:62
 msgid "DHCP and DNS"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1195
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1385
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:16
 #: modules/luci-base/luasrc/model/network.lua:968
 msgid "DHCP client"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:571
 msgid "DHCP-Options"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_dhcpv6.lua:7
 msgid "DHCPv6 client"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:540
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:594
 msgid "DHCPv6-Mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:529
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:583
 msgid "DHCPv6-Service"
 msgstr ""
 
@@ -1255,31 +1254,31 @@ msgstr ""
 msgid "DNS"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:183
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
 msgid "DNS forwardings"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:30
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:37
 msgid "DNS-Label / FQDN"
 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:136
 msgid "DNSSEC"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:139
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
 msgid "DNSSEC check unsigned"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:73
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:99
 msgid "DPD Idle Timeout"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:14
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:41
 msgid "DS-Lite AFTR address"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:92
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:815
 #: modules/luci-mod-status/luasrc/view/admin_status/index/50-dsl.htm:14
 msgid "DSL"
 msgstr ""
@@ -1288,11 +1287,11 @@ msgstr ""
 msgid "DSL Status"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:125
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:848
 msgid "DSL line mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:519
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:963
 msgid "DTIM Interval"
 msgstr ""
 
@@ -1304,77 +1303,92 @@ msgstr ""
 msgid "Data Rate"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:169
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:180
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:160
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:171
 msgid "Debug"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:759
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:783
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:807
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1183
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1207
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1231
 msgid "Default %d"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:82
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:107
 msgid "Default Route"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:17
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:81
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:51
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:32
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:48
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:85
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:65
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:80
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:108
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:146
 msgid "Default gateway"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:541
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:594
 msgid "Default is stateless + stateful"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:70
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:54
 msgid "Default state"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:503
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:553
 msgid "Define a name for this network."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:514
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:571
 msgid ""
 "Define additional DHCP options, for example "
 "\"<code>6,192.168.2.1,192.168.2.2</code>\" which advertises different DNS "
 "servers to clients."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:705
-#: modules/luci-base/htdocs/luci-static/resources/form.js:958
-#: modules/luci-base/htdocs/luci-static/resources/form.js:959
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1271
+#: modules/luci-base/htdocs/luci-static/resources/form.js:966
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1210
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1216
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1524
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1758
 #: modules/luci-base/luasrc/view/cbi/nsection.htm:11
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:162
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:16
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:41
 msgid "Delete"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:178
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:187
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:193
 msgid "Delete key"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:45
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1654
+msgid "Delete permission denied"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1656
+msgid "Delete request failed: %d %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:723
 msgid "Delete this network"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:519
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:963
 msgid "Delivery Traffic Indication Message Interval"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:102
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:108
 msgid "Description"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:224
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1754
+msgid "Deselect"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:215
 msgid "Design"
 msgstr ""
 
@@ -1392,10 +1406,12 @@ msgstr ""
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:177
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:43
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:13
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:38
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:73
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:33
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:52
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:85
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:86
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:72
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:154
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:253
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:86
@@ -1403,15 +1419,24 @@ msgstr ""
 msgid "Device"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:138
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:737
 msgid "Device Configuration"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:81
+msgid "Device is not active"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/reboot.htm:23
 msgid "Device is rebooting..."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1889
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:167
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:513
+msgid "Device is restarting…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2430
 msgid "Device unreachable!"
 msgstr ""
 
@@ -1419,96 +1444,91 @@ msgstr ""
 msgid "Device unreachable! Still waiting for device..."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:123
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:78
 #: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:61
 msgid "Diagnostics"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:45
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:60
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:101
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:93
 msgid "Dial number"
 msgstr ""
 
-#: modules/luci-base/luasrc/view/cbi/filebrowser.htm:99
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1554
 msgid "Directory"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:131
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:715
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:754
 msgid "Disable"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:472
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:531
 msgid ""
 "Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for "
 "this interface."
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:64
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:93
 msgid "Disable Encryption"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:530
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:973
 msgid "Disable Inactivity Polling"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:713
 msgid "Disable this network"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:44
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:54
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:68
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:37
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:43
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:37
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1534
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:76
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:107
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:99
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:51
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:95
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:82
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:69
 msgid "Disabled"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1139
-msgid "Disabled (default)"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:544
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:987
 msgid "Disassociate On Low Acknowledgement"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:193
 msgid "Discard upstream RFC1918 responses"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:92
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:114
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:956
 msgid "Disconnect"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:22
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:64
 msgid "Disconnection attempt failed"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1121
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1762
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1855
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:17
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1375
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1995
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2314
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2401
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1634
 msgid "Dismiss"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:240
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:334
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:770
 msgid "Distance Optimization"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:241
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:770
 msgid "Distance to farthest network member in meters."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:347
-msgid "Diversity"
-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:61
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
@@ -1516,35 +1536,43 @@ msgid ""
 "firewalls"
 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:159
 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:123
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:124
 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:118
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
 msgid "Do not forward reverse lookups for local networks"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:173
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1639
+msgid "Do you really want to delete \"%s\" ?"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:188
 msgid "Do you really want to delete the following SSH key?"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1637
+msgid "Do you really want to recursively delete the directory \"%s\" ?"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:74
 msgid "Domain required"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:205
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:206
 msgid "Domain whitelist"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:34
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:67
 msgid "Don't Fragment"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:74
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:75
 msgid ""
 "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
 "<abbr title=\"Domain Name System\">DNS</abbr>-Name"
@@ -1562,57 +1590,58 @@ msgstr ""
 msgid "Download mtdblock"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:853
 msgid "Downstream SNR offset"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:914
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1169
 msgid "Drag to reorder"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:9
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:11
 msgid "Dropbear Instance"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:6
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 msgid ""
 "Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access "
 "and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:11
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:14
 msgid "Dual-Stack Lite (RFC6333)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:493
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:547
 msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:60
 msgid "Dynamic tunnel"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:494
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:547
 msgid ""
 "Dynamically allocate DHCP addresses for clients. If disabled, only clients "
 "having static leases will be served."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:67
 msgid "EA-bits length"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:990
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1386
 msgid "EAP-Method"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:934
-#: modules/luci-base/htdocs/luci-static/resources/form.js:935
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1199
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1188
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1191
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1450
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:154
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:160
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:38
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:291
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:720
 msgid "Edit"
 msgstr ""
 
@@ -1622,90 +1651,91 @@ msgid ""
 "reload the page."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:38
-msgid "Edit this interface"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:718
+msgid "Edit this network"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:42
-msgid "Edit this network"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:669
+msgid "Edit wireless network"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:176
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:167
 msgid "Emergency"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:127
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:715
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:754
 msgid "Enable"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:414
 msgid ""
 "Enable <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> "
 "snooping"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:271
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:412
 msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:41
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:60
 msgid "Enable HE.net dynamic endpoint update"
 msgstr ""
 
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:51
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:89
 msgid "Enable IPv6 negotiation"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:23
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:35
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:41
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:35
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:37
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:49
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:80
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:54
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:67
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:93
 msgid "Enable IPv6 negotiation on the PPP link"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:143
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:188
 msgid "Enable Jumbo Frame passthrough"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:244
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:235
 msgid "Enable NTP client"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:69
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:96
 msgid "Enable Single DES"
 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:267
 msgid "Enable TFTP server"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:134
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:180
 msgid "Enable VLAN functionality"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1595
 msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1175
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
 msgid "Enable key reinstallation (KRACK) countermeasures"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:138
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:183
 msgid "Enable learning and aging"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:194
 msgid "Enable mirroring of incoming packets"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:151
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:195
 msgid "Enable mirroring of outgoing packets"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:34
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:67
 msgid "Enable the DF (Don't Fragment) flag of the encapsulating packets."
 msgstr ""
 
@@ -1713,7 +1743,7 @@ msgstr ""
 msgid "Enable this mount"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:713
 msgid "Enable this network"
 msgstr ""
 
@@ -1721,48 +1751,52 @@ msgstr ""
 msgid "Enable this swap"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:37
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:88
 msgid "Enable/Disable"
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:76
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:152
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:251
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:41
 msgid "Enabled"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:277
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:414
 msgid "Enables IGMP snooping on this bridge"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:892
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1310
 msgid ""
 "Enables fast roaming among access points that belong to the same Mobility "
 "Domain"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:272
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:412
 msgid "Enables the Spanning Tree Protocol on this bridge"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:120
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:180
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:59
+msgid "Encapsulation limit"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:843
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:901
 msgid "Encapsulation mode"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:76
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:603
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:129
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:992
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1621
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:177
 msgid "Encryption"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:155
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:128
 msgid "Endpoint Host"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:165
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:132
 msgid "Endpoint Port"
 msgstr ""
 
@@ -1774,16 +1808,21 @@ msgstr ""
 msgid "Enter custom values"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:273
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:271
 msgid "Erasing..."
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:95
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:96
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:97
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:98
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:99
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:106
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:107
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:108
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:109
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:110
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:173
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:164
 msgid "Error"
 msgstr ""
 
@@ -1791,24 +1830,28 @@ msgstr ""
 msgid "Errored seconds (ES)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1646
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1852
 #: modules/luci-base/luasrc/model/network.lua:1432
 msgid "Ethernet Adapter"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1637
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1843
 #: modules/luci-base/luasrc/model/network.lua:1422
 msgid "Ethernet Switch"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:303
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
 msgid "Exclude interfaces"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:153
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
 msgid "Expand hosts"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:195
+msgid "Expecting an hexadecimal assignment hint"
+msgstr ""
+
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:59
 msgid "Expecting: %s"
 msgstr ""
@@ -1817,60 +1860,76 @@ msgstr ""
 msgid "Expires"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:488
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:543
 msgid ""
 "Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:8
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:19
 msgid "External"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:971
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1377
 msgid "External R0 Key Holder List"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:980
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1381
 msgid "External R1 Key Holder List"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:150
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:141
 msgid "External system log server"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:155
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:146
 msgid "External system log server port"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:160
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:151
 msgid "External system log server protocol"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:18
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:79
 msgid "Extra SSH command options"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:940
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1351
 msgid "FT over DS"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:941
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1352
 msgid "FT over the Air"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:938
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1349
 msgid "FT protocol"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1842
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:82
+msgid "Failed to change the system password."
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2389
 msgid "Failed to confirm apply within %ds, waiting for rollback…"
 msgstr ""
 
-#: modules/luci-base/luasrc/view/cbi/filebrowser.htm:106
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:45
+msgid "Failed to execute \"/etc/init.d/%s %s\" action: %s"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1561
 msgid "File"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:279
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1514
+msgid "File not accessible"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1698
+msgid "Filename"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:280
 msgid "Filename of the boot image advertised to clients"
 msgstr ""
 
@@ -1880,14 +1939,15 @@ msgstr ""
 msgid "Filesystem"
 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:118
 msgid "Filter private"
 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:123
 msgid "Filter useless"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:23
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:65
 msgid "Finalizing failed"
 msgstr ""
@@ -1898,7 +1958,7 @@ msgid ""
 "with defaults based on what was detected"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:696
 msgid "Find and join network"
 msgstr ""
 
@@ -1910,11 +1970,11 @@ msgstr ""
 msgid "Firewall"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:77
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:76
 msgid "Firewall Mark"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:193
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:278
 msgid "Firewall Settings"
 msgstr ""
 
@@ -1922,7 +1982,7 @@ msgstr ""
 msgid "Firewall Status"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:137
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:860
 msgid "Firmware File"
 msgstr ""
 
@@ -1930,7 +1990,7 @@ msgstr ""
 msgid "Firmware Version"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:225
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:226
 msgid "Fixed source port for outbound DNS queries"
 msgstr ""
 
@@ -1950,35 +2010,35 @@ msgstr ""
 msgid "Flash operations"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:194
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:192
 msgid "Flashing..."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:498
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:550
 msgid "Force"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:258
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:782
 msgid "Force 40MHz mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:622
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1031
 msgid "Force CCMP (AES)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:499
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:550
 msgid "Force DHCP on this network even if another server is detected."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:623
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1032
 msgid "Force TKIP"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:624
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1033
 msgid "Force TKIP and CCMP (AES)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:795
 msgid "Force link"
 msgstr ""
 
@@ -1986,7 +2046,7 @@ msgstr ""
 msgid "Force upgrade"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:60
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:90
 msgid "Force use of NAT-T"
 msgstr ""
 
@@ -1994,7 +2054,7 @@ msgstr ""
 msgid "Form token mismatch"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:34
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:164
 msgid "Forward DHCP traffic"
 msgstr ""
 
@@ -2002,46 +2062,41 @@ msgstr ""
 msgid "Forward Error Correction Seconds (FECS)"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:28
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:161
 msgid "Forward broadcast traffic"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:375
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:809
 msgid "Forward mesh peer traffic"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:186
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:908
 msgid "Forwarding mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:255
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:596
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:774
 msgid "Fragmentation Threshold"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:332
-msgid "Frame Bursting"
-msgstr ""
-
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:17
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:28
 msgid "Free"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:91
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:89
 msgid ""
-"Further information about WireGuard interfaces and peers at <a href=\"http://"
-"wireguard.com\">wireguard.com</a>."
+"Further information about WireGuard interfaces and peers at <a href='http://"
+"wireguard.com'>wireguard.com</a>."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:45
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:130
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:186
 msgid "GHz"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:29
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:36
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:91
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:77
 msgid "GPRS only"
 msgstr ""
 
@@ -2050,28 +2105,28 @@ msgstr ""
 msgid "Gateway"
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:35
+msgid "Gateway Ports"
+msgstr ""
+
 #: modules/luci-base/htdocs/luci-static/resources/network.js:9
 #: modules/luci-base/luasrc/model/network.lua:29
 msgid "Gateway address is invalid"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:46
-msgid "Gateway ports"
-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:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:275
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:23
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:112
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:103
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:49
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:33
 msgid "General Settings"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:188
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:462
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:175
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:141
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:361
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:504
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:895
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:741
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:796
 msgid "General Setup"
 msgstr ""
 
@@ -2079,7 +2134,7 @@ msgstr ""
 msgid "Generate Config"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:945
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1355
 msgid "Generate PMK locally"
 msgstr ""
 
@@ -2087,11 +2142,7 @@ msgstr ""
 msgid "Generate archive"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:63
-msgid "Generic 802.11%s Wireless Controller"
-msgstr ""
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:26
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:74
 msgid "Given password confirmation did not match, password not changed!"
 msgstr ""
 
@@ -2099,7 +2150,7 @@ msgstr ""
 msgid "Global Settings"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:806
 msgid "Global network options"
 msgstr ""
 
@@ -2110,33 +2161,29 @@ msgstr ""
 msgid "Go to password configuration..."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:857
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1369
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1112
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1616
 #: modules/luci-base/luasrc/view/cbi/full_valueheader.htm:4
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:58
 msgid "Go to relevant configuration page"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:38
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:66
 msgid "Group Password"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:11
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:22
 msgid "Guest"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:73
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:81
 msgid "HE.net password"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:60
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:73
 msgid "HE.net username"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:310
-msgid "HT mode (802.11n)"
-msgstr ""
-
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:16
 msgid "Hang Up"
 msgstr ""
@@ -2145,15 +2192,13 @@ msgstr ""
 msgid "Header Error Code Errors (HEC)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:103
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 msgid ""
 "Here you can configure the basic aspects of your device like its hostname or "
 "the timezone."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:499
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:556
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:579
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:941
 msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr ""
 
@@ -2164,14 +2209,15 @@ msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:92
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1959
 msgid "Host"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:20
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:21
 msgid "Host entries"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:48
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:171
 msgid "Host expiry timeout"
 msgstr ""
 
@@ -2179,45 +2225,45 @@ msgstr ""
 msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:118
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:102
 msgid "Host-Uniq tag content"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:71
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:31
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:316
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:25
+#: 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:317
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:26
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:17
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:125
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:116
 msgid "Hostname"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:12
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:22
 msgid "Hostname to send when requesting DHCP"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:18
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:19
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:67
 msgid "Hostnames"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:13
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:24
 msgid "Hybrid"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:45
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:75
 msgid "IKE DH Group"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:41
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:59
 msgid "IP Addresses"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:40
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:80
 msgid "IP Protocol"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:29
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:30
 msgid "IP address"
 msgstr ""
 
@@ -2236,6 +2282,11 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:20
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:21
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:22
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:79
+#: 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/network.js:89
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:90
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:91
@@ -2243,7 +2294,7 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:93
 #: 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/luasrc/model/cbi/admin_network/proto_ncm.lua:42
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:82
 msgid "IPv4"
 msgstr ""
 
@@ -2255,24 +2306,23 @@ msgstr ""
 msgid "IPv4 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:57
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:178
 msgid "IPv4 address"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:26
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:33
 msgid "IPv4 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:104
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:181
 msgid "IPv4 broadcast"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:100
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:180
 msgid "IPv4 gateway"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:92
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:179
 msgid "IPv4 netmask"
 msgstr ""
 
@@ -2280,24 +2330,25 @@ msgstr ""
 msgid "IPv4 network in address/netmask notation"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:25
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:52
 msgid "IPv4 prefix"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:42
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:30
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:55
 msgid "IPv4 prefix length"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:43
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:83
 msgid "IPv4+IPv6"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:72
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:34
 msgid "IPv4-Address"
 msgstr ""
 
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:10
 #: protocols/luci-proto-ipip/luasrc/model/network/proto_ipip.lua:9
 msgid "IPv4-in-IPv4 (RFC2003)"
 msgstr ""
@@ -2312,6 +2363,16 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:30
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:31
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:32
+#: 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/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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:89
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:90
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:91
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:92
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:95
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:96
@@ -2324,7 +2385,7 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:103
 #: 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/luasrc/model/cbi/admin_network/proto_ncm.lua:44
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:84
 msgid "IPv6"
 msgstr ""
 
@@ -2336,11 +2397,11 @@ msgstr ""
 msgid "IPv6 Neighbours"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:464
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:506
 msgid "IPv6 Settings"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:195
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:810
 msgid "IPv6 ULA-Prefix"
 msgstr ""
 
@@ -2348,21 +2409,21 @@ msgstr ""
 msgid "IPv6 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:202
 msgid "IPv6 address"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:23
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:189
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:31
 msgid "IPv6 assignment hint"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:18
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:184
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:27
 msgid "IPv6 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:207
 msgid "IPv6 gateway"
 msgstr ""
 
@@ -2370,22 +2431,22 @@ msgstr ""
 msgid "IPv6 network in address/netmask notation"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:37
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:59
 msgid "IPv6 prefix"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:34
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:45
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:63
 msgid "IPv6 prefix length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:33
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:211
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:57
 msgid "IPv6 routed prefix"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:143
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:215
 msgid "IPv6 suffix"
 msgstr ""
 
@@ -2395,31 +2456,35 @@ msgid "IPv6-Address"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:93
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:104
 msgid "IPv6-PD"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:10
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:13
 msgid "IPv6-in-IPv4 (RFC4213)"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:17
 msgid "IPv6-over-IPv4 (6rd)"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:15
 msgid "IPv6-over-IPv4 (6to4)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1075
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1478
 msgid "Identity"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:70
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:96
 msgid "If checked, 1DES is enabled"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:65
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:93
 msgid "If checked, encryption is disabled"
 msgstr ""
 
@@ -2436,36 +2501,36 @@ msgid ""
 "device node"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:27
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:71
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:18
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:82
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:52
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:17
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:29
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:33
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:68
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:85
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:32
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:45
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:45
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:24
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:44
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:116
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:48
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:85
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:65
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:33
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:80
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:108
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:146
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:74
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:97
 msgid "If unchecked, no default route is configured"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:34
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:86
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:35
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:99
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:47
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:60
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:60
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:39
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:59
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:124
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:39
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:116
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:59
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:103
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:64
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:77
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:100
 msgid "If unchecked, the advertised DNS server addresses are ignored"
 msgstr ""
 
@@ -2478,15 +2543,15 @@ msgid ""
 "of the <abbr title=\"Random Access Memory\">RAM</abbr>."
 msgstr ""
 
-#: 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:102
 msgid "Ignore <code>/etc/hosts</code>"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:471
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:531
 msgid "Ignore interface"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:90
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:91
 msgid "Ignore resolve file"
 msgstr ""
 
@@ -2504,12 +2569,12 @@ msgid ""
 "blocked. Click \"Continue »\" below to return to the previous page."
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:145
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:118
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:124
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:126
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:97
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:118
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:157
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:141
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:115
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:138
 msgid "Inactivity timeout"
 msgstr ""
 
@@ -2517,23 +2582,25 @@ msgstr ""
 msgid "Inbound:"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:170
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:161
 msgid "Info"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:105
 msgid "Information"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:25
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:67
 msgid "Initialization failure"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:34
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:87
 msgid "Initscript"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:26
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:122
 msgid "Initscripts"
 msgstr ""
 
@@ -2541,55 +2608,74 @@ msgstr ""
 msgid "Install iputils-traceroute6 for IPv6 traceroute"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:223
-msgid "Install package %q"
-msgstr ""
-
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:220
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:120
 msgid "Install protocol extensions..."
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:416
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:423
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:683
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:687
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:26
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:284
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:342
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:47
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:134
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:14
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:16
 msgid "Interface"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:58
 msgid "Interface %q device auto-migrated from %q to %q."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:356
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:792
 msgid "Interface Configuration"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:51
-msgid "Interface Overview"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:99
+msgid "Interface has %d pending changes"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:57
+msgid "Interface is marked for deletion"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:162
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:3
 msgid "Interface is reconnecting..."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:162
+msgid "Interface is shutting down..."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:205
+msgid "Interface is starting..."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:208
+msgid "Interface is stopping..."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:954
 msgid "Interface name"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:34
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:224
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:131
 msgid "Interface not present or not connected yet."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:88
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:16
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:11
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:287
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:54
 msgid "Interfaces"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:9
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:20
 msgid "Internal"
 msgstr ""
 
@@ -2602,19 +2688,35 @@ msgstr ""
 msgid "Invalid"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:311
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:10
+msgid "Invalid Base64 key string"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:281
 msgid "Invalid VLAN ID given! Only IDs between %d and %d are allowed."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:307
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:290
 msgid "Invalid VLAN ID given! Only unique IDs are allowed"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:195
+msgid "Invalid argument"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:194
+msgid "Invalid command"
+msgstr ""
+
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:80
+msgid "Invalid hexadecimal value"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/sysauth.htm:12
 msgid "Invalid username and/or password! Please try again."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:508
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:950
 msgid "Isolate Clients"
 msgstr ""
 
@@ -2631,15 +2733,15 @@ msgstr ""
 msgid "JavaScript required!"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:52
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1691
 msgid "Join Network"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:22
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1628
 msgid "Join Network: Wireless Scan"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:19
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1833
 msgid "Joining Network: %q"
 msgstr ""
 
@@ -2656,15 +2758,15 @@ msgstr ""
 msgid "Kernel Version"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:823
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1248
 msgid "Key"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:851
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:852
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:853
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:854
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:870
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1277
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1278
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1279
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1291
 msgid "Key #%d"
 msgstr ""
 
@@ -2672,33 +2774,34 @@ msgstr ""
 msgid "Kill"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:10
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:21
 msgid "L2TP"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:10
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:40
 msgid "L2TP Server"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:100
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:74
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:80
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:74
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:53
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:73
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:131
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:102
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:89
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:112
 msgid "LCP echo failure threshold"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:118
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:89
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:95
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:89
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:68
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:91
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:144
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:102
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:125
 msgid "LCP echo interval"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:181
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:902
 msgid "LLC"
 msgstr ""
 
@@ -2707,11 +2810,11 @@ msgstr ""
 msgid "Label"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:213
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:204
 msgid "Language"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:115
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:106
 msgid "Language and Style"
 msgstr ""
 
@@ -2719,51 +2822,51 @@ msgstr ""
 msgid "Latency"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:10
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:21
 msgid "Leaf"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:369
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:487
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:393
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:543
 msgid "Lease time"
 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:87
 msgid "Leasefile"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:74
 #: modules/luci-base/luasrc/view/lease_status.htm:95
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:34
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
 msgid "Leasetime remaining"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:9
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:20
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:27
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:50
 msgid "Leave empty to autodetect"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:21
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:45
 msgid "Leave empty to use the current WAN address"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1746
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2299
 msgid "Legend:"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:481
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:538
 msgid "Limit"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:287
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:288
 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:299
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:300
 msgid "Limit listening to these interfaces, and loopback."
 msgstr ""
 
@@ -2783,17 +2886,17 @@ msgstr ""
 msgid "Line Uptime"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:101
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:88
 msgid "Link On"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:185
 msgid ""
 "List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
 "requests to"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:972
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1377
 msgid ""
 "List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-"
 "Identifier,128-bit key as hex string. <br />This list is used to map R0KH-ID "
@@ -2802,7 +2905,7 @@ msgid ""
 "Association."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:981
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1381
 msgid ""
 "List of R1KHs in the same Mobility Domain. <br />Format: MAC-address,R1KH-ID "
 "as 6 octets with colons,128-bit key as hex string. <br />This list is used "
@@ -2811,31 +2914,31 @@ msgid ""
 "PMK-R1 keys."
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:21
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:82
 msgid "List of SSH key files for auth"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:206
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:207
 msgid "List of domains to allow RFC1918 responses for"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:174
 msgid "List of hosts that supply bogus NX domain results"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:298
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:299
 msgid "Listen Interfaces"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:30
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:54
 msgid "Listen Port"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:15
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:16
 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:216
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:217
 msgid "Listening port for inbound DNS queries"
 msgstr ""
 
@@ -2854,11 +2957,11 @@ msgstr ""
 msgid "Loading"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:35
-msgid "Loading SSH keys…"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1819
+msgid "Loading directory contents…"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1204
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1296
 #: modules/luci-base/luasrc/view/view.htm:4
 msgid "Loading view…"
 msgstr ""
@@ -2868,77 +2971,73 @@ msgstr ""
 msgid "Local IP address is invalid"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:25
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:86
 msgid "Local IP address to assign"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:10
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:11
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:44
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:39
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:151
 msgid "Local IPv4 address"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:20
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:54
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:45
 msgid "Local IPv6 address"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:286
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:287
 msgid "Local Service Only"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:81
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:126
 msgid "Local Startup"
 msgstr ""
 
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:25
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:121
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:112
 msgid "Local Time"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:149
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
 msgid "Local domain"
 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:147
 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:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:151
 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:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
 msgid "Local server"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:129
 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:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:128
 msgid "Localise queries"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:175
-msgid "Locked to channel %s used by: %s"
-msgstr ""
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:168
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:159
 msgid "Log output level"
 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:181
 msgid "Log queries"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:113
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:104
 msgid "Logging"
 msgstr ""
 
@@ -2946,7 +3045,7 @@ msgstr ""
 msgid "Login"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:95
+#: modules/luci-base/luasrc/controller/admin/index.lua:103
 msgid "Logout"
 msgstr ""
 
@@ -2954,11 +3053,13 @@ msgstr ""
 msgid "Loss of Signal Seconds (LOSS)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:476
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:533
 msgid "Lowest leased address as offset from the network address."
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:40
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:75
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:35
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:86
 msgid "MAC"
@@ -2966,32 +3067,32 @@ msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:73
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:109
-#: 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:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1958
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:86
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:133
 msgid "MAC-Address"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:457
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:586
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:886
 msgid "MAC-Address Filter"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:142
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:363
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:798
 msgid "MAC-Filter"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:464
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:590
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:893
 msgid "MAC-List"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:13
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:16
 msgid "MAP / LW4over6"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:62
 msgid "MAP rule is invalid"
 msgstr ""
@@ -3009,8 +3110,8 @@ msgid "MHz"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:53
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:29
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:66
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:53
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:71
 msgid "MTU"
 msgstr ""
 
@@ -3020,16 +3121,17 @@ msgid ""
 "below:"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:55
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:69
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:26
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:38
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:38
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:108
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:52
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:96
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:83
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:57
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:70
 msgid "Manual"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1949
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2188
 msgid "Master"
 msgstr ""
 
@@ -3037,48 +3139,46 @@ msgstr ""
 msgid "Max. Attainable Data Rate (ATTNDR)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:539
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:982
 msgid "Maximum allowed Listen Interval"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:234
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
 msgid "Maximum allowed number of active DHCP leases"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:252
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:253
 msgid "Maximum allowed number of concurrent DNS queries"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:244
 msgid "Maximum allowed size of EDNS.0 UDP packets"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:63
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:77
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:57
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:112
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:104
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:93
 msgid "Maximum amount of seconds to wait for the modem to become ready"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:27
-msgid ""
-"Maximum length of the name is 15 characters including the automatic protocol/"
-"bridge prefix (br-, 6in4-, pppoe- etc.)"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:538
+msgid "Maximum number of leased addresses."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:482
-msgid "Maximum number of leased addresses."
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:761
+msgid "Maximum transmit power"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:21
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:49
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:134
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:187
 #: modules/luci-mod-status/luasrc/view/admin_status/bandwidth.htm:79
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:284
 msgid "Mbit/s"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:18
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:32
 msgid "Medium"
 msgstr ""
 
@@ -3090,42 +3190,43 @@ msgstr ""
 msgid "Memory usage (%)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1952
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2191
 msgid "Mesh"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:372
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:806
 msgid "Mesh Id"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:196
+msgid "Method not found"
+msgstr ""
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:45
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:76
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:104
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:54
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:66
 msgid "Metric"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:154
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:198
 msgid "Mirror monitor port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:153
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:197
 msgid "Mirror source port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:408
-msgid "Missing protocol extension for proto %q"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:923
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1337
 msgid "Mobility Domain"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:154
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:41
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:74
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:366
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:31
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:360
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:801
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1619
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:175
 msgid "Mode"
 msgstr ""
@@ -3134,39 +3235,38 @@ msgstr ""
 msgid "Model"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:31
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:72
 msgid "Modem default"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:11
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:19
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:11
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:10
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:73
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:73
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:57
 msgid "Modem device"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:24
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:66
 msgid "Modem information query failed"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:62
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:76
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:56
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:112
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:104
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:93
 msgid "Modem init timeout"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1953
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:452
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:554
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:577
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2192
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:880
 msgid "Monitor"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:14
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
 msgid "More Characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:802
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1057
 msgid "More…"
 msgstr ""
 
@@ -3179,7 +3279,7 @@ msgstr ""
 msgid "Mount Point"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:26
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:36
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:137
 msgid "Mount Points"
@@ -3227,46 +3327,44 @@ msgstr ""
 msgid "Move up"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:912
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
 msgid "NAS ID"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:57
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:87
 msgid "NAT-T Mode"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:9
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 msgid "NAT64 Prefix"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:31
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:26
 msgid "NCM"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:535
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:589
 msgid "NDP-Proxy"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:43
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:72
 msgid "NT Domain"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:273
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:264
 msgid "NTP server candidates"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:837
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1092
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:27
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:502
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:65
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:553
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:658
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:49
 msgid "Name"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:17
-msgid "Name of the new interface"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1808
 msgid "Name of the new network"
 msgstr ""
 
@@ -3274,9 +3372,10 @@ msgstr ""
 msgid "Navigation"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:62
+#: modules/luci-base/luasrc/controller/admin/index.lua:69
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:108
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:402
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:834
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1957
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:389
 #: modules/luci-mod-status/luasrc/view/admin_status/index/30-network.htm:8
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:73
@@ -3288,7 +3387,7 @@ msgstr ""
 msgid "Network Utilities"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:278
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:279
 msgid "Network boot image"
 msgstr ""
 
@@ -3301,53 +3400,59 @@ msgstr ""
 msgid "Network without interfaces."
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:661
+msgid "New interface name…"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:11
 msgid "Next »"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1507
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1754
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:108
 msgid "No"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:453
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:514
 msgid "No DHCP Server configured for this interface"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1162
+msgid "No Encryption"
+msgstr ""
+
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:89
 msgid "No NAT-T"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:198
+msgid "No data received"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1764
+msgid "No entries in this directory"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/backupfiles.lua:82
 msgid "No files found"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:550
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:191
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:180
 msgid "No information available"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:8
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:63
 msgid "No matching prefix delegation"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:157
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
 msgid "No negative cache"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:53
-msgid "No network configured on this device"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:65
-msgid "No network name specified"
-msgstr ""
-
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:147
-msgid "No networks in range"
-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
@@ -3355,7 +3460,12 @@ msgstr ""
 msgid "No password set!"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:116
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:104
+msgid "No peers defined yet"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:129
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:271
 msgid "No public keys present yet."
 msgstr ""
 
@@ -3363,19 +3473,19 @@ msgstr ""
 msgid "No rules in this chain."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:150
-msgid "No scan results available yet..."
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:53
+msgid "No signal"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:7
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:756
 msgid "No zone assigned"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:111
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:35
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:48
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:133
 msgid "Noise"
 msgstr ""
 
@@ -3391,16 +3501,16 @@ msgstr ""
 msgid "Non Pre-emtive CRC errors (CRC_P)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:292
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:293
 msgid "Non-wildcard"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:129
 msgid "None"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:181
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:172
 msgid "Normal"
 msgstr ""
 
@@ -3408,25 +3518,29 @@ msgstr ""
 msgid "Not Found"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:27
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:5
-msgid "Not associated"
-msgstr ""
-
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:87
 msgid "Not connected"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:38
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:139
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:232
+msgid "Not present"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:105
 msgid "Not started on boot"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:26
-msgid "Note: interface name length"
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:201
+msgid "Not supported"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:171
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:162
 msgid "Notice"
 msgstr ""
 
@@ -3434,57 +3548,50 @@ msgstr ""
 msgid "Nslookup"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:261
 msgid "Number of cached DNS entries (max is 10000, 0 is no caching)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:203
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:194
 msgid "Number of parallel threads used for compression"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:40
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:69
 msgid "Obfuscated Group Password"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:35
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:61
 msgid "Obfuscated Password"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:22
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:34
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:40
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:105
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:97
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:49
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:80
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:54
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:67
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:93
 msgid "Obtain IPv6-Address"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:83
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:68
 msgid "Off-State Delay"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:16
-msgid ""
-"On this page you can configure the network interfaces. You can bridge "
-"several interfaces by ticking the \"bridge interfaces\" field and enter the "
-"names of several network interfaces separated by spaces. You can also use "
-"<abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
-"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
-"<samp>eth0.1</samp>)."
-msgstr ""
-
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:95
 msgid "On-Link route"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:80
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:64
 msgid "On-State Delay"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:360
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:382
 msgid "One of hostname or mac address must be specified!"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:456
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:462
 msgid "One of the following: %s"
 msgstr ""
 
@@ -3506,34 +3613,35 @@ msgstr ""
 msgid "Open list..."
 msgstr ""
 
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:61
 #: protocols/luci-proto-openconnect/luasrc/model/network/proto_openconnect.lua:9
 msgid "OpenConnect (CISCO AnyConnect)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:757
 msgid "Operating frequency"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1753
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2306
 msgid "Option changed"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1755
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2308
 msgid "Option removed"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1140
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:55
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1535
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:66
 msgid "Optional"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:78
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:76
 msgid ""
 "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, "
 "starting with <code>0x</code>."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:144
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:215
 msgid ""
 "Optional. Allowed values: 'eui64', 'random', fixed value like '::1' or "
 "'::1:2'. When IPv6 prefix (like 'a:b:c:d::') is received from a delegating "
@@ -3541,41 +3649,41 @@ msgid ""
 "for the interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:123
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:117
 msgid ""
 "Optional. Base64-encoded preshared key. Adds in an additional layer of "
 "symmetric-key cryptography for post-quantum resistance."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:148
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:126
 msgid "Optional. Create routes for Allowed IPs for this peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:103
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:108
 msgid "Optional. Description of peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:156
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:128
 msgid ""
 "Optional. Host of peer. Names are resolved prior to bringing up the "
 "interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:67
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:71
 msgid "Optional. Maximum Transmission Unit of tunnel interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:166
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:132
 msgid "Optional. Port of peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:175
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:136
 msgid ""
 "Optional. Seconds between keep alive messages. Default is 0 (disabled). "
 "Recommended value if this device is behind a NAT is 25."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:31
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:54
 msgid "Optional. UDP port used for outgoing and incoming packets."
 msgstr ""
 
@@ -3596,7 +3704,7 @@ msgstr ""
 msgid "Outbound:"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:26
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:50
 msgid "Output Interface"
 msgstr ""
 
@@ -3605,51 +3713,51 @@ msgstr ""
 msgid "Output zone"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:63
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:155
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:33
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:54
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:54
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:219
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:50
 msgid "Override MAC address"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:66
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:35
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:56
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:88
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:125
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:131
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:133
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:104
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:61
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:58
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:223
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:44
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:54
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:154
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:71
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:145
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:132
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:110
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:119
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:97
 msgid "Override MTU"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:30
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:63
 msgid "Override TOS"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:25
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:58
 msgid "Override TTL"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:954
 msgid "Override default interface name"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:41
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:167
 msgid "Override the gateway in DHCP responses"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:507
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:555
 msgid ""
 "Override the netmask sent to clients. Normally it is calculated from the "
 "subnet that is served."
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:65
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:179
 msgid "Override the table used for internal routes"
 msgstr ""
 
@@ -3657,29 +3765,33 @@ msgstr ""
 msgid "Overview"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1606
+msgid "Overwrite existing file \"%s\" ?"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:11
 msgid "Owner"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:42
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:56
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:17
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:28
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:34
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:14
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:18
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:43
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:98
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:45
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:44
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:63
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:82
 msgid "PAP/CHAP password"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:39
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:53
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:14
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:11
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:15
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:96
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:88
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:43
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:74
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:42
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:61
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:77
 msgid "PAP/CHAP username"
 msgstr ""
 
@@ -3687,9 +3799,9 @@ msgstr ""
 msgid "PID"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:36
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:50
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:26
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:95
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:87
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:68
 msgid "PIN"
 msgstr ""
 
@@ -3698,114 +3810,116 @@ msgstr ""
 msgid "PIN code rejected"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:966
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1372
 msgid "PMK R1 Push"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:43
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:13
 msgid "PPP"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:11
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:58
 msgid "PPPoA Encapsulation"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:19
 msgid "PPPoATM"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:17
 msgid "PPPoE"
 msgstr ""
 
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:28
 #: protocols/luci-proto-pppossh/luasrc/model/network/proto_pppossh.lua:9
 msgid "PPPoSSH"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:15
 msgid "PPtP"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:59
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:73
 msgid "PSID offset"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:56
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:70
 msgid "PSID-bits length"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:123
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:846
 msgid "PTM/EFM (Packet Transfer Mode)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:78
-msgid "Package libiwinfo required!"
-msgstr ""
-
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:45
 msgid "Packets"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:7
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:756
 msgid "Part of zone %q"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/sysauth.htm:29
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1111
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:35
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:42
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1514
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:46
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:104
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:58
 msgid "Password"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:29
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:24
 msgid "Password authentication"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1019
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1414
 msgid "Password of Private Key"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1067
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1471
 msgid "Password of inner Private Key"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:14
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:16
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:18
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:20
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:32
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:34
 msgid "Password strength"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:44
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:107
 msgid "Password2"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:37
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:244
 msgid "Paste or drag SSH key file…"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1000
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1396
 msgid "Path to CA-Certificate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1007
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1402
 msgid "Path to Client-Certificate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1013
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1408
 msgid "Path to Private Key"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1049
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1453
 msgid "Path to inner CA-Certificate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1055
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1459
 msgid "Path to inner Client-Certificate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1061
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1465
 msgid "Path to inner Private Key"
 msgstr ""
 
@@ -3823,7 +3937,7 @@ msgstr ""
 msgid "Peak:"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:28
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:89
 msgid "Peer IP address to assign"
 msgstr ""
 
@@ -3832,11 +3946,11 @@ msgstr ""
 msgid "Peer address is missing"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:90
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:89
 msgid "Peers"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:50
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:80
 msgid "Perfect Forward Secrecy"
 msgstr ""
 
@@ -3848,7 +3962,11 @@ msgstr ""
 msgid "Perform reset"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:174
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:199
+msgid "Permission denied"
+msgstr ""
+
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:136
 msgid "Persistent Keep Alive"
 msgstr ""
 
@@ -3856,7 +3974,7 @@ msgstr ""
 msgid "Phy Rate:"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:190
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:277
 msgid "Physical Settings"
 msgstr ""
 
@@ -3867,6 +3985,10 @@ msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:16
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:17
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:41
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:77
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:87
@@ -3884,15 +4006,19 @@ msgstr ""
 msgid "Policy"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:22
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:20
 msgid "Port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:18
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:133
+msgid "Port %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:274
 msgid "Port status:"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:482
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:488
 msgid "Potential negation of: %s"
 msgstr ""
 
@@ -3904,11 +4030,11 @@ msgstr ""
 msgid "Pre-emtive CRC errors (CRCP_P)"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:32
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:73
 msgid "Prefer LTE"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:33
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:74
 msgid "Prefer UMTS"
 msgstr ""
 
@@ -3916,31 +4042,30 @@ msgstr ""
 msgid "Prefix Delegated"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:122
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:117
 msgid "Preshared Key"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:101
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:75
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:81
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:75
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:54
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:74
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:131
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:102
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:89
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:112
 msgid ""
 "Presume peer to be dead after given amount of LCP echo failures, use 0 to "
 "ignore failures"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:305
 msgid "Prevent listening on these interfaces."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:509
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:562
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:950
 msgid "Prevents client-to-client communication"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:18
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:49
 msgid "Private Key"
 msgstr ""
 
@@ -3961,39 +4086,33 @@ msgstr ""
 msgid "Prot."
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:72
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:349
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:675
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:84
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:216
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:87
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:390
 msgid "Protocol"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:31
-msgid "Protocol of the new interface"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:222
-msgid "Protocol support is not installed"
-msgstr ""
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:269
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:260
 msgid "Provide NTP server"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:701
 msgid "Provide new network"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:451
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:879
 msgid "Pseudo Ad-Hoc (ahdemo)"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:112
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:113
 msgid "Public Key"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:278
 msgid ""
 "Public keys allow for the passwordless SSH logins with a higher security "
 "compared to the use of plain passwords. In order to upload a new key to the "
@@ -4001,47 +4120,48 @@ msgid ""
 "code> file into the input field."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:139
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:211
 msgid "Public prefix routed to this device for distribution to clients."
 msgstr ""
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:27
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:9
 msgid "QMI Cellular"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:173
 msgid "Quality"
 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:171
 msgid ""
 "Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> "
 "servers"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:952
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1360
 msgid "R0 Key Lifetime"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:959
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1366
 msgid "R1 Key Holder"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:58
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:88
 msgid "RFC3947 NAT-T mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:381
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:814
 msgid "RSSI threshold for joining"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:256
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:597
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:778
 msgid "RTS/CTS Threshold"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:41
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:76
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:87
 msgid "RX"
@@ -4051,35 +4171,39 @@ msgstr ""
 msgid "RX Rate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:783
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1961
+msgid "RX Rate / TX Rate"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1207
 msgid "Radius-Accounting-Port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:791
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1215
 msgid "Radius-Accounting-Secret"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:775
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1199
 msgid "Radius-Accounting-Server"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:759
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1183
 msgid "Radius-Authentication-Port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:767
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1191
 msgid "Radius-Authentication-Secret"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:751
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1175
 msgid "Radius-Authentication-Server"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:119
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:102
 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:83
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:84
 msgid ""
 "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-Server"
@@ -4091,17 +4215,11 @@ msgid ""
 "access to this device if you are connected via this interface"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2
-msgid ""
-"Really delete this wireless network? The deletion cannot be undone! You "
-"might lose access to this device if you are connected via this network."
-msgstr ""
-
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:40
 msgid "Really reset all changes?"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:237
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:354
 msgid "Really switch protocol?"
 msgstr ""
 
@@ -4125,15 +4243,15 @@ msgstr ""
 msgid "Realtime Wireless"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:931
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1343
 msgid "Reassociation Deadline"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:191
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
 msgid "Rebind protection"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:48
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:46
 #: modules/luci-mod-system/luasrc/view/admin_system/reboot.htm:9
 msgid "Reboot"
 msgstr ""
@@ -4147,21 +4265,15 @@ msgstr ""
 msgid "Reboots the operating system of your device"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:103
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:90
 msgid "Receive"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:325
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:350
-msgid "Receiver Antenna"
-msgstr ""
-
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:42
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:59
 msgid "Recommended. IP addresses of the WireGuard interface."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:28
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:300
 msgid "Reconnect this interface"
 msgstr ""
 
@@ -4169,92 +4281,134 @@ msgstr ""
 msgid "References"
 msgstr ""
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:39
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:153
 msgid "Relay"
 msgstr ""
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:36
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:157
 msgid "Relay Bridge"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:17
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:154
 msgid "Relay between networks"
 msgstr ""
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:64
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:12
 msgid "Relay bridge"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:18
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:50
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:49
 msgid "Remote IPv4 address"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:8
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:40
 msgid "Remote IPv4 address or FQDN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:45
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:725
 msgid "Remove"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:53
-msgid "Repeat scan"
-msgstr ""
-
-#: modules/luci-base/luasrc/view/cbi/upload.htm:11
-msgid "Replace entry"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:46
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:51
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1806
 msgid "Replace wireless configuration"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:8
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:17
 msgid "Request IPv6-address"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:16
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:23
 msgid "Request IPv6-prefix of length"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1141
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:200
+msgid "Request timeout"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1536
 msgid "Required"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:20
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:31
 msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:19
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:49
 msgid "Required. Base64-encoded private key for this interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:113
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:113
 msgid "Required. Base64-encoded public key of peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:136
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:122
 msgid ""
 "Required. IP addresses and prefixes that this peer is allowed to use inside "
 "the tunnel. Usually the peer's tunnel IP addresses and the networks the peer "
 "routes through the tunnel."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1134
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1095
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1096
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1097
+msgid "Requires hostapd"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1101
+msgid "Requires hostapd with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1102
+msgid "Requires hostapd with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1098
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1099
+msgid "Requires hostapd with SAE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1533
 msgid ""
 "Requires the 'full' version of wpad/hostapd and support from the wifi driver "
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:141
 msgid ""
 "Requires upstream supports DNSSEC; verify unsigned domain responses really "
 "come from unsigned domains"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1268
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1109
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1119
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1120
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1121
+msgid "Requires wpa-supplicant"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1113
+msgid "Requires wpa-supplicant with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1114
+msgid "Requires wpa-supplicant with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1111
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1124
+msgid "Requires wpa-supplicant with SAE support"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1355
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:17
 #: modules/luci-base/luasrc/view/cbi/footer.htm:30
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:66
@@ -4270,17 +4424,22 @@ msgstr ""
 msgid "Reset to defaults"
 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:68
 msgid "Resolv and Hosts Files"
 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:94
 msgid "Resolve file"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:28
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:14
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:71
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:197
+msgid "Resource not found"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:302
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:693
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:90
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:112
 msgid "Restart"
 msgstr ""
 
@@ -4288,7 +4447,7 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:14
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:691
 msgid "Restart radio interface"
 msgstr ""
 
@@ -4300,26 +4459,24 @@ msgstr ""
 msgid "Restore backup"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:113
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:114
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:38
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:46
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:119
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:120
 msgid "Reveal/hide password"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1774
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2322
 msgid "Revert"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1861
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2405
 msgid "Revert changes"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2013
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2554
 msgid "Revert request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1993
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2534
 msgid "Reverting configuration…"
 msgstr ""
 
@@ -4327,7 +4484,7 @@ msgstr ""
 msgid "Root"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:271
 msgid "Root directory for files served via TFTP"
 msgstr ""
 
@@ -4335,7 +4492,7 @@ msgstr ""
 msgid "Root preparation"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:147
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:126
 msgid "Route Allowed IPs"
 msgstr ""
 
@@ -4347,12 +4504,12 @@ msgstr ""
 msgid "Route type"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:523
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:577
 msgid "Router Advertisement-Service"
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:43
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:15
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:27
 msgid "Router Password"
 msgstr ""
 
@@ -4380,7 +4537,7 @@ msgstr ""
 msgid "Run filesystem check"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:651
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:669
 msgid "Runtime error"
 msgstr ""
 
@@ -4392,31 +4549,31 @@ msgstr ""
 msgid "SNR"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:5
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:18
 msgid "SSH Access"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:10
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:70
 msgid "SSH server address"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:13
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:74
 msgid "SSH server port"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:8
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:58
 msgid "SSH username"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:27
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:277
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
 msgid "SSH-Keys"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:42
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:73
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:29
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1617
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:174
 msgid "SSID"
 msgstr ""
@@ -4425,17 +4582,17 @@ msgstr ""
 msgid "SWAP"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1127
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1262
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1379
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1351
 #: modules/luci-base/luasrc/view/cbi/error.htm:17
 #: modules/luci-base/luasrc/view/cbi/footer.htm:26
 #: modules/luci-base/luasrc/view/cbi/header.htm:17
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:54
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:133
 msgid "Save"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1256
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1768
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1347
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2318
 #: modules/luci-base/luasrc/view/cbi/footer.htm:22
 msgid "Save & Apply"
 msgstr ""
@@ -4448,28 +4605,20 @@ msgstr ""
 msgid "Save mtdblock contents"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
-msgid "Saving keys…"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:698
 msgid "Scan"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:109
-msgid "Scan request failed"
-msgstr ""
-
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:8
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:39
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:23
 msgid "Scheduled Tasks"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1749
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2302
 msgid "Section added"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1751
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2304
 msgid "Section removed"
 msgstr ""
 
@@ -4484,61 +4633,66 @@ msgid ""
 "your device!"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:119
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:90
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:96
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:90
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:69
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:92
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1516
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1646
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1809
+msgid "Select file…"
+msgstr ""
+
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:144
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:102
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:125
 msgid ""
 "Send LCP echo requests at the given interval in seconds, only effective in "
 "conjunction with failure threshold"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:561
-msgid "Separate Clients"
-msgstr ""
-
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:62
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:63
 msgid "Server Settings"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:26
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:50
 msgid "Service Name"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:25
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:30
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:87
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:71
 msgid "Service Type"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:55
+#: modules/luci-base/luasrc/controller/admin/index.lua:62
 msgid "Services"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:815
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:861
 msgid "Session expired"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:83
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:107
 msgid "Set VPN as Default Route"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:258
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:795
 msgid ""
 "Set interface properties regardless of the link carrier (If set, carrier "
 "sense events do not invoke hotplug handlers)."
 msgstr ""
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:23
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:55
 msgid "Setting PLMN failed"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:26
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:68
 msgid "Setting operation mode failed"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:454
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:517
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:527
 msgid "Setup DHCP Server"
 msgstr ""
 
@@ -4550,7 +4704,7 @@ msgstr ""
 msgid "Short GI"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:516
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:960
 msgid "Short Preamble"
 msgstr ""
 
@@ -4562,21 +4716,23 @@ msgstr ""
 msgid "Show empty chains"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:306
 msgid "Shutdown this interface"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:111
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:34
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:47
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:132
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1616
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:173
 msgid "Signal"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1960
+msgid "Signal / Noise"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:125
 msgid "Signal Attenuation (SATN)"
 msgstr ""
@@ -4589,11 +4745,11 @@ msgstr ""
 msgid "Size"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:259
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:260
 msgid "Size of DNS query cache"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:191
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
 msgid "Size of the ZRam device in megabytes"
 msgstr ""
 
@@ -4610,11 +4766,7 @@ msgstr ""
 msgid "Skip to navigation"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:335
-msgid "Slot time"
-msgstr ""
-
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1640
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1846
 #: modules/luci-base/luasrc/model/network.lua:1427
 msgid "Software VLAN"
 msgstr ""
@@ -4652,61 +4804,65 @@ msgstr ""
 msgid "Specifies the directory the device is attached to"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:23
-msgid "Specifies the listening port of this <em>Dropbear</em> instance"
-msgstr ""
-
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:57
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:175
 msgid ""
 "Specifies the maximum amount of failed ARP requests until hosts are presumed "
 "to be dead"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:49
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:171
 msgid ""
 "Specifies the maximum amount of seconds after which hosts are presumed to be "
 "dead"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:761
+msgid ""
+"Specifies the maximum transmit power the wireless radio may use. Depending "
+"on regulatory requirements and wireless usage, the actual transmit power may "
+"be reduced by the driver."
+msgstr ""
+
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:63
 msgid "Specify a TOS (Type of Service)."
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:25
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:58
 msgid ""
 "Specify a TTL (Time to Live) for the encapsulating packet other than the "
 "default (64)."
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:53
 msgid ""
 "Specify an MTU (Maximum Transmission Unit) other than the default (1280 "
 "bytes)."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:60
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "Specify the secret encryption key here."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:475
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:64
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:533
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:89
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:111
 msgid "Start"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:33
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:86
 msgid "Start priority"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1958
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2499
 msgid "Starting configuration apply…"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1626
 msgid "Starting wireless scan..."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:24
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:120
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
 msgid "Startup"
 msgstr ""
 
@@ -4718,59 +4874,62 @@ msgstr ""
 msgid "Static IPv6 Routes"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:70
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:71
 msgid "Static Leases"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:118
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:73
 msgid "Static Routes"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1194
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1384
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:172
 #: modules/luci-base/luasrc/model/network.lua:966
 msgid "Static address"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:308
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:309
 msgid ""
 "Static leases are used to assign fixed IP addresses and symbolic hostnames "
 "to DHCP clients. They are also required for non-dynamic interface "
 "configurations where only hosts with a corresponding lease are served."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:534
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:977
 msgid "Station inactivity limit"
 msgstr ""
 
 #: modules/luci-base/luasrc/controller/admin/index.lua:40
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:197
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:337
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:746
 #: modules/luci-mod-status/luasrc/view/admin_status/index.htm:128
 msgid "Status"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:35
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:75
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:308
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:91
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:113
 msgid "Stop"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:165
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Strict order"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:16
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:30
 msgid "Strong"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1843
 msgid "Submit"
 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:108
 msgid "Suppress logging"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:109
 msgid "Suppress logging of the routine operation of these protocols"
 msgstr ""
 
@@ -4782,42 +4941,44 @@ msgstr ""
 msgid "Swap Entry"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:23
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:5
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:135
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:21
 msgid "Switch"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:129
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:168
 msgid "Switch %q"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:128
-msgid "Switch %q (%s)"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:66
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:146
 msgid ""
 "Switch %q has an unknown topology - the VLAN settings might not be accurate."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:146
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:142
 msgid "Switch Port Mask"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1640
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1846
 #: modules/luci-base/luasrc/model/network.lua:1425
 msgid "Switch VLAN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:238
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:355
 msgid "Switch protocol"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:103
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:104
 #: modules/luci-base/luasrc/view/cbi/ipaddr.htm:26
 msgid "Switch to CIDR list notation"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:77
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1547
+msgid "Symbolic link"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:71
 msgid "Sync with NTP-Server"
 msgstr ""
 
@@ -4827,7 +4988,7 @@ msgstr ""
 
 #: modules/luci-base/luasrc/controller/admin/index.lua:47
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:14
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:102
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:94
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
 #: modules/luci-mod-system/luasrc/view/admin_system/applyreboot.htm:39
 msgid "System"
@@ -4838,11 +4999,11 @@ msgstr ""
 msgid "System Log"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:108
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:99
 msgid "System Properties"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:145
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:136
 msgid "System log buffer size"
 msgstr ""
 
@@ -4850,15 +5011,17 @@ msgstr ""
 msgid "TCP:"
 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:69
 msgid "TFTP Settings"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:269
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
 msgid "TFTP server root"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:17
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:77
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:88
 msgid "TX"
@@ -4881,7 +5044,7 @@ msgstr ""
 msgid "Target"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:77
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:103
 msgid "Target network"
 msgstr ""
 
@@ -4889,40 +5052,24 @@ msgstr ""
 msgid "Terminate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:27
-msgid ""
-"The <em>Device Configuration</em> section covers physical settings of the "
-"radio hardware such as channel, transmit power or antenna selection which "
-"are shared among all defined wireless networks (if the radio hardware is "
-"multi-SSID capable). Per network settings like encryption or operation mode "
-"are grouped in the <em>Interface Configuration</em>."
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:79
-msgid ""
-"The <em>libiwinfo-lua</em> package is not installed. You must install this "
-"component for working wireless configuration!"
-msgstr ""
-
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:66
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:77
 msgid ""
 "The HE.net endpoint update configuration changed, you must now use the plain "
 "username instead of the user ID!"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:8
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:40
 msgid ""
 "The IPv4 address or the fully-qualified domain name of the remote tunnel end."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:27
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:38
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:59
 msgid ""
 "The IPv6 prefix assigned to the provider, usually ends with <code>::</code>"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:18
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1808
 msgid ""
 "The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
 "code> and <code>_</code>"
@@ -4936,7 +5083,7 @@ msgstr ""
 msgid "The configuration file could not be loaded due to the following error:"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1849
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2396
 msgid ""
 "The device could not be reached within %d seconds after applying the pending "
 "changes, which caused the configuration to be rolled back for safety "
@@ -4954,6 +5101,12 @@ msgid ""
 "</abbr> <code>/dev/sda1</code>)"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:612
+msgid ""
+"The existing wireless configuration needs to be changed for LuCI to function "
+"properly."
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:127
 msgid ""
 "The filesystem that was used to format the memory (<abbr title=\"for example"
@@ -4972,43 +5125,49 @@ msgstr ""
 msgid "The following rules are currently active on this system."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:144
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:154
+msgid "The gateway address must not be a local IP address"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:154
 msgid "The given SSH public key has already been added."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:150
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:160
 msgid ""
 "The given SSH public key is invalid. Please supply proper public RSA or "
 "ECDSA keys."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:67
-msgid "The given network name is not unique"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:664
+msgid "The interface name is already used"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:52
-msgid ""
-"The hardware is not multi-SSID capable and the existing configuration will "
-"be replaced if you proceed."
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:670
+msgid "The interface name is too long"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:43
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:31
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:55
 msgid ""
 "The length of the IPv4 prefix in bits, the remainder is used in the IPv6 "
 "addresses."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:35
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:46
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:63
 msgid "The length of the IPv6 prefix in bits"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:12
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:44
 msgid "The local IPv4 address over which the tunnel is created (optional)."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:5
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1814
+msgid "The network name is already used"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:135
 msgid ""
 "The network ports on this device can be combined to several <abbr title="
 "\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
@@ -5018,22 +5177,21 @@ msgid ""
 "next greater network like the internet and other ports for a local network."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:77
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:395
-msgid "The selected protocol needs a device assigned"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1149
+msgid "The selected %s mode is incompatible with %s encryption"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/csrftoken.htm:11
 msgid "The submitted security token is invalid or already expired!"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:274
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:272
 msgid ""
 "The system is erasing the configuration partition now and will reboot itself "
 "when finished."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:195
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:193
 msgid ""
 "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
 "few minutes before you try to reconnect. It might be necessary to renew the "
@@ -5041,7 +5199,7 @@ msgid ""
 "settings."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:15
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:80
 msgid "The system password has been successfully changed."
 msgstr ""
 
@@ -5051,7 +5209,7 @@ msgid ""
 "you choose the generic image format for your platform."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:427
 msgid "There are no active leases"
 msgstr ""
 
@@ -5060,16 +5218,10 @@ msgstr ""
 msgid "There are no active leases."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1973
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2514
 msgid "There are no changes to apply"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:204
-msgid ""
-"There is no device assigned yet, please attach a network device in the "
-"\"Physical Settings\" tab"
-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
@@ -5079,11 +5231,19 @@ msgid ""
 "protect the web interface and enable SSH."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:19
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:49
 msgid "This IPv4 address of the relay"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1448
+msgid "This authentication type is not applicable to the selected EAP method."
+msgstr ""
+
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:54
+msgid "This does not look like a valid PEM file"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
 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 "
@@ -5097,44 +5257,44 @@ msgid ""
 "configurations are automatically preserved."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:74
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:81
 msgid ""
 "This is either the \"Update Key\" configured for the tunnel or the account "
 "password if no update key has been configured"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:82
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:127
 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 ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:27
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:54
 msgid ""
 "This is the local endpoint address assigned by the tunnel broker, it usually "
 "ends with <code>...:2/64</code>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:79
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> in the local network"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:73
 msgid "This is the plain username for logging into the account"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:34
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:57
 msgid ""
 "This is the prefix routed to you by the tunnel broker for use by clients"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:9
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:41
 msgid "This is the system crontab in which scheduled tasks can be defined."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:19
+#: 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 ""
@@ -5149,26 +5309,26 @@ msgstr ""
 msgid "This page gives an overview over currently active network connections."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:726
-#: modules/luci-base/htdocs/luci-static/resources/form.js:809
+#: modules/luci-base/htdocs/luci-static/resources/form.js:936
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1064
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:172
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:32
 msgid "This section contains no values yet"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:114
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:105
 msgid "Time Synchronization"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:525
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:968
 msgid "Time interval for rekeying GTK"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:128
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:119
 msgid "Timezone"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:825
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:871
 msgid "To login…"
 msgstr ""
 
@@ -5179,7 +5339,7 @@ msgid ""
 "reset\" (only possible with squashfs images)."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:835
 msgid "Tone"
 msgstr ""
 
@@ -5203,55 +5363,41 @@ msgstr ""
 msgid "Transfer"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:595
-msgid "Transmission Rate"
-msgstr ""
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:102
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:89
 msgid "Transmit"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:211
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:273
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:345
-msgid "Transmit Power"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:318
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:349
-msgid "Transmitter Antenna"
-msgstr ""
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:73
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:57
 msgid "Trigger"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:98
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:84
 msgid "Trigger Mode"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:54
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:69
 msgid "Tunnel ID"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1643
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1849
 #: modules/luci-base/luasrc/model/network.lua:1430
 msgid "Tunnel Interface"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:44
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:55
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:76
 msgid "Tunnel Link"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:46
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:131
 msgid "Tx-Power"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:32
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:185
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:11
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:43
 msgid "Type"
 msgstr ""
 
@@ -5259,19 +5405,20 @@ msgstr ""
 msgid "UDP:"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:28
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:90
 msgid "UMTS only"
 msgstr ""
 
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:43
 #: protocols/luci-proto-3g/luasrc/model/network/proto_3g.lua:10
 msgid "UMTS/GPRS/EV-DO"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:106
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:93
 msgid "USB Device"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:122
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:110
 msgid "USB Ports"
 msgstr ""
 
@@ -5301,10 +5448,12 @@ msgstr ""
 msgid "Unable to dispatch"
 msgstr ""
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:22
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:54
 msgid "Unable to obtain client ID"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:61
 msgid "Unable to resolve AFTR host name"
 msgstr ""
@@ -5314,21 +5463,31 @@ msgstr ""
 msgid "Unable to resolve peer host name"
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:33
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:68
+msgid "Unable to save contents: %s"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:132
 msgid "Unavailable Seconds (UAS)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1196
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1386
 #: modules/luci-base/luasrc/model/network.lua:970
 msgid "Unknown"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1349
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1539
 #: modules/luci-base/luasrc/model/network.lua:1137
 msgid "Unknown error (%s)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1193
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:204
+msgid "Unknown error code"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1383
+#: modules/luci-base/htdocs/luci-static/resources/protocol/none.js:6
 #: modules/luci-base/luasrc/model/network.lua:964
 msgid "Unmanaged"
 msgstr ""
@@ -5338,22 +5497,30 @@ msgstr ""
 msgid "Unmount"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:107
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:262
 msgid "Unnamed key"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1708
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2261
 msgid "Unsaved Changes"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:202
+msgid "Unspecified error"
+msgstr ""
+
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:64
 msgid "Unsupported MAP type"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:27
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:69
 msgid "Unsupported modem"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:219
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:119
 msgid "Unsupported protocol type."
 msgstr ""
@@ -5373,56 +5540,70 @@ msgstr ""
 msgid "Upload archive..."
 msgstr ""
 
-#: modules/luci-base/luasrc/view/cbi/upload.htm:8
-msgid "Uploaded File"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1703
+msgid "Upload file"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1678
+msgid "Upload file…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1623
+msgid "Upload request failed: %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:613
+msgid ""
+"Upon pressing \"Continue\", anonymous \"wifi-iface\" sections will be "
+"assigned with a name in the form <em>wifinet#</em> and the network will be "
+"restarted to apply the updated configuration."
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:14
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:74
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:85
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:26
 msgid "Uptime"
 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:83
 msgid "Use <code>/etc/ethers</code>"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:40
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:167
 msgid "Use DHCP gateway"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:33
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:85
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:34
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:98
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:46
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:65
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:38
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:58
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:124
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:39
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:116
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:59
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:103
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:64
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:77
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:100
 msgid "Use DNS servers advertised by peer"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:227
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:233
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:479
 msgid "Use ISO/IEC 3166 alpha2 country codes."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:31
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:100
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:70
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:35
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:51
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:86
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:56
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:97
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:77
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:75
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:92
 msgid "Use MTU on tunnel interface"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:95
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:65
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:30
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:46
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:81
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:93
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:73
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:88
 msgid "Use TTL on tunnel interface"
 msgstr ""
 
@@ -5434,68 +5615,65 @@ msgstr ""
 msgid "Use as root filesystem (/)"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:19
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:31
 msgid "Use broadcast flag"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:253
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:791
 msgid "Use builtin IPv6-management"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:40
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:109
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:92
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:45
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:105
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:53
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:72
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:45
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:65
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:40
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:182
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:127
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:42
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:119
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:62
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:67
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:80
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:103
 msgid "Use custom DNS servers"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:26
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:70
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:16
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:28
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:84
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:24
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:50
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:23
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:43
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:116
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:33
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:74
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:97
 msgid "Use default gateway"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:48
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:164
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:77
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:24
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:88
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:58
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:23
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:39
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:74
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:90
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:38
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:57
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:30
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:50
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:45
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:227
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:119
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:51
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:88
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:68
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:52
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:70
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:83
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:111
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:149
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:67
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:111
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:98
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:72
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:85
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:108
 msgid "Use gateway metric"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:64
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:179
 msgid "Use routing table"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:309
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:310
 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 "
@@ -5508,77 +5686,78 @@ msgstr ""
 msgid "Used"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:848
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1273
 msgid "Used Key Slot"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:913
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
 msgid ""
 "Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not "
 "needed with normal WPA(2)-PSK."
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:48
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:110
 msgid "User certificate (PEM encoded)"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:61
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:122
 msgid "User key (PEM encoded)"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/sysauth.htm:23
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:41
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:32
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:102
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:56
 msgid "Username"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:182
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:903
 msgid "VC-Mux"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:851
 msgid "VDSL"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:172
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:169
 msgid "VLANs on %q"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:171
-msgid "VLANs on %q (%s)"
+#: modules/luci-base/luasrc/controller/admin/index.lua:55
+msgid "VPN"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:18
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:42
 msgid "VPN Local address"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:22
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:46
 msgid "VPN Local port"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:15
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:11
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:15
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:58
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:39
 msgid "VPN Server"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:18
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:96
 msgid "VPN Server port"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:37
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:100
 msgid "VPN Server's certificate SHA1 hash"
 msgstr ""
 
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:9
 #: protocols/luci-proto-vpnc/luasrc/model/network/proto_vpnc.lua:9
 msgid "VPNC (CISCO 3000 (and others) VPN)"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:44
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:73
 msgid "Vendor"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:60
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:52
 msgid "Vendor Class to send when requesting DHCP"
 msgstr ""
 
@@ -5586,41 +5765,37 @@ msgstr ""
 msgid "Verify"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:52
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:76
 msgid "Virtual dynamic interface"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:470
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:471
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:553
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:576
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:908
 msgid "WDS"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:667
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1160
 msgid "WEP Open System"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:668
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1161
 msgid "WEP Shared Key"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "WEP passphrase"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:503
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:566
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:945
 msgid "WMM Mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "WPA passphrase"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:716
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:735
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:740
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1074
 msgid ""
 "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
 "and ad-hoc mode) to be installed."
@@ -5634,7 +5809,7 @@ msgstr ""
 msgid "Waiting for command to complete..."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1940
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2481
 msgid "Waiting for configuration to get applied… %ds"
 msgstr ""
 
@@ -5642,8 +5817,8 @@ msgstr ""
 msgid "Waiting for device..."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:172
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:163
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:173
 msgid "Warning"
 msgstr ""
 
@@ -5651,11 +5826,11 @@ msgstr ""
 msgid "Warning: There are unsaved changes that will get lost on reboot!"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:20
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:34
 msgid "Weak"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:946
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1355
 msgid ""
 "When using a PSK, the PMK can be automatically generated. When enabled, the "
 "R0/R1 key options below are not applied. Disable this to use the R0 and R1 "
@@ -5663,78 +5838,85 @@ msgid ""
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:383
 msgid "Width"
 msgstr ""
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:17
 #: protocols/luci-proto-wireguard/luasrc/model/network/proto_wireguard.lua:9
 msgid "WireGuard VPN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:58
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:40
 #: modules/luci-mod-status/luasrc/controller/admin/status.lua:28
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:14
 msgid "Wireless"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1631
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1837
 #: modules/luci-base/luasrc/model/network.lua:1418
 msgid "Wireless Adapter"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1617
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2052
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1823
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2288
 #: modules/luci-base/luasrc/model/network.lua:1404
 #: modules/luci-base/luasrc/model/network.lua:1865
 msgid "Wireless Network"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:629
 msgid "Wireless Overview"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:362
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:797
 msgid "Wireless Security"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:54
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:611
+msgid "Wireless configuration migration"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:139
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:179
 msgid "Wireless is disabled"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:54
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:139
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:179
 msgid "Wireless is not associated"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:15
-msgid "Wireless is restarting..."
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:752
 msgid "Wireless network is disabled"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:752
 msgid "Wireless network is enabled"
 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:182
 msgid "Write received DNS requests to syslog"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:164
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:155
 msgid "Write system log to file"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1507
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:85
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1754
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:109
 msgid "Yes"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:26
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:943
+msgid ""
+"You appear to be currently connected to the device via the \"%h\" interface. "
+"Do you really want to shut down the interface?"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:123
 msgid ""
 "You can enable or disable installed init scripts here. Changes will applied "
 "after a device reboot.<br /><strong>Warning: If you disable essential init "
@@ -5749,38 +5931,34 @@ msgid ""
 "You must enable JavaScript in your browser or LuCI will not work properly."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:196
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:187
 msgid "ZRam Compression Algorithm"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:203
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:194
 msgid "ZRam Compression Streams"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:189
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:180
 msgid "ZRam Settings"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:191
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
 msgid "ZRam Size"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:229
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:230
 msgid "any"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:113
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:121
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:126
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:218
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:282
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:321
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:328
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:621
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:37
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:22
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:29
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:121
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:836
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:844
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:849
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1030
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:78
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:48
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:51
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:103
 msgid "auto"
 msgstr ""
 
@@ -5788,11 +5966,11 @@ msgstr ""
 msgid "automatic"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:45
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:78
 msgid "baseT"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:909
 msgid "bridged"
 msgstr ""
 
@@ -5808,22 +5986,21 @@ msgstr ""
 msgid "create:"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:264
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:368
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:678
 msgid "creates a bridge over specified interface(s)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:277
 msgid "dB"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:34
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:35
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:46
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:47
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:48
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:131
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:132
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:133
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:277
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:279
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:331
@@ -5835,26 +6012,30 @@ msgstr ""
 msgid "dBm"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:460
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:587
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:889
 msgid "disable"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:119
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:524
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:530
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:536
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:18
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:578
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:584
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:590
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:25
 msgid "disabled"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:433
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:467
+msgid "driver default"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/lease_status.htm:17
 #: modules/luci-base/luasrc/view/lease_status.htm:46
-#: 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:416
 msgid "expired"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:88
 msgid ""
 "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr>-leases will be stored"
@@ -5866,25 +6047,21 @@ msgstr ""
 msgid "forward"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:80
 msgid "full-duplex"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:80
 msgid "half-duplex"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:559
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:565
 msgid "hexadecimal encoded value"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:138
-msgid "hidden"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:527
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:533
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:538
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:581
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:587
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:592
 msgid "hybrid mode"
 msgstr ""
 
@@ -5892,6 +6069,10 @@ msgstr ""
 msgid "if target is a network"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:63
+msgid "ignore"
+msgstr ""
+
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:177
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
@@ -5926,25 +6107,26 @@ msgstr ""
 msgid "key with either 5 or 13 characters"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:94
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:95
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:952
-msgid "minutes"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1168
+msgid "medium security"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:43
-msgid "mixed WPA/WPA2"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1360
+msgid "minutes"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:225
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:232
 msgid "no"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:54
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:72
 msgid "no link"
 msgstr ""
 
@@ -5952,7 +6134,7 @@ msgstr ""
 msgid "non-empty value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1195
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1446
 msgid "none"
 msgstr ""
 
@@ -5962,7 +6144,9 @@ msgstr ""
 msgid "not present"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:363
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:341
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:776
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:780
 #: 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
@@ -5977,8 +6161,8 @@ msgstr ""
 msgid "on"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
-msgid "open"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1169
+msgid "open network"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
@@ -5998,73 +6182,77 @@ msgstr ""
 msgid "positive integer value"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:34
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:56
 msgid "random"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:526
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:532
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:537
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:580
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:586
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:591
 msgid "relay mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:910
 msgid "routed"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:525
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:534
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:968
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:977
 msgid "sec"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:525
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:531
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:579
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:585
 msgid "server mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:544
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:597
 msgid "stateful-only"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:542
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:595
 msgid "stateless"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:543
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:596
 msgid "stateless + stateful"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:369
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1167
+msgid "strong security"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:346
 msgid "tagged"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:932
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1343
 msgid "time units (TUs / 1.024 ms) [1000-65535]"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:549
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:555
 msgid "unique value"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:448
 msgid "unknown"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:15
 #: modules/luci-base/luasrc/view/lease_status.htm:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:238
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:390
+#: 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:414
 msgid "unlimited"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1401
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1648
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:63
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:355
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:378
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:413
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:446
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:512
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:450
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:545
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:53
 #: modules/luci-base/luasrc/view/cbi/network_netlist.htm:38
 msgid "unspecified"
@@ -6074,7 +6262,7 @@ msgstr ""
 msgid "unspecified -or- create:"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:366
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:344
 msgid "untagged"
 msgstr ""
 
@@ -6155,8 +6343,8 @@ msgstr ""
 msgid "valid address:port"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:523
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:527
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:529
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:533
 msgid "valid date (YYYY-MM-DD)"
 msgstr ""
 
@@ -6193,7 +6381,7 @@ msgstr ""
 msgid "valid network in address/netmask notation"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:498
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:504
 msgid "valid phone digit (0-9, \"*\", \"#\", \"!\" or \".\")"
 msgstr ""
 
@@ -6206,11 +6394,11 @@ msgstr ""
 msgid "valid port value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:503
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:509
 msgid "valid time (HH:MM:SS)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:425
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:431
 msgid "value between %d and %d characters"
 msgstr ""
 
@@ -6226,14 +6414,23 @@ msgstr ""
 msgid "value smaller or equal to %f"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:430
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:425
+msgid "value with %d characters"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:436
 msgid "value with at least %d characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:435
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:441
 msgid "value with at most %d characters"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1169
+msgid "weak security"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:221
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:232
diff --git a/modules/luci-base/po/sv/base.po b/modules/luci-base/po/sv/base.po
index 490b7f8b5..9518151e5 100644
--- a/modules/luci-base/po/sv/base.po
+++ b/modules/luci-base/po/sv/base.po
@@ -11,19 +11,20 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.6\n"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:133
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:857
 msgid "%.1f dB"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:109
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:122
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 msgid "%d Bit"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1641
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2194
 msgid "%d invalid field(s)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:281
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:31
 msgid "%s is untagged in multiple VLANs!"
 msgstr "%s är inte taggad i flera VLAN!"
 
@@ -61,19 +62,19 @@ msgid "-- Additional Field --"
 msgstr "-- Ytterligare fält --"
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:258
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1401
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1533
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:250
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:350
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1114
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1648
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1780
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:314
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:414
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1178
 #: modules/luci-base/luasrc/view/cbi/header.htm:5
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:26
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:88
 msgid "-- Please choose --"
 msgstr "-- Vänligen välj --"
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:259
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:351
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1115
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:415
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1179
 #: modules/luci-base/luasrc/view/cbi/header.htm:6
 msgid "-- custom --"
 msgstr "-- anpassad --"
@@ -96,7 +97,7 @@ msgstr "-- matcha enligt uuid --"
 msgid "-- please select --"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:382
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:814
 msgid "0 = not using RSSI threshold, 1 = do not change driver default"
 msgstr ""
 
@@ -108,10 +109,11 @@ msgstr "Belastning senaste minuten:"
 msgid "15 Minute Load:"
 msgstr "Belastning senaste 15 minutrarna:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:924
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1337
 msgid "4-character hexadecimal ID"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:11
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:18
 msgid "464XLAT (CLAT)"
 msgstr ""
@@ -120,57 +122,57 @@ msgstr ""
 msgid "5 Minute Load:"
 msgstr "Belastning senaste 5 minutrarna:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:960
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1366
 msgid "6-octet identifier as a hex string - no colons"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:891
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1310
 msgid "802.11r Fast Transition"
 msgstr "802.11r Snabb förvandling"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1157
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1567
 msgid "802.11w Association SA Query maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1574
 msgid "802.11w Association SA Query retry timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1133
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1533
 msgid "802.11w Management Frame Protection"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1156
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1567
 msgid "802.11w maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1165
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1574
 msgid "802.11w retry timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:399
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:831
 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:224
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:225
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:215
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:216
 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:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
 msgid ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
 "order of the resolvfile"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:388
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:820
 msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:351
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:373
 #: 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"
@@ -181,8 +183,8 @@ msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-adress"
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
 msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-gateway"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:555
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:35
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:506
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-nätmask"
 
@@ -198,45 +200,45 @@ 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:378
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:402
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:58
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:35
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:33
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "<abbr title=\"Lysdiod\">LED</abbr>-konfiguration"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:67
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:51
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:328
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:329
 #: 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:372
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:233
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:234
 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:242
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
 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:251
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:252
 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:10
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:42
 msgid ""
 "<br/>Note: you need to manually restart the cron service if the crontab file "
 "was empty before editing."
@@ -244,63 +246,67 @@ msgstr ""
 "<br/>Notera att: du måste starta om cron-tjänsten om crontab-filen var tom "
 "innan den ändrades."
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:817
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1605
+msgid "A directory with the same name already exists."
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:863
 msgid "A new login is required since the authentication session expired."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:114
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:837
 msgid "A43C + J43 + A43"
 msgstr "A43C + J43 + A43"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:838
 msgid "A43C + J43 + A43 + V43"
 msgstr "A43C + J43 + A43 + V43"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:850
 msgid "ADSL"
 msgstr "ADSL"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:826
 msgid "ANSI T1.413"
 msgstr "ANSI T1.413"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:33
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:47
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:23
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:94
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:86
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:67
 msgid "APN"
 msgstr "APN"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:56
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:175
 msgid "ARP retry threshold"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:122
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:845
 msgid "ATM (Asynchronous Transfer Mode)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:144
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:866
 msgid "ATM Bridges"
 msgstr "ATM-bryggor"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:178
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:21
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:898
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:66
 msgid "ATM Virtual Channel Identifier (VCI)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:179
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:26
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:899
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:70
 msgid "ATM Virtual Path Identifier (VPI)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:866
 msgid ""
 "ATM bridges expose encapsulated ethernet in AAL5 connections as virtual "
 "Linux network interfaces which can be used in conjunction with DHCP or PPP "
 "to dial into the provider network."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:184
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:905
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:62
 msgid "ATM device number"
 msgstr ""
 
@@ -309,17 +315,17 @@ msgid "ATU-C System Vendor ID"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:251
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:495
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:499
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:528
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:532
 msgid "Absent Interface"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:19
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
 msgid "Access Concentrator"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:368
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:470
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:802
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
 msgid "Access Point"
 msgstr "Accesspunkt"
 
@@ -342,7 +348,7 @@ msgid "Active Connections"
 msgstr "Aktiva anslutningar"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:68
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:30
 msgid "Active DHCP Leases"
 msgstr "Aktiva DHCP-kontrakt"
 
@@ -350,55 +356,75 @@ msgstr "Aktiva DHCP-kontrakt"
 msgid "Active DHCPv6 Leases"
 msgstr "Aktiva DHCPv6-kontrakt"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1951
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:370
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:12
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2190
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:804
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:23
 msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:650
-#: modules/luci-base/htdocs/luci-static/resources/form.js:651
-#: modules/luci-base/htdocs/luci-static/resources/form.js:666
-#: modules/luci-base/htdocs/luci-static/resources/form.js:667
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1290
+#: modules/luci-base/htdocs/luci-static/resources/form.js:902
+#: modules/luci-base/htdocs/luci-static/resources/form.js:904
+#: modules/luci-base/htdocs/luci-static/resources/form.js:917
+#: modules/luci-base/htdocs/luci-static/resources/form.js:918
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1539
 #: modules/luci-base/luasrc/view/cbi/nsection.htm:25
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:189
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:197
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:39
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:47
 #: modules/luci-base/luasrc/view/cbi/ucisection.htm:54
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:703
 msgid "Add"
 msgstr "Lägg till"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:60
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:870
+msgid "Add ATM Bridge"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:92
 msgid "Add IPv4 address…"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:129
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:204
 msgid "Add IPv6 address…"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:143
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:149
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:38
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:47
+msgid "Add LED action"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:215
+msgid "Add VLAN"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:14
+msgid "Add instance"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:153
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:159
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:250
 msgid "Add key"
 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:155
 msgid "Add local domain suffix to names served from hosts files"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:705
 msgid "Add new interface..."
 msgstr "Lägg till ett nytt gränssnitt"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:104
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:99
+msgid "Add peer"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:105
 msgid "Additional Hosts files"
 msgstr "Ytterligare värdfiler"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:161
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
 msgid "Additional servers file"
 msgstr "Ytterligare server-filer"
 
@@ -425,7 +451,7 @@ msgstr "Ytterligare server-filer"
 msgid "Address"
 msgstr "Adress"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:12
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:151
 msgid "Address to access local relay bridge"
 msgstr "Adress för att komma åt lokal reläbrygga"
 
@@ -434,13 +460,13 @@ msgstr "Adress för att komma åt lokal reläbrygga"
 msgid "Administration"
 msgstr "Administration"
 
-#: 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:70
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:505
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:896
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:24
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:189
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:463
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:176
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:143
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:364
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:742
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:799
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:50
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:34
 msgid "Advanced Settings"
@@ -450,168 +476,168 @@ msgstr "Avancerade inställningar"
 msgid "Aggregate Transmit Power(ACTATP)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:175
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:166
 msgid "Alert"
 msgstr "Varning"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1628
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1834
 #: modules/luci-base/luasrc/model/network.lua:1416
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:54
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:78
 msgid "Alias Interface"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:138
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:66
 msgid "Alias of \"%s\""
 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:170
 msgid "All Servers"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:114
 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:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:113
 msgid "Allocate IP sequentially"
 msgstr "Allokera IP sekventiellt"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:24
 msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
 msgstr "Tillåt <abbr title=\"Secure Shell\">SSH</abbr> lösenordsautentisering"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:545
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:987
 msgid "Allow AP mode to disconnect STAs based on low ACK condition"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:462
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:589
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:891
 msgid "Allow all except listed"
 msgstr "Tillåt alla utom listade"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:236
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:767
 msgid "Allow legacy 802.11b rates"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:461
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:588
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:890
 msgid "Allow listed only"
 msgstr "Tillåt enbart listade"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:198
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:199
 msgid "Allow localhost"
 msgstr "Tillåt localhost"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:47
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:35
 msgid "Allow remote hosts to connect to local SSH forwarded ports"
 msgstr ""
 "Tillåt fjärrstyrda värdar att ansluta via SSH till lokalt vidarebefordrade "
 "portar"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:38
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:30
 msgid "Allow root logins with password"
 msgstr "Tillåt root-inloggningar med lösenord"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:39
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:30
 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:199
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:200
 msgid ""
 "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:135
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:122
 msgid "Allowed IPs"
 msgstr "Tillåtna IP-adresser"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:549
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:602
 msgid "Always announce default router"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:259
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:782
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
 "option does not comply with IEEE 802.11n-2009!"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:95
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:818
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:119
 msgid "Annex"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:96
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:819
 msgid "Annex A + L + M (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:827
 msgid "Annex A G.992.1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:828
 msgid "Annex A G.992.2"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:829
 msgid "Annex A G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:830
 msgid "Annex A G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:97
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:820
 msgid "Annex B (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:823
 msgid "Annex B G.992.1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:824
 msgid "Annex B G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:102
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:825
 msgid "Annex B G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:98
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:821
 msgid "Annex J (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:831
 msgid "Annex L G.992.3 POTS 1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:99
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:822
 msgid "Annex M (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:109
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:832
 msgid "Annex M G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:833
 msgid "Annex M G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:550
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:602
 msgid "Announce as default router even if no public prefix is available."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:555
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:607
 msgid "Announced DNS domains"
 msgstr "Aviserade DNS-domäner"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:554
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:606
 msgid "Announced DNS servers"
 msgstr "Aviserade DNS-servrar"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1093
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1496
 msgid "Anonymous Identity"
 msgstr "Anonym identitet"
 
@@ -623,20 +649,6 @@ msgstr "Anonym montering"
 msgid "Anonymous Swap"
 msgstr "Anonym Swap"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:322
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:329
-msgid "Antenna 1"
-msgstr "Antenn 1"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:323
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:330
-msgid "Antenna 2"
-msgstr "Antenn 2"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:246
-msgid "Antenna Configuration"
-msgstr "Konfiguration av antenn"
-
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:71
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:160
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:181
@@ -644,11 +656,11 @@ msgstr "Konfiguration av antenn"
 msgid "Any zone"
 msgstr "NÃ¥gon zon"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1981
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2522
 msgid "Apply request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1867
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2409
 msgid "Apply unchecked"
 msgstr ""
 
@@ -656,8 +668,8 @@ msgstr ""
 msgid "Architecture"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:19
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:184
+#: 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 ""
@@ -666,13 +678,13 @@ msgstr ""
 msgid "Assign interfaces..."
 msgstr "Tilldela gränssnitten..."
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:124
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:24
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:189
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:31
 msgid ""
 "Assign prefix parts using this hexadecimal subprefix ID for this interface."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:148
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1967
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:22
 msgid "Associated Stations"
 msgstr "Associerade stationer"
@@ -681,20 +693,20 @@ msgstr "Associerade stationer"
 msgid "Associations"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:39
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:37
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:101
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:64
 msgid "Auth Group"
 msgstr "Autentiseringsgrupp"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1027
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1421
 msgid "Authentication"
 msgstr "Autentisering"
 
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:29
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:70
 msgid "Authentication Type"
 msgstr "Typ av autentisering"
 
-#: 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:78
 msgid "Authoritative"
 msgstr "Auktoritiv"
 
@@ -712,17 +724,19 @@ msgstr "Tillstånd krävs"
 msgid "Auto Refresh"
 msgstr "Uppdatera automatiskt"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:53
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:7
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:17
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:67
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:24
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:36
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:42
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:36
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:106
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:24
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:98
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:50
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:94
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:81
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:55
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:68
 msgid "Automatic"
 msgstr "Automatisk"
 
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:7
 #: protocols/luci-proto-hnet/luasrc/model/network/proto_hnet.lua:7
 msgid "Automatic Homenet (HNCP)"
 msgstr "Automatiskt hemnet (HNCP)"
@@ -765,21 +779,21 @@ msgstr "Tillgänglig"
 msgid "Average:"
 msgstr "Snitt:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:116
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:839
 msgid "B43 + B43C"
 msgstr "B43 + B43C"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:840
 msgid "B43 + B43C + V43"
 msgstr "B43 + B43C + V43"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:48
 msgid "BR / DMR / AFTR"
 msgstr "BR / DMR / AFTR"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:43
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:75
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1620
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:176
 msgid "BSSID"
 msgstr "BSSID"
@@ -793,19 +807,11 @@ msgstr "Backa till Överblick"
 msgid "Back to configuration"
 msgstr "Backa till konfiguration"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:48
-msgid "Back to overview"
-msgstr "Backa till överblick"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:20
-msgid "Back to scan results"
-msgstr "Backa till skanningsresultat"
-
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:17
 msgid "Backup"
 msgstr "Säkerhetskopiera"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:38
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:36
 msgid "Backup / Flash Firmware"
 msgstr "Säkerhetskopiera / Flasha inre mjukvara"
 
@@ -818,11 +824,11 @@ msgid "Bad address specified!"
 msgstr "Fel adress angiven!"
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:158
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:288
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:368
 msgid "Band"
 msgstr "Band"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:261
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:785
 msgid "Beacon Interval"
 msgstr ""
 
@@ -833,80 +839,86 @@ msgid ""
 "defined backup patterns."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:293
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:294
 msgid ""
 "Bind dynamically to interfaces rather than wildcard address (recommended as "
 "linux default)"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:16
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:48
 msgid "Bind interface"
 msgstr "Bind gränssnitt"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:16
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:48
 msgid "Bind the tunnel to this interface (optional)."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:49
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:134
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:187
 msgid "Bitrate"
 msgstr "Bithastighet"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:172
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
 msgid "Bogus NX Domain Override"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1634
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1840
 #: modules/luci-base/luasrc/model/network.lua:1420
 msgid "Bridge"
 msgstr "Brygga"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:264
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:368
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:678
 msgid "Bridge interfaces"
 msgstr "Brygga gränssnitt"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:906
 msgid "Bridge unit number"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:250
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:364
 msgid "Bring up on boot"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:35
-msgid "Broadcom 802.11%s Wireless Controller"
-msgstr "Broadcom 802.11%s Trådlös kontroller"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:45
-msgid "Broadcom BCM%04x 802.11 Wireless Controller"
-msgstr "Broadcom BCM%04x 802.11 Trådlös kontroller"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1697
+msgid "Browse…"
+msgstr ""
 
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:18
 msgid "Buffered"
 msgstr "Buffrad"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:75
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:134
 msgid "CA certificate; if empty it will be saved after the first connection."
 msgstr ""
 "CA-certifikat; om tom så kommer den att sparas efter första anslutningen."
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:7
+msgid "CLAT configuration failed"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:13
 msgid "CPU usage (%)"
 msgstr "CPU-användning (%)"
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:21
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:53
 msgid "Call failed"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1789
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:14
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:52
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:711
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:948
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1839
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:191
 #: modules/luci-mod-system/luasrc/view/admin_system/upgrade.htm:60
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:6
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:17
 msgid "Category"
 msgstr "Kategori"
 
@@ -924,13 +936,7 @@ msgstr ""
 msgid "Chain"
 msgstr "Kedja"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:9
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:14
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:24
-msgid "Change login password"
-msgstr ""
-
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1744
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 msgid "Changes"
 msgstr "Ändringar"
 
@@ -938,33 +944,23 @@ msgstr "Ändringar"
 msgid "Changes applied."
 msgstr "Tillämpade ändringar"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2004
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2545
 msgid "Changes have been reverted."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:43
 msgid "Changes the administrator password for accessing the device"
 msgstr "Ändrar administratörens lösenord för att få tillgång till enheten"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:10
-msgid "Changing password…"
-msgstr ""
-
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:162
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:45
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:87
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:174
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:376
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1618
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:186
 msgid "Channel"
 msgstr "Kanal"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:119
-msgid ""
-"Channel %d is not available in the %s regulatory domain and has been auto-"
-"adjusted to %d."
-msgstr ""
-
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:229
 msgid "Check"
 msgstr "Kontrollera"
@@ -973,7 +969,7 @@ msgstr "Kontrollera"
 msgid "Check filesystems before mount"
 msgstr "Kontrollera filsystemen innan de monteras"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1806
 msgid "Check this option to delete the existing networks from this radio."
 msgstr ""
 "Bocka för det här alternativet för att ta bort befintliga nätverk från den "
@@ -987,8 +983,8 @@ msgstr "Checksumma"
 msgid "Choose mtdblock"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:358
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:443
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1829
 msgid ""
 "Choose the firewall zone you want to assign to this interface. Select "
 "<em>unspecified</em> to remove the interface from the associated zone or "
@@ -996,17 +992,17 @@ msgid ""
 "interface to it."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:834
 msgid ""
 "Choose the network(s) you want to attach to this wireless interface or fill "
 "out the <em>create</em> field to define a new network."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:614
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1023
 msgid "Cipher"
 msgstr "Chiffer"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:61
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:91
 msgid "Cisco UDP encapsulation"
 msgstr ""
 
@@ -1022,28 +1018,28 @@ msgid ""
 "FEATURE IS FOR PROFESSIONALS! )"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1950
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:369
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:471
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2189
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:803
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:908
 msgid "Client"
 msgstr "Klient"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:55
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:52
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:47
 msgid "Client ID to send when requesting DHCP"
 msgstr "Klient-ID att skicka vid DHCP-förfrågning"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:145
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:151
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:155
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:161
 msgid "Close"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:146
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:119
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:125
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:127
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:98
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:119
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:157
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:141
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:115
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:138
 msgid ""
 "Close inactive connection after the given amount of seconds, use 0 to "
 "persist connection"
@@ -1056,12 +1052,9 @@ msgstr "Stäng ner lista..."
 #: modules/luci-base/luasrc/view/lease_status.htm:77
 #: modules/luci-base/luasrc/view/lease_status.htm:98
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:118
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:37
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:24
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1965
 #: modules/luci-mod-network/luasrc/view/admin_network/iface_status.htm:6
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:40
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:30
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:8
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:398
 #: modules/luci-mod-status/luasrc/view/admin_status/index/30-network.htm:11
 #: modules/luci-mod-status/luasrc/view/admin_status/index/50-dsl.htm:17
@@ -1075,15 +1068,19 @@ msgstr "Samlar in data..."
 msgid "Command"
 msgstr "Kommando"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:193
+msgid "Command OK"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:41
+msgid "Command failed"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:64
 msgid "Comment"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:185
-msgid "Common Configuration"
-msgstr "Vanlig konfiguration"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
 msgid ""
 "Complicates key reinstallation attacks on the client side by disabling "
 "retransmission of EAPOL-Key frames that are used to install keys. This "
@@ -1091,13 +1088,14 @@ msgid ""
 "negotiation especially in environments with heavy traffic load."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1744
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 #: modules/luci-base/luasrc/controller/admin/uci.lua:11
 #: modules/luci-mod-system/luasrc/view/admin_system/backupfiles.htm:9
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:13
 msgid "Configuration"
 msgstr "Konfiguration"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:21
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:63
 msgid "Configuration failed"
 msgstr ""
@@ -1106,89 +1104,89 @@ msgstr ""
 msgid "Configuration files will be kept"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1915
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2456
 msgid "Configuration has been applied."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1848
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2395
 msgid "Configuration has been rolled back!"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:43
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:942
+msgid "Confirm disconnect"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:50
 msgid "Confirmation"
 msgstr "Bekräftelse"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:32
-msgid "Connect"
-msgstr "Anslut"
-
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:72
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:105
 msgid "Connected"
 msgstr "Ansluten"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:338
-msgid "Connection Limit"
-msgstr "Anslutningsgräns"
-
 #: modules/luci-base/htdocs/luci-static/resources/network.js:7
 #: modules/luci-base/luasrc/model/network.lua:27
 msgid "Connection attempt failed"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:203
+msgid "Connection lost"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/controller/admin/status.lua:32
 msgid "Connections"
 msgstr "Anslutningar"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1890
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:66
+msgid "Contents have been saved."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:618
+msgid "Continue"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2431
 msgid ""
 "Could not regain access to the device after applying the configuration "
 "changes. You might need to reconnect if you modified network related "
 "settings such as the IP address or wireless security credentials."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:135
 msgid "Country"
 msgstr "Land"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:227
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:233
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:337
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:764
 msgid "Country Code"
 msgstr "Landskod"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:36
-msgid "Cover the following interface"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:43
-msgid "Cover the following interfaces"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:357
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:86
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:443
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1829
 msgid "Create / Assign firewall-zone"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:9
-msgid "Create Interface"
-msgstr "Skapa gränssnitt"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:33
-msgid "Create a bridge over multiple interfaces"
-msgstr "Skapa en brygga över flera gränssnitt"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:735
+msgid "Create interface"
+msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:174
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:165
 msgid "Critical"
 msgstr "Kritisk"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:178
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:169
 msgid "Cron Log Level"
 msgstr "Loggnivå för Cron"
 
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:519
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:521
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:447
+msgid "Current power"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:552
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:554
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:51
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:53
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:82
@@ -1196,7 +1194,7 @@ msgstr "Loggnivå för Cron"
 msgid "Custom Interface"
 msgstr "Anpassat gränssnitt"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:36
 msgid "Custom delegated IPv6-prefix"
 msgstr ""
 
@@ -1206,52 +1204,53 @@ msgid ""
 "this, perform a factory-reset first."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:59
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:41
 msgid ""
 "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
 "\">LED</abbr>s if possible."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:799
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1223
 msgid "DAE-Client"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:807
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1231
 msgid "DAE-Port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:815
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1239
 msgid "DAE-Secret"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:448
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:459
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:279
 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:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:61
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:62
 msgid "DHCP and DNS"
 msgstr "DHCP och DNS"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1195
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1385
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:16
 #: modules/luci-base/luasrc/model/network.lua:968
 msgid "DHCP client"
 msgstr "DHCP-klient"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:571
 msgid "DHCP-Options"
 msgstr "DHCP-alternativ"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_dhcpv6.lua:7
 msgid "DHCPv6 client"
 msgstr "DHCPv6-klient"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:540
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:594
 msgid "DHCPv6-Mode"
 msgstr "DHCPv6-läge"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:529
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:583
 msgid "DHCPv6-Service"
 msgstr "DHCPv6-tjänst"
 
@@ -1268,31 +1267,31 @@ msgstr "DHCPv6-tjänst"
 msgid "DNS"
 msgstr "DNS"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:183
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
 msgid "DNS forwardings"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:30
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:37
 msgid "DNS-Label / FQDN"
 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:136
 msgid "DNSSEC"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:139
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
 msgid "DNSSEC check unsigned"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:73
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:99
 msgid "DPD Idle Timeout"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:14
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:41
 msgid "DS-Lite AFTR address"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:92
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:815
 #: modules/luci-mod-status/luasrc/view/admin_status/index/50-dsl.htm:14
 msgid "DSL"
 msgstr "DSL"
@@ -1301,11 +1300,11 @@ msgstr "DSL"
 msgid "DSL Status"
 msgstr "DSL-status"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:125
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:848
 msgid "DSL line mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:519
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:963
 msgid "DTIM Interval"
 msgstr ""
 
@@ -1317,77 +1316,92 @@ msgstr ""
 msgid "Data Rate"
 msgstr "Datahastighet"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:169
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:180
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:160
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:171
 msgid "Debug"
 msgstr "Avlusa"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:759
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:783
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:807
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1183
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1207
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1231
 msgid "Default %d"
 msgstr "Standard %d"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:82
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:107
 msgid "Default Route"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:17
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:81
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:51
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:32
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:48
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:85
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:65
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:80
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:108
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:146
 msgid "Default gateway"
 msgstr "Standard gateway"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:541
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:594
 msgid "Default is stateless + stateful"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:70
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:54
 msgid "Default state"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:503
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:553
 msgid "Define a name for this network."
 msgstr "Ange ett namn för det här nätverket."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:514
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:571
 msgid ""
 "Define additional DHCP options, for example "
 "\"<code>6,192.168.2.1,192.168.2.2</code>\" which advertises different DNS "
 "servers to clients."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:705
-#: modules/luci-base/htdocs/luci-static/resources/form.js:958
-#: modules/luci-base/htdocs/luci-static/resources/form.js:959
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1271
+#: modules/luci-base/htdocs/luci-static/resources/form.js:966
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1210
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1216
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1524
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1758
 #: modules/luci-base/luasrc/view/cbi/nsection.htm:11
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:162
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:16
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:41
 msgid "Delete"
 msgstr "Radera"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:178
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:187
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:193
 msgid "Delete key"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:45
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1654
+msgid "Delete permission denied"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1656
+msgid "Delete request failed: %d %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:723
 msgid "Delete this network"
 msgstr "Ta bort det här nätverket"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:519
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:963
 msgid "Delivery Traffic Indication Message Interval"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:102
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:108
 msgid "Description"
 msgstr "Beskrivning"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:224
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1754
+msgid "Deselect"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:215
 msgid "Design"
 msgstr ""
 
@@ -1405,10 +1419,12 @@ msgstr ""
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:177
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:43
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:13
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:38
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:73
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:33
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:52
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:85
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:86
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:72
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:154
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:253
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:86
@@ -1416,15 +1432,24 @@ msgstr ""
 msgid "Device"
 msgstr "Enhet"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:138
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:737
 msgid "Device Configuration"
 msgstr "Enhetskonfiguration"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:81
+msgid "Device is not active"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/reboot.htm:23
 msgid "Device is rebooting..."
 msgstr "Enheten startar om..."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1889
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:167
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:513
+msgid "Device is restarting…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2430
 msgid "Device unreachable!"
 msgstr "Enheten kan inte nås"
 
@@ -1432,26 +1457,26 @@ msgstr "Enheten kan inte nås"
 msgid "Device unreachable! Still waiting for device..."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:123
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:78
 #: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:61
 msgid "Diagnostics"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:45
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:60
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:101
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:93
 msgid "Dial number"
 msgstr "Slå nummer"
 
-#: modules/luci-base/luasrc/view/cbi/filebrowser.htm:99
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1554
 msgid "Directory"
 msgstr "Mapp"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:131
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:715
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:754
 msgid "Disable"
 msgstr "Inaktivera"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:472
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:531
 msgid ""
 "Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for "
 "this interface."
@@ -1459,71 +1484,66 @@ msgstr ""
 "Inaktivera <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> "
 "för det här gränssnittet."
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:64
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:93
 msgid "Disable Encryption"
 msgstr "Inaktivera kryptering"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:530
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:973
 msgid "Disable Inactivity Polling"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:713
 msgid "Disable this network"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:44
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:54
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:68
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:37
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:43
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:37
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1534
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:76
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:107
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:99
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:51
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:95
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:82
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:69
 msgid "Disabled"
 msgstr "Inaktiverad"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1139
-msgid "Disabled (default)"
-msgstr "Inaktiverad (standard)"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:544
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:987
 msgid "Disassociate On Low Acknowledgement"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:193
 msgid "Discard upstream RFC1918 responses"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:92
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:114
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:956
 msgid "Disconnect"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:22
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:64
 msgid "Disconnection attempt failed"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1121
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1762
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1855
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:17
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1375
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1995
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2314
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2401
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1634
 msgid "Dismiss"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:240
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:334
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:770
 msgid "Distance Optimization"
 msgstr "Avståndsoptimering"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:241
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:770
 msgid "Distance to farthest network member in meters."
 msgstr "Avstånd till nätverksmledlemmen längst bort i metrar."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:347
-msgid "Diversity"
-msgstr "MÃ¥ngfald"
-
-#: 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:61
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
@@ -1531,37 +1551,45 @@ msgid ""
 "firewalls"
 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:159
 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:123
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:124
 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:118
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
 msgid "Do not forward reverse lookups for local networks"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:173
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1639
+msgid "Do you really want to delete \"%s\" ?"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:188
 msgid "Do you really want to delete the following SSH key?"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1637
+msgid "Do you really want to recursively delete the directory \"%s\" ?"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:74
 msgid "Domain required"
 msgstr "Domän krävs"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:205
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:206
 msgid "Domain whitelist"
 msgstr "Vitlista för domäner"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:34
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:67
 msgid "Don't Fragment"
 msgstr "Fragmentera inte"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:74
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:75
 msgid ""
 "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
 "<abbr title=\"Domain Name System\">DNS</abbr>-Name"
@@ -1581,57 +1609,58 @@ msgstr "Ladda ner säkerhetskopia"
 msgid "Download mtdblock"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:853
 msgid "Downstream SNR offset"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:914
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1169
 msgid "Drag to reorder"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:9
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:11
 msgid "Dropbear Instance"
 msgstr "Dropbear-instans"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:6
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 msgid ""
 "Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access "
 "and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:11
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:14
 msgid "Dual-Stack Lite (RFC6333)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:493
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:547
 msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:60
 msgid "Dynamic tunnel"
 msgstr "Dynamisk tunnel"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:494
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:547
 msgid ""
 "Dynamically allocate DHCP addresses for clients. If disabled, only clients "
 "having static leases will be served."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:67
 msgid "EA-bits length"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:990
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1386
 msgid "EAP-Method"
 msgstr "EAP-metod"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:934
-#: modules/luci-base/htdocs/luci-static/resources/form.js:935
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1199
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1188
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1191
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1450
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:154
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:160
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:38
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:291
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:720
 msgid "Edit"
 msgstr "Redigera"
 
@@ -1641,90 +1670,91 @@ msgid ""
 "reload the page."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:38
-msgid "Edit this interface"
-msgstr "Redigera det här gränssnittet"
-
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:718
 msgid "Edit this network"
 msgstr "Redigera det här nätverket"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:669
+msgid "Edit wireless network"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:167
 msgid "Emergency"
 msgstr "Nödsituation"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:127
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:715
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:754
 msgid "Enable"
 msgstr "Aktivera"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:414
 msgid ""
 "Enable <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> "
 "snooping"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:271
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:412
 msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 msgstr "Aktivera <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:41
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:60
 msgid "Enable HE.net dynamic endpoint update"
 msgstr ""
 
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:51
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:89
 msgid "Enable IPv6 negotiation"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:23
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:35
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:41
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:35
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:37
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:49
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:80
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:54
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:67
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:93
 msgid "Enable IPv6 negotiation on the PPP link"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:143
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:188
 msgid "Enable Jumbo Frame passthrough"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:244
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:235
 msgid "Enable NTP client"
 msgstr "Aktivera NTP-klient"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:69
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:96
 msgid "Enable Single DES"
 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:267
 msgid "Enable TFTP server"
 msgstr "Aktivera TFTP-server"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:134
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:180
 msgid "Enable VLAN functionality"
 msgstr "Aktivera VLAN-funktionalitet"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1595
 msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
 msgstr "Aktivera WPS-tryckknapp, kräver WPA(2)-PSK"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1175
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
 msgid "Enable key reinstallation (KRACK) countermeasures"
 msgstr "Kräver ominstallation av nyckel (KRACK) motåtgärder"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:138
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:183
 msgid "Enable learning and aging"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:194
 msgid "Enable mirroring of incoming packets"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:151
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:195
 msgid "Enable mirroring of outgoing packets"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:34
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:67
 msgid "Enable the DF (Don't Fragment) flag of the encapsulating packets."
 msgstr ""
 
@@ -1732,7 +1762,7 @@ msgstr ""
 msgid "Enable this mount"
 msgstr "Aktivera den här monteringen"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:713
 msgid "Enable this network"
 msgstr ""
 
@@ -1740,48 +1770,52 @@ msgstr ""
 msgid "Enable this swap"
 msgstr "Aktivera den här swap"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:37
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:88
 msgid "Enable/Disable"
 msgstr "Aktivera/Inaktivera"
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:76
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:152
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:251
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:41
 msgid "Enabled"
 msgstr "Aktiverad"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:277
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:414
 msgid "Enables IGMP snooping on this bridge"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:892
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1310
 msgid ""
 "Enables fast roaming among access points that belong to the same Mobility "
 "Domain"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:272
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:412
 msgid "Enables the Spanning Tree Protocol on this bridge"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:120
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:180
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:59
+msgid "Encapsulation limit"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:843
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:901
 msgid "Encapsulation mode"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:76
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:603
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:129
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:992
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1621
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:177
 msgid "Encryption"
 msgstr "Kryptering"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:155
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:128
 msgid "Endpoint Host"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:165
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:132
 msgid "Endpoint Port"
 msgstr ""
 
@@ -1793,16 +1827,21 @@ msgstr ""
 msgid "Enter custom values"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:273
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:271
 msgid "Erasing..."
 msgstr "Raderar..."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:95
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:96
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:97
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:98
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:99
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:106
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:107
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:108
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:109
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:110
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:173
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:164
 msgid "Error"
 msgstr "Fel"
 
@@ -1810,24 +1849,28 @@ msgstr "Fel"
 msgid "Errored seconds (ES)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1646
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1852
 #: modules/luci-base/luasrc/model/network.lua:1432
 msgid "Ethernet Adapter"
 msgstr "Ethernet-adapter"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1637
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1843
 #: modules/luci-base/luasrc/model/network.lua:1422
 msgid "Ethernet Switch"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:303
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
 msgid "Exclude interfaces"
 msgstr "Inkludera inte dessa gränssnitt"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:153
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
 msgid "Expand hosts"
 msgstr "Expandera värdar"
 
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:195
+msgid "Expecting an hexadecimal assignment hint"
+msgstr ""
+
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:59
 msgid "Expecting: %s"
 msgstr ""
@@ -1836,60 +1879,76 @@ msgstr ""
 msgid "Expires"
 msgstr "Löper ut"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:488
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:543
 msgid ""
 "Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:8
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:19
 msgid "External"
 msgstr "Externt"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:971
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1377
 msgid "External R0 Key Holder List"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:980
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1381
 msgid "External R1 Key Holder List"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:150
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:141
 msgid "External system log server"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:155
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:146
 msgid "External system log server port"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:160
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:151
 msgid "External system log server protocol"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:18
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:79
 msgid "Extra SSH command options"
 msgstr "Extra alternativ för SSH-kommandot"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:940
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1351
 msgid "FT over DS"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:941
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1352
 msgid "FT over the Air"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:938
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1349
 msgid "FT protocol"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1842
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:82
+msgid "Failed to change the system password."
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2389
 msgid "Failed to confirm apply within %ds, waiting for rollback…"
 msgstr ""
 
-#: modules/luci-base/luasrc/view/cbi/filebrowser.htm:106
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:45
+msgid "Failed to execute \"/etc/init.d/%s %s\" action: %s"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1561
 msgid "File"
 msgstr "Fil"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:279
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1514
+msgid "File not accessible"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1698
+msgid "Filename"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:280
 msgid "Filename of the boot image advertised to clients"
 msgstr ""
 
@@ -1899,14 +1958,15 @@ msgstr ""
 msgid "Filesystem"
 msgstr "Filsystem"
 
-#: 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:118
 msgid "Filter private"
 msgstr "Filtrera privata"
 
-#: 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:123
 msgid "Filter useless"
 msgstr "Filtrera icke-användbara"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:23
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:65
 msgid "Finalizing failed"
 msgstr ""
@@ -1917,7 +1977,7 @@ msgid ""
 "with defaults based on what was detected"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:696
 msgid "Find and join network"
 msgstr "Hitta och anslut till nätverk"
 
@@ -1929,11 +1989,11 @@ msgstr "Avsluta"
 msgid "Firewall"
 msgstr "Brandvägg"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:77
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:76
 msgid "Firewall Mark"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:193
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:278
 msgid "Firewall Settings"
 msgstr "Inställningar för brandvägg"
 
@@ -1941,7 +2001,7 @@ msgstr "Inställningar för brandvägg"
 msgid "Firewall Status"
 msgstr "Status för brandvägg"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:137
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:860
 msgid "Firmware File"
 msgstr ""
 
@@ -1949,7 +2009,7 @@ msgstr ""
 msgid "Firmware Version"
 msgstr "Version för inre mjukvara"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:225
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:226
 msgid "Fixed source port for outbound DNS queries"
 msgstr ""
 
@@ -1969,35 +2029,35 @@ msgstr ""
 msgid "Flash operations"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:194
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:192
 msgid "Flashing..."
 msgstr "Skriver..."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:498
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:550
 msgid "Force"
 msgstr "Tvinga"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:258
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:782
 msgid "Force 40MHz mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:622
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1031
 msgid "Force CCMP (AES)"
 msgstr "Tvinga CCMP (AES)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:499
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:550
 msgid "Force DHCP on this network even if another server is detected."
 msgstr "Tvinga DHCP på det här nätverket även om en annan server är upptäckt."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:623
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1032
 msgid "Force TKIP"
 msgstr "Tvinga TKIP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:624
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1033
 msgid "Force TKIP and CCMP (AES)"
 msgstr "Tvinga TKIP och CCMP (AES)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:795
 msgid "Force link"
 msgstr "Tvinga länk"
 
@@ -2005,7 +2065,7 @@ msgstr "Tvinga länk"
 msgid "Force upgrade"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:60
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:90
 msgid "Force use of NAT-T"
 msgstr "Tvinga användning av NAT-T"
 
@@ -2013,7 +2073,7 @@ msgstr "Tvinga användning av NAT-T"
 msgid "Form token mismatch"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:34
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:164
 msgid "Forward DHCP traffic"
 msgstr "Vidarebefordra DHCP-trafik"
 
@@ -2021,46 +2081,41 @@ msgstr "Vidarebefordra DHCP-trafik"
 msgid "Forward Error Correction Seconds (FECS)"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:28
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:161
 msgid "Forward broadcast traffic"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:375
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:809
 msgid "Forward mesh peer traffic"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:186
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:908
 msgid "Forwarding mode"
 msgstr "Vidarebefordringsläge"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:255
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:596
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:774
 msgid "Fragmentation Threshold"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:332
-msgid "Frame Bursting"
-msgstr ""
-
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:17
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:28
 msgid "Free"
 msgstr "Fritt"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:91
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:89
 msgid ""
-"Further information about WireGuard interfaces and peers at <a href=\"http://"
-"wireguard.com\">wireguard.com</a>."
+"Further information about WireGuard interfaces and peers at <a href='http://"
+"wireguard.com'>wireguard.com</a>."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:45
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:130
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:186
 msgid "GHz"
 msgstr "GHz"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:29
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:36
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:91
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:77
 msgid "GPRS only"
 msgstr "Endast GPRS"
 
@@ -2069,28 +2124,28 @@ msgstr "Endast GPRS"
 msgid "Gateway"
 msgstr "Gateway"
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:35
+msgid "Gateway Ports"
+msgstr "Gateway-portar"
+
 #: modules/luci-base/htdocs/luci-static/resources/network.js:9
 #: modules/luci-base/luasrc/model/network.lua:29
 msgid "Gateway address is invalid"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:46
-msgid "Gateway ports"
-msgstr "Gateway-portar"
-
-#: 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:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:275
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:23
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:112
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:103
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:49
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:33
 msgid "General Settings"
 msgstr "Generella inställningar"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:188
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:462
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:175
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:141
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:361
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:504
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:895
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:741
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:796
 msgid "General Setup"
 msgstr ""
 
@@ -2098,7 +2153,7 @@ msgstr ""
 msgid "Generate Config"
 msgstr "Generera konfig"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:945
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1355
 msgid "Generate PMK locally"
 msgstr ""
 
@@ -2106,11 +2161,7 @@ msgstr ""
 msgid "Generate archive"
 msgstr "Generera arkiv"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:63
-msgid "Generic 802.11%s Wireless Controller"
-msgstr ""
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:26
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:74
 msgid "Given password confirmation did not match, password not changed!"
 msgstr "Angiven lösenordsbekräftelse matchade inte, lösenordet ändrades inte!"
 
@@ -2118,7 +2169,7 @@ msgstr "Angiven lösenordsbekräftelse matchade inte, lösenordet ändrades inte
 msgid "Global Settings"
 msgstr "Globala inställningar"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:806
 msgid "Global network options"
 msgstr "Globala nätverksalternativ"
 
@@ -2129,33 +2180,29 @@ msgstr "Globala nätverksalternativ"
 msgid "Go to password configuration..."
 msgstr "Gå till lösenordskonfiguration..."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:857
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1369
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1112
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1616
 #: modules/luci-base/luasrc/view/cbi/full_valueheader.htm:4
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:58
 msgid "Go to relevant configuration page"
 msgstr "GÃ¥ till relevant konfigurationssida"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:38
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:66
 msgid "Group Password"
 msgstr "Grupplösenord"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:11
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:22
 msgid "Guest"
 msgstr "Gäst"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:73
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:81
 msgid "HE.net password"
 msgstr "HE.net-lösenord"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:60
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:73
 msgid "HE.net username"
 msgstr "HE.net-användarnamn"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:310
-msgid "HT mode (802.11n)"
-msgstr "HT-läge (802.11n)"
-
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:16
 msgid "Hang Up"
 msgstr "Lägg på"
@@ -2164,15 +2211,13 @@ msgstr "Lägg på"
 msgid "Header Error Code Errors (HEC)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:103
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 msgid ""
 "Here you can configure the basic aspects of your device like its hostname or "
 "the timezone."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:499
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:556
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:579
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:941
 msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "Göm <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 
@@ -2183,14 +2228,15 @@ msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:92
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1959
 msgid "Host"
 msgstr "Värd"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:20
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:21
 msgid "Host entries"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:48
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:171
 msgid "Host expiry timeout"
 msgstr ""
 
@@ -2198,45 +2244,45 @@ msgstr ""
 msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
 msgstr "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> eller Nätverk"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:118
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:102
 msgid "Host-Uniq tag content"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:71
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:31
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:316
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:25
+#: 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:317
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:26
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:17
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:125
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:116
 msgid "Hostname"
 msgstr "Värdnamn"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:12
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:22
 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:18
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:19
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:67
 msgid "Hostnames"
 msgstr "Värdnamn"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:13
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:24
 msgid "Hybrid"
 msgstr "Hybrid"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:45
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:75
 msgid "IKE DH Group"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:41
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:59
 msgid "IP Addresses"
 msgstr "IP-adresser"
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:40
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:80
 msgid "IP Protocol"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:29
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:30
 msgid "IP address"
 msgstr "IP-adress"
 
@@ -2255,6 +2301,11 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:20
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:21
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:22
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:79
+#: 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/network.js:89
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:90
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:91
@@ -2262,7 +2313,7 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:93
 #: 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/luasrc/model/cbi/admin_network/proto_ncm.lua:42
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:82
 msgid "IPv4"
 msgstr "IPv4"
 
@@ -2274,24 +2325,23 @@ msgstr "IPv4-brandvägg"
 msgid "IPv4 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:57
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:178
 msgid "IPv4 address"
 msgstr "IPv4-adress"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:26
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:33
 msgid "IPv4 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:104
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:181
 msgid "IPv4 broadcast"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:100
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:180
 msgid "IPv4 gateway"
 msgstr "IPv4-gateway"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:92
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:179
 msgid "IPv4 netmask"
 msgstr "IPv4-nätmask"
 
@@ -2299,24 +2349,25 @@ msgstr "IPv4-nätmask"
 msgid "IPv4 network in address/netmask notation"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:25
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:52
 msgid "IPv4 prefix"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:42
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:30
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:55
 msgid "IPv4 prefix length"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:43
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:83
 msgid "IPv4+IPv6"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:72
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:34
 msgid "IPv4-Address"
 msgstr "IPv4-Adress"
 
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:10
 #: protocols/luci-proto-ipip/luasrc/model/network/proto_ipip.lua:9
 msgid "IPv4-in-IPv4 (RFC2003)"
 msgstr "IPv4-i-IPv4 (RFC2003)"
@@ -2331,6 +2382,16 @@ msgstr "IPv4-i-IPv4 (RFC2003)"
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:30
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:31
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:32
+#: 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/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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:89
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:90
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:91
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:92
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:95
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:96
@@ -2343,7 +2404,7 @@ msgstr "IPv4-i-IPv4 (RFC2003)"
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:103
 #: 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/luasrc/model/cbi/admin_network/proto_ncm.lua:44
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:84
 msgid "IPv6"
 msgstr "IPv6"
 
@@ -2355,11 +2416,11 @@ msgstr "IPv6-brandvägg"
 msgid "IPv6 Neighbours"
 msgstr "IPV6-grannar"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:464
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:506
 msgid "IPv6 Settings"
 msgstr "IPv6-inställningar"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:195
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:810
 msgid "IPv6 ULA-Prefix"
 msgstr ""
 
@@ -2367,21 +2428,21 @@ msgstr ""
 msgid "IPv6 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:202
 msgid "IPv6 address"
 msgstr "IPv6-adress"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:23
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:189
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:31
 msgid "IPv6 assignment hint"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:18
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:184
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:27
 msgid "IPv6 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:207
 msgid "IPv6 gateway"
 msgstr "IPv6-gateway"
 
@@ -2389,22 +2450,22 @@ msgstr "IPv6-gateway"
 msgid "IPv6 network in address/netmask notation"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:37
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:59
 msgid "IPv6 prefix"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:34
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:45
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:63
 msgid "IPv6 prefix length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:33
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:211
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:57
 msgid "IPv6 routed prefix"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:143
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:215
 msgid "IPv6 suffix"
 msgstr ""
 
@@ -2414,31 +2475,35 @@ msgid "IPv6-Address"
 msgstr "IPv6-adress"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:93
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:104
 msgid "IPv6-PD"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:10
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:13
 msgid "IPv6-in-IPv4 (RFC4213)"
 msgstr "IPv6-i-IPv4 (RFC4213)"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:17
 msgid "IPv6-over-IPv4 (6rd)"
 msgstr "IPv6-över-IPv4 (6rd)"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:15
 msgid "IPv6-over-IPv4 (6to4)"
 msgstr "IPv6-över-IPv4 (6till4)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1075
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1478
 msgid "Identity"
 msgstr "Identitet"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:70
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:96
 msgid "If checked, 1DES is enabled"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:65
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:93
 msgid "If checked, encryption is disabled"
 msgstr ""
 
@@ -2455,36 +2520,36 @@ msgid ""
 "device node"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:27
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:71
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:18
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:82
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:52
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:17
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:29
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:33
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:68
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:85
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:32
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:45
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:45
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:24
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:44
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:116
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:48
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:85
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:65
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:33
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:80
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:108
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:146
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:74
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:97
 msgid "If unchecked, no default route is configured"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:34
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:86
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:35
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:99
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:47
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:60
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:60
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:39
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:59
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:124
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:39
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:116
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:59
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:103
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:64
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:77
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:100
 msgid "If unchecked, the advertised DNS server addresses are ignored"
 msgstr ""
 
@@ -2497,15 +2562,15 @@ msgid ""
 "of the <abbr title=\"Random Access Memory\">RAM</abbr>."
 msgstr ""
 
-#: 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:102
 msgid "Ignore <code>/etc/hosts</code>"
 msgstr "Ignorera <code>/etc/hosts</code>"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:471
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:531
 msgid "Ignore interface"
 msgstr "Ignorera gränssnitt"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:90
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:91
 msgid "Ignore resolve file"
 msgstr "Ignorera resolv-fil"
 
@@ -2523,12 +2588,12 @@ msgid ""
 "blocked. Click \"Continue »\" below to return to the previous page."
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:145
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:118
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:124
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:126
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:97
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:118
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:157
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:141
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:115
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:138
 msgid "Inactivity timeout"
 msgstr ""
 
@@ -2536,23 +2601,25 @@ msgstr ""
 msgid "Inbound:"
 msgstr "Ankommande"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:170
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:161
 msgid "Info"
 msgstr "Info"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:105
 msgid "Information"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:25
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:67
 msgid "Initialization failure"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:34
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:87
 msgid "Initscript"
 msgstr "Initskript"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:26
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:122
 msgid "Initscripts"
 msgstr "Initskripten"
 
@@ -2560,55 +2627,74 @@ msgstr "Initskripten"
 msgid "Install iputils-traceroute6 for IPv6 traceroute"
 msgstr "Installera iputils-traceroute6 för IPv6-traceroute"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:223
-msgid "Install package %q"
-msgstr "Installera paketet %q"
-
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:220
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:120
 msgid "Install protocol extensions..."
 msgstr "Installera protokoll-förlängningar..."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:416
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:423
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:683
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:687
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:26
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:284
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:342
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:47
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:134
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:14
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:16
 msgid "Interface"
 msgstr "Gränssnitt"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:58
 msgid "Interface %q device auto-migrated from %q to %q."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:356
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:792
 msgid "Interface Configuration"
 msgstr "Konfiguration av gränssnitt"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:51
-msgid "Interface Overview"
-msgstr "Överblick av gränssnitt"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:99
+msgid "Interface has %d pending changes"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:57
+msgid "Interface is marked for deletion"
+msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:162
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:3
 msgid "Interface is reconnecting..."
 msgstr "Gränssnittet återansluter..."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:162
+msgid "Interface is shutting down..."
+msgstr "Gränssnittet stänger ner..."
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:205
+msgid "Interface is starting..."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:208
+msgid "Interface is stopping..."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:954
 msgid "Interface name"
 msgstr "Gränssnittets namn"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:34
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:224
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:131
 msgid "Interface not present or not connected yet."
 msgstr "Gränssnittet är inte närvarande eller är inte anslutet än."
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:88
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:16
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:11
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:287
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:54
 msgid "Interfaces"
 msgstr "Gränssnitten"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:9
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:20
 msgid "Internal"
 msgstr "Interna"
 
@@ -2621,19 +2707,35 @@ msgstr "Internt server-fel"
 msgid "Invalid"
 msgstr "Ogiltig"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:311
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:10
+msgid "Invalid Base64 key string"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:281
 msgid "Invalid VLAN ID given! Only IDs between %d and %d are allowed."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:307
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:290
 msgid "Invalid VLAN ID given! Only unique IDs are allowed"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:195
+msgid "Invalid argument"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:194
+msgid "Invalid command"
+msgstr ""
+
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:80
+msgid "Invalid hexadecimal value"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/sysauth.htm:12
 msgid "Invalid username and/or password! Please try again."
 msgstr "Ogiltigt användarnamn och/eller lösenord! Vänligen försök igen."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:508
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:950
 msgid "Isolate Clients"
 msgstr "Isolera klienter"
 
@@ -2650,15 +2752,15 @@ msgstr ""
 msgid "JavaScript required!"
 msgstr "JavaScript krävs!"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:52
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1691
 msgid "Join Network"
 msgstr "Anslut till nätverk"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:22
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1628
 msgid "Join Network: Wireless Scan"
 msgstr "Anslut till nätverk: Trådlös skanning"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:19
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1833
 msgid "Joining Network: %q"
 msgstr "Ansluter till nätverk: %q"
 
@@ -2675,15 +2777,15 @@ msgstr "Kernel-logg"
 msgid "Kernel Version"
 msgstr "Kernel-version"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:823
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1248
 msgid "Key"
 msgstr "Nyckel"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:851
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:852
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:853
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:854
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:870
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1277
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1278
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1279
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1291
 msgid "Key #%d"
 msgstr "Nyckel #%d"
 
@@ -2691,33 +2793,34 @@ msgstr "Nyckel #%d"
 msgid "Kill"
 msgstr "Döda"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:10
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:21
 msgid "L2TP"
 msgstr "L2TP"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:10
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:40
 msgid "L2TP Server"
 msgstr "L2TP-server"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:100
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:74
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:80
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:74
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:53
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:73
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:131
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:102
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:89
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:112
 msgid "LCP echo failure threshold"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:118
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:89
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:95
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:89
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:68
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:91
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:144
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:102
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:125
 msgid "LCP echo interval"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:181
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:902
 msgid "LLC"
 msgstr "LLC"
 
@@ -2726,11 +2829,11 @@ msgstr "LLC"
 msgid "Label"
 msgstr "Märke"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:213
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:204
 msgid "Language"
 msgstr "Språk"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:115
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:106
 msgid "Language and Style"
 msgstr "Språk och Stil"
 
@@ -2738,51 +2841,51 @@ msgstr "Språk och Stil"
 msgid "Latency"
 msgstr "Latens"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:10
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:21
 msgid "Leaf"
 msgstr "Löv"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:369
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:487
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:393
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:543
 msgid "Lease time"
 msgstr "Kontraktstid"
 
-#: 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:87
 msgid "Leasefile"
 msgstr "Kontraktsfil"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:74
 #: modules/luci-base/luasrc/view/lease_status.htm:95
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:34
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
 msgid "Leasetime remaining"
 msgstr "Återstående kontraktstid"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:9
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:20
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:27
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:50
 msgid "Leave empty to autodetect"
 msgstr "Lämna tom för att upptäcka automatiskt"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:21
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:45
 msgid "Leave empty to use the current WAN address"
 msgstr "Lämna tom för att använda den nuvarande WAN-adressen"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1746
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2299
 msgid "Legend:"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:481
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:538
 msgid "Limit"
 msgstr "Begränsa"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:287
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:288
 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:299
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:300
 msgid "Limit listening to these interfaces, and loopback."
 msgstr ""
 
@@ -2802,17 +2905,17 @@ msgstr ""
 msgid "Line Uptime"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:101
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:88
 msgid "Link On"
 msgstr "Länk På"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:185
 msgid ""
 "List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
 "requests to"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:972
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1377
 msgid ""
 "List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-"
 "Identifier,128-bit key as hex string. <br />This list is used to map R0KH-ID "
@@ -2821,7 +2924,7 @@ msgid ""
 "Association."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:981
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1381
 msgid ""
 "List of R1KHs in the same Mobility Domain. <br />Format: MAC-address,R1KH-ID "
 "as 6 octets with colons,128-bit key as hex string. <br />This list is used "
@@ -2830,32 +2933,32 @@ msgid ""
 "PMK-R1 keys."
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:21
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:82
 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:206
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:207
 msgid "List of domains to allow RFC1918 responses for"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:174
 msgid "List of hosts that supply bogus NX domain results"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:298
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:299
 msgid "Listen Interfaces"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:30
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:54
 msgid "Listen Port"
 msgstr "Lyssningsportar"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:15
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:16
 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:216
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:217
 msgid "Listening port for inbound DNS queries"
 msgstr "Lyssningsportar för ankommande DNS-förfrågningar"
 
@@ -2874,11 +2977,11 @@ msgstr "Snitt-belastning"
 msgid "Loading"
 msgstr "Laddar"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:35
-msgid "Loading SSH keys…"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1819
+msgid "Loading directory contents…"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1204
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1296
 #: modules/luci-base/luasrc/view/view.htm:4
 msgid "Loading view…"
 msgstr ""
@@ -2888,77 +2991,73 @@ msgstr ""
 msgid "Local IP address is invalid"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:25
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:86
 msgid "Local IP address to assign"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:10
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:11
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:44
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:39
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:151
 msgid "Local IPv4 address"
 msgstr "Lokal IPv4-adress"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:20
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:54
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:45
 msgid "Local IPv6 address"
 msgstr "Lokal IPv6-adress"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:286
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:287
 msgid "Local Service Only"
 msgstr "Enbart lokal tjänst"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:81
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:126
 msgid "Local Startup"
 msgstr "Lokal uppstart"
 
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:25
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:121
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:112
 msgid "Local Time"
 msgstr "Lokal tid"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:149
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
 msgid "Local domain"
 msgstr "Lokal domän"
 
-#: 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:147
 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:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:151
 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:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
 msgid "Local server"
 msgstr "Lokal server"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:129
 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:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:128
 msgid "Localise queries"
 msgstr "Lokalisera förfrågningar"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:175
-msgid "Locked to channel %s used by: %s"
-msgstr "Låst till kanalen %s som används av: %s"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:168
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:159
 msgid "Log output level"
 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:181
 msgid "Log queries"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:113
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:104
 msgid "Logging"
 msgstr ""
 
@@ -2966,7 +3065,7 @@ msgstr ""
 msgid "Login"
 msgstr "Logga in"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:95
+#: modules/luci-base/luasrc/controller/admin/index.lua:103
 msgid "Logout"
 msgstr "Logga ut"
 
@@ -2974,11 +3073,13 @@ msgstr "Logga ut"
 msgid "Loss of Signal Seconds (LOSS)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:476
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:533
 msgid "Lowest leased address as offset from the network address."
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:40
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:75
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:35
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:86
 msgid "MAC"
@@ -2986,32 +3087,32 @@ msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:73
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:109
-#: 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:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1958
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:86
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:133
 msgid "MAC-Address"
 msgstr "MAC-adress"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:457
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:586
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:886
 msgid "MAC-Address Filter"
 msgstr "Filter för MAC-adress"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:142
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:363
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:798
 msgid "MAC-Filter"
 msgstr "MAC-filter"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:464
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:590
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:893
 msgid "MAC-List"
 msgstr "MAC-lista"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:13
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:16
 msgid "MAP / LW4over6"
 msgstr "MAP / LW4över6"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:62
 msgid "MAP rule is invalid"
 msgstr ""
@@ -3029,8 +3130,8 @@ msgid "MHz"
 msgstr "MHz"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:53
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:29
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:66
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:53
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:71
 msgid "MTU"
 msgstr "MTU"
 
@@ -3040,16 +3141,17 @@ msgid ""
 "below:"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:55
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:69
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:26
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:38
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:38
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:108
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:52
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:96
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:83
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:57
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:70
 msgid "Manual"
 msgstr "Manuell"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1949
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2188
 msgid "Master"
 msgstr ""
 
@@ -3057,48 +3159,46 @@ msgstr ""
 msgid "Max. Attainable Data Rate (ATTNDR)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:539
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:982
 msgid "Maximum allowed Listen Interval"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:234
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
 msgid "Maximum allowed number of active DHCP leases"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:252
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:253
 msgid "Maximum allowed number of concurrent DNS queries"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:244
 msgid "Maximum allowed size of EDNS.0 UDP packets"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:63
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:77
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:57
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:112
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:104
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:93
 msgid "Maximum amount of seconds to wait for the modem to become ready"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:27
-msgid ""
-"Maximum length of the name is 15 characters including the automatic protocol/"
-"bridge prefix (br-, 6in4-, pppoe- etc.)"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:538
+msgid "Maximum number of leased addresses."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:482
-msgid "Maximum number of leased addresses."
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:761
+msgid "Maximum transmit power"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:21
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:49
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:134
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:187
 #: modules/luci-mod-status/luasrc/view/admin_status/bandwidth.htm:79
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:284
 msgid "Mbit/s"
 msgstr "Mbit/s"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:18
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:32
 msgid "Medium"
 msgstr ""
 
@@ -3110,42 +3210,43 @@ msgstr "Minne"
 msgid "Memory usage (%)"
 msgstr "Minnesanvändning (%)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1952
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2191
 msgid "Mesh"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:372
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:806
 msgid "Mesh Id"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:196
+msgid "Method not found"
+msgstr ""
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:45
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:76
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:104
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:54
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:66
 msgid "Metric"
 msgstr "Metrisk"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:154
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:198
 msgid "Mirror monitor port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:153
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:197
 msgid "Mirror source port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:408
-msgid "Missing protocol extension for proto %q"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:923
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1337
 msgid "Mobility Domain"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:154
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:41
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:74
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:366
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:31
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:360
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:801
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1619
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:175
 msgid "Mode"
 msgstr "Läge"
@@ -3154,39 +3255,38 @@ msgstr "Läge"
 msgid "Model"
 msgstr "Modell"
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:31
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:72
 msgid "Modem default"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:11
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:19
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:11
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:10
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:73
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:73
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:57
 msgid "Modem device"
 msgstr "Modem-enhet"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:24
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:66
 msgid "Modem information query failed"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:62
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:76
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:56
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:112
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:104
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:93
 msgid "Modem init timeout"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1953
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:452
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:554
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:577
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2192
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:880
 msgid "Monitor"
 msgstr "Övervaka"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:14
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
 msgid "More Characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:802
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1057
 msgid "More…"
 msgstr ""
 
@@ -3199,7 +3299,7 @@ msgstr ""
 msgid "Mount Point"
 msgstr "Monteringspunkt"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:26
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:36
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:137
 msgid "Mount Points"
@@ -3247,46 +3347,44 @@ msgstr "Flytta ner"
 msgid "Move up"
 msgstr "Flytta upp"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:912
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
 msgid "NAS ID"
 msgstr "NAS-ID"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:57
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:87
 msgid "NAT-T Mode"
 msgstr "NAT-T-läge"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:9
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 msgid "NAT64 Prefix"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:31
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:26
 msgid "NCM"
 msgstr "NCM"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:535
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:589
 msgid "NDP-Proxy"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:43
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:72
 msgid "NT Domain"
 msgstr "NT-domän"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:273
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:264
 msgid "NTP server candidates"
 msgstr "NTP-serverkandidater"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:837
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1092
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:27
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:502
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:65
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:553
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:658
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:49
 msgid "Name"
 msgstr "Namn"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:17
-msgid "Name of the new interface"
-msgstr "Namn på det nya gränssnittet"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1808
 msgid "Name of the new network"
 msgstr "Namnet på det nya nätverket"
 
@@ -3294,9 +3392,10 @@ msgstr "Namnet på det nya nätverket"
 msgid "Navigation"
 msgstr "Navigering"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:62
+#: modules/luci-base/luasrc/controller/admin/index.lua:69
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:108
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:402
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:834
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1957
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:389
 #: modules/luci-mod-status/luasrc/view/admin_status/index/30-network.htm:8
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:73
@@ -3308,7 +3407,7 @@ msgstr "Nätverk"
 msgid "Network Utilities"
 msgstr "Nätverksverktyg"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:278
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:279
 msgid "Network boot image"
 msgstr "Uppstartsbild för nätverket"
 
@@ -3321,53 +3420,59 @@ msgstr ""
 msgid "Network without interfaces."
 msgstr "Nätverk utan gränssnitt"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:661
+msgid "New interface name…"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:11
 msgid "Next »"
 msgstr "Nästa »"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1507
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1754
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:108
 msgid "No"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:453
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:514
 msgid "No DHCP Server configured for this interface"
 msgstr "Det finns ingen DHCP-server inställd för det här gränssnittet"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1162
+msgid "No Encryption"
+msgstr ""
+
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:89
 msgid "No NAT-T"
 msgstr "Ingen NAT-T"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:198
+msgid "No data received"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1764
+msgid "No entries in this directory"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/backupfiles.lua:82
 msgid "No files found"
 msgstr "Inga filer hittades"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:550
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:191
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:180
 msgid "No information available"
 msgstr "Ingen information tillgänglig"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:8
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:63
 msgid "No matching prefix delegation"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:157
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
 msgid "No negative cache"
 msgstr "Ingen negativ cache"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:53
-msgid "No network configured on this device"
-msgstr "Det finns inget nätverk inställt på den här enheten"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:65
-msgid "No network name specified"
-msgstr "Inget nätverksnamn angavs"
-
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:147
-msgid "No networks in range"
-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
@@ -3375,7 +3480,12 @@ msgstr ""
 msgid "No password set!"
 msgstr "Inget lösenord inställt!"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:116
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:104
+msgid "No peers defined yet"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:129
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:271
 msgid "No public keys present yet."
 msgstr ""
 
@@ -3383,19 +3493,19 @@ msgstr ""
 msgid "No rules in this chain."
 msgstr "Inga regler i den här kedjan"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:150
-msgid "No scan results available yet..."
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:53
+msgid "No signal"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:7
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:756
 msgid "No zone assigned"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:111
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:35
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:48
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:133
 msgid "Noise"
 msgstr "Buller"
 
@@ -3411,16 +3521,16 @@ msgstr "Buller:"
 msgid "Non Pre-emtive CRC errors (CRC_P)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:292
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:293
 msgid "Non-wildcard"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:129
 msgid "None"
 msgstr "Ingen"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:181
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:172
 msgid "Normal"
 msgstr "Normal"
 
@@ -3428,25 +3538,29 @@ msgstr "Normal"
 msgid "Not Found"
 msgstr "Hittades inte"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:27
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:5
-msgid "Not associated"
-msgstr "Inte associerad"
-
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:87
 msgid "Not connected"
 msgstr "Inte ansluten"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:38
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:139
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:232
+msgid "Not present"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:105
 msgid "Not started on boot"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:26
-msgid "Note: interface name length"
-msgstr "Notera: längden på gränssnittets namn"
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:201
+msgid "Not supported"
+msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:171
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:162
 msgid "Notice"
 msgstr "Avisering"
 
@@ -3454,57 +3568,50 @@ msgstr "Avisering"
 msgid "Nslookup"
 msgstr "Nslookup"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:261
 msgid "Number of cached DNS entries (max is 10000, 0 is no caching)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:203
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:194
 msgid "Number of parallel threads used for compression"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:40
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:69
 msgid "Obfuscated Group Password"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:35
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:61
 msgid "Obfuscated Password"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:22
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:34
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:40
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:105
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:97
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:49
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:80
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:54
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:67
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:93
 msgid "Obtain IPv6-Address"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:83
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:68
 msgid "Off-State Delay"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:16
-msgid ""
-"On this page you can configure the network interfaces. You can bridge "
-"several interfaces by ticking the \"bridge interfaces\" field and enter the "
-"names of several network interfaces separated by spaces. You can also use "
-"<abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
-"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
-"<samp>eth0.1</samp>)."
-msgstr ""
-
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:95
 msgid "On-Link route"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:80
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:64
 msgid "On-State Delay"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:360
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:382
 msgid "One of hostname or mac address must be specified!"
 msgstr "En utav värdnamn eller MAC-adress måste anges!"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:456
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:462
 msgid "One of the following: %s"
 msgstr ""
 
@@ -3526,34 +3633,35 @@ msgstr "En eller fler fält som krävs har inget värde!"
 msgid "Open list..."
 msgstr "Öppna lista..."
 
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:61
 #: protocols/luci-proto-openconnect/luasrc/model/network/proto_openconnect.lua:9
 msgid "OpenConnect (CISCO AnyConnect)"
 msgstr "OpenConnect (CISCO AnyConnect)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:757
 msgid "Operating frequency"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1753
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2306
 msgid "Option changed"
 msgstr "Alternativet ändrades"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1755
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2308
 msgid "Option removed"
 msgstr "Alternativet togs bort"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1140
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:55
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1535
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:66
 msgid "Optional"
 msgstr "Valfri"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:78
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:76
 msgid ""
 "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, "
 "starting with <code>0x</code>."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:144
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:215
 msgid ""
 "Optional. Allowed values: 'eui64', 'random', fixed value like '::1' or "
 "'::1:2'. When IPv6 prefix (like 'a:b:c:d::') is received from a delegating "
@@ -3561,41 +3669,41 @@ msgid ""
 "for the interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:123
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:117
 msgid ""
 "Optional. Base64-encoded preshared key. Adds in an additional layer of "
 "symmetric-key cryptography for post-quantum resistance."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:148
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:126
 msgid "Optional. Create routes for Allowed IPs for this peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:103
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:108
 msgid "Optional. Description of peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:156
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:128
 msgid ""
 "Optional. Host of peer. Names are resolved prior to bringing up the "
 "interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:67
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:71
 msgid "Optional. Maximum Transmission Unit of tunnel interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:166
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:132
 msgid "Optional. Port of peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:175
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:136
 msgid ""
 "Optional. Seconds between keep alive messages. Default is 0 (disabled). "
 "Recommended value if this device is behind a NAT is 25."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:31
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:54
 msgid "Optional. UDP port used for outgoing and incoming packets."
 msgstr ""
 
@@ -3616,7 +3724,7 @@ msgstr "Ut"
 msgid "Outbound:"
 msgstr "Utgående"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:26
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:50
 msgid "Output Interface"
 msgstr ""
 
@@ -3625,51 +3733,51 @@ msgstr ""
 msgid "Output zone"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:63
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:155
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:33
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:54
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:54
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:219
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:50
 msgid "Override MAC address"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:66
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:35
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:56
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:88
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:125
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:131
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:133
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:104
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:61
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:58
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:223
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:44
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:54
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:154
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:71
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:145
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:132
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:110
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:119
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:97
 msgid "Override MTU"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:30
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:63
 msgid "Override TOS"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:25
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:58
 msgid "Override TTL"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:954
 msgid "Override default interface name"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:41
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:167
 msgid "Override the gateway in DHCP responses"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:507
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:555
 msgid ""
 "Override the netmask sent to clients. Normally it is calculated from the "
 "subnet that is served."
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:65
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:179
 msgid "Override the table used for internal routes"
 msgstr ""
 
@@ -3677,29 +3785,33 @@ msgstr ""
 msgid "Overview"
 msgstr "Överblick"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1606
+msgid "Overwrite existing file \"%s\" ?"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:11
 msgid "Owner"
 msgstr "Ägare"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:42
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:56
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:17
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:28
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:34
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:14
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:18
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:43
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:98
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:45
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:44
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:63
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:82
 msgid "PAP/CHAP password"
 msgstr "PAP/CHAP-lösenord"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:39
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:53
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:14
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:11
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:15
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:96
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:88
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:43
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:74
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:42
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:61
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:77
 msgid "PAP/CHAP username"
 msgstr "PAP/CHAP-användarnamn"
 
@@ -3707,9 +3819,9 @@ msgstr "PAP/CHAP-användarnamn"
 msgid "PID"
 msgstr "PID"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:36
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:50
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:26
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:95
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:87
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:68
 msgid "PIN"
 msgstr "PIN-kod"
 
@@ -3718,114 +3830,116 @@ msgstr "PIN-kod"
 msgid "PIN code rejected"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:966
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1372
 msgid "PMK R1 Push"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:43
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:13
 msgid "PPP"
 msgstr "PPP"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:11
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:58
 msgid "PPPoA Encapsulation"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:19
 msgid "PPPoATM"
 msgstr "PPPoATM"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:17
 msgid "PPPoE"
 msgstr "PPPoE"
 
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:28
 #: protocols/luci-proto-pppossh/luasrc/model/network/proto_pppossh.lua:9
 msgid "PPPoSSH"
 msgstr "PPPoSSH"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:15
 msgid "PPtP"
 msgstr "PPtP"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:59
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:73
 msgid "PSID offset"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:56
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:70
 msgid "PSID-bits length"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:123
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:846
 msgid "PTM/EFM (Packet Transfer Mode)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:78
-msgid "Package libiwinfo required!"
-msgstr "Paketet libiwinfo krävs!"
-
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:45
 msgid "Packets"
 msgstr "Paket"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:7
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:756
 msgid "Part of zone %q"
 msgstr "Del av zon %q"
 
 #: modules/luci-base/luasrc/view/sysauth.htm:29
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1111
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:35
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:42
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1514
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:46
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:104
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:58
 msgid "Password"
 msgstr "Lösenord"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:29
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:24
 msgid "Password authentication"
 msgstr "Lösenordsautentisering"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1019
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1414
 msgid "Password of Private Key"
 msgstr "Den privata nyckelns lösenord"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1067
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1471
 msgid "Password of inner Private Key"
 msgstr "Lösenordet för den inre privata nyckeln"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:14
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:16
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:18
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:20
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:32
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:34
 msgid "Password strength"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:44
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:107
 msgid "Password2"
 msgstr "Lösenord2"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:37
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:244
 msgid "Paste or drag SSH key file…"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1000
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1396
 msgid "Path to CA-Certificate"
 msgstr "Genväg till CA-certifikat"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1007
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1402
 msgid "Path to Client-Certificate"
 msgstr "Genväg till klient-certifikat"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1013
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1408
 msgid "Path to Private Key"
 msgstr "Genväg till privat nyckel"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1049
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1453
 msgid "Path to inner CA-Certificate"
 msgstr "Genväg till det inre CA-certifikatet"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1055
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1459
 msgid "Path to inner Client-Certificate"
 msgstr "Genväg till det inre klient-certifikatet"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1061
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1465
 msgid "Path to inner Private Key"
 msgstr "Genväg till den inre privata nyckeln"
 
@@ -3843,7 +3957,7 @@ msgstr "Genväg till den inre privata nyckeln"
 msgid "Peak:"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:28
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:89
 msgid "Peer IP address to assign"
 msgstr ""
 
@@ -3852,11 +3966,11 @@ msgstr ""
 msgid "Peer address is missing"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:90
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:89
 msgid "Peers"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:50
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:80
 msgid "Perfect Forward Secrecy"
 msgstr ""
 
@@ -3868,7 +3982,11 @@ msgstr "Utför omstart"
 msgid "Perform reset"
 msgstr "Utför återställning"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:174
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:199
+msgid "Permission denied"
+msgstr ""
+
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:136
 msgid "Persistent Keep Alive"
 msgstr ""
 
@@ -3876,7 +3994,7 @@ msgstr ""
 msgid "Phy Rate:"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:190
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:277
 msgid "Physical Settings"
 msgstr "Fysiska inställningar"
 
@@ -3887,6 +4005,10 @@ msgstr "Ping"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:16
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:17
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:41
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:77
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:87
@@ -3904,15 +4026,19 @@ msgstr "Vänligen ange ditt användarnamn och lösenord."
 msgid "Policy"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:22
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:20
 msgid "Port"
 msgstr "Port"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:18
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:133
+msgid "Port %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:274
 msgid "Port status:"
 msgstr "Port-status:"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:482
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:488
 msgid "Potential negation of: %s"
 msgstr ""
 
@@ -3924,11 +4050,11 @@ msgstr ""
 msgid "Pre-emtive CRC errors (CRCP_P)"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:32
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:73
 msgid "Prefer LTE"
 msgstr "Föredra LTE"
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:33
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:74
 msgid "Prefer UMTS"
 msgstr "Föredra UMTS"
 
@@ -3936,31 +4062,30 @@ msgstr "Föredra UMTS"
 msgid "Prefix Delegated"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:122
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:117
 msgid "Preshared Key"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:101
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:75
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:81
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:75
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:54
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:74
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:131
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:102
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:89
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:112
 msgid ""
 "Presume peer to be dead after given amount of LCP echo failures, use 0 to "
 "ignore failures"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:305
 msgid "Prevent listening on these interfaces."
 msgstr "Förhindra lyssning på dessa gränssnitt."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:509
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:562
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:950
 msgid "Prevents client-to-client communication"
 msgstr "Förhindrar kommunikation klient-till-klient"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:18
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:49
 msgid "Private Key"
 msgstr "Privat nyckel"
 
@@ -3981,39 +4106,33 @@ msgstr "Profil"
 msgid "Prot."
 msgstr "Prot."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:72
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:349
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:675
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:84
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:216
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:87
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:390
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:31
-msgid "Protocol of the new interface"
-msgstr "Det nya gränssnittets protokoll"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:222
-msgid "Protocol support is not installed"
-msgstr "Stöd för protokoll är inte installerat"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:269
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:260
 msgid "Provide NTP server"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:701
 msgid "Provide new network"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:451
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:879
 msgid "Pseudo Ad-Hoc (ahdemo)"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:112
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:113
 msgid "Public Key"
 msgstr "Publik nyckel"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:278
 msgid ""
 "Public keys allow for the passwordless SSH logins with a higher security "
 "compared to the use of plain passwords. In order to upload a new key to the "
@@ -4021,47 +4140,48 @@ msgid ""
 "code> file into the input field."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:139
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:211
 msgid "Public prefix routed to this device for distribution to clients."
 msgstr ""
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:27
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:9
 msgid "QMI Cellular"
 msgstr "QMI-telefoni"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:173
 msgid "Quality"
 msgstr "Kvalité"
 
-#: 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:171
 msgid ""
 "Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> "
 "servers"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:952
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1360
 msgid "R0 Key Lifetime"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:959
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1366
 msgid "R1 Key Holder"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:58
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:88
 msgid "RFC3947 NAT-T mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:381
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:814
 msgid "RSSI threshold for joining"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:256
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:597
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:778
 msgid "RTS/CTS Threshold"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:41
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:76
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:87
 msgid "RX"
@@ -4071,35 +4191,39 @@ msgstr "RT"
 msgid "RX Rate"
 msgstr "RX-hastighet"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:783
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1961
+msgid "RX Rate / TX Rate"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1207
 msgid "Radius-Accounting-Port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:791
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1215
 msgid "Radius-Accounting-Secret"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:775
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1199
 msgid "Radius-Accounting-Server"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:759
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1183
 msgid "Radius-Authentication-Port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:767
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1191
 msgid "Radius-Authentication-Secret"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:751
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1175
 msgid "Radius-Authentication-Server"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:119
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:102
 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:83
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:84
 msgid ""
 "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-Server"
@@ -4113,17 +4237,11 @@ msgid ""
 "access to this device if you are connected via this interface"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2
-msgid ""
-"Really delete this wireless network? The deletion cannot be undone! You "
-"might lose access to this device if you are connected via this network."
-msgstr ""
-
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:40
 msgid "Really reset all changes?"
 msgstr "Verkligen återställa alla ändringar?"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:237
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:354
 msgid "Really switch protocol?"
 msgstr "Verkligen byta protokoll?"
 
@@ -4147,15 +4265,15 @@ msgstr "Trafik i realtid"
 msgid "Realtime Wireless"
 msgstr "Trådlöst i realtid"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:931
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1343
 msgid "Reassociation Deadline"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:191
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
 msgid "Rebind protection"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:48
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:46
 #: modules/luci-mod-system/luasrc/view/admin_system/reboot.htm:9
 msgid "Reboot"
 msgstr "Starta om"
@@ -4169,21 +4287,15 @@ msgstr "Startar om..."
 msgid "Reboots the operating system of your device"
 msgstr "Startar om din enhets operativsystem"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:103
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:90
 msgid "Receive"
 msgstr "Ta emot"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:325
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:350
-msgid "Receiver Antenna"
-msgstr "Mottagningsantenn"
-
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:42
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:59
 msgid "Recommended. IP addresses of the WireGuard interface."
 msgstr "Rekommenderad. WireGuard-gränssnittets IP-adress"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:28
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:300
 msgid "Reconnect this interface"
 msgstr "Återanslut det här gränssnittet"
 
@@ -4191,92 +4303,134 @@ msgstr "Återanslut det här gränssnittet"
 msgid "References"
 msgstr "Referens"
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:39
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:153
 msgid "Relay"
 msgstr "Relä"
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:36
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:157
 msgid "Relay Bridge"
 msgstr "Relä-brygga"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:17
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:154
 msgid "Relay between networks"
 msgstr "Relä mellan nätverk"
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:64
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:12
 msgid "Relay bridge"
 msgstr "Relä-brygga"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:18
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:50
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:49
 msgid "Remote IPv4 address"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:8
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:40
 msgid "Remote IPv4 address or FQDN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:45
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:725
 msgid "Remove"
 msgstr "Ta bort"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:53
-msgid "Repeat scan"
-msgstr "Repetera skanning"
-
-#: modules/luci-base/luasrc/view/cbi/upload.htm:11
-msgid "Replace entry"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:46
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:51
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1806
 msgid "Replace wireless configuration"
 msgstr "Ersätt trådlös konfiguration"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:8
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:17
 msgid "Request IPv6-address"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:16
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:23
 msgid "Request IPv6-prefix of length"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1141
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:200
+msgid "Request timeout"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1536
 msgid "Required"
 msgstr "Krävs!"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:20
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:31
 msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:19
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:49
 msgid "Required. Base64-encoded private key for this interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:113
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:113
 msgid "Required. Base64-encoded public key of peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:136
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:122
 msgid ""
 "Required. IP addresses and prefixes that this peer is allowed to use inside "
 "the tunnel. Usually the peer's tunnel IP addresses and the networks the peer "
 "routes through the tunnel."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1134
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1095
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1096
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1097
+msgid "Requires hostapd"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1101
+msgid "Requires hostapd with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1102
+msgid "Requires hostapd with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1098
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1099
+msgid "Requires hostapd with SAE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1533
 msgid ""
 "Requires the 'full' version of wpad/hostapd and support from the wifi driver "
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:141
 msgid ""
 "Requires upstream supports DNSSEC; verify unsigned domain responses really "
 "come from unsigned domains"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1268
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1109
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1119
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1120
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1121
+msgid "Requires wpa-supplicant"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1113
+msgid "Requires wpa-supplicant with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1114
+msgid "Requires wpa-supplicant with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1111
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1124
+msgid "Requires wpa-supplicant with SAE support"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1355
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:17
 #: modules/luci-base/luasrc/view/cbi/footer.htm:30
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:66
@@ -4292,17 +4446,22 @@ 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:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:68
 msgid "Resolv and Hosts Files"
 msgstr "Resolv och Värd-filer"
 
-#: 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:94
 msgid "Resolve file"
 msgstr "Resolv-fil"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:28
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:14
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:71
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:197
+msgid "Resource not found"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:302
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:693
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:90
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:112
 msgid "Restart"
 msgstr "Starta om"
 
@@ -4310,7 +4469,7 @@ msgstr "Starta om"
 msgid "Restart Firewall"
 msgstr "Starta om brandvägg"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:14
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:691
 msgid "Restart radio interface"
 msgstr ""
 
@@ -4322,26 +4481,24 @@ msgstr "Återställ"
 msgid "Restore backup"
 msgstr "Återställ säkerhetskopian"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:113
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:114
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:38
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:46
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:119
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:120
 msgid "Reveal/hide password"
 msgstr "Visa/göm lösenord"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1774
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2322
 msgid "Revert"
 msgstr "Återgå"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1861
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2405
 msgid "Revert changes"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2013
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2554
 msgid "Revert request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1993
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2534
 msgid "Reverting configuration…"
 msgstr ""
 
@@ -4349,7 +4506,7 @@ msgstr ""
 msgid "Root"
 msgstr "Root"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:271
 msgid "Root directory for files served via TFTP"
 msgstr "Root-mappen för filer som skickas via TFTP"
 
@@ -4357,7 +4514,7 @@ msgstr "Root-mappen för filer som skickas via TFTP"
 msgid "Root preparation"
 msgstr "Root-förberedelse"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:147
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:126
 msgid "Route Allowed IPs"
 msgstr ""
 
@@ -4369,12 +4526,12 @@ msgstr ""
 msgid "Route type"
 msgstr "Typ av rutt"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:523
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:577
 msgid "Router Advertisement-Service"
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:43
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:15
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:27
 msgid "Router Password"
 msgstr "Router-lösenord"
 
@@ -4402,7 +4559,7 @@ msgstr "Kör en filsystemskontroll innan enheten monteras"
 msgid "Run filesystem check"
 msgstr "Kör filsystemskontrollen"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:651
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:669
 msgid "Runtime error"
 msgstr ""
 
@@ -4414,31 +4571,31 @@ msgstr "SHA256"
 msgid "SNR"
 msgstr "SNR"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:5
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:18
 msgid "SSH Access"
 msgstr "SSH-Ã¥tkomst"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:10
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:70
 msgid "SSH server address"
 msgstr "SSH-serverns adress"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:13
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:74
 msgid "SSH server port"
 msgstr "SSH-serverns port"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:8
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:58
 msgid "SSH username"
 msgstr "Användarnamn för SSH"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:27
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:277
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
 msgid "SSH-Keys"
 msgstr "SSH-nycklar"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:42
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:73
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:29
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1617
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:174
 msgid "SSID"
 msgstr "SSID"
@@ -4447,17 +4604,17 @@ msgstr "SSID"
 msgid "SWAP"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1127
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1262
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1379
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1351
 #: modules/luci-base/luasrc/view/cbi/error.htm:17
 #: modules/luci-base/luasrc/view/cbi/footer.htm:26
 #: modules/luci-base/luasrc/view/cbi/header.htm:17
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:54
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:133
 msgid "Save"
 msgstr "Spara"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1256
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1768
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1347
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2318
 #: modules/luci-base/luasrc/view/cbi/footer.htm:22
 msgid "Save & Apply"
 msgstr "Spara och Verkställ"
@@ -4470,28 +4627,20 @@ msgstr ""
 msgid "Save mtdblock contents"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
-msgid "Saving keys…"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:698
 msgid "Scan"
 msgstr "Skanna"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:109
-msgid "Scan request failed"
-msgstr ""
-
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:8
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:39
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:23
 msgid "Scheduled Tasks"
 msgstr "Schemalagda uppgifter"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1749
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2302
 msgid "Section added"
 msgstr "Sektionen lades till"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1751
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2304
 msgid "Section removed"
 msgstr "Sektionen togs bort"
 
@@ -4506,61 +4655,66 @@ msgid ""
 "your device!"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:119
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:90
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:96
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:90
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:69
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:92
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1516
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1646
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1809
+msgid "Select file…"
+msgstr ""
+
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:144
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:102
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:125
 msgid ""
 "Send LCP echo requests at the given interval in seconds, only effective in "
 "conjunction with failure threshold"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:561
-msgid "Separate Clients"
-msgstr "Separera klienter"
-
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:62
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:63
 msgid "Server Settings"
 msgstr "Inställningar för server"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:26
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:50
 msgid "Service Name"
 msgstr "Namn på tjänst"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:25
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:30
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:87
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:71
 msgid "Service Type"
 msgstr "Typ av tjänst"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:55
+#: modules/luci-base/luasrc/controller/admin/index.lua:62
 msgid "Services"
 msgstr "Tjänster"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:815
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:861
 msgid "Session expired"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:83
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:107
 msgid "Set VPN as Default Route"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:258
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:795
 msgid ""
 "Set interface properties regardless of the link carrier (If set, carrier "
 "sense events do not invoke hotplug handlers)."
 msgstr ""
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:23
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:55
 msgid "Setting PLMN failed"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:26
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:68
 msgid "Setting operation mode failed"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:454
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:517
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:527
 msgid "Setup DHCP Server"
 msgstr "Ställ in DHCP-server"
 
@@ -4572,7 +4726,7 @@ msgstr ""
 msgid "Short GI"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:516
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:960
 msgid "Short Preamble"
 msgstr ""
 
@@ -4584,21 +4738,23 @@ msgstr ""
 msgid "Show empty chains"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:306
 msgid "Shutdown this interface"
 msgstr "Stäng ner det här gränssnittet"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:111
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:34
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:47
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:132
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1616
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:173
 msgid "Signal"
 msgstr "Signal"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1960
+msgid "Signal / Noise"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:125
 msgid "Signal Attenuation (SATN)"
 msgstr ""
@@ -4611,11 +4767,11 @@ msgstr "Signal:"
 msgid "Size"
 msgstr "Storlek"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:259
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:260
 msgid "Size of DNS query cache"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:191
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
 msgid "Size of the ZRam device in megabytes"
 msgstr ""
 
@@ -4632,11 +4788,7 @@ msgstr "Hoppa över till innehåll"
 msgid "Skip to navigation"
 msgstr "Hoppa över till navigering"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:335
-msgid "Slot time"
-msgstr ""
-
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1640
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1846
 #: modules/luci-base/luasrc/model/network.lua:1427
 msgid "Software VLAN"
 msgstr ""
@@ -4674,61 +4826,65 @@ msgstr ""
 msgid "Specifies the directory the device is attached to"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:23
-msgid "Specifies the listening port of this <em>Dropbear</em> instance"
-msgstr "Anger lyssningsporten för den här <em>Dropbear</em>-instansen"
-
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:57
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:175
 msgid ""
 "Specifies the maximum amount of failed ARP requests until hosts are presumed "
 "to be dead"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:49
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:171
 msgid ""
 "Specifies the maximum amount of seconds after which hosts are presumed to be "
 "dead"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:761
+msgid ""
+"Specifies the maximum transmit power the wireless radio may use. Depending "
+"on regulatory requirements and wireless usage, the actual transmit power may "
+"be reduced by the driver."
+msgstr ""
+
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:63
 msgid "Specify a TOS (Type of Service)."
 msgstr "Ange en TaT (Typ av Tjänst)."
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:25
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:58
 msgid ""
 "Specify a TTL (Time to Live) for the encapsulating packet other than the "
 "default (64)."
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:53
 msgid ""
 "Specify an MTU (Maximum Transmission Unit) other than the default (1280 "
 "bytes)."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:60
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "Specify the secret encryption key here."
 msgstr "Ange den hemliga krypteringsnyckeln här."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:475
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:64
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:533
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:89
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:111
 msgid "Start"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:33
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:86
 msgid "Start priority"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1958
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2499
 msgid "Starting configuration apply…"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1626
 msgid "Starting wireless scan..."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:24
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:120
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
 msgid "Startup"
 msgstr ""
 
@@ -4740,59 +4896,62 @@ msgstr "Statiska IPv4-rutter"
 msgid "Static IPv6 Routes"
 msgstr "Statiska IPv6-rutter"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:70
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:71
 msgid "Static Leases"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:118
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:73
 msgid "Static Routes"
 msgstr "Statiska rutter"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1194
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1384
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:172
 #: modules/luci-base/luasrc/model/network.lua:966
 msgid "Static address"
 msgstr "Statiska adresser"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:308
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:309
 msgid ""
 "Static leases are used to assign fixed IP addresses and symbolic hostnames "
 "to DHCP clients. They are also required for non-dynamic interface "
 "configurations where only hosts with a corresponding lease are served."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:534
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:977
 msgid "Station inactivity limit"
 msgstr ""
 
 #: modules/luci-base/luasrc/controller/admin/index.lua:40
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:197
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:337
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:746
 #: modules/luci-mod-status/luasrc/view/admin_status/index.htm:128
 msgid "Status"
 msgstr "Status"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:35
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:75
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:308
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:91
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:113
 msgid "Stop"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:165
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Strict order"
 msgstr "Strikt sortering"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:16
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:30
 msgid "Strong"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1843
 msgid "Submit"
 msgstr "Skicka in"
 
-#: 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:108
 msgid "Suppress logging"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:109
 msgid "Suppress logging of the routine operation of these protocols"
 msgstr ""
 
@@ -4804,42 +4963,44 @@ msgstr "Swap"
 msgid "Swap Entry"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:23
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:5
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:135
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:21
 msgid "Switch"
 msgstr "Byt"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:129
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:168
 msgid "Switch %q"
 msgstr "Byt %q"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:128
-msgid "Switch %q (%s)"
-msgstr "Byt %q (%s)"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:66
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:146
 msgid ""
 "Switch %q has an unknown topology - the VLAN settings might not be accurate."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:146
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:142
 msgid "Switch Port Mask"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1640
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1846
 #: modules/luci-base/luasrc/model/network.lua:1425
 msgid "Switch VLAN"
 msgstr "Byt VLAN"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:238
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:355
 msgid "Switch protocol"
 msgstr "Byt protokoll"
 
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:103
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:104
 #: modules/luci-base/luasrc/view/cbi/ipaddr.htm:26
 msgid "Switch to CIDR list notation"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:77
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1547
+msgid "Symbolic link"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:71
 msgid "Sync with NTP-Server"
 msgstr ""
 
@@ -4849,7 +5010,7 @@ msgstr "Synkronisera med webbläsare"
 
 #: modules/luci-base/luasrc/controller/admin/index.lua:47
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:14
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:102
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:94
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
 #: modules/luci-mod-system/luasrc/view/admin_system/applyreboot.htm:39
 msgid "System"
@@ -4860,11 +5021,11 @@ msgstr "System"
 msgid "System Log"
 msgstr "Systemlogg"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:108
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:99
 msgid "System Properties"
 msgstr "Systemets egenskaper"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:145
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:136
 msgid "System log buffer size"
 msgstr ""
 
@@ -4872,15 +5033,17 @@ msgstr ""
 msgid "TCP:"
 msgstr "TCP:"
 
-#: 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:69
 msgid "TFTP Settings"
 msgstr "Inställningar för TFTP"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:269
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
 msgid "TFTP server root"
 msgstr "Root för TFTP-server"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:17
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:77
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:88
 msgid "TX"
@@ -4903,7 +5066,7 @@ msgstr "Tabell"
 msgid "Target"
 msgstr "MÃ¥l"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:77
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:103
 msgid "Target network"
 msgstr "Målnätverk"
 
@@ -4911,40 +5074,24 @@ msgstr "Målnätverk"
 msgid "Terminate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:27
-msgid ""
-"The <em>Device Configuration</em> section covers physical settings of the "
-"radio hardware such as channel, transmit power or antenna selection which "
-"are shared among all defined wireless networks (if the radio hardware is "
-"multi-SSID capable). Per network settings like encryption or operation mode "
-"are grouped in the <em>Interface Configuration</em>."
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:79
-msgid ""
-"The <em>libiwinfo-lua</em> package is not installed. You must install this "
-"component for working wireless configuration!"
-msgstr ""
-
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:66
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:77
 msgid ""
 "The HE.net endpoint update configuration changed, you must now use the plain "
 "username instead of the user ID!"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:8
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:40
 msgid ""
 "The IPv4 address or the fully-qualified domain name of the remote tunnel end."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:27
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:38
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:59
 msgid ""
 "The IPv6 prefix assigned to the provider, usually ends with <code>::</code>"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:18
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1808
 msgid ""
 "The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
 "code> and <code>_</code>"
@@ -4958,7 +5105,7 @@ msgstr ""
 msgid "The configuration file could not be loaded due to the following error:"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1849
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2396
 msgid ""
 "The device could not be reached within %d seconds after applying the pending "
 "changes, which caused the configuration to be rolled back for safety "
@@ -4976,6 +5123,12 @@ msgid ""
 "</abbr> <code>/dev/sda1</code>)"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:612
+msgid ""
+"The existing wireless configuration needs to be changed for LuCI to function "
+"properly."
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:127
 msgid ""
 "The filesystem that was used to format the memory (<abbr title=\"for example"
@@ -4994,43 +5147,49 @@ msgstr ""
 msgid "The following rules are currently active on this system."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:144
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:154
+msgid "The gateway address must not be a local IP address"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:154
 msgid "The given SSH public key has already been added."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:150
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:160
 msgid ""
 "The given SSH public key is invalid. Please supply proper public RSA or "
 "ECDSA keys."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:67
-msgid "The given network name is not unique"
-msgstr "Det angivna nätverksnamnet är inte unikt"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:664
+msgid "The interface name is already used"
+msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:52
-msgid ""
-"The hardware is not multi-SSID capable and the existing configuration will "
-"be replaced if you proceed."
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:670
+msgid "The interface name is too long"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:43
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:31
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:55
 msgid ""
 "The length of the IPv4 prefix in bits, the remainder is used in the IPv6 "
 "addresses."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:35
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:46
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:63
 msgid "The length of the IPv6 prefix in bits"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:12
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:44
 msgid "The local IPv4 address over which the tunnel is created (optional)."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:5
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1814
+msgid "The network name is already used"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:135
 msgid ""
 "The network ports on this device can be combined to several <abbr title="
 "\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
@@ -5040,22 +5199,21 @@ msgid ""
 "next greater network like the internet and other ports for a local network."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:77
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:395
-msgid "The selected protocol needs a device assigned"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1149
+msgid "The selected %s mode is incompatible with %s encryption"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/csrftoken.htm:11
 msgid "The submitted security token is invalid or already expired!"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:274
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:272
 msgid ""
 "The system is erasing the configuration partition now and will reboot itself "
 "when finished."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:195
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:193
 msgid ""
 "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
 "few minutes before you try to reconnect. It might be necessary to renew the "
@@ -5063,7 +5221,7 @@ msgid ""
 "settings."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:15
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:80
 msgid "The system password has been successfully changed."
 msgstr ""
 
@@ -5073,7 +5231,7 @@ msgid ""
 "you choose the generic image format for your platform."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:427
 msgid "There are no active leases"
 msgstr ""
 
@@ -5082,16 +5240,10 @@ msgstr ""
 msgid "There are no active leases."
 msgstr "Det finns inga aktiva kontrakt."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1973
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2514
 msgid "There are no changes to apply"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:204
-msgid ""
-"There is no device assigned yet, please attach a network device in the "
-"\"Physical Settings\" tab"
-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
@@ -5103,11 +5255,19 @@ msgstr ""
 "Det finns inget lösenord inställt på den här routern. Vänligen ställ in ett "
 "root-lösenord för att skydda webbgränssnittet och för att aktivera SSH."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:19
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:49
 msgid "This IPv4 address of the relay"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1448
+msgid "This authentication type is not applicable to the selected EAP method."
+msgstr ""
+
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:54
+msgid "This does not look like a valid PEM file"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
 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 "
@@ -5121,44 +5281,44 @@ msgid ""
 "configurations are automatically preserved."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:74
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:81
 msgid ""
 "This is either the \"Update Key\" configured for the tunnel or the account "
 "password if no update key has been configured"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:82
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:127
 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 ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:27
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:54
 msgid ""
 "This is the local endpoint address assigned by the tunnel broker, it usually "
 "ends with <code>...:2/64</code>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:79
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> in the local network"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:73
 msgid "This is the plain username for logging into the account"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:34
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:57
 msgid ""
 "This is the prefix routed to you by the tunnel broker for use by clients"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:9
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:41
 msgid "This is the system crontab in which scheduled tasks can be defined."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:19
+#: 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 ""
@@ -5173,26 +5333,26 @@ msgstr ""
 msgid "This page gives an overview over currently active network connections."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:726
-#: modules/luci-base/htdocs/luci-static/resources/form.js:809
+#: modules/luci-base/htdocs/luci-static/resources/form.js:936
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1064
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:172
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:32
 msgid "This section contains no values yet"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:114
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:105
 msgid "Time Synchronization"
 msgstr "Synkronisering av tid"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:525
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:968
 msgid "Time interval for rekeying GTK"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:128
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:119
 msgid "Timezone"
 msgstr "Tidszon"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:825
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:871
 msgid "To login…"
 msgstr ""
 
@@ -5205,7 +5365,7 @@ msgstr ""
 "För att återställa konfigurationsfiler så kan du ladda upp ett tidigare "
 "genererat säkerhetskopierings arkiv här."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:835
 msgid "Tone"
 msgstr "Ton"
 
@@ -5229,55 +5389,41 @@ msgstr "Trafik"
 msgid "Transfer"
 msgstr "Överför"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:595
-msgid "Transmission Rate"
-msgstr "Överföringshastighet"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:102
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:89
 msgid "Transmit"
 msgstr "Överför"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:211
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:273
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:345
-msgid "Transmit Power"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:318
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:349
-msgid "Transmitter Antenna"
-msgstr ""
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:73
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:57
 msgid "Trigger"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:98
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:84
 msgid "Trigger Mode"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:54
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:69
 msgid "Tunnel ID"
 msgstr "Tunnel-ID"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1643
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1849
 #: modules/luci-base/luasrc/model/network.lua:1430
 msgid "Tunnel Interface"
 msgstr "Tunnelgränssnitt"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:44
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:55
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:76
 msgid "Tunnel Link"
 msgstr "Tunnel-länk"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:46
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:131
 msgid "Tx-Power"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:32
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:185
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:11
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:43
 msgid "Type"
 msgstr "Typ"
 
@@ -5285,19 +5431,20 @@ msgstr "Typ"
 msgid "UDP:"
 msgstr "UDP:"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:28
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:90
 msgid "UMTS only"
 msgstr "Endast UMTS"
 
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:43
 #: protocols/luci-proto-3g/luasrc/model/network/proto_3g.lua:10
 msgid "UMTS/GPRS/EV-DO"
 msgstr "UMTS/GPRS/EV-DO"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:106
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:93
 msgid "USB Device"
 msgstr "USB-enhet"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:122
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:110
 msgid "USB Ports"
 msgstr "USB-portar"
 
@@ -5327,10 +5474,12 @@ msgstr ""
 msgid "Unable to dispatch"
 msgstr "Det går inte att skicka"
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:22
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:54
 msgid "Unable to obtain client ID"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:61
 msgid "Unable to resolve AFTR host name"
 msgstr ""
@@ -5340,21 +5489,31 @@ msgstr ""
 msgid "Unable to resolve peer host name"
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:33
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:68
+msgid "Unable to save contents: %s"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:132
 msgid "Unavailable Seconds (UAS)"
 msgstr "Otillgängliga Sekunder (UAS)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1196
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1386
 #: modules/luci-base/luasrc/model/network.lua:970
 msgid "Unknown"
 msgstr "Okänd"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1349
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1539
 #: modules/luci-base/luasrc/model/network.lua:1137
 msgid "Unknown error (%s)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1193
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:204
+msgid "Unknown error code"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1383
+#: modules/luci-base/htdocs/luci-static/resources/protocol/none.js:6
 #: modules/luci-base/luasrc/model/network.lua:964
 msgid "Unmanaged"
 msgstr ""
@@ -5364,22 +5523,30 @@ msgstr ""
 msgid "Unmount"
 msgstr "Avmontera"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:107
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:262
 msgid "Unnamed key"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1708
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2261
 msgid "Unsaved Changes"
 msgstr "Osparade ändringar"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:202
+msgid "Unspecified error"
+msgstr ""
+
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:64
 msgid "Unsupported MAP type"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:27
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:69
 msgid "Unsupported modem"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:219
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:119
 msgid "Unsupported protocol type."
 msgstr "Protokolltypen stöds inte."
@@ -5399,56 +5566,70 @@ msgstr ""
 msgid "Upload archive..."
 msgstr "Ladda upp arkiv..."
 
-#: modules/luci-base/luasrc/view/cbi/upload.htm:8
-msgid "Uploaded File"
-msgstr "Laddade upp fil"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1703
+msgid "Upload file"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1678
+msgid "Upload file…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1623
+msgid "Upload request failed: %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:613
+msgid ""
+"Upon pressing \"Continue\", anonymous \"wifi-iface\" sections will be "
+"assigned with a name in the form <em>wifinet#</em> and the network will be "
+"restarted to apply the updated configuration."
+msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:14
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:74
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:85
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:26
 msgid "Uptime"
 msgstr "Upptid"
 
-#: 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:83
 msgid "Use <code>/etc/ethers</code>"
 msgstr "Använd <code>/etc/ethers</code>"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:40
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:167
 msgid "Use DHCP gateway"
 msgstr "Använd DHCP-gateway"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:33
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:85
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:34
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:98
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:46
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:65
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:38
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:58
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:124
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:39
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:116
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:59
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:103
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:64
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:77
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:100
 msgid "Use DNS servers advertised by peer"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:227
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:233
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:479
 msgid "Use ISO/IEC 3166 alpha2 country codes."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:31
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:100
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:70
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:35
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:51
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:86
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:56
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:97
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:77
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:75
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:92
 msgid "Use MTU on tunnel interface"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:95
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:65
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:30
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:46
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:81
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:93
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:73
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:88
 msgid "Use TTL on tunnel interface"
 msgstr ""
 
@@ -5460,68 +5641,65 @@ msgstr ""
 msgid "Use as root filesystem (/)"
 msgstr "Använd som root-filsystem (/)"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:19
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:31
 msgid "Use broadcast flag"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:253
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:791
 msgid "Use builtin IPv6-management"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:40
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:109
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:92
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:45
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:105
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:53
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:72
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:45
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:65
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:40
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:182
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:127
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:42
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:119
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:62
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:67
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:80
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:103
 msgid "Use custom DNS servers"
 msgstr "Använd anpassade DNS-servrar"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:26
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:70
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:16
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:28
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:84
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:24
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:50
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:23
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:43
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:116
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:33
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:74
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:97
 msgid "Use default gateway"
 msgstr "Använd standard-gateway"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:48
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:164
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:77
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:24
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:88
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:58
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:23
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:39
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:74
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:90
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:38
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:57
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:30
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:50
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:45
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:227
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:119
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:51
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:88
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:68
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:52
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:70
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:83
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:111
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:149
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:67
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:111
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:98
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:72
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:85
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:108
 msgid "Use gateway metric"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:64
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:179
 msgid "Use routing table"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:309
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:310
 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 "
@@ -5534,77 +5712,78 @@ msgstr ""
 msgid "Used"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:848
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1273
 msgid "Used Key Slot"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:913
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
 msgid ""
 "Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not "
 "needed with normal WPA(2)-PSK."
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:48
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:110
 msgid "User certificate (PEM encoded)"
 msgstr "Användarcertifikat (PEM-krypterad)"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:61
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:122
 msgid "User key (PEM encoded)"
 msgstr "Användarnyckel (PEM-krypterad)"
 
 #: modules/luci-base/luasrc/view/sysauth.htm:23
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:41
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:32
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:102
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:56
 msgid "Username"
 msgstr "Användarnamn"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:182
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:903
 msgid "VC-Mux"
 msgstr "VC-Mux"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:851
 msgid "VDSL"
 msgstr "VDSL"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:172
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:169
 msgid "VLANs on %q"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:171
-msgid "VLANs on %q (%s)"
+#: modules/luci-base/luasrc/controller/admin/index.lua:55
+msgid "VPN"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:18
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:42
 msgid "VPN Local address"
 msgstr "Lokal adress för VPN"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:22
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:46
 msgid "VPN Local port"
 msgstr "Lokal port för VPN"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:15
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:11
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:15
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:58
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:39
 msgid "VPN Server"
 msgstr "VPN-server"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:18
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:96
 msgid "VPN Server port"
 msgstr "Port för VPN-server"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:37
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:100
 msgid "VPN Server's certificate SHA1 hash"
 msgstr ""
 
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:9
 #: protocols/luci-proto-vpnc/luasrc/model/network/proto_vpnc.lua:9
 msgid "VPNC (CISCO 3000 (and others) VPN)"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:44
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:73
 msgid "Vendor"
 msgstr "Tillverkare"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:60
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:52
 msgid "Vendor Class to send when requesting DHCP"
 msgstr ""
 
@@ -5612,41 +5791,37 @@ msgstr ""
 msgid "Verify"
 msgstr "Verkställ"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:52
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:76
 msgid "Virtual dynamic interface"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:470
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:471
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:553
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:576
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:908
 msgid "WDS"
 msgstr "WDS"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:667
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1160
 msgid "WEP Open System"
 msgstr "Öppet System WEP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:668
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1161
 msgid "WEP Shared Key"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "WEP passphrase"
 msgstr "WEP-lösenordsfras"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:503
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:566
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:945
 msgid "WMM Mode"
 msgstr "WMM-läge"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "WPA passphrase"
 msgstr "WPA-lösenordsfras"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:716
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:735
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:740
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1074
 msgid ""
 "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
 "and ad-hoc mode) to be installed."
@@ -5660,7 +5835,7 @@ msgstr "Väntar på att ändringarna ska tillämpas..."
 msgid "Waiting for command to complete..."
 msgstr "Väntar på att kommandot ska avsluta..."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1940
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2481
 msgid "Waiting for configuration to get applied… %ds"
 msgstr ""
 
@@ -5668,8 +5843,8 @@ msgstr ""
 msgid "Waiting for device..."
 msgstr "Väntar på enheten..."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:172
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:163
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:173
 msgid "Warning"
 msgstr "Varning"
 
@@ -5678,11 +5853,11 @@ msgid "Warning: There are unsaved changes that will get lost on reboot!"
 msgstr ""
 "Varning: Det finns osparade ändringar som kommer att förloras vid omstart!"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:20
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:34
 msgid "Weak"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:946
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1355
 msgid ""
 "When using a PSK, the PMK can be automatically generated. When enabled, the "
 "R0/R1 key options below are not applied. Disable this to use the R0 and R1 "
@@ -5690,78 +5865,85 @@ msgid ""
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:383
 msgid "Width"
 msgstr "Bredd"
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:17
 #: protocols/luci-proto-wireguard/luasrc/model/network/proto_wireguard.lua:9
 msgid "WireGuard VPN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:58
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:40
 #: modules/luci-mod-status/luasrc/controller/admin/status.lua:28
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:14
 msgid "Wireless"
 msgstr "Trådlöst"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1631
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1837
 #: modules/luci-base/luasrc/model/network.lua:1418
 msgid "Wireless Adapter"
 msgstr "Trådlös adapter"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1617
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2052
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1823
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2288
 #: modules/luci-base/luasrc/model/network.lua:1404
 #: modules/luci-base/luasrc/model/network.lua:1865
 msgid "Wireless Network"
 msgstr "Trådlöst nätverk"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:629
 msgid "Wireless Overview"
 msgstr "Trådlös överblick"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:362
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:797
 msgid "Wireless Security"
 msgstr "Trådlös säkerhet"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:54
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:611
+msgid "Wireless configuration migration"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:139
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:179
 msgid "Wireless is disabled"
 msgstr "Trådlöst är avstängt"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:54
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:139
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:179
 msgid "Wireless is not associated"
 msgstr "Trådlöst är inte associerat"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:15
-msgid "Wireless is restarting..."
-msgstr "Trådlöst startar om..."
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:752
 msgid "Wireless network is disabled"
 msgstr "Trådlöst nätverk är avstängt"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:752
 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:181
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:182
 msgid "Write received DNS requests to syslog"
 msgstr "Skriv mottagna DNS-förfrågningar till syslogg"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:164
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:155
 msgid "Write system log to file"
 msgstr "Skriv systemlogg till fil"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1507
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:85
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1754
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:109
 msgid "Yes"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:26
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:943
+msgid ""
+"You appear to be currently connected to the device via the \"%h\" interface. "
+"Do you really want to shut down the interface?"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:123
 msgid ""
 "You can enable or disable installed init scripts here. Changes will applied "
 "after a device reboot.<br /><strong>Warning: If you disable essential init "
@@ -5778,38 +5960,34 @@ msgstr ""
 "Du måste aktivera JavaScript i din webbläsare, annars kommer inte LuCi att "
 "fungera korrekt."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:196
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:187
 msgid "ZRam Compression Algorithm"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:203
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:194
 msgid "ZRam Compression Streams"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:189
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:180
 msgid "ZRam Settings"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:191
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
 msgid "ZRam Size"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:229
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:230
 msgid "any"
 msgstr "något"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:113
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:121
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:126
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:218
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:282
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:321
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:328
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:621
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:37
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:22
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:29
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:121
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:836
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:844
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:849
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1030
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:78
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:48
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:51
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:103
 msgid "auto"
 msgstr "auto"
 
@@ -5817,11 +5995,11 @@ msgstr "auto"
 msgid "automatic"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:45
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:78
 msgid "baseT"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:909
 msgid "bridged"
 msgstr "bryggad"
 
@@ -5837,22 +6015,21 @@ msgstr ""
 msgid "create:"
 msgstr "skapa:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:264
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:368
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:678
 msgid "creates a bridge over specified interface(s)"
 msgstr "skapar en brygga över angivna gränssnitt(en)"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:277
 msgid "dB"
 msgstr "dB"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:34
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:35
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:46
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:47
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:48
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:131
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:132
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:133
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:277
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:279
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:331
@@ -5864,26 +6041,30 @@ msgstr "dB"
 msgid "dBm"
 msgstr "dBm"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:460
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:587
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:889
 msgid "disable"
 msgstr "stäng ner"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:119
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:524
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:530
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:536
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:18
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:578
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:584
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:590
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:25
 msgid "disabled"
 msgstr "avstängd"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:433
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:467
+msgid "driver default"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/lease_status.htm:17
 #: modules/luci-base/luasrc/view/lease_status.htm:46
-#: 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:416
 msgid "expired"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:88
 msgid ""
 "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr>-leases will be stored"
@@ -5895,25 +6076,21 @@ msgstr ""
 msgid "forward"
 msgstr "vidarebefordra"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:80
 msgid "full-duplex"
 msgstr "full-duplex"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:80
 msgid "half-duplex"
 msgstr "halv-duplex"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:559
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:565
 msgid "hexadecimal encoded value"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:138
-msgid "hidden"
-msgstr "gömd"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:527
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:533
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:538
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:581
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:587
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:592
 msgid "hybrid mode"
 msgstr "hybrid-läge"
 
@@ -5921,6 +6098,10 @@ msgstr "hybrid-läge"
 msgid "if target is a network"
 msgstr "om målet är ett nätverk"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:63
+msgid "ignore"
+msgstr ""
+
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:177
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
@@ -5955,25 +6136,26 @@ msgstr ""
 msgid "key with either 5 or 13 characters"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:94
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:95
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr "lokal <abbr title=\"Domain Name System\">DNS</abbr>-fil"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:952
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1168
+msgid "medium security"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1360
 msgid "minutes"
 msgstr "minuter"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:43
-msgid "mixed WPA/WPA2"
-msgstr ""
-
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:225
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:232
 msgid "no"
 msgstr "nej"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:54
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:72
 msgid "no link"
 msgstr "ingen länk"
 
@@ -5981,7 +6163,7 @@ msgstr "ingen länk"
 msgid "non-empty value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1195
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1446
 msgid "none"
 msgstr ""
 
@@ -5991,7 +6173,9 @@ msgstr ""
 msgid "not present"
 msgstr "inte tillgängligt"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:363
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:341
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:776
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:780
 #: 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
@@ -6006,9 +6190,9 @@ msgstr "av"
 msgid "on"
 msgstr "på"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
-msgid "open"
-msgstr "öppen"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1169
+msgid "open network"
+msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
@@ -6027,73 +6211,77 @@ msgstr ""
 msgid "positive integer value"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:34
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:56
 msgid "random"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:526
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:532
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:537
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:580
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:586
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:591
 msgid "relay mode"
 msgstr "relä-läge"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:910
 msgid "routed"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:525
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:534
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:968
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:977
 msgid "sec"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:525
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:531
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:579
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:585
 msgid "server mode"
 msgstr "server-läge"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:544
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:597
 msgid "stateful-only"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:542
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:595
 msgid "stateless"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:543
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:596
 msgid "stateless + stateful"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:369
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1167
+msgid "strong security"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:346
 msgid "tagged"
 msgstr "taggad"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:932
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1343
 msgid "time units (TUs / 1.024 ms) [1000-65535]"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:549
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:555
 msgid "unique value"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:448
 msgid "unknown"
 msgstr "okänd"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:15
 #: modules/luci-base/luasrc/view/lease_status.htm:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:238
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:390
+#: 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:414
 msgid "unlimited"
 msgstr "obegränsat"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1401
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1648
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:63
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:355
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:378
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:413
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:446
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:512
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:450
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:545
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:53
 #: modules/luci-base/luasrc/view/cbi/network_netlist.htm:38
 msgid "unspecified"
@@ -6103,7 +6291,7 @@ msgstr "ospecifierat"
 msgid "unspecified -or- create:"
 msgstr "ospecifierat -eller- skapa:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:366
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:344
 msgid "untagged"
 msgstr "otaggat"
 
@@ -6184,8 +6372,8 @@ msgstr ""
 msgid "valid address:port"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:523
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:527
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:529
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:533
 msgid "valid date (YYYY-MM-DD)"
 msgstr ""
 
@@ -6222,7 +6410,7 @@ msgstr ""
 msgid "valid network in address/netmask notation"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:498
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:504
 msgid "valid phone digit (0-9, \"*\", \"#\", \"!\" or \".\")"
 msgstr ""
 
@@ -6235,11 +6423,11 @@ msgstr ""
 msgid "valid port value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:503
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:509
 msgid "valid time (HH:MM:SS)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:425
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:431
 msgid "value between %d and %d characters"
 msgstr ""
 
@@ -6255,14 +6443,23 @@ msgstr ""
 msgid "value smaller or equal to %f"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:430
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:425
+msgid "value with %d characters"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:436
 msgid "value with at least %d characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:435
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:441
 msgid "value with at most %d characters"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1169
+msgid "weak security"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:221
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:232
@@ -6273,6 +6470,120 @@ msgstr "ja"
 msgid "« Back"
 msgstr "« Bakåt"
 
+#~ msgid "Disabled (default)"
+#~ msgstr "Inaktiverad (standard)"
+
+#~ msgid "Specifies the listening port of this <em>Dropbear</em> instance"
+#~ msgstr "Anger lyssningsporten för den här <em>Dropbear</em>-instansen"
+
+#~ msgid "Switch %q (%s)"
+#~ msgstr "Byt %q (%s)"
+
+#~ msgid "Antenna 1"
+#~ msgstr "Antenn 1"
+
+#~ msgid "Antenna 2"
+#~ msgstr "Antenn 2"
+
+#~ msgid "Antenna Configuration"
+#~ msgstr "Konfiguration av antenn"
+
+#~ msgid "Back to overview"
+#~ msgstr "Backa till överblick"
+
+#~ msgid "Back to scan results"
+#~ msgstr "Backa till skanningsresultat"
+
+#~ msgid "Broadcom 802.11%s Wireless Controller"
+#~ msgstr "Broadcom 802.11%s Trådlös kontroller"
+
+#~ msgid "Broadcom BCM%04x 802.11 Wireless Controller"
+#~ msgstr "Broadcom BCM%04x 802.11 Trådlös kontroller"
+
+#~ msgid "Common Configuration"
+#~ msgstr "Vanlig konfiguration"
+
+#~ msgid "Connect"
+#~ msgstr "Anslut"
+
+#~ msgid "Connection Limit"
+#~ msgstr "Anslutningsgräns"
+
+#~ msgid "Create Interface"
+#~ msgstr "Skapa gränssnitt"
+
+#~ msgid "Create a bridge over multiple interfaces"
+#~ msgstr "Skapa en brygga över flera gränssnitt"
+
+#~ msgid "Diversity"
+#~ msgstr "MÃ¥ngfald"
+
+#~ msgid "Edit this interface"
+#~ msgstr "Redigera det här gränssnittet"
+
+#~ msgid "HT mode (802.11n)"
+#~ msgstr "HT-läge (802.11n)"
+
+#~ msgid "Install package %q"
+#~ msgstr "Installera paketet %q"
+
+#~ msgid "Interface Overview"
+#~ msgstr "Överblick av gränssnitt"
+
+#~ msgid "Locked to channel %s used by: %s"
+#~ msgstr "Låst till kanalen %s som används av: %s"
+
+#~ msgid "Name of the new interface"
+#~ msgstr "Namn på det nya gränssnittet"
+
+#~ msgid "No network configured on this device"
+#~ msgstr "Det finns inget nätverk inställt på den här enheten"
+
+#~ msgid "No network name specified"
+#~ msgstr "Inget nätverksnamn angavs"
+
+#~ msgid "Not associated"
+#~ msgstr "Inte associerad"
+
+#~ msgid "Note: interface name length"
+#~ msgstr "Notera: längden på gränssnittets namn"
+
+#~ msgid "Package libiwinfo required!"
+#~ msgstr "Paketet libiwinfo krävs!"
+
+#~ msgid "Protocol of the new interface"
+#~ msgstr "Det nya gränssnittets protokoll"
+
+#~ msgid "Protocol support is not installed"
+#~ msgstr "Stöd för protokoll är inte installerat"
+
+#~ msgid "Receiver Antenna"
+#~ msgstr "Mottagningsantenn"
+
+#~ msgid "Repeat scan"
+#~ msgstr "Repetera skanning"
+
+#~ msgid "Separate Clients"
+#~ msgstr "Separera klienter"
+
+#~ msgid "The given network name is not unique"
+#~ msgstr "Det angivna nätverksnamnet är inte unikt"
+
+#~ msgid "Transmission Rate"
+#~ msgstr "Överföringshastighet"
+
+#~ msgid "Uploaded File"
+#~ msgstr "Laddade upp fil"
+
+#~ msgid "Wireless is restarting..."
+#~ msgstr "Trådlöst startar om..."
+
+#~ msgid "hidden"
+#~ msgstr "gömd"
+
+#~ msgid "open"
+#~ msgstr "öppen"
+
 #~ msgid "Back"
 #~ msgstr "Bakåt"
 
@@ -6396,9 +6707,6 @@ msgstr "« Bakåt"
 #~ msgid "Activate this network"
 #~ msgstr "Aktivera det här nätverket"
 
-#~ msgid "Interface is shutting down..."
-#~ msgstr "Gränssnittet stänger ner..."
-
 #~ msgid "Interface reconnected"
 #~ msgstr "Gränssnittet återanslöt"
 
diff --git a/modules/luci-base/po/templates/base.pot b/modules/luci-base/po/templates/base.pot
index d23da3aa8..334ed9783 100644
--- a/modules/luci-base/po/templates/base.pot
+++ b/modules/luci-base/po/templates/base.pot
@@ -1,19 +1,20 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=UTF-8"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:133
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:857
 msgid "%.1f dB"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:109
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:122
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 msgid "%d Bit"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1641
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2194
 msgid "%d invalid field(s)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:281
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:31
 msgid "%s is untagged in multiple VLANs!"
 msgstr ""
 
@@ -51,19 +52,19 @@ msgid "-- Additional Field --"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:258
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1401
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1533
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:250
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:350
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1114
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1648
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1780
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:314
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:414
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1178
 #: modules/luci-base/luasrc/view/cbi/header.htm:5
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:26
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:88
 msgid "-- Please choose --"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:259
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:351
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1115
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:415
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1179
 #: modules/luci-base/luasrc/view/cbi/header.htm:6
 msgid "-- custom --"
 msgstr ""
@@ -86,7 +87,7 @@ msgstr ""
 msgid "-- please select --"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:382
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:814
 msgid "0 = not using RSSI threshold, 1 = do not change driver default"
 msgstr ""
 
@@ -98,10 +99,11 @@ msgstr ""
 msgid "15 Minute Load:"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:924
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1337
 msgid "4-character hexadecimal ID"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:11
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:18
 msgid "464XLAT (CLAT)"
 msgstr ""
@@ -110,57 +112,57 @@ msgstr ""
 msgid "5 Minute Load:"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:960
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1366
 msgid "6-octet identifier as a hex string - no colons"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:891
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1310
 msgid "802.11r Fast Transition"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1157
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1567
 msgid "802.11w Association SA Query maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1574
 msgid "802.11w Association SA Query retry timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1133
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1533
 msgid "802.11w Management Frame Protection"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1156
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1567
 msgid "802.11w maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1165
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1574
 msgid "802.11w retry timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:399
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:831
 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:224
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:225
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:215
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:216
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
 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:167
 msgid ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
 "order of the resolvfile"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:388
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:820
 msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:351
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:373
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:45
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
 msgstr ""
@@ -170,8 +172,8 @@ msgstr ""
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:555
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:35
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:506
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr ""
 
@@ -185,107 +187,111 @@ msgstr ""
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 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:402
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:58
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:35
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:33
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:67
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:51
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:328
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:329
 #: 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:372
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:233
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:234
 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:242
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
 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:251
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:252
 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:10
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:42
 msgid ""
 "<br/>Note: you need to manually restart the cron service if the crontab file "
 "was empty before editing."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:817
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1605
+msgid "A directory with the same name already exists."
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:863
 msgid "A new login is required since the authentication session expired."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:114
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:837
 msgid "A43C + J43 + A43"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:838
 msgid "A43C + J43 + A43 + V43"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:850
 msgid "ADSL"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:826
 msgid "ANSI T1.413"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:33
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:47
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:23
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:94
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:86
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:67
 msgid "APN"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:56
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:175
 msgid "ARP retry threshold"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:122
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:845
 msgid "ATM (Asynchronous Transfer Mode)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:144
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:866
 msgid "ATM Bridges"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:178
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:21
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:898
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:66
 msgid "ATM Virtual Channel Identifier (VCI)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:179
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:26
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:899
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:70
 msgid "ATM Virtual Path Identifier (VPI)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:866
 msgid ""
 "ATM bridges expose encapsulated ethernet in AAL5 connections as virtual "
 "Linux network interfaces which can be used in conjunction with DHCP or PPP "
 "to dial into the provider network."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:184
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:905
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:62
 msgid "ATM device number"
 msgstr ""
 
@@ -294,17 +300,17 @@ msgid "ATU-C System Vendor ID"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:251
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:495
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:499
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:528
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:532
 msgid "Absent Interface"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:19
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
 msgid "Access Concentrator"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:368
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:470
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:802
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
 msgid "Access Point"
 msgstr ""
 
@@ -327,7 +333,7 @@ msgid "Active Connections"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:68
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:30
 msgid "Active DHCP Leases"
 msgstr ""
 
@@ -335,55 +341,75 @@ msgstr ""
 msgid "Active DHCPv6 Leases"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1951
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:370
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:12
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2190
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:804
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:23
 msgid "Ad-Hoc"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:650
-#: modules/luci-base/htdocs/luci-static/resources/form.js:651
-#: modules/luci-base/htdocs/luci-static/resources/form.js:666
-#: modules/luci-base/htdocs/luci-static/resources/form.js:667
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1290
+#: modules/luci-base/htdocs/luci-static/resources/form.js:902
+#: modules/luci-base/htdocs/luci-static/resources/form.js:904
+#: modules/luci-base/htdocs/luci-static/resources/form.js:917
+#: modules/luci-base/htdocs/luci-static/resources/form.js:918
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1539
 #: modules/luci-base/luasrc/view/cbi/nsection.htm:25
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:189
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:197
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:39
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:47
 #: modules/luci-base/luasrc/view/cbi/ucisection.htm:54
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:703
 msgid "Add"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:60
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:870
+msgid "Add ATM Bridge"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:92
 msgid "Add IPv4 address…"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:129
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:204
 msgid "Add IPv6 address…"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:143
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:149
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:38
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:47
+msgid "Add LED action"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:215
+msgid "Add VLAN"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:14
+msgid "Add instance"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:153
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:159
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:250
 msgid "Add key"
 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:155
 msgid "Add local domain suffix to names served from hosts files"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:705
 msgid "Add new interface..."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:104
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:99
+msgid "Add peer"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:105
 msgid "Additional Hosts files"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:161
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
 msgid "Additional servers file"
 msgstr ""
 
@@ -410,7 +436,7 @@ msgstr ""
 msgid "Address"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:12
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:151
 msgid "Address to access local relay bridge"
 msgstr ""
 
@@ -419,13 +445,13 @@ msgstr ""
 msgid "Administration"
 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:70
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:505
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:896
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:24
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:189
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:463
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:176
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:143
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:364
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:742
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:799
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:50
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:34
 msgid "Advanced Settings"
@@ -435,165 +461,165 @@ msgstr ""
 msgid "Aggregate Transmit Power(ACTATP)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:175
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:166
 msgid "Alert"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1628
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1834
 #: modules/luci-base/luasrc/model/network.lua:1416
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:54
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:78
 msgid "Alias Interface"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:138
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:66
 msgid "Alias of \"%s\""
 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:170
 msgid "All Servers"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:114
 msgid ""
 "Allocate IP addresses sequentially, starting from the lowest available "
 "address"
 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:113
 msgid "Allocate IP sequentially"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:24
 msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:545
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:987
 msgid "Allow AP mode to disconnect STAs based on low ACK condition"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:462
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:589
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:891
 msgid "Allow all except listed"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:236
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:767
 msgid "Allow legacy 802.11b rates"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:461
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:588
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:890
 msgid "Allow listed only"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:198
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:199
 msgid "Allow localhost"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:47
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:35
 msgid "Allow remote hosts to connect to local SSH forwarded ports"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:38
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:30
 msgid "Allow root logins with password"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:39
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:30
 msgid "Allow the <em>root</em> user to login with password"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:199
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:200
 msgid ""
 "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:135
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:122
 msgid "Allowed IPs"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:549
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:602
 msgid "Always announce default router"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:259
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:782
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
 "option does not comply with IEEE 802.11n-2009!"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:95
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:818
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:119
 msgid "Annex"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:96
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:819
 msgid "Annex A + L + M (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:827
 msgid "Annex A G.992.1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:828
 msgid "Annex A G.992.2"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:829
 msgid "Annex A G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:830
 msgid "Annex A G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:97
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:820
 msgid "Annex B (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:823
 msgid "Annex B G.992.1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:824
 msgid "Annex B G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:102
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:825
 msgid "Annex B G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:98
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:821
 msgid "Annex J (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:831
 msgid "Annex L G.992.3 POTS 1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:99
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:822
 msgid "Annex M (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:109
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:832
 msgid "Annex M G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:833
 msgid "Annex M G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:550
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:602
 msgid "Announce as default router even if no public prefix is available."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:555
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:607
 msgid "Announced DNS domains"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:554
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:606
 msgid "Announced DNS servers"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1093
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1496
 msgid "Anonymous Identity"
 msgstr ""
 
@@ -605,20 +631,6 @@ msgstr ""
 msgid "Anonymous Swap"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:322
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:329
-msgid "Antenna 1"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:323
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:330
-msgid "Antenna 2"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:246
-msgid "Antenna Configuration"
-msgstr ""
-
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:71
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:160
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:181
@@ -626,11 +638,11 @@ msgstr ""
 msgid "Any zone"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1981
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2522
 msgid "Apply request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1867
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2409
 msgid "Apply unchecked"
 msgstr ""
 
@@ -638,8 +650,8 @@ msgstr ""
 msgid "Architecture"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:19
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:184
+#: 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 ""
@@ -648,13 +660,13 @@ msgstr ""
 msgid "Assign interfaces..."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:124
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:24
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:189
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:31
 msgid ""
 "Assign prefix parts using this hexadecimal subprefix ID for this interface."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:148
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1967
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:22
 msgid "Associated Stations"
 msgstr ""
@@ -663,20 +675,20 @@ msgstr ""
 msgid "Associations"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:39
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:37
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:101
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:64
 msgid "Auth Group"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1027
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1421
 msgid "Authentication"
 msgstr ""
 
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:29
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:70
 msgid "Authentication Type"
 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:78
 msgid "Authoritative"
 msgstr ""
 
@@ -694,17 +706,19 @@ msgstr ""
 msgid "Auto Refresh"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:53
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:7
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:17
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:67
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:24
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:36
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:42
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:36
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:106
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:24
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:98
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:50
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:94
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:81
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:55
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:68
 msgid "Automatic"
 msgstr ""
 
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:7
 #: protocols/luci-proto-hnet/luasrc/model/network/proto_hnet.lua:7
 msgid "Automatic Homenet (HNCP)"
 msgstr ""
@@ -747,21 +761,21 @@ msgstr ""
 msgid "Average:"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:116
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:839
 msgid "B43 + B43C"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:840
 msgid "B43 + B43C + V43"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:48
 msgid "BR / DMR / AFTR"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:43
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:75
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1620
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:176
 msgid "BSSID"
 msgstr ""
@@ -775,19 +789,11 @@ msgstr ""
 msgid "Back to configuration"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:48
-msgid "Back to overview"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:20
-msgid "Back to scan results"
-msgstr ""
-
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:17
 msgid "Backup"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:38
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:36
 msgid "Backup / Flash Firmware"
 msgstr ""
 
@@ -800,11 +806,11 @@ msgid "Bad address specified!"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:158
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:288
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:368
 msgid "Band"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:261
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:785
 msgid "Beacon Interval"
 msgstr ""
 
@@ -815,79 +821,85 @@ msgid ""
 "defined backup patterns."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:293
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:294
 msgid ""
 "Bind dynamically to interfaces rather than wildcard address (recommended as "
 "linux default)"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:16
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:48
 msgid "Bind interface"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:16
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:48
 msgid "Bind the tunnel to this interface (optional)."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:49
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:134
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:187
 msgid "Bitrate"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:172
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
 msgid "Bogus NX Domain Override"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1634
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1840
 #: modules/luci-base/luasrc/model/network.lua:1420
 msgid "Bridge"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:264
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:368
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:678
 msgid "Bridge interfaces"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:906
 msgid "Bridge unit number"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:250
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:364
 msgid "Bring up on boot"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:35
-msgid "Broadcom 802.11%s Wireless Controller"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:45
-msgid "Broadcom BCM%04x 802.11 Wireless Controller"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1697
+msgid "Browse…"
 msgstr ""
 
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:18
 msgid "Buffered"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:75
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:134
 msgid "CA certificate; if empty it will be saved after the first connection."
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:7
+msgid "CLAT configuration failed"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:13
 msgid "CPU usage (%)"
 msgstr ""
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:21
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:53
 msgid "Call failed"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1789
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:14
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:52
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:711
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:948
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1839
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:191
 #: modules/luci-mod-system/luasrc/view/admin_system/upgrade.htm:60
 msgid "Cancel"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:6
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:17
 msgid "Category"
 msgstr ""
 
@@ -905,13 +917,7 @@ msgstr ""
 msgid "Chain"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:9
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:14
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:24
-msgid "Change login password"
-msgstr ""
-
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1744
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 msgid "Changes"
 msgstr ""
 
@@ -919,33 +925,23 @@ msgstr ""
 msgid "Changes applied."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2004
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2545
 msgid "Changes have been reverted."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:43
 msgid "Changes the administrator password for accessing the device"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:10
-msgid "Changing password…"
-msgstr ""
-
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:162
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:45
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:87
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:174
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:376
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1618
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:186
 msgid "Channel"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:119
-msgid ""
-"Channel %d is not available in the %s regulatory domain and has been auto-"
-"adjusted to %d."
-msgstr ""
-
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:229
 msgid "Check"
 msgstr ""
@@ -954,7 +950,7 @@ msgstr ""
 msgid "Check filesystems before mount"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1806
 msgid "Check this option to delete the existing networks from this radio."
 msgstr ""
 
@@ -966,8 +962,8 @@ msgstr ""
 msgid "Choose mtdblock"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:358
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:443
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1829
 msgid ""
 "Choose the firewall zone you want to assign to this interface. Select "
 "<em>unspecified</em> to remove the interface from the associated zone or "
@@ -975,17 +971,17 @@ msgid ""
 "interface to it."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:834
 msgid ""
 "Choose the network(s) you want to attach to this wireless interface or fill "
 "out the <em>create</em> field to define a new network."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:614
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1023
 msgid "Cipher"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:61
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:91
 msgid "Cisco UDP encapsulation"
 msgstr ""
 
@@ -1001,28 +997,28 @@ msgid ""
 "FEATURE IS FOR PROFESSIONALS! )"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1950
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:369
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:471
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2189
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:803
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:908
 msgid "Client"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:55
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:52
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:47
 msgid "Client ID to send when requesting DHCP"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:145
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:151
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:155
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:161
 msgid "Close"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:146
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:119
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:125
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:127
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:98
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:119
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:157
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:141
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:115
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:138
 msgid ""
 "Close inactive connection after the given amount of seconds, use 0 to "
 "persist connection"
@@ -1035,12 +1031,9 @@ msgstr ""
 #: modules/luci-base/luasrc/view/lease_status.htm:77
 #: modules/luci-base/luasrc/view/lease_status.htm:98
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:118
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:37
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:24
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1965
 #: modules/luci-mod-network/luasrc/view/admin_network/iface_status.htm:6
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:40
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:30
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:8
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:398
 #: modules/luci-mod-status/luasrc/view/admin_status/index/30-network.htm:11
 #: modules/luci-mod-status/luasrc/view/admin_status/index/50-dsl.htm:17
@@ -1054,15 +1047,19 @@ msgstr ""
 msgid "Command"
 msgstr ""
 
-#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:64
-msgid "Comment"
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:193
+msgid "Command OK"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:185
-msgid "Common Configuration"
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:41
+msgid "Command failed"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1176
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:64
+msgid "Comment"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
 msgid ""
 "Complicates key reinstallation attacks on the client side by disabling "
 "retransmission of EAPOL-Key frames that are used to install keys. This "
@@ -1070,13 +1067,14 @@ msgid ""
 "negotiation especially in environments with heavy traffic load."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1744
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 #: modules/luci-base/luasrc/controller/admin/uci.lua:11
 #: modules/luci-mod-system/luasrc/view/admin_system/backupfiles.htm:9
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:13
 msgid "Configuration"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:21
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:63
 msgid "Configuration failed"
 msgstr ""
@@ -1085,89 +1083,89 @@ msgstr ""
 msgid "Configuration files will be kept"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1915
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2456
 msgid "Configuration has been applied."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1848
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2395
 msgid "Configuration has been rolled back!"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:43
-msgid "Confirmation"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:942
+msgid "Confirm disconnect"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:32
-msgid "Connect"
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:50
+msgid "Confirmation"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:72
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:105
 msgid "Connected"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:338
-msgid "Connection Limit"
-msgstr ""
-
 #: modules/luci-base/htdocs/luci-static/resources/network.js:7
 #: modules/luci-base/luasrc/model/network.lua:27
 msgid "Connection attempt failed"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:203
+msgid "Connection lost"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/controller/admin/status.lua:32
 msgid "Connections"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1890
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:66
+msgid "Contents have been saved."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:618
+msgid "Continue"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2431
 msgid ""
 "Could not regain access to the device after applying the configuration "
 "changes. You might need to reconnect if you modified network related "
 "settings such as the IP address or wireless security credentials."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:135
 msgid "Country"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:227
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:233
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:337
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:764
 msgid "Country Code"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:36
-msgid "Cover the following interface"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:43
-msgid "Cover the following interfaces"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:357
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:86
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:443
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1829
 msgid "Create / Assign firewall-zone"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:9
-msgid "Create Interface"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:735
+msgid "Create interface"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:33
-msgid "Create a bridge over multiple interfaces"
-msgstr ""
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:174
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:165
 msgid "Critical"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:178
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:169
 msgid "Cron Log Level"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:519
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:521
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:447
+msgid "Current power"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:552
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:554
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:51
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:53
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:82
@@ -1175,7 +1173,7 @@ msgstr ""
 msgid "Custom Interface"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:36
 msgid "Custom delegated IPv6-prefix"
 msgstr ""
 
@@ -1185,52 +1183,53 @@ msgid ""
 "this, perform a factory-reset first."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:59
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:41
 msgid ""
 "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
 "\">LED</abbr>s if possible."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:799
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1223
 msgid "DAE-Client"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:807
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1231
 msgid "DAE-Port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:815
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1239
 msgid "DAE-Secret"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:448
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:459
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:279
 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:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:61
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:62
 msgid "DHCP and DNS"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1195
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1385
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:16
 #: modules/luci-base/luasrc/model/network.lua:968
 msgid "DHCP client"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:571
 msgid "DHCP-Options"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_dhcpv6.lua:7
 msgid "DHCPv6 client"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:540
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:594
 msgid "DHCPv6-Mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:529
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:583
 msgid "DHCPv6-Service"
 msgstr ""
 
@@ -1247,31 +1246,31 @@ msgstr ""
 msgid "DNS"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:183
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
 msgid "DNS forwardings"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:30
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:37
 msgid "DNS-Label / FQDN"
 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:136
 msgid "DNSSEC"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:139
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
 msgid "DNSSEC check unsigned"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:73
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:99
 msgid "DPD Idle Timeout"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:14
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:41
 msgid "DS-Lite AFTR address"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:92
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:815
 #: modules/luci-mod-status/luasrc/view/admin_status/index/50-dsl.htm:14
 msgid "DSL"
 msgstr ""
@@ -1280,11 +1279,11 @@ msgstr ""
 msgid "DSL Status"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:125
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:848
 msgid "DSL line mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:519
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:963
 msgid "DTIM Interval"
 msgstr ""
 
@@ -1296,77 +1295,92 @@ msgstr ""
 msgid "Data Rate"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:169
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:180
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:160
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:171
 msgid "Debug"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:759
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:783
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:807
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1183
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1207
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1231
 msgid "Default %d"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:82
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:107
 msgid "Default Route"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:17
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:81
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:51
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:32
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:48
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:85
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:65
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:80
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:108
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:146
 msgid "Default gateway"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:541
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:594
 msgid "Default is stateless + stateful"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:70
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:54
 msgid "Default state"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:503
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:553
 msgid "Define a name for this network."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:514
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:571
 msgid ""
 "Define additional DHCP options, for example "
 "\"<code>6,192.168.2.1,192.168.2.2</code>\" which advertises different DNS "
 "servers to clients."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:705
-#: modules/luci-base/htdocs/luci-static/resources/form.js:958
-#: modules/luci-base/htdocs/luci-static/resources/form.js:959
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1271
+#: modules/luci-base/htdocs/luci-static/resources/form.js:966
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1210
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1216
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1524
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1758
 #: modules/luci-base/luasrc/view/cbi/nsection.htm:11
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:162
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:16
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:41
 msgid "Delete"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:178
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:187
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:193
 msgid "Delete key"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:45
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1654
+msgid "Delete permission denied"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1656
+msgid "Delete request failed: %d %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:723
 msgid "Delete this network"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:519
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:963
 msgid "Delivery Traffic Indication Message Interval"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:102
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:108
 msgid "Description"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:224
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1754
+msgid "Deselect"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:215
 msgid "Design"
 msgstr ""
 
@@ -1384,10 +1398,12 @@ msgstr ""
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:177
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:43
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:13
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:38
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:73
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:33
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:52
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:85
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:86
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:72
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:154
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:253
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:86
@@ -1395,15 +1411,24 @@ msgstr ""
 msgid "Device"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:138
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:737
 msgid "Device Configuration"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:81
+msgid "Device is not active"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/reboot.htm:23
 msgid "Device is rebooting..."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1889
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:167
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:513
+msgid "Device is restarting…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2430
 msgid "Device unreachable!"
 msgstr ""
 
@@ -1411,96 +1436,91 @@ msgstr ""
 msgid "Device unreachable! Still waiting for device..."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:123
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:78
 #: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:61
 msgid "Diagnostics"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:45
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:60
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:101
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:93
 msgid "Dial number"
 msgstr ""
 
-#: modules/luci-base/luasrc/view/cbi/filebrowser.htm:99
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1554
 msgid "Directory"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:131
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:715
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:754
 msgid "Disable"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:472
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:531
 msgid ""
 "Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for "
 "this interface."
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:64
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:93
 msgid "Disable Encryption"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:530
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:973
 msgid "Disable Inactivity Polling"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:713
 msgid "Disable this network"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:44
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:54
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:68
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:37
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:43
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:37
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1534
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:76
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:107
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:99
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:51
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:95
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:82
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:69
 msgid "Disabled"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1139
-msgid "Disabled (default)"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:544
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:987
 msgid "Disassociate On Low Acknowledgement"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:193
 msgid "Discard upstream RFC1918 responses"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:92
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:114
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:956
 msgid "Disconnect"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:22
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:64
 msgid "Disconnection attempt failed"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1121
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1762
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1855
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:17
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1375
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1995
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2314
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2401
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1634
 msgid "Dismiss"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:240
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:334
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:770
 msgid "Distance Optimization"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:241
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:770
 msgid "Distance to farthest network member in meters."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:347
-msgid "Diversity"
-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:61
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
@@ -1508,35 +1528,43 @@ msgid ""
 "firewalls"
 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:159
 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:123
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:124
 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:118
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
 msgid "Do not forward reverse lookups for local networks"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:173
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1639
+msgid "Do you really want to delete \"%s\" ?"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:188
 msgid "Do you really want to delete the following SSH key?"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1637
+msgid "Do you really want to recursively delete the directory \"%s\" ?"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:74
 msgid "Domain required"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:205
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:206
 msgid "Domain whitelist"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:34
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:67
 msgid "Don't Fragment"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:74
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:75
 msgid ""
 "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
 "<abbr title=\"Domain Name System\">DNS</abbr>-Name"
@@ -1554,57 +1582,58 @@ msgstr ""
 msgid "Download mtdblock"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:853
 msgid "Downstream SNR offset"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:914
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1169
 msgid "Drag to reorder"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:9
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:11
 msgid "Dropbear Instance"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:6
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 msgid ""
 "Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access "
 "and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:11
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:14
 msgid "Dual-Stack Lite (RFC6333)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:493
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:547
 msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:60
 msgid "Dynamic tunnel"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:494
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:547
 msgid ""
 "Dynamically allocate DHCP addresses for clients. If disabled, only clients "
 "having static leases will be served."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:67
 msgid "EA-bits length"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:990
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1386
 msgid "EAP-Method"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:934
-#: modules/luci-base/htdocs/luci-static/resources/form.js:935
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1199
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1188
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1191
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1450
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:154
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:160
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:38
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:291
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:720
 msgid "Edit"
 msgstr ""
 
@@ -1614,90 +1643,91 @@ msgid ""
 "reload the page."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:38
-msgid "Edit this interface"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:718
+msgid "Edit this network"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:42
-msgid "Edit this network"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:669
+msgid "Edit wireless network"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:176
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:167
 msgid "Emergency"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:127
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:715
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:754
 msgid "Enable"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:414
 msgid ""
 "Enable <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> "
 "snooping"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:271
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:412
 msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:41
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:60
 msgid "Enable HE.net dynamic endpoint update"
 msgstr ""
 
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:51
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:89
 msgid "Enable IPv6 negotiation"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:23
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:35
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:41
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:35
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:37
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:49
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:80
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:54
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:67
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:93
 msgid "Enable IPv6 negotiation on the PPP link"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:143
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:188
 msgid "Enable Jumbo Frame passthrough"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:244
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:235
 msgid "Enable NTP client"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:69
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:96
 msgid "Enable Single DES"
 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:267
 msgid "Enable TFTP server"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:134
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:180
 msgid "Enable VLAN functionality"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1595
 msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1175
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
 msgid "Enable key reinstallation (KRACK) countermeasures"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:138
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:183
 msgid "Enable learning and aging"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:194
 msgid "Enable mirroring of incoming packets"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:151
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:195
 msgid "Enable mirroring of outgoing packets"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:34
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:67
 msgid "Enable the DF (Don't Fragment) flag of the encapsulating packets."
 msgstr ""
 
@@ -1705,7 +1735,7 @@ msgstr ""
 msgid "Enable this mount"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:713
 msgid "Enable this network"
 msgstr ""
 
@@ -1713,48 +1743,52 @@ msgstr ""
 msgid "Enable this swap"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:37
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:88
 msgid "Enable/Disable"
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:76
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:152
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:251
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:41
 msgid "Enabled"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:277
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:414
 msgid "Enables IGMP snooping on this bridge"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:892
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1310
 msgid ""
 "Enables fast roaming among access points that belong to the same Mobility "
 "Domain"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:272
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:412
 msgid "Enables the Spanning Tree Protocol on this bridge"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:120
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:180
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:59
+msgid "Encapsulation limit"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:843
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:901
 msgid "Encapsulation mode"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:76
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:603
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:129
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:992
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1621
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:177
 msgid "Encryption"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:155
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:128
 msgid "Endpoint Host"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:165
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:132
 msgid "Endpoint Port"
 msgstr ""
 
@@ -1766,16 +1800,21 @@ msgstr ""
 msgid "Enter custom values"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:273
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:271
 msgid "Erasing..."
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:95
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:96
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:97
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:98
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:99
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:106
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:107
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:108
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:109
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:110
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:173
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:164
 msgid "Error"
 msgstr ""
 
@@ -1783,24 +1822,28 @@ msgstr ""
 msgid "Errored seconds (ES)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1646
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1852
 #: modules/luci-base/luasrc/model/network.lua:1432
 msgid "Ethernet Adapter"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1637
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1843
 #: modules/luci-base/luasrc/model/network.lua:1422
 msgid "Ethernet Switch"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:303
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
 msgid "Exclude interfaces"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:153
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
 msgid "Expand hosts"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:195
+msgid "Expecting an hexadecimal assignment hint"
+msgstr ""
+
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:59
 msgid "Expecting: %s"
 msgstr ""
@@ -1809,60 +1852,76 @@ msgstr ""
 msgid "Expires"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:488
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:543
 msgid ""
 "Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:8
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:19
 msgid "External"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:971
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1377
 msgid "External R0 Key Holder List"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:980
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1381
 msgid "External R1 Key Holder List"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:150
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:141
 msgid "External system log server"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:155
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:146
 msgid "External system log server port"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:160
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:151
 msgid "External system log server protocol"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:18
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:79
 msgid "Extra SSH command options"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:940
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1351
 msgid "FT over DS"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:941
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1352
 msgid "FT over the Air"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:938
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1349
 msgid "FT protocol"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1842
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:82
+msgid "Failed to change the system password."
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2389
 msgid "Failed to confirm apply within %ds, waiting for rollback…"
 msgstr ""
 
-#: modules/luci-base/luasrc/view/cbi/filebrowser.htm:106
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:45
+msgid "Failed to execute \"/etc/init.d/%s %s\" action: %s"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1561
 msgid "File"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:279
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1514
+msgid "File not accessible"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1698
+msgid "Filename"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:280
 msgid "Filename of the boot image advertised to clients"
 msgstr ""
 
@@ -1872,14 +1931,15 @@ msgstr ""
 msgid "Filesystem"
 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:118
 msgid "Filter private"
 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:123
 msgid "Filter useless"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:23
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:65
 msgid "Finalizing failed"
 msgstr ""
@@ -1890,7 +1950,7 @@ msgid ""
 "with defaults based on what was detected"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:696
 msgid "Find and join network"
 msgstr ""
 
@@ -1902,11 +1962,11 @@ msgstr ""
 msgid "Firewall"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:77
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:76
 msgid "Firewall Mark"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:193
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:278
 msgid "Firewall Settings"
 msgstr ""
 
@@ -1914,7 +1974,7 @@ msgstr ""
 msgid "Firewall Status"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:137
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:860
 msgid "Firmware File"
 msgstr ""
 
@@ -1922,7 +1982,7 @@ msgstr ""
 msgid "Firmware Version"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:225
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:226
 msgid "Fixed source port for outbound DNS queries"
 msgstr ""
 
@@ -1942,35 +2002,35 @@ msgstr ""
 msgid "Flash operations"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:194
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:192
 msgid "Flashing..."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:498
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:550
 msgid "Force"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:258
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:782
 msgid "Force 40MHz mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:622
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1031
 msgid "Force CCMP (AES)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:499
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:550
 msgid "Force DHCP on this network even if another server is detected."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:623
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1032
 msgid "Force TKIP"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:624
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1033
 msgid "Force TKIP and CCMP (AES)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:795
 msgid "Force link"
 msgstr ""
 
@@ -1978,7 +2038,7 @@ msgstr ""
 msgid "Force upgrade"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:60
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:90
 msgid "Force use of NAT-T"
 msgstr ""
 
@@ -1986,7 +2046,7 @@ msgstr ""
 msgid "Form token mismatch"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:34
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:164
 msgid "Forward DHCP traffic"
 msgstr ""
 
@@ -1994,46 +2054,41 @@ msgstr ""
 msgid "Forward Error Correction Seconds (FECS)"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:28
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:161
 msgid "Forward broadcast traffic"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:375
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:809
 msgid "Forward mesh peer traffic"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:186
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:908
 msgid "Forwarding mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:255
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:596
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:774
 msgid "Fragmentation Threshold"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:332
-msgid "Frame Bursting"
-msgstr ""
-
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:17
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:28
 msgid "Free"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:91
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:89
 msgid ""
-"Further information about WireGuard interfaces and peers at <a href=\"http://"
-"wireguard.com\">wireguard.com</a>."
+"Further information about WireGuard interfaces and peers at <a href='http://"
+"wireguard.com'>wireguard.com</a>."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:45
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:130
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:186
 msgid "GHz"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:29
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:36
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:91
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:77
 msgid "GPRS only"
 msgstr ""
 
@@ -2042,28 +2097,28 @@ msgstr ""
 msgid "Gateway"
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:35
+msgid "Gateway Ports"
+msgstr ""
+
 #: modules/luci-base/htdocs/luci-static/resources/network.js:9
 #: modules/luci-base/luasrc/model/network.lua:29
 msgid "Gateway address is invalid"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:46
-msgid "Gateway ports"
-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:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:275
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:23
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:112
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:103
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:49
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:33
 msgid "General Settings"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:188
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:462
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:175
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:141
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:361
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:504
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:895
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:741
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:796
 msgid "General Setup"
 msgstr ""
 
@@ -2071,7 +2126,7 @@ msgstr ""
 msgid "Generate Config"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:945
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1355
 msgid "Generate PMK locally"
 msgstr ""
 
@@ -2079,11 +2134,7 @@ msgstr ""
 msgid "Generate archive"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:63
-msgid "Generic 802.11%s Wireless Controller"
-msgstr ""
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:26
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:74
 msgid "Given password confirmation did not match, password not changed!"
 msgstr ""
 
@@ -2091,7 +2142,7 @@ msgstr ""
 msgid "Global Settings"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:806
 msgid "Global network options"
 msgstr ""
 
@@ -2102,33 +2153,29 @@ msgstr ""
 msgid "Go to password configuration..."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:857
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1369
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1112
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1616
 #: modules/luci-base/luasrc/view/cbi/full_valueheader.htm:4
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:58
 msgid "Go to relevant configuration page"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:38
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:66
 msgid "Group Password"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:11
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:22
 msgid "Guest"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:73
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:81
 msgid "HE.net password"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:60
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:73
 msgid "HE.net username"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:310
-msgid "HT mode (802.11n)"
-msgstr ""
-
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:16
 msgid "Hang Up"
 msgstr ""
@@ -2137,15 +2184,13 @@ msgstr ""
 msgid "Header Error Code Errors (HEC)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:103
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 msgid ""
 "Here you can configure the basic aspects of your device like its hostname or "
 "the timezone."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:499
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:556
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:579
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:941
 msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr ""
 
@@ -2156,14 +2201,15 @@ msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:92
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1959
 msgid "Host"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:20
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:21
 msgid "Host entries"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:48
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:171
 msgid "Host expiry timeout"
 msgstr ""
 
@@ -2171,45 +2217,45 @@ msgstr ""
 msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:118
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:102
 msgid "Host-Uniq tag content"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:71
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:31
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:316
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:25
+#: 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:317
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:26
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:17
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:125
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:116
 msgid "Hostname"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:12
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:22
 msgid "Hostname to send when requesting DHCP"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:18
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:19
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:67
 msgid "Hostnames"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:13
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:24
 msgid "Hybrid"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:45
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:75
 msgid "IKE DH Group"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:41
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:59
 msgid "IP Addresses"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:40
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:80
 msgid "IP Protocol"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:29
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:30
 msgid "IP address"
 msgstr ""
 
@@ -2228,6 +2274,11 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:20
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:21
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:22
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:79
+#: 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/network.js:89
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:90
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:91
@@ -2235,7 +2286,7 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:93
 #: 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/luasrc/model/cbi/admin_network/proto_ncm.lua:42
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:82
 msgid "IPv4"
 msgstr ""
 
@@ -2247,24 +2298,23 @@ msgstr ""
 msgid "IPv4 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:57
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:178
 msgid "IPv4 address"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:26
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:33
 msgid "IPv4 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:104
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:181
 msgid "IPv4 broadcast"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:100
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:180
 msgid "IPv4 gateway"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:92
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:179
 msgid "IPv4 netmask"
 msgstr ""
 
@@ -2272,24 +2322,25 @@ msgstr ""
 msgid "IPv4 network in address/netmask notation"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:25
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:52
 msgid "IPv4 prefix"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:42
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:30
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:55
 msgid "IPv4 prefix length"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:43
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:83
 msgid "IPv4+IPv6"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:72
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:34
 msgid "IPv4-Address"
 msgstr ""
 
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:10
 #: protocols/luci-proto-ipip/luasrc/model/network/proto_ipip.lua:9
 msgid "IPv4-in-IPv4 (RFC2003)"
 msgstr ""
@@ -2304,6 +2355,16 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:30
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:31
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:32
+#: 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/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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:89
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:90
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:91
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:92
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:95
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:96
@@ -2316,7 +2377,7 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:103
 #: 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/luasrc/model/cbi/admin_network/proto_ncm.lua:44
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:84
 msgid "IPv6"
 msgstr ""
 
@@ -2328,11 +2389,11 @@ msgstr ""
 msgid "IPv6 Neighbours"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:464
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:506
 msgid "IPv6 Settings"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:195
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:810
 msgid "IPv6 ULA-Prefix"
 msgstr ""
 
@@ -2340,21 +2401,21 @@ msgstr ""
 msgid "IPv6 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:202
 msgid "IPv6 address"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:23
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:189
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:31
 msgid "IPv6 assignment hint"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:18
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:184
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:27
 msgid "IPv6 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:207
 msgid "IPv6 gateway"
 msgstr ""
 
@@ -2362,22 +2423,22 @@ msgstr ""
 msgid "IPv6 network in address/netmask notation"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:37
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:59
 msgid "IPv6 prefix"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:34
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:45
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:63
 msgid "IPv6 prefix length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:33
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:211
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:57
 msgid "IPv6 routed prefix"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:143
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:215
 msgid "IPv6 suffix"
 msgstr ""
 
@@ -2387,31 +2448,35 @@ msgid "IPv6-Address"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:93
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:104
 msgid "IPv6-PD"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:10
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:13
 msgid "IPv6-in-IPv4 (RFC4213)"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:17
 msgid "IPv6-over-IPv4 (6rd)"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:15
 msgid "IPv6-over-IPv4 (6to4)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1075
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1478
 msgid "Identity"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:70
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:96
 msgid "If checked, 1DES is enabled"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:65
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:93
 msgid "If checked, encryption is disabled"
 msgstr ""
 
@@ -2428,36 +2493,36 @@ msgid ""
 "device node"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:27
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:71
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:18
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:82
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:52
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:17
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:29
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:33
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:68
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:85
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:32
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:45
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:45
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:24
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:44
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:116
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:48
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:85
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:65
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:33
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:80
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:108
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:146
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:74
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:97
 msgid "If unchecked, no default route is configured"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:34
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:86
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:35
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:99
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:47
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:60
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:60
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:39
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:59
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:124
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:39
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:116
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:59
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:103
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:64
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:77
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:100
 msgid "If unchecked, the advertised DNS server addresses are ignored"
 msgstr ""
 
@@ -2470,15 +2535,15 @@ msgid ""
 "of the <abbr title=\"Random Access Memory\">RAM</abbr>."
 msgstr ""
 
-#: 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:102
 msgid "Ignore <code>/etc/hosts</code>"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:471
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:531
 msgid "Ignore interface"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:90
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:91
 msgid "Ignore resolve file"
 msgstr ""
 
@@ -2496,12 +2561,12 @@ msgid ""
 "blocked. Click \"Continue »\" below to return to the previous page."
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:145
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:118
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:124
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:126
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:97
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:118
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:157
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:141
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:115
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:138
 msgid "Inactivity timeout"
 msgstr ""
 
@@ -2509,23 +2574,25 @@ msgstr ""
 msgid "Inbound:"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:170
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:161
 msgid "Info"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:105
 msgid "Information"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:25
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:67
 msgid "Initialization failure"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:34
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:87
 msgid "Initscript"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:26
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:122
 msgid "Initscripts"
 msgstr ""
 
@@ -2533,55 +2600,74 @@ msgstr ""
 msgid "Install iputils-traceroute6 for IPv6 traceroute"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:223
-msgid "Install package %q"
-msgstr ""
-
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:220
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:120
 msgid "Install protocol extensions..."
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:416
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:423
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:683
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:687
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:26
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:284
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:342
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:47
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:134
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:14
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:16
 msgid "Interface"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:58
 msgid "Interface %q device auto-migrated from %q to %q."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:356
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:792
 msgid "Interface Configuration"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:51
-msgid "Interface Overview"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:99
+msgid "Interface has %d pending changes"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:57
+msgid "Interface is marked for deletion"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:162
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:3
 msgid "Interface is reconnecting..."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:162
+msgid "Interface is shutting down..."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:205
+msgid "Interface is starting..."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:208
+msgid "Interface is stopping..."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:954
 msgid "Interface name"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:34
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:224
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:131
 msgid "Interface not present or not connected yet."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:88
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:16
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:11
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:287
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:54
 msgid "Interfaces"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:9
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:20
 msgid "Internal"
 msgstr ""
 
@@ -2594,19 +2680,35 @@ msgstr ""
 msgid "Invalid"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:311
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:10
+msgid "Invalid Base64 key string"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:281
 msgid "Invalid VLAN ID given! Only IDs between %d and %d are allowed."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:307
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:290
 msgid "Invalid VLAN ID given! Only unique IDs are allowed"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:195
+msgid "Invalid argument"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:194
+msgid "Invalid command"
+msgstr ""
+
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:80
+msgid "Invalid hexadecimal value"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/sysauth.htm:12
 msgid "Invalid username and/or password! Please try again."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:508
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:950
 msgid "Isolate Clients"
 msgstr ""
 
@@ -2623,15 +2725,15 @@ msgstr ""
 msgid "JavaScript required!"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:52
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1691
 msgid "Join Network"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:22
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1628
 msgid "Join Network: Wireless Scan"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:19
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1833
 msgid "Joining Network: %q"
 msgstr ""
 
@@ -2648,15 +2750,15 @@ msgstr ""
 msgid "Kernel Version"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:823
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1248
 msgid "Key"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:851
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:852
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:853
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:854
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:870
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1277
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1278
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1279
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1291
 msgid "Key #%d"
 msgstr ""
 
@@ -2664,33 +2766,34 @@ msgstr ""
 msgid "Kill"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:10
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:21
 msgid "L2TP"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:10
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:40
 msgid "L2TP Server"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:100
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:74
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:80
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:74
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:53
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:73
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:131
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:102
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:89
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:112
 msgid "LCP echo failure threshold"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:118
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:89
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:95
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:89
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:68
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:91
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:144
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:102
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:125
 msgid "LCP echo interval"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:181
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:902
 msgid "LLC"
 msgstr ""
 
@@ -2699,11 +2802,11 @@ msgstr ""
 msgid "Label"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:213
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:204
 msgid "Language"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:115
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:106
 msgid "Language and Style"
 msgstr ""
 
@@ -2711,51 +2814,51 @@ msgstr ""
 msgid "Latency"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:10
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:21
 msgid "Leaf"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:369
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:487
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:393
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:543
 msgid "Lease time"
 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:87
 msgid "Leasefile"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:74
 #: modules/luci-base/luasrc/view/lease_status.htm:95
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:34
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
 msgid "Leasetime remaining"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:9
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:20
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:27
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:50
 msgid "Leave empty to autodetect"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:21
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:45
 msgid "Leave empty to use the current WAN address"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1746
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2299
 msgid "Legend:"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:481
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:538
 msgid "Limit"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:287
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:288
 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:299
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:300
 msgid "Limit listening to these interfaces, and loopback."
 msgstr ""
 
@@ -2775,17 +2878,17 @@ msgstr ""
 msgid "Line Uptime"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:101
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:88
 msgid "Link On"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:185
 msgid ""
 "List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
 "requests to"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:972
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1377
 msgid ""
 "List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-"
 "Identifier,128-bit key as hex string. <br />This list is used to map R0KH-ID "
@@ -2794,7 +2897,7 @@ msgid ""
 "Association."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:981
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1381
 msgid ""
 "List of R1KHs in the same Mobility Domain. <br />Format: MAC-address,R1KH-ID "
 "as 6 octets with colons,128-bit key as hex string. <br />This list is used "
@@ -2803,31 +2906,31 @@ msgid ""
 "PMK-R1 keys."
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:21
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:82
 msgid "List of SSH key files for auth"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:206
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:207
 msgid "List of domains to allow RFC1918 responses for"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:174
 msgid "List of hosts that supply bogus NX domain results"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:298
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:299
 msgid "Listen Interfaces"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:30
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:54
 msgid "Listen Port"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:15
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:16
 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:216
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:217
 msgid "Listening port for inbound DNS queries"
 msgstr ""
 
@@ -2846,11 +2949,11 @@ msgstr ""
 msgid "Loading"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:35
-msgid "Loading SSH keys…"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1819
+msgid "Loading directory contents…"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1204
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1296
 #: modules/luci-base/luasrc/view/view.htm:4
 msgid "Loading view…"
 msgstr ""
@@ -2860,77 +2963,73 @@ msgstr ""
 msgid "Local IP address is invalid"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:25
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:86
 msgid "Local IP address to assign"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:10
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:11
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:44
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:39
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:151
 msgid "Local IPv4 address"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:20
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:54
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:45
 msgid "Local IPv6 address"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:286
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:287
 msgid "Local Service Only"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:81
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:126
 msgid "Local Startup"
 msgstr ""
 
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:25
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:121
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:112
 msgid "Local Time"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:149
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
 msgid "Local domain"
 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:147
 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:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:151
 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:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
 msgid "Local server"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:129
 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:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:128
 msgid "Localise queries"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:175
-msgid "Locked to channel %s used by: %s"
-msgstr ""
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:168
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:159
 msgid "Log output level"
 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:181
 msgid "Log queries"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:113
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:104
 msgid "Logging"
 msgstr ""
 
@@ -2938,7 +3037,7 @@ msgstr ""
 msgid "Login"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:95
+#: modules/luci-base/luasrc/controller/admin/index.lua:103
 msgid "Logout"
 msgstr ""
 
@@ -2946,11 +3045,13 @@ msgstr ""
 msgid "Loss of Signal Seconds (LOSS)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:476
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:533
 msgid "Lowest leased address as offset from the network address."
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:40
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:75
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:35
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:86
 msgid "MAC"
@@ -2958,32 +3059,32 @@ msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:73
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:109
-#: 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:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1958
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:86
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:133
 msgid "MAC-Address"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:457
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:586
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:886
 msgid "MAC-Address Filter"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:142
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:363
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:798
 msgid "MAC-Filter"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:464
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:590
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:893
 msgid "MAC-List"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:13
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:16
 msgid "MAP / LW4over6"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:62
 msgid "MAP rule is invalid"
 msgstr ""
@@ -3001,8 +3102,8 @@ msgid "MHz"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:53
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:29
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:66
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:53
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:71
 msgid "MTU"
 msgstr ""
 
@@ -3012,16 +3113,17 @@ msgid ""
 "below:"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:55
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:69
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:26
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:38
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:38
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:108
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:52
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:96
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:83
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:57
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:70
 msgid "Manual"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1949
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2188
 msgid "Master"
 msgstr ""
 
@@ -3029,48 +3131,46 @@ msgstr ""
 msgid "Max. Attainable Data Rate (ATTNDR)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:539
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:982
 msgid "Maximum allowed Listen Interval"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:234
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
 msgid "Maximum allowed number of active DHCP leases"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:252
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:253
 msgid "Maximum allowed number of concurrent DNS queries"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:244
 msgid "Maximum allowed size of EDNS.0 UDP packets"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:63
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:77
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:57
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:112
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:104
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:93
 msgid "Maximum amount of seconds to wait for the modem to become ready"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:27
-msgid ""
-"Maximum length of the name is 15 characters including the automatic protocol/"
-"bridge prefix (br-, 6in4-, pppoe- etc.)"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:538
+msgid "Maximum number of leased addresses."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:482
-msgid "Maximum number of leased addresses."
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:761
+msgid "Maximum transmit power"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:21
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:49
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:134
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:187
 #: modules/luci-mod-status/luasrc/view/admin_status/bandwidth.htm:79
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:284
 msgid "Mbit/s"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:18
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:32
 msgid "Medium"
 msgstr ""
 
@@ -3082,42 +3182,43 @@ msgstr ""
 msgid "Memory usage (%)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1952
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2191
 msgid "Mesh"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:372
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:806
 msgid "Mesh Id"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:196
+msgid "Method not found"
+msgstr ""
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:45
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:76
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:104
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:54
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:66
 msgid "Metric"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:154
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:198
 msgid "Mirror monitor port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:153
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:197
 msgid "Mirror source port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:408
-msgid "Missing protocol extension for proto %q"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:923
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1337
 msgid "Mobility Domain"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:154
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:41
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:74
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:366
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:31
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:360
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:801
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1619
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:175
 msgid "Mode"
 msgstr ""
@@ -3126,39 +3227,38 @@ msgstr ""
 msgid "Model"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:31
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:72
 msgid "Modem default"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:11
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:19
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:11
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:10
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:73
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:73
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:57
 msgid "Modem device"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:24
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:66
 msgid "Modem information query failed"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:62
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:76
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:56
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:112
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:104
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:93
 msgid "Modem init timeout"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1953
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:452
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:554
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:577
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2192
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:880
 msgid "Monitor"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:14
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
 msgid "More Characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:802
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1057
 msgid "More…"
 msgstr ""
 
@@ -3171,7 +3271,7 @@ msgstr ""
 msgid "Mount Point"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:26
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:36
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:137
 msgid "Mount Points"
@@ -3219,46 +3319,44 @@ msgstr ""
 msgid "Move up"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:912
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
 msgid "NAS ID"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:57
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:87
 msgid "NAT-T Mode"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:9
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 msgid "NAT64 Prefix"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:31
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:26
 msgid "NCM"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:535
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:589
 msgid "NDP-Proxy"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:43
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:72
 msgid "NT Domain"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:273
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:264
 msgid "NTP server candidates"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:837
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1092
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:27
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:502
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:65
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:553
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:658
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:49
 msgid "Name"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:17
-msgid "Name of the new interface"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1808
 msgid "Name of the new network"
 msgstr ""
 
@@ -3266,9 +3364,10 @@ msgstr ""
 msgid "Navigation"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:62
+#: modules/luci-base/luasrc/controller/admin/index.lua:69
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:108
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:402
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:834
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1957
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:389
 #: modules/luci-mod-status/luasrc/view/admin_status/index/30-network.htm:8
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:73
@@ -3280,7 +3379,7 @@ msgstr ""
 msgid "Network Utilities"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:278
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:279
 msgid "Network boot image"
 msgstr ""
 
@@ -3293,53 +3392,59 @@ msgstr ""
 msgid "Network without interfaces."
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:661
+msgid "New interface name…"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:11
 msgid "Next »"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1507
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1754
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:108
 msgid "No"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:453
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:514
 msgid "No DHCP Server configured for this interface"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1162
+msgid "No Encryption"
+msgstr ""
+
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:89
 msgid "No NAT-T"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:198
+msgid "No data received"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1764
+msgid "No entries in this directory"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/backupfiles.lua:82
 msgid "No files found"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:550
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:191
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:180
 msgid "No information available"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:8
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:63
 msgid "No matching prefix delegation"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:157
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
 msgid "No negative cache"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:53
-msgid "No network configured on this device"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:65
-msgid "No network name specified"
-msgstr ""
-
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:147
-msgid "No networks in range"
-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
@@ -3347,7 +3452,12 @@ msgstr ""
 msgid "No password set!"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:116
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:104
+msgid "No peers defined yet"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:129
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:271
 msgid "No public keys present yet."
 msgstr ""
 
@@ -3355,19 +3465,19 @@ msgstr ""
 msgid "No rules in this chain."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:150
-msgid "No scan results available yet..."
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:53
+msgid "No signal"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:7
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:756
 msgid "No zone assigned"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:111
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:35
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:48
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:133
 msgid "Noise"
 msgstr ""
 
@@ -3383,16 +3493,16 @@ msgstr ""
 msgid "Non Pre-emtive CRC errors (CRC_P)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:292
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:293
 msgid "Non-wildcard"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:129
 msgid "None"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:181
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:172
 msgid "Normal"
 msgstr ""
 
@@ -3400,25 +3510,29 @@ msgstr ""
 msgid "Not Found"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:27
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:5
-msgid "Not associated"
-msgstr ""
-
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:87
 msgid "Not connected"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:38
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:139
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:232
+msgid "Not present"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:105
 msgid "Not started on boot"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:26
-msgid "Note: interface name length"
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:201
+msgid "Not supported"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:171
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:162
 msgid "Notice"
 msgstr ""
 
@@ -3426,57 +3540,50 @@ msgstr ""
 msgid "Nslookup"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:261
 msgid "Number of cached DNS entries (max is 10000, 0 is no caching)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:203
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:194
 msgid "Number of parallel threads used for compression"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:40
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:69
 msgid "Obfuscated Group Password"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:35
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:61
 msgid "Obfuscated Password"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:22
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:34
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:40
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:105
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:97
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:49
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:80
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:54
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:67
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:93
 msgid "Obtain IPv6-Address"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:83
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:68
 msgid "Off-State Delay"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:16
-msgid ""
-"On this page you can configure the network interfaces. You can bridge "
-"several interfaces by ticking the \"bridge interfaces\" field and enter the "
-"names of several network interfaces separated by spaces. You can also use "
-"<abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
-"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
-"<samp>eth0.1</samp>)."
-msgstr ""
-
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:95
 msgid "On-Link route"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:80
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:64
 msgid "On-State Delay"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:360
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:382
 msgid "One of hostname or mac address must be specified!"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:456
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:462
 msgid "One of the following: %s"
 msgstr ""
 
@@ -3498,34 +3605,35 @@ msgstr ""
 msgid "Open list..."
 msgstr ""
 
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:61
 #: protocols/luci-proto-openconnect/luasrc/model/network/proto_openconnect.lua:9
 msgid "OpenConnect (CISCO AnyConnect)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:757
 msgid "Operating frequency"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1753
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2306
 msgid "Option changed"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1755
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2308
 msgid "Option removed"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1140
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:55
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1535
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:66
 msgid "Optional"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:78
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:76
 msgid ""
 "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, "
 "starting with <code>0x</code>."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:144
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:215
 msgid ""
 "Optional. Allowed values: 'eui64', 'random', fixed value like '::1' or "
 "'::1:2'. When IPv6 prefix (like 'a:b:c:d::') is received from a delegating "
@@ -3533,41 +3641,41 @@ msgid ""
 "for the interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:123
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:117
 msgid ""
 "Optional. Base64-encoded preshared key. Adds in an additional layer of "
 "symmetric-key cryptography for post-quantum resistance."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:148
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:126
 msgid "Optional. Create routes for Allowed IPs for this peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:103
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:108
 msgid "Optional. Description of peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:156
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:128
 msgid ""
 "Optional. Host of peer. Names are resolved prior to bringing up the "
 "interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:67
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:71
 msgid "Optional. Maximum Transmission Unit of tunnel interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:166
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:132
 msgid "Optional. Port of peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:175
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:136
 msgid ""
 "Optional. Seconds between keep alive messages. Default is 0 (disabled). "
 "Recommended value if this device is behind a NAT is 25."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:31
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:54
 msgid "Optional. UDP port used for outgoing and incoming packets."
 msgstr ""
 
@@ -3588,7 +3696,7 @@ msgstr ""
 msgid "Outbound:"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:26
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:50
 msgid "Output Interface"
 msgstr ""
 
@@ -3597,51 +3705,51 @@ msgstr ""
 msgid "Output zone"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:63
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:155
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:33
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:54
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:54
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:219
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:50
 msgid "Override MAC address"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:66
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:35
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:56
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:88
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:125
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:131
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:133
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:104
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:61
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:58
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:223
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:44
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:54
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:154
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:71
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:145
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:132
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:110
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:119
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:97
 msgid "Override MTU"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:30
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:63
 msgid "Override TOS"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:25
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:58
 msgid "Override TTL"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:954
 msgid "Override default interface name"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:41
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:167
 msgid "Override the gateway in DHCP responses"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:507
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:555
 msgid ""
 "Override the netmask sent to clients. Normally it is calculated from the "
 "subnet that is served."
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:65
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:179
 msgid "Override the table used for internal routes"
 msgstr ""
 
@@ -3649,29 +3757,33 @@ msgstr ""
 msgid "Overview"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1606
+msgid "Overwrite existing file \"%s\" ?"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:11
 msgid "Owner"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:42
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:56
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:17
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:28
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:34
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:14
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:18
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:43
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:98
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:45
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:44
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:63
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:82
 msgid "PAP/CHAP password"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:39
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:53
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:14
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:11
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:15
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:96
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:88
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:43
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:74
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:42
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:61
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:77
 msgid "PAP/CHAP username"
 msgstr ""
 
@@ -3679,9 +3791,9 @@ msgstr ""
 msgid "PID"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:36
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:50
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:26
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:95
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:87
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:68
 msgid "PIN"
 msgstr ""
 
@@ -3690,114 +3802,116 @@ msgstr ""
 msgid "PIN code rejected"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:966
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1372
 msgid "PMK R1 Push"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:43
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:13
 msgid "PPP"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:11
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:58
 msgid "PPPoA Encapsulation"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:19
 msgid "PPPoATM"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:17
 msgid "PPPoE"
 msgstr ""
 
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:28
 #: protocols/luci-proto-pppossh/luasrc/model/network/proto_pppossh.lua:9
 msgid "PPPoSSH"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:15
 msgid "PPtP"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:59
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:73
 msgid "PSID offset"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:56
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:70
 msgid "PSID-bits length"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:123
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:846
 msgid "PTM/EFM (Packet Transfer Mode)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:78
-msgid "Package libiwinfo required!"
-msgstr ""
-
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:45
 msgid "Packets"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:7
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:756
 msgid "Part of zone %q"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/sysauth.htm:29
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1111
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:35
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:42
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1514
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:46
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:104
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:58
 msgid "Password"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:29
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:24
 msgid "Password authentication"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1019
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1414
 msgid "Password of Private Key"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1067
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1471
 msgid "Password of inner Private Key"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:14
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:16
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:18
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:20
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:32
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:34
 msgid "Password strength"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:44
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:107
 msgid "Password2"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:37
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:244
 msgid "Paste or drag SSH key file…"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1000
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1396
 msgid "Path to CA-Certificate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1007
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1402
 msgid "Path to Client-Certificate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1013
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1408
 msgid "Path to Private Key"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1049
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1453
 msgid "Path to inner CA-Certificate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1055
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1459
 msgid "Path to inner Client-Certificate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1061
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1465
 msgid "Path to inner Private Key"
 msgstr ""
 
@@ -3815,7 +3929,7 @@ msgstr ""
 msgid "Peak:"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:28
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:89
 msgid "Peer IP address to assign"
 msgstr ""
 
@@ -3824,11 +3938,11 @@ msgstr ""
 msgid "Peer address is missing"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:90
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:89
 msgid "Peers"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:50
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:80
 msgid "Perfect Forward Secrecy"
 msgstr ""
 
@@ -3840,7 +3954,11 @@ msgstr ""
 msgid "Perform reset"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:174
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:199
+msgid "Permission denied"
+msgstr ""
+
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:136
 msgid "Persistent Keep Alive"
 msgstr ""
 
@@ -3848,7 +3966,7 @@ msgstr ""
 msgid "Phy Rate:"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:190
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:277
 msgid "Physical Settings"
 msgstr ""
 
@@ -3859,6 +3977,10 @@ msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:16
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:17
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:41
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:77
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:87
@@ -3876,15 +3998,19 @@ msgstr ""
 msgid "Policy"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:22
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:20
 msgid "Port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:18
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:133
+msgid "Port %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:274
 msgid "Port status:"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:482
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:488
 msgid "Potential negation of: %s"
 msgstr ""
 
@@ -3896,11 +4022,11 @@ msgstr ""
 msgid "Pre-emtive CRC errors (CRCP_P)"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:32
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:73
 msgid "Prefer LTE"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:33
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:74
 msgid "Prefer UMTS"
 msgstr ""
 
@@ -3908,31 +4034,30 @@ msgstr ""
 msgid "Prefix Delegated"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:122
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:117
 msgid "Preshared Key"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:101
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:75
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:81
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:75
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:54
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:74
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:131
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:102
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:89
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:112
 msgid ""
 "Presume peer to be dead after given amount of LCP echo failures, use 0 to "
 "ignore failures"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:305
 msgid "Prevent listening on these interfaces."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:509
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:562
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:950
 msgid "Prevents client-to-client communication"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:18
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:49
 msgid "Private Key"
 msgstr ""
 
@@ -3953,39 +4078,33 @@ msgstr ""
 msgid "Prot."
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:72
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:349
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:675
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:84
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:216
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:87
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:390
 msgid "Protocol"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:31
-msgid "Protocol of the new interface"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:222
-msgid "Protocol support is not installed"
-msgstr ""
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:269
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:260
 msgid "Provide NTP server"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:701
 msgid "Provide new network"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:451
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:879
 msgid "Pseudo Ad-Hoc (ahdemo)"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:112
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:113
 msgid "Public Key"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:278
 msgid ""
 "Public keys allow for the passwordless SSH logins with a higher security "
 "compared to the use of plain passwords. In order to upload a new key to the "
@@ -3993,47 +4112,48 @@ msgid ""
 "code> file into the input field."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:139
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:211
 msgid "Public prefix routed to this device for distribution to clients."
 msgstr ""
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:27
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:9
 msgid "QMI Cellular"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:173
 msgid "Quality"
 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:171
 msgid ""
 "Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> "
 "servers"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:952
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1360
 msgid "R0 Key Lifetime"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:959
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1366
 msgid "R1 Key Holder"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:58
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:88
 msgid "RFC3947 NAT-T mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:381
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:814
 msgid "RSSI threshold for joining"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:256
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:597
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:778
 msgid "RTS/CTS Threshold"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:41
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:76
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:87
 msgid "RX"
@@ -4043,35 +4163,39 @@ msgstr ""
 msgid "RX Rate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:783
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1961
+msgid "RX Rate / TX Rate"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1207
 msgid "Radius-Accounting-Port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:791
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1215
 msgid "Radius-Accounting-Secret"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:775
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1199
 msgid "Radius-Accounting-Server"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:759
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1183
 msgid "Radius-Authentication-Port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:767
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1191
 msgid "Radius-Authentication-Secret"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:751
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1175
 msgid "Radius-Authentication-Server"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:119
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:102
 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:83
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:84
 msgid ""
 "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-Server"
@@ -4083,17 +4207,11 @@ msgid ""
 "access to this device if you are connected via this interface"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2
-msgid ""
-"Really delete this wireless network? The deletion cannot be undone! You "
-"might lose access to this device if you are connected via this network."
-msgstr ""
-
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:40
 msgid "Really reset all changes?"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:237
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:354
 msgid "Really switch protocol?"
 msgstr ""
 
@@ -4117,15 +4235,15 @@ msgstr ""
 msgid "Realtime Wireless"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:931
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1343
 msgid "Reassociation Deadline"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:191
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
 msgid "Rebind protection"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:48
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:46
 #: modules/luci-mod-system/luasrc/view/admin_system/reboot.htm:9
 msgid "Reboot"
 msgstr ""
@@ -4139,21 +4257,15 @@ msgstr ""
 msgid "Reboots the operating system of your device"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:103
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:90
 msgid "Receive"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:325
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:350
-msgid "Receiver Antenna"
-msgstr ""
-
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:42
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:59
 msgid "Recommended. IP addresses of the WireGuard interface."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:28
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:300
 msgid "Reconnect this interface"
 msgstr ""
 
@@ -4161,92 +4273,134 @@ msgstr ""
 msgid "References"
 msgstr ""
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:39
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:153
 msgid "Relay"
 msgstr ""
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:36
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:157
 msgid "Relay Bridge"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:17
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:154
 msgid "Relay between networks"
 msgstr ""
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:64
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:12
 msgid "Relay bridge"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:18
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:50
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:49
 msgid "Remote IPv4 address"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:8
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:40
 msgid "Remote IPv4 address or FQDN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:45
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:725
 msgid "Remove"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:53
-msgid "Repeat scan"
-msgstr ""
-
-#: modules/luci-base/luasrc/view/cbi/upload.htm:11
-msgid "Replace entry"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:46
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:51
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1806
 msgid "Replace wireless configuration"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:8
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:17
 msgid "Request IPv6-address"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:16
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:23
 msgid "Request IPv6-prefix of length"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1141
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:200
+msgid "Request timeout"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1536
 msgid "Required"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:20
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:31
 msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:19
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:49
 msgid "Required. Base64-encoded private key for this interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:113
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:113
 msgid "Required. Base64-encoded public key of peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:136
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:122
 msgid ""
 "Required. IP addresses and prefixes that this peer is allowed to use inside "
 "the tunnel. Usually the peer's tunnel IP addresses and the networks the peer "
 "routes through the tunnel."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1134
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1095
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1096
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1097
+msgid "Requires hostapd"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1101
+msgid "Requires hostapd with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1102
+msgid "Requires hostapd with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1098
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1099
+msgid "Requires hostapd with SAE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1533
 msgid ""
 "Requires the 'full' version of wpad/hostapd and support from the wifi driver "
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:141
 msgid ""
 "Requires upstream supports DNSSEC; verify unsigned domain responses really "
 "come from unsigned domains"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1268
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1109
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1119
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1120
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1121
+msgid "Requires wpa-supplicant"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1113
+msgid "Requires wpa-supplicant with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1114
+msgid "Requires wpa-supplicant with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1111
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1124
+msgid "Requires wpa-supplicant with SAE support"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1355
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:17
 #: modules/luci-base/luasrc/view/cbi/footer.htm:30
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:66
@@ -4262,17 +4416,22 @@ msgstr ""
 msgid "Reset to defaults"
 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:68
 msgid "Resolv and Hosts Files"
 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:94
 msgid "Resolve file"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:28
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:14
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:71
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:197
+msgid "Resource not found"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:302
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:693
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:90
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:112
 msgid "Restart"
 msgstr ""
 
@@ -4280,7 +4439,7 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:14
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:691
 msgid "Restart radio interface"
 msgstr ""
 
@@ -4292,26 +4451,24 @@ msgstr ""
 msgid "Restore backup"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:113
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:114
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:38
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:46
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:119
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:120
 msgid "Reveal/hide password"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1774
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2322
 msgid "Revert"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1861
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2405
 msgid "Revert changes"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2013
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2554
 msgid "Revert request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1993
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2534
 msgid "Reverting configuration…"
 msgstr ""
 
@@ -4319,7 +4476,7 @@ msgstr ""
 msgid "Root"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:271
 msgid "Root directory for files served via TFTP"
 msgstr ""
 
@@ -4327,7 +4484,7 @@ msgstr ""
 msgid "Root preparation"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:147
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:126
 msgid "Route Allowed IPs"
 msgstr ""
 
@@ -4339,12 +4496,12 @@ msgstr ""
 msgid "Route type"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:523
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:577
 msgid "Router Advertisement-Service"
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:43
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:15
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:27
 msgid "Router Password"
 msgstr ""
 
@@ -4372,7 +4529,7 @@ msgstr ""
 msgid "Run filesystem check"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:651
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:669
 msgid "Runtime error"
 msgstr ""
 
@@ -4384,31 +4541,31 @@ msgstr ""
 msgid "SNR"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:5
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:18
 msgid "SSH Access"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:10
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:70
 msgid "SSH server address"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:13
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:74
 msgid "SSH server port"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:8
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:58
 msgid "SSH username"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:27
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:277
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
 msgid "SSH-Keys"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:42
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:73
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:29
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1617
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:174
 msgid "SSID"
 msgstr ""
@@ -4417,17 +4574,17 @@ msgstr ""
 msgid "SWAP"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1127
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1262
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1379
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1351
 #: modules/luci-base/luasrc/view/cbi/error.htm:17
 #: modules/luci-base/luasrc/view/cbi/footer.htm:26
 #: modules/luci-base/luasrc/view/cbi/header.htm:17
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:54
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:133
 msgid "Save"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1256
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1768
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1347
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2318
 #: modules/luci-base/luasrc/view/cbi/footer.htm:22
 msgid "Save & Apply"
 msgstr ""
@@ -4440,28 +4597,20 @@ msgstr ""
 msgid "Save mtdblock contents"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
-msgid "Saving keys…"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:698
 msgid "Scan"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:109
-msgid "Scan request failed"
-msgstr ""
-
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:8
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:39
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:23
 msgid "Scheduled Tasks"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1749
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2302
 msgid "Section added"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1751
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2304
 msgid "Section removed"
 msgstr ""
 
@@ -4476,61 +4625,66 @@ msgid ""
 "your device!"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:119
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:90
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:96
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:90
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:69
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:92
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1516
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1646
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1809
+msgid "Select file…"
+msgstr ""
+
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:144
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:102
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:125
 msgid ""
 "Send LCP echo requests at the given interval in seconds, only effective in "
 "conjunction with failure threshold"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:561
-msgid "Separate Clients"
-msgstr ""
-
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:62
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:63
 msgid "Server Settings"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:26
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:50
 msgid "Service Name"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:25
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:30
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:87
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:71
 msgid "Service Type"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:55
+#: modules/luci-base/luasrc/controller/admin/index.lua:62
 msgid "Services"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:815
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:861
 msgid "Session expired"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:83
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:107
 msgid "Set VPN as Default Route"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:258
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:795
 msgid ""
 "Set interface properties regardless of the link carrier (If set, carrier "
 "sense events do not invoke hotplug handlers)."
 msgstr ""
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:23
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:55
 msgid "Setting PLMN failed"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:26
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:68
 msgid "Setting operation mode failed"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:454
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:517
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:527
 msgid "Setup DHCP Server"
 msgstr ""
 
@@ -4542,7 +4696,7 @@ msgstr ""
 msgid "Short GI"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:516
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:960
 msgid "Short Preamble"
 msgstr ""
 
@@ -4554,21 +4708,23 @@ msgstr ""
 msgid "Show empty chains"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:306
 msgid "Shutdown this interface"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:111
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:34
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:47
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:132
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1616
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:173
 msgid "Signal"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1960
+msgid "Signal / Noise"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:125
 msgid "Signal Attenuation (SATN)"
 msgstr ""
@@ -4581,11 +4737,11 @@ msgstr ""
 msgid "Size"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:259
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:260
 msgid "Size of DNS query cache"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:191
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
 msgid "Size of the ZRam device in megabytes"
 msgstr ""
 
@@ -4602,11 +4758,7 @@ msgstr ""
 msgid "Skip to navigation"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:335
-msgid "Slot time"
-msgstr ""
-
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1640
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1846
 #: modules/luci-base/luasrc/model/network.lua:1427
 msgid "Software VLAN"
 msgstr ""
@@ -4644,61 +4796,65 @@ msgstr ""
 msgid "Specifies the directory the device is attached to"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:23
-msgid "Specifies the listening port of this <em>Dropbear</em> instance"
-msgstr ""
-
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:57
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:175
 msgid ""
 "Specifies the maximum amount of failed ARP requests until hosts are presumed "
 "to be dead"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:49
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:171
 msgid ""
 "Specifies the maximum amount of seconds after which hosts are presumed to be "
 "dead"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:761
+msgid ""
+"Specifies the maximum transmit power the wireless radio may use. Depending "
+"on regulatory requirements and wireless usage, the actual transmit power may "
+"be reduced by the driver."
+msgstr ""
+
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:63
 msgid "Specify a TOS (Type of Service)."
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:25
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:58
 msgid ""
 "Specify a TTL (Time to Live) for the encapsulating packet other than the "
 "default (64)."
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:53
 msgid ""
 "Specify an MTU (Maximum Transmission Unit) other than the default (1280 "
 "bytes)."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:60
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "Specify the secret encryption key here."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:475
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:64
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:533
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:89
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:111
 msgid "Start"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:33
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:86
 msgid "Start priority"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1958
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2499
 msgid "Starting configuration apply…"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1626
 msgid "Starting wireless scan..."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:24
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:120
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
 msgid "Startup"
 msgstr ""
 
@@ -4710,59 +4866,62 @@ msgstr ""
 msgid "Static IPv6 Routes"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:70
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:71
 msgid "Static Leases"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:118
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:73
 msgid "Static Routes"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1194
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1384
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:172
 #: modules/luci-base/luasrc/model/network.lua:966
 msgid "Static address"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:308
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:309
 msgid ""
 "Static leases are used to assign fixed IP addresses and symbolic hostnames "
 "to DHCP clients. They are also required for non-dynamic interface "
 "configurations where only hosts with a corresponding lease are served."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:534
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:977
 msgid "Station inactivity limit"
 msgstr ""
 
 #: modules/luci-base/luasrc/controller/admin/index.lua:40
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:197
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:337
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:746
 #: modules/luci-mod-status/luasrc/view/admin_status/index.htm:128
 msgid "Status"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:35
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:75
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:308
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:91
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:113
 msgid "Stop"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:165
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Strict order"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:16
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:30
 msgid "Strong"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1843
 msgid "Submit"
 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:108
 msgid "Suppress logging"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:109
 msgid "Suppress logging of the routine operation of these protocols"
 msgstr ""
 
@@ -4774,42 +4933,44 @@ msgstr ""
 msgid "Swap Entry"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:23
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:5
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:135
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:21
 msgid "Switch"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:129
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:168
 msgid "Switch %q"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:128
-msgid "Switch %q (%s)"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:66
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:146
 msgid ""
 "Switch %q has an unknown topology - the VLAN settings might not be accurate."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:146
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:142
 msgid "Switch Port Mask"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1640
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1846
 #: modules/luci-base/luasrc/model/network.lua:1425
 msgid "Switch VLAN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:238
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:355
 msgid "Switch protocol"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:103
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:104
 #: modules/luci-base/luasrc/view/cbi/ipaddr.htm:26
 msgid "Switch to CIDR list notation"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:77
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1547
+msgid "Symbolic link"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:71
 msgid "Sync with NTP-Server"
 msgstr ""
 
@@ -4819,7 +4980,7 @@ msgstr ""
 
 #: modules/luci-base/luasrc/controller/admin/index.lua:47
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:14
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:102
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:94
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
 #: modules/luci-mod-system/luasrc/view/admin_system/applyreboot.htm:39
 msgid "System"
@@ -4830,11 +4991,11 @@ msgstr ""
 msgid "System Log"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:108
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:99
 msgid "System Properties"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:145
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:136
 msgid "System log buffer size"
 msgstr ""
 
@@ -4842,15 +5003,17 @@ msgstr ""
 msgid "TCP:"
 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:69
 msgid "TFTP Settings"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:269
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
 msgid "TFTP server root"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:17
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:77
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:88
 msgid "TX"
@@ -4873,7 +5036,7 @@ msgstr ""
 msgid "Target"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:77
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:103
 msgid "Target network"
 msgstr ""
 
@@ -4881,40 +5044,24 @@ msgstr ""
 msgid "Terminate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:27
-msgid ""
-"The <em>Device Configuration</em> section covers physical settings of the "
-"radio hardware such as channel, transmit power or antenna selection which "
-"are shared among all defined wireless networks (if the radio hardware is "
-"multi-SSID capable). Per network settings like encryption or operation mode "
-"are grouped in the <em>Interface Configuration</em>."
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:79
-msgid ""
-"The <em>libiwinfo-lua</em> package is not installed. You must install this "
-"component for working wireless configuration!"
-msgstr ""
-
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:66
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:77
 msgid ""
 "The HE.net endpoint update configuration changed, you must now use the plain "
 "username instead of the user ID!"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:8
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:40
 msgid ""
 "The IPv4 address or the fully-qualified domain name of the remote tunnel end."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:27
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:38
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:59
 msgid ""
 "The IPv6 prefix assigned to the provider, usually ends with <code>::</code>"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:18
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1808
 msgid ""
 "The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
 "code> and <code>_</code>"
@@ -4928,7 +5075,7 @@ msgstr ""
 msgid "The configuration file could not be loaded due to the following error:"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1849
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2396
 msgid ""
 "The device could not be reached within %d seconds after applying the pending "
 "changes, which caused the configuration to be rolled back for safety "
@@ -4946,6 +5093,12 @@ msgid ""
 "</abbr> <code>/dev/sda1</code>)"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:612
+msgid ""
+"The existing wireless configuration needs to be changed for LuCI to function "
+"properly."
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:127
 msgid ""
 "The filesystem that was used to format the memory (<abbr title=\"for example"
@@ -4964,43 +5117,49 @@ msgstr ""
 msgid "The following rules are currently active on this system."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:144
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:154
+msgid "The gateway address must not be a local IP address"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:154
 msgid "The given SSH public key has already been added."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:150
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:160
 msgid ""
 "The given SSH public key is invalid. Please supply proper public RSA or "
 "ECDSA keys."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:67
-msgid "The given network name is not unique"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:664
+msgid "The interface name is already used"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:52
-msgid ""
-"The hardware is not multi-SSID capable and the existing configuration will "
-"be replaced if you proceed."
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:670
+msgid "The interface name is too long"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:43
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:31
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:55
 msgid ""
 "The length of the IPv4 prefix in bits, the remainder is used in the IPv6 "
 "addresses."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:35
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:46
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:63
 msgid "The length of the IPv6 prefix in bits"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:12
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:44
 msgid "The local IPv4 address over which the tunnel is created (optional)."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:5
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1814
+msgid "The network name is already used"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:135
 msgid ""
 "The network ports on this device can be combined to several <abbr title="
 "\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
@@ -5010,22 +5169,21 @@ msgid ""
 "next greater network like the internet and other ports for a local network."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:77
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:395
-msgid "The selected protocol needs a device assigned"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1149
+msgid "The selected %s mode is incompatible with %s encryption"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/csrftoken.htm:11
 msgid "The submitted security token is invalid or already expired!"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:274
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:272
 msgid ""
 "The system is erasing the configuration partition now and will reboot itself "
 "when finished."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:195
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:193
 msgid ""
 "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
 "few minutes before you try to reconnect. It might be necessary to renew the "
@@ -5033,7 +5191,7 @@ msgid ""
 "settings."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:15
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:80
 msgid "The system password has been successfully changed."
 msgstr ""
 
@@ -5043,7 +5201,7 @@ msgid ""
 "you choose the generic image format for your platform."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:427
 msgid "There are no active leases"
 msgstr ""
 
@@ -5052,16 +5210,10 @@ msgstr ""
 msgid "There are no active leases."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1973
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2514
 msgid "There are no changes to apply"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:204
-msgid ""
-"There is no device assigned yet, please attach a network device in the "
-"\"Physical Settings\" tab"
-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
@@ -5071,11 +5223,19 @@ msgid ""
 "protect the web interface and enable SSH."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:19
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:49
 msgid "This IPv4 address of the relay"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1448
+msgid "This authentication type is not applicable to the selected EAP method."
+msgstr ""
+
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:54
+msgid "This does not look like a valid PEM file"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
 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 "
@@ -5089,44 +5249,44 @@ msgid ""
 "configurations are automatically preserved."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:74
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:81
 msgid ""
 "This is either the \"Update Key\" configured for the tunnel or the account "
 "password if no update key has been configured"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:82
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:127
 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 ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:27
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:54
 msgid ""
 "This is the local endpoint address assigned by the tunnel broker, it usually "
 "ends with <code>...:2/64</code>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:79
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> in the local network"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:73
 msgid "This is the plain username for logging into the account"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:34
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:57
 msgid ""
 "This is the prefix routed to you by the tunnel broker for use by clients"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:9
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:41
 msgid "This is the system crontab in which scheduled tasks can be defined."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:19
+#: 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 ""
@@ -5141,26 +5301,26 @@ msgstr ""
 msgid "This page gives an overview over currently active network connections."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:726
-#: modules/luci-base/htdocs/luci-static/resources/form.js:809
+#: modules/luci-base/htdocs/luci-static/resources/form.js:936
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1064
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:172
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:32
 msgid "This section contains no values yet"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:114
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:105
 msgid "Time Synchronization"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:525
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:968
 msgid "Time interval for rekeying GTK"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:128
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:119
 msgid "Timezone"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:825
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:871
 msgid "To login…"
 msgstr ""
 
@@ -5171,7 +5331,7 @@ msgid ""
 "reset\" (only possible with squashfs images)."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:835
 msgid "Tone"
 msgstr ""
 
@@ -5195,55 +5355,41 @@ msgstr ""
 msgid "Transfer"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:595
-msgid "Transmission Rate"
-msgstr ""
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:102
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:89
 msgid "Transmit"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:211
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:273
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:345
-msgid "Transmit Power"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:318
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:349
-msgid "Transmitter Antenna"
-msgstr ""
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:73
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:57
 msgid "Trigger"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:98
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:84
 msgid "Trigger Mode"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:54
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:69
 msgid "Tunnel ID"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1643
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1849
 #: modules/luci-base/luasrc/model/network.lua:1430
 msgid "Tunnel Interface"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:44
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:55
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:76
 msgid "Tunnel Link"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:46
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:131
 msgid "Tx-Power"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:32
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:185
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:11
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:43
 msgid "Type"
 msgstr ""
 
@@ -5251,19 +5397,20 @@ msgstr ""
 msgid "UDP:"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:28
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:90
 msgid "UMTS only"
 msgstr ""
 
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:43
 #: protocols/luci-proto-3g/luasrc/model/network/proto_3g.lua:10
 msgid "UMTS/GPRS/EV-DO"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:106
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:93
 msgid "USB Device"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:122
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:110
 msgid "USB Ports"
 msgstr ""
 
@@ -5293,10 +5440,12 @@ msgstr ""
 msgid "Unable to dispatch"
 msgstr ""
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:22
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:54
 msgid "Unable to obtain client ID"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:61
 msgid "Unable to resolve AFTR host name"
 msgstr ""
@@ -5306,21 +5455,31 @@ msgstr ""
 msgid "Unable to resolve peer host name"
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:33
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:68
+msgid "Unable to save contents: %s"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:132
 msgid "Unavailable Seconds (UAS)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1196
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1386
 #: modules/luci-base/luasrc/model/network.lua:970
 msgid "Unknown"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1349
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1539
 #: modules/luci-base/luasrc/model/network.lua:1137
 msgid "Unknown error (%s)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1193
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:204
+msgid "Unknown error code"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1383
+#: modules/luci-base/htdocs/luci-static/resources/protocol/none.js:6
 #: modules/luci-base/luasrc/model/network.lua:964
 msgid "Unmanaged"
 msgstr ""
@@ -5330,22 +5489,30 @@ msgstr ""
 msgid "Unmount"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:107
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:262
 msgid "Unnamed key"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1708
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2261
 msgid "Unsaved Changes"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:202
+msgid "Unspecified error"
+msgstr ""
+
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:64
 msgid "Unsupported MAP type"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:27
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:69
 msgid "Unsupported modem"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:219
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:119
 msgid "Unsupported protocol type."
 msgstr ""
@@ -5365,56 +5532,70 @@ msgstr ""
 msgid "Upload archive..."
 msgstr ""
 
-#: modules/luci-base/luasrc/view/cbi/upload.htm:8
-msgid "Uploaded File"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1703
+msgid "Upload file"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1678
+msgid "Upload file…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1623
+msgid "Upload request failed: %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:613
+msgid ""
+"Upon pressing \"Continue\", anonymous \"wifi-iface\" sections will be "
+"assigned with a name in the form <em>wifinet#</em> and the network will be "
+"restarted to apply the updated configuration."
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:14
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:74
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:85
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:26
 msgid "Uptime"
 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:83
 msgid "Use <code>/etc/ethers</code>"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:40
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:167
 msgid "Use DHCP gateway"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:33
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:85
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:34
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:98
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:46
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:65
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:38
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:58
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:124
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:39
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:116
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:59
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:103
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:64
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:77
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:100
 msgid "Use DNS servers advertised by peer"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:227
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:233
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:479
 msgid "Use ISO/IEC 3166 alpha2 country codes."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:31
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:100
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:70
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:35
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:51
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:86
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:56
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:97
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:77
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:75
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:92
 msgid "Use MTU on tunnel interface"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:95
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:65
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:30
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:46
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:81
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:93
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:73
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:88
 msgid "Use TTL on tunnel interface"
 msgstr ""
 
@@ -5426,68 +5607,65 @@ msgstr ""
 msgid "Use as root filesystem (/)"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:19
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:31
 msgid "Use broadcast flag"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:253
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:791
 msgid "Use builtin IPv6-management"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:40
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:109
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:92
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:45
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:105
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:53
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:72
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:45
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:65
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:40
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:182
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:127
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:42
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:119
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:62
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:67
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:80
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:103
 msgid "Use custom DNS servers"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:26
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:70
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:16
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:28
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:84
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:24
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:50
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:23
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:43
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:116
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:33
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:74
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:97
 msgid "Use default gateway"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:48
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:164
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:77
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:24
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:88
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:58
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:23
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:39
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:74
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:90
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:38
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:57
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:30
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:50
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:45
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:227
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:119
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:51
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:88
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:68
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:52
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:70
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:83
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:111
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:149
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:67
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:111
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:98
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:72
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:85
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:108
 msgid "Use gateway metric"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:64
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:179
 msgid "Use routing table"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:309
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:310
 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 "
@@ -5500,77 +5678,78 @@ msgstr ""
 msgid "Used"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:848
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1273
 msgid "Used Key Slot"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:913
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
 msgid ""
 "Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not "
 "needed with normal WPA(2)-PSK."
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:48
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:110
 msgid "User certificate (PEM encoded)"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:61
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:122
 msgid "User key (PEM encoded)"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/sysauth.htm:23
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:41
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:32
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:102
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:56
 msgid "Username"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:182
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:903
 msgid "VC-Mux"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:851
 msgid "VDSL"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:172
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:169
 msgid "VLANs on %q"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:171
-msgid "VLANs on %q (%s)"
+#: modules/luci-base/luasrc/controller/admin/index.lua:55
+msgid "VPN"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:18
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:42
 msgid "VPN Local address"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:22
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:46
 msgid "VPN Local port"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:15
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:11
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:15
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:58
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:39
 msgid "VPN Server"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:18
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:96
 msgid "VPN Server port"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:37
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:100
 msgid "VPN Server's certificate SHA1 hash"
 msgstr ""
 
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:9
 #: protocols/luci-proto-vpnc/luasrc/model/network/proto_vpnc.lua:9
 msgid "VPNC (CISCO 3000 (and others) VPN)"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:44
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:73
 msgid "Vendor"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:60
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:52
 msgid "Vendor Class to send when requesting DHCP"
 msgstr ""
 
@@ -5578,41 +5757,37 @@ msgstr ""
 msgid "Verify"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:52
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:76
 msgid "Virtual dynamic interface"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:470
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:471
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:553
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:576
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:908
 msgid "WDS"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:667
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1160
 msgid "WEP Open System"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:668
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1161
 msgid "WEP Shared Key"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "WEP passphrase"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:503
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:566
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:945
 msgid "WMM Mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "WPA passphrase"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:716
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:735
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:740
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1074
 msgid ""
 "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
 "and ad-hoc mode) to be installed."
@@ -5626,7 +5801,7 @@ msgstr ""
 msgid "Waiting for command to complete..."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1940
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2481
 msgid "Waiting for configuration to get applied… %ds"
 msgstr ""
 
@@ -5634,8 +5809,8 @@ msgstr ""
 msgid "Waiting for device..."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:172
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:163
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:173
 msgid "Warning"
 msgstr ""
 
@@ -5643,11 +5818,11 @@ msgstr ""
 msgid "Warning: There are unsaved changes that will get lost on reboot!"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:20
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:34
 msgid "Weak"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:946
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1355
 msgid ""
 "When using a PSK, the PMK can be automatically generated. When enabled, the "
 "R0/R1 key options below are not applied. Disable this to use the R0 and R1 "
@@ -5655,78 +5830,85 @@ msgid ""
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:383
 msgid "Width"
 msgstr ""
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:17
 #: protocols/luci-proto-wireguard/luasrc/model/network/proto_wireguard.lua:9
 msgid "WireGuard VPN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:58
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:40
 #: modules/luci-mod-status/luasrc/controller/admin/status.lua:28
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:14
 msgid "Wireless"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1631
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1837
 #: modules/luci-base/luasrc/model/network.lua:1418
 msgid "Wireless Adapter"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1617
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2052
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1823
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2288
 #: modules/luci-base/luasrc/model/network.lua:1404
 #: modules/luci-base/luasrc/model/network.lua:1865
 msgid "Wireless Network"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:629
 msgid "Wireless Overview"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:362
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:797
 msgid "Wireless Security"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:54
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:611
+msgid "Wireless configuration migration"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:139
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:179
 msgid "Wireless is disabled"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:54
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:139
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:179
 msgid "Wireless is not associated"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:15
-msgid "Wireless is restarting..."
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:752
 msgid "Wireless network is disabled"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:752
 msgid "Wireless network is enabled"
 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:182
 msgid "Write received DNS requests to syslog"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:164
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:155
 msgid "Write system log to file"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1507
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:85
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1754
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:109
 msgid "Yes"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:26
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:943
+msgid ""
+"You appear to be currently connected to the device via the \"%h\" interface. "
+"Do you really want to shut down the interface?"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:123
 msgid ""
 "You can enable or disable installed init scripts here. Changes will applied "
 "after a device reboot.<br /><strong>Warning: If you disable essential init "
@@ -5741,38 +5923,34 @@ msgid ""
 "You must enable JavaScript in your browser or LuCI will not work properly."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:196
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:187
 msgid "ZRam Compression Algorithm"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:203
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:194
 msgid "ZRam Compression Streams"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:189
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:180
 msgid "ZRam Settings"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:191
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
 msgid "ZRam Size"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:229
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:230
 msgid "any"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:113
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:121
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:126
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:218
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:282
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:321
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:328
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:621
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:37
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:22
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:29
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:121
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:836
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:844
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:849
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1030
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:78
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:48
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:51
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:103
 msgid "auto"
 msgstr ""
 
@@ -5780,11 +5958,11 @@ msgstr ""
 msgid "automatic"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:45
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:78
 msgid "baseT"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:909
 msgid "bridged"
 msgstr ""
 
@@ -5800,22 +5978,21 @@ msgstr ""
 msgid "create:"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:264
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:368
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:678
 msgid "creates a bridge over specified interface(s)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:277
 msgid "dB"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:34
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:35
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:46
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:47
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:48
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:131
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:132
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:133
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:277
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:279
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:331
@@ -5827,26 +6004,30 @@ msgstr ""
 msgid "dBm"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:460
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:587
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:889
 msgid "disable"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:119
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:524
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:530
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:536
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:18
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:578
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:584
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:590
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:25
 msgid "disabled"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:433
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:467
+msgid "driver default"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/lease_status.htm:17
 #: modules/luci-base/luasrc/view/lease_status.htm:46
-#: 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:416
 msgid "expired"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:88
 msgid ""
 "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr>-leases will be stored"
@@ -5858,25 +6039,21 @@ msgstr ""
 msgid "forward"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:80
 msgid "full-duplex"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:80
 msgid "half-duplex"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:559
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:565
 msgid "hexadecimal encoded value"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:138
-msgid "hidden"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:527
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:533
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:538
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:581
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:587
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:592
 msgid "hybrid mode"
 msgstr ""
 
@@ -5884,6 +6061,10 @@ msgstr ""
 msgid "if target is a network"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:63
+msgid "ignore"
+msgstr ""
+
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:177
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
@@ -5918,25 +6099,26 @@ msgstr ""
 msgid "key with either 5 or 13 characters"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:94
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:95
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:952
-msgid "minutes"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1168
+msgid "medium security"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:43
-msgid "mixed WPA/WPA2"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1360
+msgid "minutes"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:225
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:232
 msgid "no"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:54
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:72
 msgid "no link"
 msgstr ""
 
@@ -5944,7 +6126,7 @@ msgstr ""
 msgid "non-empty value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1195
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1446
 msgid "none"
 msgstr ""
 
@@ -5954,7 +6136,9 @@ msgstr ""
 msgid "not present"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:363
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:341
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:776
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:780
 #: 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
@@ -5969,8 +6153,8 @@ msgstr ""
 msgid "on"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
-msgid "open"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1169
+msgid "open network"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
@@ -5990,73 +6174,77 @@ msgstr ""
 msgid "positive integer value"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:34
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:56
 msgid "random"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:526
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:532
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:537
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:580
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:586
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:591
 msgid "relay mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:910
 msgid "routed"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:525
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:534
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:968
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:977
 msgid "sec"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:525
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:531
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:579
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:585
 msgid "server mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:544
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:597
 msgid "stateful-only"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:542
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:595
 msgid "stateless"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:543
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:596
 msgid "stateless + stateful"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:369
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1167
+msgid "strong security"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:346
 msgid "tagged"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:932
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1343
 msgid "time units (TUs / 1.024 ms) [1000-65535]"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:549
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:555
 msgid "unique value"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:448
 msgid "unknown"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:15
 #: modules/luci-base/luasrc/view/lease_status.htm:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:238
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:390
+#: 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:414
 msgid "unlimited"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1401
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1648
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:63
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:355
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:378
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:413
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:446
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:512
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:450
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:545
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:53
 #: modules/luci-base/luasrc/view/cbi/network_netlist.htm:38
 msgid "unspecified"
@@ -6066,7 +6254,7 @@ msgstr ""
 msgid "unspecified -or- create:"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:366
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:344
 msgid "untagged"
 msgstr ""
 
@@ -6147,8 +6335,8 @@ msgstr ""
 msgid "valid address:port"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:523
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:527
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:529
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:533
 msgid "valid date (YYYY-MM-DD)"
 msgstr ""
 
@@ -6185,7 +6373,7 @@ msgstr ""
 msgid "valid network in address/netmask notation"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:498
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:504
 msgid "valid phone digit (0-9, \"*\", \"#\", \"!\" or \".\")"
 msgstr ""
 
@@ -6198,11 +6386,11 @@ msgstr ""
 msgid "valid port value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:503
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:509
 msgid "valid time (HH:MM:SS)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:425
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:431
 msgid "value between %d and %d characters"
 msgstr ""
 
@@ -6218,14 +6406,23 @@ msgstr ""
 msgid "value smaller or equal to %f"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:430
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:425
+msgid "value with %d characters"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:436
 msgid "value with at least %d characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:435
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:441
 msgid "value with at most %d characters"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1169
+msgid "weak security"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:221
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:232
diff --git a/modules/luci-base/po/tr/base.po b/modules/luci-base/po/tr/base.po
index 81d4cec7e..0276055ad 100644
--- a/modules/luci-base/po/tr/base.po
+++ b/modules/luci-base/po/tr/base.po
@@ -12,19 +12,20 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 2.1.1\n"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:133
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:857
 msgid "%.1f dB"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:109
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:122
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 msgid "%d Bit"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1641
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2194
 msgid "%d invalid field(s)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:281
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:31
 msgid "%s is untagged in multiple VLANs!"
 msgstr ""
 
@@ -62,19 +63,19 @@ msgid "-- Additional Field --"
 msgstr "-- Ek Alan--"
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:258
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1401
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1533
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:250
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:350
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1114
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1648
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1780
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:314
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:414
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1178
 #: modules/luci-base/luasrc/view/cbi/header.htm:5
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:26
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:88
 msgid "-- Please choose --"
 msgstr "-- Lütfen seçiniz --"
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:259
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:351
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1115
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:415
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1179
 #: modules/luci-base/luasrc/view/cbi/header.htm:6
 msgid "-- custom --"
 msgstr "-- özel --"
@@ -97,7 +98,7 @@ msgstr "-- uuid'e göre eşleştir --"
 msgid "-- please select --"
 msgstr "-- lütfen seçin --"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:382
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:814
 msgid "0 = not using RSSI threshold, 1 = do not change driver default"
 msgstr ""
 
@@ -109,10 +110,11 @@ msgstr "1 Dakikalık Yük:"
 msgid "15 Minute Load:"
 msgstr "15 Dakikalık Yük:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:924
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1337
 msgid "4-character hexadecimal ID"
 msgstr "4 karakterli HEX ID"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:11
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:18
 msgid "464XLAT (CLAT)"
 msgstr ""
@@ -121,57 +123,57 @@ msgstr ""
 msgid "5 Minute Load:"
 msgstr "5 Dakikalık Yük:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:960
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1366
 msgid "6-octet identifier as a hex string - no colons"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:891
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1310
 msgid "802.11r Fast Transition"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1157
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1567
 msgid "802.11w Association SA Query maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1574
 msgid "802.11w Association SA Query retry timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1133
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1533
 msgid "802.11w Management Frame Protection"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1156
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1567
 msgid "802.11w maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1165
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1574
 msgid "802.11w retry timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:399
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:831
 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr "<abbr title=\\\"Temel Servis Ayar Tanımlayıcısı\\\"> BSSID </abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:224
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:225
 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:215
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:216
 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:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
 msgid ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
 "order of the resolvfile"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:388
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:820
 msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:351
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:373
 #: 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"
@@ -181,8 +183,8 @@ msgstr "<abbr title=\"Internet Protokolü Sürüm 4\">IPv4</abbr>-Adres"
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
 msgstr "<abbr title=\"Internet Protokolü Sürüm 4\">IPv4</abbr>-Gateway"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:555
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:35
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:506
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr "<abbr title=\"Internet Protokolü Sürüm 4\">IPv4</abbr>-Netmask"
 
@@ -198,29 +200,29 @@ 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:378
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:402
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:58
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:35
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:33
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> Ayarları"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:67
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:51
 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:328
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:329
 #: 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:372
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:233
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:234
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> leases"
@@ -228,7 +230,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:242
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> packet size"
@@ -236,73 +238,77 @@ 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:251
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:252
 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
 msgstr "<abbr title=\"maximal\">Maks.</abbr> eşzamanlı sorgu"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:10
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:42
 msgid ""
 "<br/>Note: you need to manually restart the cron service if the crontab file "
 "was empty before editing."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:817
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1605
+msgid "A directory with the same name already exists."
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:863
 msgid "A new login is required since the authentication session expired."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:114
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:837
 msgid "A43C + J43 + A43"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:838
 msgid "A43C + J43 + A43 + V43"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:850
 msgid "ADSL"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:826
 msgid "ANSI T1.413"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:33
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:47
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:23
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:94
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:86
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:67
 msgid "APN"
 msgstr "APN"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:56
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:175
 msgid "ARP retry threshold"
 msgstr "ARP yenileme aralığı"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:122
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:845
 msgid "ATM (Asynchronous Transfer Mode)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:144
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:866
 msgid "ATM Bridges"
 msgstr "ATM Köprüleri"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:178
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:21
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:898
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:66
 msgid "ATM Virtual Channel Identifier (VCI)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:179
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:26
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:899
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:70
 msgid "ATM Virtual Path Identifier (VPI)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:866
 msgid ""
 "ATM bridges expose encapsulated ethernet in AAL5 connections as virtual "
 "Linux network interfaces which can be used in conjunction with DHCP or PPP "
 "to dial into the provider network."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:184
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:905
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:62
 msgid "ATM device number"
 msgstr ""
 
@@ -311,17 +317,17 @@ msgid "ATU-C System Vendor ID"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:251
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:495
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:499
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:528
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:532
 msgid "Absent Interface"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:19
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
 msgid "Access Concentrator"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:368
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:470
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:802
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
 msgid "Access Point"
 msgstr "Erişim Noktası"
 
@@ -346,7 +352,7 @@ msgid "Active Connections"
 msgstr "Aktif Bağlantılar"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:68
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:30
 msgid "Active DHCP Leases"
 msgstr "Aktif DHCP Kiraları"
 
@@ -354,55 +360,75 @@ msgstr "Aktif DHCP Kiraları"
 msgid "Active DHCPv6 Leases"
 msgstr "Aktif DHCPv6 Kiraları"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1951
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:370
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:12
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2190
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:804
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:23
 msgid "Ad-Hoc"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:650
-#: modules/luci-base/htdocs/luci-static/resources/form.js:651
-#: modules/luci-base/htdocs/luci-static/resources/form.js:666
-#: modules/luci-base/htdocs/luci-static/resources/form.js:667
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1290
+#: modules/luci-base/htdocs/luci-static/resources/form.js:902
+#: modules/luci-base/htdocs/luci-static/resources/form.js:904
+#: modules/luci-base/htdocs/luci-static/resources/form.js:917
+#: modules/luci-base/htdocs/luci-static/resources/form.js:918
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1539
 #: modules/luci-base/luasrc/view/cbi/nsection.htm:25
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:189
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:197
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:39
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:47
 #: modules/luci-base/luasrc/view/cbi/ucisection.htm:54
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:703
 msgid "Add"
 msgstr "Ekle"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:60
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:870
+msgid "Add ATM Bridge"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:92
 msgid "Add IPv4 address…"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:129
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:204
 msgid "Add IPv6 address…"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:143
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:149
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:38
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:47
+msgid "Add LED action"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:215
+msgid "Add VLAN"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:14
+msgid "Add instance"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:153
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:159
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:250
 msgid "Add key"
 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:155
 msgid "Add local domain suffix to names served from hosts files"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:705
 msgid "Add new interface..."
 msgstr "Yeni arabirim ekle..."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:104
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:99
+msgid "Add peer"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:105
 msgid "Additional Hosts files"
 msgstr "Ek Hosts dosyaları"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:161
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
 msgid "Additional servers file"
 msgstr "Ek sunucular dosyası"
 
@@ -429,7 +455,7 @@ msgstr "Ek sunucular dosyası"
 msgid "Address"
 msgstr "Adres"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:12
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:151
 msgid "Address to access local relay bridge"
 msgstr ""
 
@@ -438,13 +464,13 @@ msgstr ""
 msgid "Administration"
 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:70
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:505
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:896
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:24
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:189
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:463
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:176
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:143
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:364
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:742
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:799
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:50
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:34
 msgid "Advanced Settings"
@@ -454,167 +480,167 @@ msgstr "Gelişmiş Ayarlar"
 msgid "Aggregate Transmit Power(ACTATP)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:175
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:166
 msgid "Alert"
 msgstr "Uyarı"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1628
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1834
 #: modules/luci-base/luasrc/model/network.lua:1416
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:54
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:78
 msgid "Alias Interface"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:138
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:66
 msgid "Alias of \"%s\""
 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:170
 msgid "All Servers"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:114
 msgid ""
 "Allocate IP addresses sequentially, starting from the lowest available "
 "address"
 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:113
 msgid "Allocate IP sequentially"
 msgstr ""
 
 # "Secure Shell" için ne kullanılabilinir bir fikrim yok.
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:24
 msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
 msgstr ""
 "<abbr title=\"Secure Shell\">SSH</abbr> parola kimlik doğrulamasına izin ver"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:545
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:987
 msgid "Allow AP mode to disconnect STAs based on low ACK condition"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:462
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:589
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:891
 msgid "Allow all except listed"
 msgstr "Listelenenlerin haricindekilere izin ver"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:236
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:767
 msgid "Allow legacy 802.11b rates"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:461
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:588
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:890
 msgid "Allow listed only"
 msgstr "Yanlızca listelenenlere izin ver"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:198
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:199
 msgid "Allow localhost"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:47
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:35
 msgid "Allow remote hosts to connect to local SSH forwarded ports"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:38
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:30
 msgid "Allow root logins with password"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:39
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:30
 msgid "Allow the <em>root</em> user to login with password"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:199
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:200
 msgid ""
 "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:135
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:122
 msgid "Allowed IPs"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:549
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:602
 msgid "Always announce default router"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:259
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:782
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
 "option does not comply with IEEE 802.11n-2009!"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:95
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:818
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:119
 msgid "Annex"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:96
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:819
 msgid "Annex A + L + M (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:827
 msgid "Annex A G.992.1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:828
 msgid "Annex A G.992.2"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:829
 msgid "Annex A G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:830
 msgid "Annex A G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:97
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:820
 msgid "Annex B (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:823
 msgid "Annex B G.992.1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:824
 msgid "Annex B G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:102
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:825
 msgid "Annex B G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:98
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:821
 msgid "Annex J (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:831
 msgid "Annex L G.992.3 POTS 1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:99
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:822
 msgid "Annex M (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:109
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:832
 msgid "Annex M G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:833
 msgid "Annex M G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:550
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:602
 msgid "Announce as default router even if no public prefix is available."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:555
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:607
 msgid "Announced DNS domains"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:554
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:606
 msgid "Announced DNS servers"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1093
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1496
 msgid "Anonymous Identity"
 msgstr ""
 
@@ -626,20 +652,6 @@ msgstr ""
 msgid "Anonymous Swap"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:322
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:329
-msgid "Antenna 1"
-msgstr "1. Anten"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:323
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:330
-msgid "Antenna 2"
-msgstr "2. Anten"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:246
-msgid "Antenna Configuration"
-msgstr "Anten Yapılandırması"
-
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:71
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:160
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:181
@@ -647,11 +659,11 @@ msgstr "Anten Yapılandırması"
 msgid "Any zone"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1981
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2522
 msgid "Apply request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1867
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2409
 msgid "Apply unchecked"
 msgstr ""
 
@@ -659,8 +671,8 @@ msgstr ""
 msgid "Architecture"
 msgstr "Mimari"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:19
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:184
+#: 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 ""
@@ -669,13 +681,13 @@ msgstr ""
 msgid "Assign interfaces..."
 msgstr "Arabirim ata..."
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:124
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:24
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:189
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:31
 msgid ""
 "Assign prefix parts using this hexadecimal subprefix ID for this interface."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:148
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1967
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:22
 msgid "Associated Stations"
 msgstr "İlişkili istasyonlar"
@@ -684,20 +696,20 @@ msgstr "İlişkili istasyonlar"
 msgid "Associations"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:39
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:37
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:101
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:64
 msgid "Auth Group"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1027
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1421
 msgid "Authentication"
 msgstr "Kimlik Doğrulama"
 
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:29
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:70
 msgid "Authentication Type"
 msgstr "Kimlik doğrulama türü"
 
-#: 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:78
 msgid "Authoritative"
 msgstr "Yetkilendirme"
 
@@ -715,17 +727,19 @@ msgstr "Yetkilendirme Gerekli"
 msgid "Auto Refresh"
 msgstr "Otomatik Yenileme"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:53
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:7
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:17
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:67
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:24
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:36
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:42
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:36
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:106
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:24
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:98
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:50
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:94
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:81
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:55
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:68
 msgid "Automatic"
 msgstr "Otomatik"
 
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:7
 #: protocols/luci-proto-hnet/luasrc/model/network/proto_hnet.lua:7
 msgid "Automatic Homenet (HNCP)"
 msgstr ""
@@ -768,21 +782,21 @@ msgstr "Kullanılabilir"
 msgid "Average:"
 msgstr "Ortalama:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:116
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:839
 msgid "B43 + B43C"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:840
 msgid "B43 + B43C + V43"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:48
 msgid "BR / DMR / AFTR"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:43
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:75
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1620
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:176
 msgid "BSSID"
 msgstr "BSSID"
@@ -796,19 +810,11 @@ msgstr "Genel Bakışa dön"
 msgid "Back to configuration"
 msgstr "Yapılandırmaya dön"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:48
-msgid "Back to overview"
-msgstr "Genel Bakışa dön"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:20
-msgid "Back to scan results"
-msgstr "Tarama sonuçlarına dön"
-
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:17
 msgid "Backup"
 msgstr "Yedekleme"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:38
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:36
 msgid "Backup / Flash Firmware"
 msgstr "Yedek/Firmware Yazma"
 
@@ -821,11 +827,11 @@ msgid "Bad address specified!"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:158
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:288
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:368
 msgid "Band"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:261
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:785
 msgid "Beacon Interval"
 msgstr ""
 
@@ -836,79 +842,85 @@ msgid ""
 "defined backup patterns."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:293
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:294
 msgid ""
 "Bind dynamically to interfaces rather than wildcard address (recommended as "
 "linux default)"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:16
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:48
 msgid "Bind interface"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:16
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:48
 msgid "Bind the tunnel to this interface (optional)."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:49
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:134
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:187
 msgid "Bitrate"
 msgstr "Bit hızı"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:172
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
 msgid "Bogus NX Domain Override"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1634
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1840
 #: modules/luci-base/luasrc/model/network.lua:1420
 msgid "Bridge"
 msgstr "Köprü"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:264
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:368
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:678
 msgid "Bridge interfaces"
 msgstr "Köprü arabirimleri"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:906
 msgid "Bridge unit number"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:250
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:364
 msgid "Bring up on boot"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:35
-msgid "Broadcom 802.11%s Wireless Controller"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:45
-msgid "Broadcom BCM%04x 802.11 Wireless Controller"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1697
+msgid "Browse…"
 msgstr ""
 
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:18
 msgid "Buffered"
 msgstr "Tamponlu"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:75
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:134
 msgid "CA certificate; if empty it will be saved after the first connection."
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:7
+msgid "CLAT configuration failed"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:13
 msgid "CPU usage (%)"
 msgstr "CPU kullanımı (%)"
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:21
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:53
 msgid "Call failed"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1789
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:14
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:52
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:711
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:948
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1839
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:191
 #: modules/luci-mod-system/luasrc/view/admin_system/upgrade.htm:60
 msgid "Cancel"
 msgstr "Vazgeç"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:6
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:17
 msgid "Category"
 msgstr "Kategori"
 
@@ -926,13 +938,7 @@ msgstr ""
 msgid "Chain"
 msgstr "Zincir"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:9
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:14
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:24
-msgid "Change login password"
-msgstr ""
-
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1744
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 msgid "Changes"
 msgstr "Değişiklikler"
 
@@ -940,33 +946,23 @@ msgstr "Değişiklikler"
 msgid "Changes applied."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2004
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2545
 msgid "Changes have been reverted."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:43
 msgid "Changes the administrator password for accessing the device"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:10
-msgid "Changing password…"
-msgstr ""
-
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:162
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:45
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:87
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:174
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:376
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1618
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:186
 msgid "Channel"
 msgstr "Kanal"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:119
-msgid ""
-"Channel %d is not available in the %s regulatory domain and has been auto-"
-"adjusted to %d."
-msgstr ""
-
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:229
 msgid "Check"
 msgstr ""
@@ -975,7 +971,7 @@ msgstr ""
 msgid "Check filesystems before mount"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1806
 msgid "Check this option to delete the existing networks from this radio."
 msgstr ""
 
@@ -987,8 +983,8 @@ msgstr ""
 msgid "Choose mtdblock"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:358
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:443
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1829
 msgid ""
 "Choose the firewall zone you want to assign to this interface. Select "
 "<em>unspecified</em> to remove the interface from the associated zone or "
@@ -996,17 +992,17 @@ msgid ""
 "interface to it."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:834
 msgid ""
 "Choose the network(s) you want to attach to this wireless interface or fill "
 "out the <em>create</em> field to define a new network."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:614
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1023
 msgid "Cipher"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:61
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:91
 msgid "Cisco UDP encapsulation"
 msgstr ""
 
@@ -1024,28 +1020,28 @@ msgid ""
 "FEATURE IS FOR PROFESSIONALS! )"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1950
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:369
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:471
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2189
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:803
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:908
 msgid "Client"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:55
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:52
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:47
 msgid "Client ID to send when requesting DHCP"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:145
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:151
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:155
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:161
 msgid "Close"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:146
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:119
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:125
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:127
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:98
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:119
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:157
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:141
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:115
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:138
 msgid ""
 "Close inactive connection after the given amount of seconds, use 0 to "
 "persist connection"
@@ -1058,12 +1054,9 @@ msgstr ""
 #: modules/luci-base/luasrc/view/lease_status.htm:77
 #: modules/luci-base/luasrc/view/lease_status.htm:98
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:118
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:37
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:24
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1965
 #: modules/luci-mod-network/luasrc/view/admin_network/iface_status.htm:6
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:40
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:30
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:8
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:398
 #: modules/luci-mod-status/luasrc/view/admin_status/index/30-network.htm:11
 #: modules/luci-mod-status/luasrc/view/admin_status/index/50-dsl.htm:17
@@ -1077,15 +1070,19 @@ msgstr ""
 msgid "Command"
 msgstr ""
 
-#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:64
-msgid "Comment"
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:193
+msgid "Command OK"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:41
+msgid "Command failed"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:185
-msgid "Common Configuration"
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:64
+msgid "Comment"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
 msgid ""
 "Complicates key reinstallation attacks on the client side by disabling "
 "retransmission of EAPOL-Key frames that are used to install keys. This "
@@ -1093,13 +1090,14 @@ msgid ""
 "negotiation especially in environments with heavy traffic load."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1744
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 #: modules/luci-base/luasrc/controller/admin/uci.lua:11
 #: modules/luci-mod-system/luasrc/view/admin_system/backupfiles.htm:9
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:13
 msgid "Configuration"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:21
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:63
 msgid "Configuration failed"
 msgstr ""
@@ -1108,89 +1106,89 @@ msgstr ""
 msgid "Configuration files will be kept"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1915
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2456
 msgid "Configuration has been applied."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1848
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2395
 msgid "Configuration has been rolled back!"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:43
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:942
+msgid "Confirm disconnect"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:50
 msgid "Confirmation"
 msgstr "Onayla"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:32
-msgid "Connect"
-msgstr "Bağlan"
-
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:72
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:105
 msgid "Connected"
 msgstr "Bağlandı"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:338
-msgid "Connection Limit"
-msgstr "Bağlantı limiti"
-
 #: modules/luci-base/htdocs/luci-static/resources/network.js:7
 #: modules/luci-base/luasrc/model/network.lua:27
 msgid "Connection attempt failed"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:203
+msgid "Connection lost"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/controller/admin/status.lua:32
 msgid "Connections"
 msgstr "Bağlantılar"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1890
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:66
+msgid "Contents have been saved."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:618
+msgid "Continue"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2431
 msgid ""
 "Could not regain access to the device after applying the configuration "
 "changes. You might need to reconnect if you modified network related "
 "settings such as the IP address or wireless security credentials."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:135
 msgid "Country"
 msgstr "Ülke"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:227
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:233
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:337
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:764
 msgid "Country Code"
 msgstr "Ülke Kodu"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:36
-msgid "Cover the following interface"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:43
-msgid "Cover the following interfaces"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:357
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:86
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:443
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1829
 msgid "Create / Assign firewall-zone"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:9
-msgid "Create Interface"
-msgstr "Arabirim Oluştur"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:33
-msgid "Create a bridge over multiple interfaces"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:735
+msgid "Create interface"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:174
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:165
 msgid "Critical"
 msgstr "Kritik"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:178
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:169
 msgid "Cron Log Level"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:519
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:521
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:447
+msgid "Current power"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:552
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:554
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:51
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:53
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:82
@@ -1198,7 +1196,7 @@ msgstr ""
 msgid "Custom Interface"
 msgstr "Özel Arabirim"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:36
 msgid "Custom delegated IPv6-prefix"
 msgstr ""
 
@@ -1208,52 +1206,53 @@ msgid ""
 "this, perform a factory-reset first."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:59
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:41
 msgid ""
 "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
 "\">LED</abbr>s if possible."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:799
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1223
 msgid "DAE-Client"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:807
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1231
 msgid "DAE-Port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:815
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1239
 msgid "DAE-Secret"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:448
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:459
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:279
 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:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:61
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:62
 msgid "DHCP and DNS"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1195
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1385
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:16
 #: modules/luci-base/luasrc/model/network.lua:968
 msgid "DHCP client"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:571
 msgid "DHCP-Options"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_dhcpv6.lua:7
 msgid "DHCPv6 client"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:540
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:594
 msgid "DHCPv6-Mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:529
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:583
 msgid "DHCPv6-Service"
 msgstr ""
 
@@ -1270,31 +1269,31 @@ msgstr ""
 msgid "DNS"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:183
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
 msgid "DNS forwardings"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:30
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:37
 msgid "DNS-Label / FQDN"
 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:136
 msgid "DNSSEC"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:139
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
 msgid "DNSSEC check unsigned"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:73
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:99
 msgid "DPD Idle Timeout"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:14
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:41
 msgid "DS-Lite AFTR address"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:92
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:815
 #: modules/luci-mod-status/luasrc/view/admin_status/index/50-dsl.htm:14
 msgid "DSL"
 msgstr ""
@@ -1303,11 +1302,11 @@ msgstr ""
 msgid "DSL Status"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:125
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:848
 msgid "DSL line mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:519
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:963
 msgid "DTIM Interval"
 msgstr ""
 
@@ -1319,77 +1318,92 @@ msgstr ""
 msgid "Data Rate"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:169
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:180
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:160
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:171
 msgid "Debug"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:759
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:783
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:807
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1183
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1207
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1231
 msgid "Default %d"
 msgstr "Varsayılan"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:82
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:107
 msgid "Default Route"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:17
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:81
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:51
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:32
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:48
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:85
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:65
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:80
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:108
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:146
 msgid "Default gateway"
 msgstr "Default ağ geçidi"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:541
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:594
 msgid "Default is stateless + stateful"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:70
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:54
 msgid "Default state"
 msgstr "Varsayılan durum"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:503
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:553
 msgid "Define a name for this network."
 msgstr "Bu ağ için bir ad tanımlayın."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:514
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:571
 msgid ""
 "Define additional DHCP options, for example "
 "\"<code>6,192.168.2.1,192.168.2.2</code>\" which advertises different DNS "
 "servers to clients."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:705
-#: modules/luci-base/htdocs/luci-static/resources/form.js:958
-#: modules/luci-base/htdocs/luci-static/resources/form.js:959
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1271
+#: modules/luci-base/htdocs/luci-static/resources/form.js:966
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1210
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1216
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1524
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1758
 #: modules/luci-base/luasrc/view/cbi/nsection.htm:11
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:162
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:16
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:41
 msgid "Delete"
 msgstr "Sil"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:178
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:187
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:193
 msgid "Delete key"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:45
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1654
+msgid "Delete permission denied"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1656
+msgid "Delete request failed: %d %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:723
 msgid "Delete this network"
 msgstr "Bu ağı sil"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:519
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:963
 msgid "Delivery Traffic Indication Message Interval"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:102
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:108
 msgid "Description"
 msgstr "Açıklama"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:224
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1754
+msgid "Deselect"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:215
 msgid "Design"
 msgstr "Tasarım"
 
@@ -1407,10 +1421,12 @@ msgstr ""
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:177
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:43
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:13
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:38
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:73
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:33
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:52
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:85
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:86
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:72
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:154
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:253
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:86
@@ -1418,15 +1434,24 @@ msgstr ""
 msgid "Device"
 msgstr "Cihaz"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:138
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:737
 msgid "Device Configuration"
 msgstr "Cihaz Yapılandırması"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:81
+msgid "Device is not active"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/reboot.htm:23
 msgid "Device is rebooting..."
 msgstr "Cihaz yeniden başlatılıyor..."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1889
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:167
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:513
+msgid "Device is restarting…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2430
 msgid "Device unreachable!"
 msgstr "Cihaz ulaşılamaz!"
 
@@ -1434,26 +1459,26 @@ 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:123
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:78
 #: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:61
 msgid "Diagnostics"
 msgstr "Tanı"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:45
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:60
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:101
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:93
 msgid "Dial number"
 msgstr "Arama numarası"
 
-#: modules/luci-base/luasrc/view/cbi/filebrowser.htm:99
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1554
 msgid "Directory"
 msgstr "Dizin"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:131
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:715
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:754
 msgid "Disable"
 msgstr "Pasif"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:472
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:531
 msgid ""
 "Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for "
 "this interface."
@@ -1461,71 +1486,66 @@ msgstr ""
 "Bu arabirim için <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr>'yi devre dışı bırakın."
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:64
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:93
 msgid "Disable Encryption"
 msgstr "Şifrelemeyi Devre Dışı"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:530
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:973
 msgid "Disable Inactivity Polling"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:713
 msgid "Disable this network"
 msgstr "Ağ devre dışı"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:44
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:54
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:68
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:37
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:43
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:37
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1534
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:76
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:107
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:99
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:51
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:95
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:82
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:69
 msgid "Disabled"
 msgstr "Devre dışı"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1139
-msgid "Disabled (default)"
-msgstr "Devre dışı (varsayılan)"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:544
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:987
 msgid "Disassociate On Low Acknowledgement"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:193
 msgid "Discard upstream RFC1918 responses"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:92
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:114
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:956
 msgid "Disconnect"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:22
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:64
 msgid "Disconnection attempt failed"
 msgstr "Bağlantı kesme girişimi başarısız oldu"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1121
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1762
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1855
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:17
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1375
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1995
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2314
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2401
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1634
 msgid "Dismiss"
 msgstr "Reddet"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:240
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:334
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:770
 msgid "Distance Optimization"
 msgstr "Mesafe Optimizasyonu"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:241
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:770
 msgid "Distance to farthest network member in meters."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:347
-msgid "Diversity"
-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:61
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
@@ -1533,35 +1553,43 @@ msgid ""
 "firewalls"
 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:159
 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:123
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:124
 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:118
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
 msgid "Do not forward reverse lookups for local networks"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:173
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1639
+msgid "Do you really want to delete \"%s\" ?"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:188
 msgid "Do you really want to delete the following SSH key?"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1637
+msgid "Do you really want to recursively delete the directory \"%s\" ?"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:74
 msgid "Domain required"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:205
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:206
 msgid "Domain whitelist"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:34
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:67
 msgid "Don't Fragment"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:74
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:75
 msgid ""
 "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
 "<abbr title=\"Domain Name System\">DNS</abbr>-Name"
@@ -1579,57 +1607,58 @@ msgstr ""
 msgid "Download mtdblock"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:853
 msgid "Downstream SNR offset"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:914
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1169
 msgid "Drag to reorder"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:9
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:11
 msgid "Dropbear Instance"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:6
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 msgid ""
 "Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access "
 "and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:11
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:14
 msgid "Dual-Stack Lite (RFC6333)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:493
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:547
 msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:60
 msgid "Dynamic tunnel"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:494
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:547
 msgid ""
 "Dynamically allocate DHCP addresses for clients. If disabled, only clients "
 "having static leases will be served."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:67
 msgid "EA-bits length"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:990
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1386
 msgid "EAP-Method"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:934
-#: modules/luci-base/htdocs/luci-static/resources/form.js:935
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1199
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1188
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1191
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1450
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:154
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:160
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:38
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:291
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:720
 msgid "Edit"
 msgstr ""
 
@@ -1639,90 +1668,91 @@ msgid ""
 "reload the page."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:38
-msgid "Edit this interface"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:718
+msgid "Edit this network"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:42
-msgid "Edit this network"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:669
+msgid "Edit wireless network"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:176
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:167
 msgid "Emergency"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:127
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:715
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:754
 msgid "Enable"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:414
 msgid ""
 "Enable <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> "
 "snooping"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:271
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:412
 msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:41
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:60
 msgid "Enable HE.net dynamic endpoint update"
 msgstr ""
 
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:51
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:89
 msgid "Enable IPv6 negotiation"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:23
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:35
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:41
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:35
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:37
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:49
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:80
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:54
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:67
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:93
 msgid "Enable IPv6 negotiation on the PPP link"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:143
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:188
 msgid "Enable Jumbo Frame passthrough"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:244
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:235
 msgid "Enable NTP client"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:69
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:96
 msgid "Enable Single DES"
 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:267
 msgid "Enable TFTP server"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:134
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:180
 msgid "Enable VLAN functionality"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1595
 msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1175
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
 msgid "Enable key reinstallation (KRACK) countermeasures"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:138
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:183
 msgid "Enable learning and aging"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:194
 msgid "Enable mirroring of incoming packets"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:151
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:195
 msgid "Enable mirroring of outgoing packets"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:34
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:67
 msgid "Enable the DF (Don't Fragment) flag of the encapsulating packets."
 msgstr ""
 
@@ -1730,7 +1760,7 @@ msgstr ""
 msgid "Enable this mount"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:713
 msgid "Enable this network"
 msgstr ""
 
@@ -1738,48 +1768,52 @@ msgstr ""
 msgid "Enable this swap"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:37
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:88
 msgid "Enable/Disable"
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:76
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:152
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:251
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:41
 msgid "Enabled"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:277
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:414
 msgid "Enables IGMP snooping on this bridge"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:892
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1310
 msgid ""
 "Enables fast roaming among access points that belong to the same Mobility "
 "Domain"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:272
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:412
 msgid "Enables the Spanning Tree Protocol on this bridge"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:120
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:180
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:59
+msgid "Encapsulation limit"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:843
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:901
 msgid "Encapsulation mode"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:76
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:603
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:129
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:992
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1621
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:177
 msgid "Encryption"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:155
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:128
 msgid "Endpoint Host"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:165
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:132
 msgid "Endpoint Port"
 msgstr ""
 
@@ -1791,16 +1825,21 @@ msgstr ""
 msgid "Enter custom values"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:273
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:271
 msgid "Erasing..."
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:95
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:96
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:97
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:98
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:99
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:106
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:107
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:108
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:109
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:110
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:173
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:164
 msgid "Error"
 msgstr ""
 
@@ -1808,24 +1847,28 @@ msgstr ""
 msgid "Errored seconds (ES)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1646
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1852
 #: modules/luci-base/luasrc/model/network.lua:1432
 msgid "Ethernet Adapter"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1637
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1843
 #: modules/luci-base/luasrc/model/network.lua:1422
 msgid "Ethernet Switch"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:303
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
 msgid "Exclude interfaces"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:153
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
 msgid "Expand hosts"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:195
+msgid "Expecting an hexadecimal assignment hint"
+msgstr ""
+
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:59
 msgid "Expecting: %s"
 msgstr ""
@@ -1834,60 +1877,76 @@ msgstr ""
 msgid "Expires"
 msgstr "Süre Bitişi"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:488
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:543
 msgid ""
 "Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:8
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:19
 msgid "External"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:971
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1377
 msgid "External R0 Key Holder List"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:980
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1381
 msgid "External R1 Key Holder List"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:150
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:141
 msgid "External system log server"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:155
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:146
 msgid "External system log server port"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:160
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:151
 msgid "External system log server protocol"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:18
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:79
 msgid "Extra SSH command options"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:940
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1351
 msgid "FT over DS"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:941
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1352
 msgid "FT over the Air"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:938
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1349
 msgid "FT protocol"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1842
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:82
+msgid "Failed to change the system password."
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2389
 msgid "Failed to confirm apply within %ds, waiting for rollback…"
 msgstr ""
 
-#: modules/luci-base/luasrc/view/cbi/filebrowser.htm:106
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:45
+msgid "Failed to execute \"/etc/init.d/%s %s\" action: %s"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1561
 msgid "File"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:279
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1514
+msgid "File not accessible"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1698
+msgid "Filename"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:280
 msgid "Filename of the boot image advertised to clients"
 msgstr ""
 
@@ -1897,14 +1956,15 @@ msgstr ""
 msgid "Filesystem"
 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:118
 msgid "Filter private"
 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:123
 msgid "Filter useless"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:23
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:65
 msgid "Finalizing failed"
 msgstr ""
@@ -1915,7 +1975,7 @@ msgid ""
 "with defaults based on what was detected"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:696
 msgid "Find and join network"
 msgstr ""
 
@@ -1927,11 +1987,11 @@ msgstr ""
 msgid "Firewall"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:77
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:76
 msgid "Firewall Mark"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:193
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:278
 msgid "Firewall Settings"
 msgstr ""
 
@@ -1939,7 +1999,7 @@ msgstr ""
 msgid "Firewall Status"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:137
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:860
 msgid "Firmware File"
 msgstr ""
 
@@ -1947,7 +2007,7 @@ msgstr ""
 msgid "Firmware Version"
 msgstr "Firmware Versiyon"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:225
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:226
 msgid "Fixed source port for outbound DNS queries"
 msgstr ""
 
@@ -1967,35 +2027,35 @@ msgstr "Yeni firmware dosyasını yaz"
 msgid "Flash operations"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:194
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:192
 msgid "Flashing..."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:498
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:550
 msgid "Force"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:258
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:782
 msgid "Force 40MHz mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:622
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1031
 msgid "Force CCMP (AES)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:499
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:550
 msgid "Force DHCP on this network even if another server is detected."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:623
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1032
 msgid "Force TKIP"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:624
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1033
 msgid "Force TKIP and CCMP (AES)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:795
 msgid "Force link"
 msgstr ""
 
@@ -2003,7 +2063,7 @@ msgstr ""
 msgid "Force upgrade"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:60
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:90
 msgid "Force use of NAT-T"
 msgstr ""
 
@@ -2011,7 +2071,7 @@ msgstr ""
 msgid "Form token mismatch"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:34
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:164
 msgid "Forward DHCP traffic"
 msgstr ""
 
@@ -2019,46 +2079,41 @@ msgstr ""
 msgid "Forward Error Correction Seconds (FECS)"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:28
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:161
 msgid "Forward broadcast traffic"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:375
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:809
 msgid "Forward mesh peer traffic"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:186
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:908
 msgid "Forwarding mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:255
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:596
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:774
 msgid "Fragmentation Threshold"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:332
-msgid "Frame Bursting"
-msgstr ""
-
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:17
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:28
 msgid "Free"
 msgstr "Boş"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:91
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:89
 msgid ""
-"Further information about WireGuard interfaces and peers at <a href=\"http://"
-"wireguard.com\">wireguard.com</a>."
+"Further information about WireGuard interfaces and peers at <a href='http://"
+"wireguard.com'>wireguard.com</a>."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:45
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:130
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:186
 msgid "GHz"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:29
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:36
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:91
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:77
 msgid "GPRS only"
 msgstr ""
 
@@ -2067,28 +2122,28 @@ msgstr ""
 msgid "Gateway"
 msgstr "Ağ Geçidi"
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:35
+msgid "Gateway Ports"
+msgstr ""
+
 #: modules/luci-base/htdocs/luci-static/resources/network.js:9
 #: modules/luci-base/luasrc/model/network.lua:29
 msgid "Gateway address is invalid"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:46
-msgid "Gateway ports"
-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:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:275
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:23
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:112
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:103
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:49
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:33
 msgid "General Settings"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:188
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:462
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:175
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:141
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:361
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:504
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:895
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:741
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:796
 msgid "General Setup"
 msgstr ""
 
@@ -2096,7 +2151,7 @@ msgstr ""
 msgid "Generate Config"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:945
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1355
 msgid "Generate PMK locally"
 msgstr ""
 
@@ -2104,11 +2159,7 @@ msgstr ""
 msgid "Generate archive"
 msgstr "Arşiv oluştur"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:63
-msgid "Generic 802.11%s Wireless Controller"
-msgstr ""
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:26
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:74
 msgid "Given password confirmation did not match, password not changed!"
 msgstr ""
 
@@ -2116,7 +2167,7 @@ msgstr ""
 msgid "Global Settings"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:806
 msgid "Global network options"
 msgstr ""
 
@@ -2127,33 +2178,29 @@ msgstr ""
 msgid "Go to password configuration..."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:857
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1369
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1112
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1616
 #: modules/luci-base/luasrc/view/cbi/full_valueheader.htm:4
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:58
 msgid "Go to relevant configuration page"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:38
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:66
 msgid "Group Password"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:11
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:22
 msgid "Guest"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:73
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:81
 msgid "HE.net password"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:60
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:73
 msgid "HE.net username"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:310
-msgid "HT mode (802.11n)"
-msgstr ""
-
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:16
 msgid "Hang Up"
 msgstr ""
@@ -2162,15 +2209,13 @@ msgstr ""
 msgid "Header Error Code Errors (HEC)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:103
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 msgid ""
 "Here you can configure the basic aspects of your device like its hostname or "
 "the timezone."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:499
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:556
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:579
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:941
 msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr ""
 
@@ -2181,14 +2226,15 @@ msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:92
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1959
 msgid "Host"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:20
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:21
 msgid "Host entries"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:48
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:171
 msgid "Host expiry timeout"
 msgstr ""
 
@@ -2196,45 +2242,45 @@ msgstr ""
 msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:118
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:102
 msgid "Host-Uniq tag content"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:71
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:31
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:316
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:25
+#: 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:317
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:26
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:17
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:125
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:116
 msgid "Hostname"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:12
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:22
 msgid "Hostname to send when requesting DHCP"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:18
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:19
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:67
 msgid "Hostnames"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:13
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:24
 msgid "Hybrid"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:45
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:75
 msgid "IKE DH Group"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:41
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:59
 msgid "IP Addresses"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:40
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:80
 msgid "IP Protocol"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:29
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:30
 msgid "IP address"
 msgstr ""
 
@@ -2253,6 +2299,11 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:20
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:21
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:22
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:79
+#: 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/network.js:89
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:90
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:91
@@ -2260,7 +2311,7 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:93
 #: 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/luasrc/model/cbi/admin_network/proto_ncm.lua:42
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:82
 msgid "IPv4"
 msgstr ""
 
@@ -2272,24 +2323,23 @@ msgstr ""
 msgid "IPv4 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:57
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:178
 msgid "IPv4 address"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:26
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:33
 msgid "IPv4 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:104
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:181
 msgid "IPv4 broadcast"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:100
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:180
 msgid "IPv4 gateway"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:92
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:179
 msgid "IPv4 netmask"
 msgstr ""
 
@@ -2297,24 +2347,25 @@ msgstr ""
 msgid "IPv4 network in address/netmask notation"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:25
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:52
 msgid "IPv4 prefix"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:42
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:30
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:55
 msgid "IPv4 prefix length"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:43
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:83
 msgid "IPv4+IPv6"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:72
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:34
 msgid "IPv4-Address"
 msgstr "IPv4-Adres"
 
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:10
 #: protocols/luci-proto-ipip/luasrc/model/network/proto_ipip.lua:9
 msgid "IPv4-in-IPv4 (RFC2003)"
 msgstr ""
@@ -2329,6 +2380,16 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:30
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:31
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:32
+#: 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/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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:89
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:90
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:91
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:92
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:95
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:96
@@ -2341,7 +2402,7 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:103
 #: 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/luasrc/model/cbi/admin_network/proto_ncm.lua:44
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:84
 msgid "IPv6"
 msgstr ""
 
@@ -2353,11 +2414,11 @@ msgstr ""
 msgid "IPv6 Neighbours"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:464
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:506
 msgid "IPv6 Settings"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:195
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:810
 msgid "IPv6 ULA-Prefix"
 msgstr ""
 
@@ -2365,21 +2426,21 @@ msgstr ""
 msgid "IPv6 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:202
 msgid "IPv6 address"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:23
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:189
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:31
 msgid "IPv6 assignment hint"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:18
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:184
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:27
 msgid "IPv6 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:207
 msgid "IPv6 gateway"
 msgstr ""
 
@@ -2387,22 +2448,22 @@ msgstr ""
 msgid "IPv6 network in address/netmask notation"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:37
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:59
 msgid "IPv6 prefix"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:34
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:45
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:63
 msgid "IPv6 prefix length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:33
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:211
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:57
 msgid "IPv6 routed prefix"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:143
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:215
 msgid "IPv6 suffix"
 msgstr ""
 
@@ -2412,31 +2473,35 @@ msgid "IPv6-Address"
 msgstr "IPv6-Adres"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:93
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:104
 msgid "IPv6-PD"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:10
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:13
 msgid "IPv6-in-IPv4 (RFC4213)"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:17
 msgid "IPv6-over-IPv4 (6rd)"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:15
 msgid "IPv6-over-IPv4 (6to4)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1075
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1478
 msgid "Identity"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:70
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:96
 msgid "If checked, 1DES is enabled"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:65
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:93
 msgid "If checked, encryption is disabled"
 msgstr ""
 
@@ -2453,36 +2518,36 @@ msgid ""
 "device node"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:27
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:71
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:18
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:82
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:52
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:17
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:29
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:33
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:68
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:85
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:32
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:45
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:45
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:24
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:44
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:116
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:48
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:85
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:65
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:33
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:80
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:108
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:146
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:74
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:97
 msgid "If unchecked, no default route is configured"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:34
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:86
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:35
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:99
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:47
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:60
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:60
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:39
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:59
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:124
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:39
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:116
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:59
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:103
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:64
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:77
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:100
 msgid "If unchecked, the advertised DNS server addresses are ignored"
 msgstr ""
 
@@ -2495,15 +2560,15 @@ msgid ""
 "of the <abbr title=\"Random Access Memory\">RAM</abbr>."
 msgstr ""
 
-#: 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:102
 msgid "Ignore <code>/etc/hosts</code>"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:471
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:531
 msgid "Ignore interface"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:90
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:91
 msgid "Ignore resolve file"
 msgstr ""
 
@@ -2521,12 +2586,12 @@ msgid ""
 "blocked. Click \"Continue »\" below to return to the previous page."
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:145
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:118
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:124
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:126
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:97
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:118
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:157
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:141
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:115
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:138
 msgid "Inactivity timeout"
 msgstr ""
 
@@ -2534,23 +2599,25 @@ msgstr ""
 msgid "Inbound:"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:170
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:161
 msgid "Info"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:105
 msgid "Information"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:25
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:67
 msgid "Initialization failure"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:34
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:87
 msgid "Initscript"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:26
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:122
 msgid "Initscripts"
 msgstr ""
 
@@ -2558,55 +2625,74 @@ msgstr ""
 msgid "Install iputils-traceroute6 for IPv6 traceroute"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:223
-msgid "Install package %q"
-msgstr ""
-
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:220
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:120
 msgid "Install protocol extensions..."
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:416
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:423
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:683
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:687
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:26
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:284
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:342
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:47
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:134
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:14
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:16
 msgid "Interface"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:58
 msgid "Interface %q device auto-migrated from %q to %q."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:356
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:792
 msgid "Interface Configuration"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:51
-msgid "Interface Overview"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:99
+msgid "Interface has %d pending changes"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:57
+msgid "Interface is marked for deletion"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:162
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:3
 msgid "Interface is reconnecting..."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:162
+msgid "Interface is shutting down..."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:205
+msgid "Interface is starting..."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:208
+msgid "Interface is stopping..."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:954
 msgid "Interface name"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:34
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:224
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:131
 msgid "Interface not present or not connected yet."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:88
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:16
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:11
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:287
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:54
 msgid "Interfaces"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:9
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:20
 msgid "Internal"
 msgstr ""
 
@@ -2619,19 +2705,35 @@ msgstr ""
 msgid "Invalid"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:311
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:10
+msgid "Invalid Base64 key string"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:281
 msgid "Invalid VLAN ID given! Only IDs between %d and %d are allowed."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:307
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:290
 msgid "Invalid VLAN ID given! Only unique IDs are allowed"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:195
+msgid "Invalid argument"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:194
+msgid "Invalid command"
+msgstr ""
+
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:80
+msgid "Invalid hexadecimal value"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/sysauth.htm:12
 msgid "Invalid username and/or password! Please try again."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:508
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:950
 msgid "Isolate Clients"
 msgstr ""
 
@@ -2648,15 +2750,15 @@ msgstr ""
 msgid "JavaScript required!"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:52
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1691
 msgid "Join Network"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:22
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1628
 msgid "Join Network: Wireless Scan"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:19
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1833
 msgid "Joining Network: %q"
 msgstr ""
 
@@ -2673,15 +2775,15 @@ msgstr ""
 msgid "Kernel Version"
 msgstr "Çekirdek Versiyonu"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:823
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1248
 msgid "Key"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:851
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:852
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:853
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:854
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:870
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1277
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1278
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1279
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1291
 msgid "Key #%d"
 msgstr ""
 
@@ -2689,33 +2791,34 @@ msgstr ""
 msgid "Kill"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:10
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:21
 msgid "L2TP"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:10
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:40
 msgid "L2TP Server"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:100
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:74
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:80
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:74
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:53
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:73
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:131
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:102
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:89
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:112
 msgid "LCP echo failure threshold"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:118
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:89
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:95
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:89
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:68
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:91
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:144
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:102
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:125
 msgid "LCP echo interval"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:181
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:902
 msgid "LLC"
 msgstr ""
 
@@ -2724,11 +2827,11 @@ msgstr ""
 msgid "Label"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:213
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:204
 msgid "Language"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:115
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:106
 msgid "Language and Style"
 msgstr ""
 
@@ -2736,51 +2839,51 @@ msgstr ""
 msgid "Latency"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:10
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:21
 msgid "Leaf"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:369
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:487
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:393
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:543
 msgid "Lease time"
 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:87
 msgid "Leasefile"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:74
 #: modules/luci-base/luasrc/view/lease_status.htm:95
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:34
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
 msgid "Leasetime remaining"
 msgstr "Kalan kira süresi"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:9
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:20
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:27
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:50
 msgid "Leave empty to autodetect"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:21
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:45
 msgid "Leave empty to use the current WAN address"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1746
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2299
 msgid "Legend:"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:481
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:538
 msgid "Limit"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:287
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:288
 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:299
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:300
 msgid "Limit listening to these interfaces, and loopback."
 msgstr ""
 
@@ -2800,17 +2903,17 @@ msgstr ""
 msgid "Line Uptime"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:101
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:88
 msgid "Link On"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:185
 msgid ""
 "List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
 "requests to"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:972
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1377
 msgid ""
 "List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-"
 "Identifier,128-bit key as hex string. <br />This list is used to map R0KH-ID "
@@ -2819,7 +2922,7 @@ msgid ""
 "Association."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:981
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1381
 msgid ""
 "List of R1KHs in the same Mobility Domain. <br />Format: MAC-address,R1KH-ID "
 "as 6 octets with colons,128-bit key as hex string. <br />This list is used "
@@ -2828,31 +2931,31 @@ msgid ""
 "PMK-R1 keys."
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:21
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:82
 msgid "List of SSH key files for auth"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:206
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:207
 msgid "List of domains to allow RFC1918 responses for"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:174
 msgid "List of hosts that supply bogus NX domain results"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:298
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:299
 msgid "Listen Interfaces"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:30
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:54
 msgid "Listen Port"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:15
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:16
 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:216
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:217
 msgid "Listening port for inbound DNS queries"
 msgstr ""
 
@@ -2871,11 +2974,11 @@ msgstr "Ortalama Yük"
 msgid "Loading"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:35
-msgid "Loading SSH keys…"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1819
+msgid "Loading directory contents…"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1204
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1296
 #: modules/luci-base/luasrc/view/view.htm:4
 msgid "Loading view…"
 msgstr ""
@@ -2885,77 +2988,73 @@ msgstr ""
 msgid "Local IP address is invalid"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:25
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:86
 msgid "Local IP address to assign"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:10
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:11
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:44
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:39
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:151
 msgid "Local IPv4 address"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:20
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:54
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:45
 msgid "Local IPv6 address"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:286
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:287
 msgid "Local Service Only"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:81
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:126
 msgid "Local Startup"
 msgstr ""
 
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:25
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:121
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:112
 msgid "Local Time"
 msgstr "Yerel Zaman"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:149
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
 msgid "Local domain"
 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:147
 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:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:151
 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:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
 msgid "Local server"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:129
 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:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:128
 msgid "Localise queries"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:175
-msgid "Locked to channel %s used by: %s"
-msgstr ""
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:168
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:159
 msgid "Log output level"
 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:181
 msgid "Log queries"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:113
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:104
 msgid "Logging"
 msgstr ""
 
@@ -2963,7 +3062,7 @@ msgstr ""
 msgid "Login"
 msgstr "Oturum Aç"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:95
+#: modules/luci-base/luasrc/controller/admin/index.lua:103
 msgid "Logout"
 msgstr "Oturumu Kapat"
 
@@ -2971,11 +3070,13 @@ msgstr "Oturumu Kapat"
 msgid "Loss of Signal Seconds (LOSS)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:476
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:533
 msgid "Lowest leased address as offset from the network address."
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:40
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:75
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:35
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:86
 msgid "MAC"
@@ -2983,32 +3084,32 @@ msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:73
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:109
-#: 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:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1958
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:86
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:133
 msgid "MAC-Address"
 msgstr "MAC-Adres"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:457
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:586
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:886
 msgid "MAC-Address Filter"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:142
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:363
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:798
 msgid "MAC-Filter"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:464
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:590
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:893
 msgid "MAC-List"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:13
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:16
 msgid "MAP / LW4over6"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:62
 msgid "MAP rule is invalid"
 msgstr ""
@@ -3026,8 +3127,8 @@ msgid "MHz"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:53
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:29
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:66
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:53
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:71
 msgid "MTU"
 msgstr ""
 
@@ -3037,16 +3138,17 @@ msgid ""
 "below:"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:55
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:69
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:26
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:38
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:38
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:108
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:52
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:96
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:83
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:57
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:70
 msgid "Manual"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1949
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2188
 msgid "Master"
 msgstr ""
 
@@ -3054,48 +3156,46 @@ msgstr ""
 msgid "Max. Attainable Data Rate (ATTNDR)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:539
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:982
 msgid "Maximum allowed Listen Interval"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:234
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
 msgid "Maximum allowed number of active DHCP leases"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:252
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:253
 msgid "Maximum allowed number of concurrent DNS queries"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:244
 msgid "Maximum allowed size of EDNS.0 UDP packets"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:63
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:77
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:57
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:112
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:104
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:93
 msgid "Maximum amount of seconds to wait for the modem to become ready"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:27
-msgid ""
-"Maximum length of the name is 15 characters including the automatic protocol/"
-"bridge prefix (br-, 6in4-, pppoe- etc.)"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:538
+msgid "Maximum number of leased addresses."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:482
-msgid "Maximum number of leased addresses."
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:761
+msgid "Maximum transmit power"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:21
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:49
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:134
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:187
 #: modules/luci-mod-status/luasrc/view/admin_status/bandwidth.htm:79
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:284
 msgid "Mbit/s"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:18
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:32
 msgid "Medium"
 msgstr ""
 
@@ -3107,42 +3207,43 @@ msgstr "Bellek"
 msgid "Memory usage (%)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1952
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2191
 msgid "Mesh"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:372
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:806
 msgid "Mesh Id"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:196
+msgid "Method not found"
+msgstr ""
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:45
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:76
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:104
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:54
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:66
 msgid "Metric"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:154
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:198
 msgid "Mirror monitor port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:153
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:197
 msgid "Mirror source port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:408
-msgid "Missing protocol extension for proto %q"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:923
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1337
 msgid "Mobility Domain"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:154
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:41
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:74
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:366
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:31
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:360
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:801
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1619
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:175
 msgid "Mode"
 msgstr ""
@@ -3151,39 +3252,38 @@ msgstr ""
 msgid "Model"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:31
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:72
 msgid "Modem default"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:11
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:19
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:11
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:10
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:73
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:73
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:57
 msgid "Modem device"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:24
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:66
 msgid "Modem information query failed"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:62
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:76
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:56
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:112
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:104
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:93
 msgid "Modem init timeout"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1953
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:452
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:554
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:577
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2192
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:880
 msgid "Monitor"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:14
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
 msgid "More Characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:802
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1057
 msgid "More…"
 msgstr ""
 
@@ -3196,7 +3296,7 @@ msgstr ""
 msgid "Mount Point"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:26
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:36
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:137
 msgid "Mount Points"
@@ -3244,46 +3344,44 @@ msgstr ""
 msgid "Move up"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:912
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
 msgid "NAS ID"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:57
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:87
 msgid "NAT-T Mode"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:9
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 msgid "NAT64 Prefix"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:31
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:26
 msgid "NCM"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:535
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:589
 msgid "NDP-Proxy"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:43
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:72
 msgid "NT Domain"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:273
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:264
 msgid "NTP server candidates"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:837
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1092
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:27
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:502
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:65
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:553
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:658
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:49
 msgid "Name"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:17
-msgid "Name of the new interface"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1808
 msgid "Name of the new network"
 msgstr ""
 
@@ -3291,9 +3389,10 @@ msgstr ""
 msgid "Navigation"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:62
+#: modules/luci-base/luasrc/controller/admin/index.lua:69
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:108
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:402
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:834
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1957
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:389
 #: modules/luci-mod-status/luasrc/view/admin_status/index/30-network.htm:8
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:73
@@ -3305,7 +3404,7 @@ msgstr "Ağ"
 msgid "Network Utilities"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:278
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:279
 msgid "Network boot image"
 msgstr ""
 
@@ -3318,53 +3417,59 @@ msgstr ""
 msgid "Network without interfaces."
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:661
+msgid "New interface name…"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:11
 msgid "Next »"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1507
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1754
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:108
 msgid "No"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:453
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:514
 msgid "No DHCP Server configured for this interface"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1162
+msgid "No Encryption"
+msgstr ""
+
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:89
 msgid "No NAT-T"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:198
+msgid "No data received"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1764
+msgid "No entries in this directory"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/backupfiles.lua:82
 msgid "No files found"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:550
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:191
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:180
 msgid "No information available"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:8
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:63
 msgid "No matching prefix delegation"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:157
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
 msgid "No negative cache"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:53
-msgid "No network configured on this device"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:65
-msgid "No network name specified"
-msgstr ""
-
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:147
-msgid "No networks in range"
-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
@@ -3372,7 +3477,12 @@ msgstr ""
 msgid "No password set!"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:116
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:104
+msgid "No peers defined yet"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:129
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:271
 msgid "No public keys present yet."
 msgstr ""
 
@@ -3380,19 +3490,19 @@ msgstr ""
 msgid "No rules in this chain."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:150
-msgid "No scan results available yet..."
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:53
+msgid "No signal"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:7
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:756
 msgid "No zone assigned"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:111
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:35
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:48
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:133
 msgid "Noise"
 msgstr "Parazit"
 
@@ -3408,16 +3518,16 @@ msgstr ""
 msgid "Non Pre-emtive CRC errors (CRC_P)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:292
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:293
 msgid "Non-wildcard"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:129
 msgid "None"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:181
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:172
 msgid "Normal"
 msgstr ""
 
@@ -3425,25 +3535,29 @@ msgstr ""
 msgid "Not Found"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:27
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:5
-msgid "Not associated"
-msgstr ""
-
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:87
 msgid "Not connected"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:38
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:139
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:232
+msgid "Not present"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:105
 msgid "Not started on boot"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:26
-msgid "Note: interface name length"
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:201
+msgid "Not supported"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:171
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:162
 msgid "Notice"
 msgstr ""
 
@@ -3451,57 +3565,50 @@ msgstr ""
 msgid "Nslookup"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:261
 msgid "Number of cached DNS entries (max is 10000, 0 is no caching)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:203
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:194
 msgid "Number of parallel threads used for compression"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:40
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:69
 msgid "Obfuscated Group Password"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:35
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:61
 msgid "Obfuscated Password"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:22
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:34
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:40
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:105
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:97
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:49
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:80
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:54
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:67
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:93
 msgid "Obtain IPv6-Address"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:83
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:68
 msgid "Off-State Delay"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:16
-msgid ""
-"On this page you can configure the network interfaces. You can bridge "
-"several interfaces by ticking the \"bridge interfaces\" field and enter the "
-"names of several network interfaces separated by spaces. You can also use "
-"<abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
-"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
-"<samp>eth0.1</samp>)."
-msgstr ""
-
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:95
 msgid "On-Link route"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:80
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:64
 msgid "On-State Delay"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:360
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:382
 msgid "One of hostname or mac address must be specified!"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:456
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:462
 msgid "One of the following: %s"
 msgstr ""
 
@@ -3523,34 +3630,35 @@ msgstr ""
 msgid "Open list..."
 msgstr ""
 
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:61
 #: protocols/luci-proto-openconnect/luasrc/model/network/proto_openconnect.lua:9
 msgid "OpenConnect (CISCO AnyConnect)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:757
 msgid "Operating frequency"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1753
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2306
 msgid "Option changed"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1755
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2308
 msgid "Option removed"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1140
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:55
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1535
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:66
 msgid "Optional"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:78
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:76
 msgid ""
 "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, "
 "starting with <code>0x</code>."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:144
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:215
 msgid ""
 "Optional. Allowed values: 'eui64', 'random', fixed value like '::1' or "
 "'::1:2'. When IPv6 prefix (like 'a:b:c:d::') is received from a delegating "
@@ -3558,41 +3666,41 @@ msgid ""
 "for the interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:123
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:117
 msgid ""
 "Optional. Base64-encoded preshared key. Adds in an additional layer of "
 "symmetric-key cryptography for post-quantum resistance."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:148
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:126
 msgid "Optional. Create routes for Allowed IPs for this peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:103
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:108
 msgid "Optional. Description of peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:156
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:128
 msgid ""
 "Optional. Host of peer. Names are resolved prior to bringing up the "
 "interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:67
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:71
 msgid "Optional. Maximum Transmission Unit of tunnel interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:166
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:132
 msgid "Optional. Port of peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:175
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:136
 msgid ""
 "Optional. Seconds between keep alive messages. Default is 0 (disabled). "
 "Recommended value if this device is behind a NAT is 25."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:31
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:54
 msgid "Optional. UDP port used for outgoing and incoming packets."
 msgstr ""
 
@@ -3613,7 +3721,7 @@ msgstr ""
 msgid "Outbound:"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:26
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:50
 msgid "Output Interface"
 msgstr ""
 
@@ -3622,51 +3730,51 @@ msgstr ""
 msgid "Output zone"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:63
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:155
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:33
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:54
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:54
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:219
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:50
 msgid "Override MAC address"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:66
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:35
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:56
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:88
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:125
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:131
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:133
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:104
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:61
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:58
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:223
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:44
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:54
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:154
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:71
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:145
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:132
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:110
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:119
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:97
 msgid "Override MTU"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:30
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:63
 msgid "Override TOS"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:25
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:58
 msgid "Override TTL"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:954
 msgid "Override default interface name"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:41
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:167
 msgid "Override the gateway in DHCP responses"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:507
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:555
 msgid ""
 "Override the netmask sent to clients. Normally it is calculated from the "
 "subnet that is served."
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:65
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:179
 msgid "Override the table used for internal routes"
 msgstr ""
 
@@ -3674,29 +3782,33 @@ msgstr ""
 msgid "Overview"
 msgstr "Genel Bakış"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1606
+msgid "Overwrite existing file \"%s\" ?"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:11
 msgid "Owner"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:42
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:56
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:17
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:28
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:34
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:14
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:18
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:43
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:98
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:45
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:44
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:63
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:82
 msgid "PAP/CHAP password"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:39
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:53
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:14
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:11
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:15
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:96
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:88
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:43
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:74
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:42
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:61
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:77
 msgid "PAP/CHAP username"
 msgstr ""
 
@@ -3704,9 +3816,9 @@ msgstr ""
 msgid "PID"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:36
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:50
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:26
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:95
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:87
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:68
 msgid "PIN"
 msgstr ""
 
@@ -3715,114 +3827,116 @@ msgstr ""
 msgid "PIN code rejected"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:966
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1372
 msgid "PMK R1 Push"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:43
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:13
 msgid "PPP"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:11
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:58
 msgid "PPPoA Encapsulation"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:19
 msgid "PPPoATM"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:17
 msgid "PPPoE"
 msgstr ""
 
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:28
 #: protocols/luci-proto-pppossh/luasrc/model/network/proto_pppossh.lua:9
 msgid "PPPoSSH"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:15
 msgid "PPtP"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:59
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:73
 msgid "PSID offset"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:56
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:70
 msgid "PSID-bits length"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:123
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:846
 msgid "PTM/EFM (Packet Transfer Mode)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:78
-msgid "Package libiwinfo required!"
-msgstr ""
-
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:45
 msgid "Packets"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:7
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:756
 msgid "Part of zone %q"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/sysauth.htm:29
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1111
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:35
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:42
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1514
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:46
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:104
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:58
 msgid "Password"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:29
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:24
 msgid "Password authentication"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1019
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1414
 msgid "Password of Private Key"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1067
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1471
 msgid "Password of inner Private Key"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:14
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:16
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:18
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:20
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:32
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:34
 msgid "Password strength"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:44
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:107
 msgid "Password2"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:37
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:244
 msgid "Paste or drag SSH key file…"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1000
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1396
 msgid "Path to CA-Certificate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1007
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1402
 msgid "Path to Client-Certificate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1013
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1408
 msgid "Path to Private Key"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1049
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1453
 msgid "Path to inner CA-Certificate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1055
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1459
 msgid "Path to inner Client-Certificate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1061
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1465
 msgid "Path to inner Private Key"
 msgstr ""
 
@@ -3840,7 +3954,7 @@ msgstr ""
 msgid "Peak:"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:28
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:89
 msgid "Peer IP address to assign"
 msgstr ""
 
@@ -3849,11 +3963,11 @@ msgstr ""
 msgid "Peer address is missing"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:90
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:89
 msgid "Peers"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:50
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:80
 msgid "Perfect Forward Secrecy"
 msgstr ""
 
@@ -3865,7 +3979,11 @@ msgstr ""
 msgid "Perform reset"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:174
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:199
+msgid "Permission denied"
+msgstr ""
+
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:136
 msgid "Persistent Keep Alive"
 msgstr ""
 
@@ -3873,7 +3991,7 @@ msgstr ""
 msgid "Phy Rate:"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:190
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:277
 msgid "Physical Settings"
 msgstr ""
 
@@ -3884,6 +4002,10 @@ msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:16
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:17
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:41
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:77
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:87
@@ -3901,15 +4023,19 @@ msgstr ""
 msgid "Policy"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:22
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:20
 msgid "Port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:18
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:133
+msgid "Port %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:274
 msgid "Port status:"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:482
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:488
 msgid "Potential negation of: %s"
 msgstr ""
 
@@ -3921,11 +4047,11 @@ msgstr ""
 msgid "Pre-emtive CRC errors (CRCP_P)"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:32
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:73
 msgid "Prefer LTE"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:33
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:74
 msgid "Prefer UMTS"
 msgstr ""
 
@@ -3933,31 +4059,30 @@ msgstr ""
 msgid "Prefix Delegated"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:122
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:117
 msgid "Preshared Key"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:101
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:75
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:81
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:75
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:54
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:74
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:131
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:102
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:89
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:112
 msgid ""
 "Presume peer to be dead after given amount of LCP echo failures, use 0 to "
 "ignore failures"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:305
 msgid "Prevent listening on these interfaces."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:509
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:562
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:950
 msgid "Prevents client-to-client communication"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:18
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:49
 msgid "Private Key"
 msgstr ""
 
@@ -3978,39 +4103,33 @@ msgstr ""
 msgid "Prot."
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:72
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:349
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:675
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:84
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:216
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:87
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:390
 msgid "Protocol"
 msgstr "Protokol"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:31
-msgid "Protocol of the new interface"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:222
-msgid "Protocol support is not installed"
-msgstr ""
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:269
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:260
 msgid "Provide NTP server"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:701
 msgid "Provide new network"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:451
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:879
 msgid "Pseudo Ad-Hoc (ahdemo)"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:112
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:113
 msgid "Public Key"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:278
 msgid ""
 "Public keys allow for the passwordless SSH logins with a higher security "
 "compared to the use of plain passwords. In order to upload a new key to the "
@@ -4018,47 +4137,48 @@ msgid ""
 "code> file into the input field."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:139
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:211
 msgid "Public prefix routed to this device for distribution to clients."
 msgstr ""
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:27
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:9
 msgid "QMI Cellular"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:173
 msgid "Quality"
 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:171
 msgid ""
 "Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> "
 "servers"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:952
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1360
 msgid "R0 Key Lifetime"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:959
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1366
 msgid "R1 Key Holder"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:58
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:88
 msgid "RFC3947 NAT-T mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:381
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:814
 msgid "RSSI threshold for joining"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:256
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:597
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:778
 msgid "RTS/CTS Threshold"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:41
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:76
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:87
 msgid "RX"
@@ -4068,35 +4188,39 @@ msgstr ""
 msgid "RX Rate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:783
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1961
+msgid "RX Rate / TX Rate"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1207
 msgid "Radius-Accounting-Port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:791
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1215
 msgid "Radius-Accounting-Secret"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:775
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1199
 msgid "Radius-Accounting-Server"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:759
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1183
 msgid "Radius-Authentication-Port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:767
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1191
 msgid "Radius-Authentication-Secret"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:751
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1175
 msgid "Radius-Authentication-Server"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:119
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:102
 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:83
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:84
 msgid ""
 "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-Server"
@@ -4108,17 +4232,11 @@ msgid ""
 "access to this device if you are connected via this interface"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2
-msgid ""
-"Really delete this wireless network? The deletion cannot be undone! You "
-"might lose access to this device if you are connected via this network."
-msgstr ""
-
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:40
 msgid "Really reset all changes?"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:237
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:354
 msgid "Really switch protocol?"
 msgstr ""
 
@@ -4142,15 +4260,15 @@ msgstr ""
 msgid "Realtime Wireless"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:931
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1343
 msgid "Reassociation Deadline"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:191
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
 msgid "Rebind protection"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:48
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:46
 #: modules/luci-mod-system/luasrc/view/admin_system/reboot.htm:9
 msgid "Reboot"
 msgstr ""
@@ -4164,21 +4282,15 @@ msgstr ""
 msgid "Reboots the operating system of your device"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:103
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:90
 msgid "Receive"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:325
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:350
-msgid "Receiver Antenna"
-msgstr ""
-
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:42
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:59
 msgid "Recommended. IP addresses of the WireGuard interface."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:28
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:300
 msgid "Reconnect this interface"
 msgstr ""
 
@@ -4186,92 +4298,134 @@ msgstr ""
 msgid "References"
 msgstr ""
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:39
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:153
 msgid "Relay"
 msgstr ""
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:36
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:157
 msgid "Relay Bridge"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:17
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:154
 msgid "Relay between networks"
 msgstr ""
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:64
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:12
 msgid "Relay bridge"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:18
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:50
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:49
 msgid "Remote IPv4 address"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:8
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:40
 msgid "Remote IPv4 address or FQDN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:45
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:725
 msgid "Remove"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:53
-msgid "Repeat scan"
-msgstr ""
-
-#: modules/luci-base/luasrc/view/cbi/upload.htm:11
-msgid "Replace entry"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:46
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:51
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1806
 msgid "Replace wireless configuration"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:8
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:17
 msgid "Request IPv6-address"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:16
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:23
 msgid "Request IPv6-prefix of length"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1141
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:200
+msgid "Request timeout"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1536
 msgid "Required"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:20
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:31
 msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:19
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:49
 msgid "Required. Base64-encoded private key for this interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:113
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:113
 msgid "Required. Base64-encoded public key of peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:136
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:122
 msgid ""
 "Required. IP addresses and prefixes that this peer is allowed to use inside "
 "the tunnel. Usually the peer's tunnel IP addresses and the networks the peer "
 "routes through the tunnel."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1134
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1095
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1096
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1097
+msgid "Requires hostapd"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1101
+msgid "Requires hostapd with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1102
+msgid "Requires hostapd with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1098
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1099
+msgid "Requires hostapd with SAE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1533
 msgid ""
 "Requires the 'full' version of wpad/hostapd and support from the wifi driver "
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:141
 msgid ""
 "Requires upstream supports DNSSEC; verify unsigned domain responses really "
 "come from unsigned domains"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1268
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1109
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1119
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1120
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1121
+msgid "Requires wpa-supplicant"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1113
+msgid "Requires wpa-supplicant with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1114
+msgid "Requires wpa-supplicant with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1111
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1124
+msgid "Requires wpa-supplicant with SAE support"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1355
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:17
 #: modules/luci-base/luasrc/view/cbi/footer.htm:30
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:66
@@ -4287,17 +4441,22 @@ 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:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:68
 msgid "Resolv and Hosts Files"
 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:94
 msgid "Resolve file"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:28
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:14
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:71
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:197
+msgid "Resource not found"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:302
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:693
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:90
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:112
 msgid "Restart"
 msgstr "Tekrar başlat"
 
@@ -4305,7 +4464,7 @@ msgstr "Tekrar başlat"
 msgid "Restart Firewall"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:14
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:691
 msgid "Restart radio interface"
 msgstr ""
 
@@ -4317,26 +4476,24 @@ msgstr "Geri Yükleme"
 msgid "Restore backup"
 msgstr "Yedeklemeyi geri yükle"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:113
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:114
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:38
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:46
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:119
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:120
 msgid "Reveal/hide password"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1774
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2322
 msgid "Revert"
 msgstr "Dönmek"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1861
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2405
 msgid "Revert changes"
 msgstr "Değişiklikleri geri al"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2013
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2554
 msgid "Revert request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1993
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2534
 msgid "Reverting configuration…"
 msgstr ""
 
@@ -4344,7 +4501,7 @@ msgstr ""
 msgid "Root"
 msgstr "Kök"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:271
 msgid "Root directory for files served via TFTP"
 msgstr ""
 
@@ -4352,7 +4509,7 @@ msgstr ""
 msgid "Root preparation"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:147
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:126
 msgid "Route Allowed IPs"
 msgstr ""
 
@@ -4364,12 +4521,12 @@ msgstr ""
 msgid "Route type"
 msgstr "Yönlendirme Tipi"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:523
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:577
 msgid "Router Advertisement-Service"
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:43
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:15
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:27
 msgid "Router Password"
 msgstr "Yönlendirici Parolası"
 
@@ -4397,7 +4554,7 @@ msgstr "Cihazı bağlamadan önce bir dosya sistemi kontrolü yapın"
 msgid "Run filesystem check"
 msgstr "Dosya sistemi kontrolünü çalıştır"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:651
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:669
 msgid "Runtime error"
 msgstr ""
 
@@ -4409,31 +4566,31 @@ msgstr "SHA256"
 msgid "SNR"
 msgstr "SNR"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:5
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:18
 msgid "SSH Access"
 msgstr "SSH Erişimi"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:10
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:70
 msgid "SSH server address"
 msgstr "SSH sunucu adresi"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:13
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:74
 msgid "SSH server port"
 msgstr "SSH sunucu portu"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:8
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:58
 msgid "SSH username"
 msgstr "SSH kullanıcı adı"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:27
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:277
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
 msgid "SSH-Keys"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:42
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:73
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:29
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1617
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:174
 msgid "SSID"
 msgstr "SSID"
@@ -4442,17 +4599,17 @@ msgstr "SSID"
 msgid "SWAP"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1127
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1262
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1379
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1351
 #: modules/luci-base/luasrc/view/cbi/error.htm:17
 #: modules/luci-base/luasrc/view/cbi/footer.htm:26
 #: modules/luci-base/luasrc/view/cbi/header.htm:17
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:54
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:133
 msgid "Save"
 msgstr "Kaydet"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1256
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1768
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1347
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2318
 #: modules/luci-base/luasrc/view/cbi/footer.htm:22
 msgid "Save & Apply"
 msgstr "Kaydet & Uygula"
@@ -4465,28 +4622,20 @@ msgstr ""
 msgid "Save mtdblock contents"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
-msgid "Saving keys…"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:698
 msgid "Scan"
 msgstr "Tara"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:109
-msgid "Scan request failed"
-msgstr ""
-
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:8
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:39
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:23
 msgid "Scheduled Tasks"
 msgstr "Zamanlanmış Görevler"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1749
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2302
 msgid "Section added"
 msgstr "Bölüm eklendi"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1751
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2304
 msgid "Section removed"
 msgstr "Bölüm kaldırıldı"
 
@@ -4501,61 +4650,66 @@ msgid ""
 "your device!"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:119
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:90
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:96
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:90
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:69
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:92
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1516
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1646
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1809
+msgid "Select file…"
+msgstr ""
+
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:144
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:102
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:125
 msgid ""
 "Send LCP echo requests at the given interval in seconds, only effective in "
 "conjunction with failure threshold"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:561
-msgid "Separate Clients"
-msgstr ""
-
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:62
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:63
 msgid "Server Settings"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:26
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:50
 msgid "Service Name"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:25
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:30
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:87
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:71
 msgid "Service Type"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:55
+#: modules/luci-base/luasrc/controller/admin/index.lua:62
 msgid "Services"
 msgstr "Servisler"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:815
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:861
 msgid "Session expired"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:83
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:107
 msgid "Set VPN as Default Route"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:258
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:795
 msgid ""
 "Set interface properties regardless of the link carrier (If set, carrier "
 "sense events do not invoke hotplug handlers)."
 msgstr ""
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:23
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:55
 msgid "Setting PLMN failed"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:26
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:68
 msgid "Setting operation mode failed"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:454
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:517
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:527
 msgid "Setup DHCP Server"
 msgstr ""
 
@@ -4567,7 +4721,7 @@ msgstr ""
 msgid "Short GI"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:516
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:960
 msgid "Short Preamble"
 msgstr ""
 
@@ -4579,21 +4733,23 @@ msgstr ""
 msgid "Show empty chains"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:306
 msgid "Shutdown this interface"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:111
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:34
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:47
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:132
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1616
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:173
 msgid "Signal"
 msgstr "Sinyal"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1960
+msgid "Signal / Noise"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:125
 msgid "Signal Attenuation (SATN)"
 msgstr "Sinyal Zayıflama (SATN)"
@@ -4606,11 +4762,11 @@ msgstr "Sinyal:"
 msgid "Size"
 msgstr "Boyut"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:259
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:260
 msgid "Size of DNS query cache"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:191
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
 msgid "Size of the ZRam device in megabytes"
 msgstr ""
 
@@ -4627,11 +4783,7 @@ msgstr ""
 msgid "Skip to navigation"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:335
-msgid "Slot time"
-msgstr ""
-
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1640
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1846
 #: modules/luci-base/luasrc/model/network.lua:1427
 msgid "Software VLAN"
 msgstr ""
@@ -4669,61 +4821,65 @@ msgstr ""
 msgid "Specifies the directory the device is attached to"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:23
-msgid "Specifies the listening port of this <em>Dropbear</em> instance"
-msgstr ""
-
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:57
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:175
 msgid ""
 "Specifies the maximum amount of failed ARP requests until hosts are presumed "
 "to be dead"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:49
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:171
 msgid ""
 "Specifies the maximum amount of seconds after which hosts are presumed to be "
 "dead"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:761
+msgid ""
+"Specifies the maximum transmit power the wireless radio may use. Depending "
+"on regulatory requirements and wireless usage, the actual transmit power may "
+"be reduced by the driver."
+msgstr ""
+
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:63
 msgid "Specify a TOS (Type of Service)."
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:25
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:58
 msgid ""
 "Specify a TTL (Time to Live) for the encapsulating packet other than the "
 "default (64)."
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:53
 msgid ""
 "Specify an MTU (Maximum Transmission Unit) other than the default (1280 "
 "bytes)."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:60
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "Specify the secret encryption key here."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:475
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:64
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:533
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:89
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:111
 msgid "Start"
 msgstr "Başlat"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:33
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:86
 msgid "Start priority"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1958
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2499
 msgid "Starting configuration apply…"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1626
 msgid "Starting wireless scan..."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:24
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:120
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
 msgid "Startup"
 msgstr ""
 
@@ -4735,59 +4891,62 @@ msgstr ""
 msgid "Static IPv6 Routes"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:70
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:71
 msgid "Static Leases"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:118
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:73
 msgid "Static Routes"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1194
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1384
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:172
 #: modules/luci-base/luasrc/model/network.lua:966
 msgid "Static address"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:308
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:309
 msgid ""
 "Static leases are used to assign fixed IP addresses and symbolic hostnames "
 "to DHCP clients. They are also required for non-dynamic interface "
 "configurations where only hosts with a corresponding lease are served."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:534
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:977
 msgid "Station inactivity limit"
 msgstr ""
 
 #: modules/luci-base/luasrc/controller/admin/index.lua:40
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:197
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:337
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:746
 #: modules/luci-mod-status/luasrc/view/admin_status/index.htm:128
 msgid "Status"
 msgstr "Durum"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:35
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:75
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:308
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:91
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:113
 msgid "Stop"
 msgstr "Durdur"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:165
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Strict order"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:16
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:30
 msgid "Strong"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1843
 msgid "Submit"
 msgstr "Gönder"
 
-#: 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:108
 msgid "Suppress logging"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:109
 msgid "Suppress logging of the routine operation of these protocols"
 msgstr ""
 
@@ -4799,42 +4958,44 @@ msgstr ""
 msgid "Swap Entry"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:23
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:5
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:135
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:21
 msgid "Switch"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:129
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:168
 msgid "Switch %q"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:128
-msgid "Switch %q (%s)"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:66
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:146
 msgid ""
 "Switch %q has an unknown topology - the VLAN settings might not be accurate."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:146
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:142
 msgid "Switch Port Mask"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1640
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1846
 #: modules/luci-base/luasrc/model/network.lua:1425
 msgid "Switch VLAN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:238
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:355
 msgid "Switch protocol"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:103
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:104
 #: modules/luci-base/luasrc/view/cbi/ipaddr.htm:26
 msgid "Switch to CIDR list notation"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:77
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1547
+msgid "Symbolic link"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:71
 msgid "Sync with NTP-Server"
 msgstr ""
 
@@ -4844,7 +5005,7 @@ msgstr ""
 
 #: modules/luci-base/luasrc/controller/admin/index.lua:47
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:14
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:102
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:94
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
 #: modules/luci-mod-system/luasrc/view/admin_system/applyreboot.htm:39
 msgid "System"
@@ -4855,11 +5016,11 @@ msgstr "Sistem"
 msgid "System Log"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:108
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:99
 msgid "System Properties"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:145
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:136
 msgid "System log buffer size"
 msgstr ""
 
@@ -4867,15 +5028,17 @@ msgstr ""
 msgid "TCP:"
 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:69
 msgid "TFTP Settings"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:269
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
 msgid "TFTP server root"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:17
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:77
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:88
 msgid "TX"
@@ -4898,7 +5061,7 @@ msgstr ""
 msgid "Target"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:77
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:103
 msgid "Target network"
 msgstr ""
 
@@ -4906,40 +5069,24 @@ msgstr ""
 msgid "Terminate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:27
-msgid ""
-"The <em>Device Configuration</em> section covers physical settings of the "
-"radio hardware such as channel, transmit power or antenna selection which "
-"are shared among all defined wireless networks (if the radio hardware is "
-"multi-SSID capable). Per network settings like encryption or operation mode "
-"are grouped in the <em>Interface Configuration</em>."
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:79
-msgid ""
-"The <em>libiwinfo-lua</em> package is not installed. You must install this "
-"component for working wireless configuration!"
-msgstr ""
-
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:66
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:77
 msgid ""
 "The HE.net endpoint update configuration changed, you must now use the plain "
 "username instead of the user ID!"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:8
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:40
 msgid ""
 "The IPv4 address or the fully-qualified domain name of the remote tunnel end."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:27
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:38
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:59
 msgid ""
 "The IPv6 prefix assigned to the provider, usually ends with <code>::</code>"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:18
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1808
 msgid ""
 "The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
 "code> and <code>_</code>"
@@ -4953,7 +5100,7 @@ msgstr ""
 msgid "The configuration file could not be loaded due to the following error:"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1849
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2396
 msgid ""
 "The device could not be reached within %d seconds after applying the pending "
 "changes, which caused the configuration to be rolled back for safety "
@@ -4971,6 +5118,12 @@ msgid ""
 "</abbr> <code>/dev/sda1</code>)"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:612
+msgid ""
+"The existing wireless configuration needs to be changed for LuCI to function "
+"properly."
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:127
 msgid ""
 "The filesystem that was used to format the memory (<abbr title=\"for example"
@@ -4989,43 +5142,49 @@ msgstr ""
 msgid "The following rules are currently active on this system."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:144
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:154
+msgid "The gateway address must not be a local IP address"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:154
 msgid "The given SSH public key has already been added."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:150
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:160
 msgid ""
 "The given SSH public key is invalid. Please supply proper public RSA or "
 "ECDSA keys."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:67
-msgid "The given network name is not unique"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:664
+msgid "The interface name is already used"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:52
-msgid ""
-"The hardware is not multi-SSID capable and the existing configuration will "
-"be replaced if you proceed."
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:670
+msgid "The interface name is too long"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:43
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:31
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:55
 msgid ""
 "The length of the IPv4 prefix in bits, the remainder is used in the IPv6 "
 "addresses."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:35
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:46
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:63
 msgid "The length of the IPv6 prefix in bits"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:12
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:44
 msgid "The local IPv4 address over which the tunnel is created (optional)."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:5
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1814
+msgid "The network name is already used"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:135
 msgid ""
 "The network ports on this device can be combined to several <abbr title="
 "\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
@@ -5035,22 +5194,21 @@ msgid ""
 "next greater network like the internet and other ports for a local network."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:77
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:395
-msgid "The selected protocol needs a device assigned"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1149
+msgid "The selected %s mode is incompatible with %s encryption"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/csrftoken.htm:11
 msgid "The submitted security token is invalid or already expired!"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:274
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:272
 msgid ""
 "The system is erasing the configuration partition now and will reboot itself "
 "when finished."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:195
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:193
 msgid ""
 "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
 "few minutes before you try to reconnect. It might be necessary to renew the "
@@ -5058,7 +5216,7 @@ msgid ""
 "settings."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:15
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:80
 msgid "The system password has been successfully changed."
 msgstr ""
 
@@ -5068,7 +5226,7 @@ msgid ""
 "you choose the generic image format for your platform."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:427
 msgid "There are no active leases"
 msgstr ""
 
@@ -5077,16 +5235,10 @@ msgstr ""
 msgid "There are no active leases."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1973
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2514
 msgid "There are no changes to apply"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:204
-msgid ""
-"There is no device assigned yet, please attach a network device in the "
-"\"Physical Settings\" tab"
-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
@@ -5096,11 +5248,19 @@ msgid ""
 "protect the web interface and enable SSH."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:19
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:49
 msgid "This IPv4 address of the relay"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1448
+msgid "This authentication type is not applicable to the selected EAP method."
+msgstr ""
+
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:54
+msgid "This does not look like a valid PEM file"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
 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 "
@@ -5114,44 +5274,44 @@ msgid ""
 "configurations are automatically preserved."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:74
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:81
 msgid ""
 "This is either the \"Update Key\" configured for the tunnel or the account "
 "password if no update key has been configured"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:82
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:127
 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 ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:27
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:54
 msgid ""
 "This is the local endpoint address assigned by the tunnel broker, it usually "
 "ends with <code>...:2/64</code>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:79
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> in the local network"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:73
 msgid "This is the plain username for logging into the account"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:34
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:57
 msgid ""
 "This is the prefix routed to you by the tunnel broker for use by clients"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:9
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:41
 msgid "This is the system crontab in which scheduled tasks can be defined."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:19
+#: 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 ""
@@ -5166,26 +5326,26 @@ msgstr ""
 msgid "This page gives an overview over currently active network connections."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:726
-#: modules/luci-base/htdocs/luci-static/resources/form.js:809
+#: modules/luci-base/htdocs/luci-static/resources/form.js:936
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1064
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:172
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:32
 msgid "This section contains no values yet"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:114
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:105
 msgid "Time Synchronization"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:525
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:968
 msgid "Time interval for rekeying GTK"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:128
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:119
 msgid "Timezone"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:825
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:871
 msgid "To login…"
 msgstr ""
 
@@ -5196,7 +5356,7 @@ msgid ""
 "reset\" (only possible with squashfs images)."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:835
 msgid "Tone"
 msgstr ""
 
@@ -5220,55 +5380,41 @@ msgstr ""
 msgid "Transfer"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:595
-msgid "Transmission Rate"
-msgstr ""
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:102
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:89
 msgid "Transmit"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:211
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:273
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:345
-msgid "Transmit Power"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:318
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:349
-msgid "Transmitter Antenna"
-msgstr ""
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:73
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:57
 msgid "Trigger"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:98
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:84
 msgid "Trigger Mode"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:54
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:69
 msgid "Tunnel ID"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1643
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1849
 #: modules/luci-base/luasrc/model/network.lua:1430
 msgid "Tunnel Interface"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:44
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:55
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:76
 msgid "Tunnel Link"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:46
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:131
 msgid "Tx-Power"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:32
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:185
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:11
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:43
 msgid "Type"
 msgstr ""
 
@@ -5276,19 +5422,20 @@ msgstr ""
 msgid "UDP:"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:28
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:90
 msgid "UMTS only"
 msgstr ""
 
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:43
 #: protocols/luci-proto-3g/luasrc/model/network/proto_3g.lua:10
 msgid "UMTS/GPRS/EV-DO"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:106
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:93
 msgid "USB Device"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:122
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:110
 msgid "USB Ports"
 msgstr ""
 
@@ -5318,10 +5465,12 @@ msgstr ""
 msgid "Unable to dispatch"
 msgstr ""
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:22
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:54
 msgid "Unable to obtain client ID"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:61
 msgid "Unable to resolve AFTR host name"
 msgstr ""
@@ -5331,21 +5480,31 @@ msgstr ""
 msgid "Unable to resolve peer host name"
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:33
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:68
+msgid "Unable to save contents: %s"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:132
 msgid "Unavailable Seconds (UAS)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1196
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1386
 #: modules/luci-base/luasrc/model/network.lua:970
 msgid "Unknown"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1349
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1539
 #: modules/luci-base/luasrc/model/network.lua:1137
 msgid "Unknown error (%s)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1193
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:204
+msgid "Unknown error code"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1383
+#: modules/luci-base/htdocs/luci-static/resources/protocol/none.js:6
 #: modules/luci-base/luasrc/model/network.lua:964
 msgid "Unmanaged"
 msgstr ""
@@ -5355,22 +5514,30 @@ msgstr ""
 msgid "Unmount"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:107
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:262
 msgid "Unnamed key"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1708
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2261
 msgid "Unsaved Changes"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:202
+msgid "Unspecified error"
+msgstr ""
+
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:64
 msgid "Unsupported MAP type"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:27
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:69
 msgid "Unsupported modem"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:219
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:119
 msgid "Unsupported protocol type."
 msgstr ""
@@ -5390,56 +5557,70 @@ msgstr ""
 msgid "Upload archive..."
 msgstr ""
 
-#: modules/luci-base/luasrc/view/cbi/upload.htm:8
-msgid "Uploaded File"
-msgstr "Yüklenen Dosya"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1703
+msgid "Upload file"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1678
+msgid "Upload file…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1623
+msgid "Upload request failed: %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:613
+msgid ""
+"Upon pressing \"Continue\", anonymous \"wifi-iface\" sections will be "
+"assigned with a name in the form <em>wifinet#</em> and the network will be "
+"restarted to apply the updated configuration."
+msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:14
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:74
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:85
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:26
 msgid "Uptime"
 msgstr "Çalışma Zamanı"
 
-#: 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:83
 msgid "Use <code>/etc/ethers</code>"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:40
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:167
 msgid "Use DHCP gateway"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:33
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:85
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:34
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:98
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:46
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:65
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:38
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:58
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:124
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:39
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:116
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:59
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:103
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:64
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:77
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:100
 msgid "Use DNS servers advertised by peer"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:227
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:233
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:479
 msgid "Use ISO/IEC 3166 alpha2 country codes."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:31
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:100
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:70
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:35
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:51
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:86
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:56
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:97
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:77
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:75
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:92
 msgid "Use MTU on tunnel interface"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:95
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:65
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:30
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:46
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:81
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:93
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:73
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:88
 msgid "Use TTL on tunnel interface"
 msgstr ""
 
@@ -5451,68 +5632,65 @@ msgstr ""
 msgid "Use as root filesystem (/)"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:19
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:31
 msgid "Use broadcast flag"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:253
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:791
 msgid "Use builtin IPv6-management"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:40
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:109
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:92
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:45
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:105
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:53
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:72
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:45
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:65
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:40
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:182
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:127
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:42
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:119
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:62
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:67
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:80
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:103
 msgid "Use custom DNS servers"
 msgstr "Özel DNS sunucularını kullan"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:26
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:70
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:16
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:28
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:84
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:24
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:50
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:23
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:43
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:116
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:33
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:74
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:97
 msgid "Use default gateway"
 msgstr "Varsayılan ağ geçidini kullan"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:48
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:164
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:77
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:24
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:88
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:58
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:23
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:39
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:74
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:90
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:38
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:57
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:30
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:50
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:45
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:227
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:119
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:51
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:88
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:68
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:52
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:70
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:83
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:111
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:149
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:67
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:111
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:98
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:72
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:85
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:108
 msgid "Use gateway metric"
 msgstr "Ağ geçidi metriğini kullan"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:64
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:179
 msgid "Use routing table"
 msgstr "Yönlendirme tablosunu kullan"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:309
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:310
 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 "
@@ -5525,77 +5703,78 @@ msgstr ""
 msgid "Used"
 msgstr "Kullanılmış"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:848
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1273
 msgid "Used Key Slot"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:913
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
 msgid ""
 "Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not "
 "needed with normal WPA(2)-PSK."
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:48
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:110
 msgid "User certificate (PEM encoded)"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:61
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:122
 msgid "User key (PEM encoded)"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/sysauth.htm:23
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:41
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:32
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:102
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:56
 msgid "Username"
 msgstr "Kullanıcı adı"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:182
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:903
 msgid "VC-Mux"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:851
 msgid "VDSL"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:172
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:169
 msgid "VLANs on %q"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:171
-msgid "VLANs on %q (%s)"
+#: modules/luci-base/luasrc/controller/admin/index.lua:55
+msgid "VPN"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:18
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:42
 msgid "VPN Local address"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:22
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:46
 msgid "VPN Local port"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:15
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:11
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:15
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:58
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:39
 msgid "VPN Server"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:18
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:96
 msgid "VPN Server port"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:37
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:100
 msgid "VPN Server's certificate SHA1 hash"
 msgstr ""
 
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:9
 #: protocols/luci-proto-vpnc/luasrc/model/network/proto_vpnc.lua:9
 msgid "VPNC (CISCO 3000 (and others) VPN)"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:44
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:73
 msgid "Vendor"
 msgstr "Satıcı"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:60
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:52
 msgid "Vendor Class to send when requesting DHCP"
 msgstr ""
 
@@ -5603,41 +5782,37 @@ msgstr ""
 msgid "Verify"
 msgstr "Kontrol"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:52
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:76
 msgid "Virtual dynamic interface"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:470
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:471
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:553
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:576
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:908
 msgid "WDS"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:667
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1160
 msgid "WEP Open System"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:668
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1161
 msgid "WEP Shared Key"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "WEP passphrase"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:503
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:566
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:945
 msgid "WMM Mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "WPA passphrase"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:716
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:735
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:740
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1074
 msgid ""
 "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
 "and ad-hoc mode) to be installed."
@@ -5651,7 +5826,7 @@ msgstr ""
 msgid "Waiting for command to complete..."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1940
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2481
 msgid "Waiting for configuration to get applied… %ds"
 msgstr ""
 
@@ -5659,8 +5834,8 @@ msgstr ""
 msgid "Waiting for device..."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:172
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:163
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:173
 msgid "Warning"
 msgstr "Uyarı"
 
@@ -5668,11 +5843,11 @@ msgstr "Uyarı"
 msgid "Warning: There are unsaved changes that will get lost on reboot!"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:20
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:34
 msgid "Weak"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:946
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1355
 msgid ""
 "When using a PSK, the PMK can be automatically generated. When enabled, the "
 "R0/R1 key options below are not applied. Disable this to use the R0 and R1 "
@@ -5680,78 +5855,85 @@ msgid ""
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:383
 msgid "Width"
 msgstr "Genişlik"
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:17
 #: protocols/luci-proto-wireguard/luasrc/model/network/proto_wireguard.lua:9
 msgid "WireGuard VPN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:58
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:40
 #: modules/luci-mod-status/luasrc/controller/admin/status.lua:28
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:14
 msgid "Wireless"
 msgstr "Kablosuz"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1631
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1837
 #: modules/luci-base/luasrc/model/network.lua:1418
 msgid "Wireless Adapter"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1617
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2052
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1823
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2288
 #: modules/luci-base/luasrc/model/network.lua:1404
 #: modules/luci-base/luasrc/model/network.lua:1865
 msgid "Wireless Network"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:629
 msgid "Wireless Overview"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:362
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:797
 msgid "Wireless Security"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:54
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:611
+msgid "Wireless configuration migration"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:139
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:179
 msgid "Wireless is disabled"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:54
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:139
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:179
 msgid "Wireless is not associated"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:15
-msgid "Wireless is restarting..."
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:752
 msgid "Wireless network is disabled"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:752
 msgid "Wireless network is enabled"
 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:182
 msgid "Write received DNS requests to syslog"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:164
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:155
 msgid "Write system log to file"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1507
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:85
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1754
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:109
 msgid "Yes"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:26
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:943
+msgid ""
+"You appear to be currently connected to the device via the \"%h\" interface. "
+"Do you really want to shut down the interface?"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:123
 msgid ""
 "You can enable or disable installed init scripts here. Changes will applied "
 "after a device reboot.<br /><strong>Warning: If you disable essential init "
@@ -5768,38 +5950,34 @@ msgstr ""
 "LuCI'nin düzgün çalışması için tarayıcınızda Java Scripti "
 "etkinleştirmelisiniz."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:196
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:187
 msgid "ZRam Compression Algorithm"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:203
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:194
 msgid "ZRam Compression Streams"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:189
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:180
 msgid "ZRam Settings"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:191
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
 msgid "ZRam Size"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:229
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:230
 msgid "any"
 msgstr "herhangi"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:113
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:121
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:126
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:218
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:282
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:321
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:328
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:621
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:37
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:22
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:29
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:121
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:836
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:844
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:849
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1030
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:78
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:48
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:51
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:103
 msgid "auto"
 msgstr "otomatik"
 
@@ -5807,11 +5985,11 @@ msgstr "otomatik"
 msgid "automatic"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:45
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:78
 msgid "baseT"
 msgstr "baseT"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:909
 msgid "bridged"
 msgstr "köprülü"
 
@@ -5827,22 +6005,21 @@ msgstr ""
 msgid "create:"
 msgstr "oluşturma:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:264
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:368
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:678
 msgid "creates a bridge over specified interface(s)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:277
 msgid "dB"
 msgstr "dB"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:34
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:35
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:46
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:47
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:48
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:131
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:132
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:133
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:277
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:279
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:331
@@ -5854,26 +6031,30 @@ msgstr "dB"
 msgid "dBm"
 msgstr "dBm"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:460
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:587
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:889
 msgid "disable"
 msgstr "etkin değil"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:119
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:524
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:530
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:536
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:18
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:578
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:584
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:590
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:25
 msgid "disabled"
 msgstr "devre dışı"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:433
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:467
+msgid "driver default"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/lease_status.htm:17
 #: modules/luci-base/luasrc/view/lease_status.htm:46
-#: 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:416
 msgid "expired"
 msgstr "sona ermiş"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:88
 msgid ""
 "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr>-leases will be stored"
@@ -5885,25 +6066,21 @@ msgstr ""
 msgid "forward"
 msgstr "ileri"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:80
 msgid "full-duplex"
 msgstr "tam çift yönlü"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:80
 msgid "half-duplex"
 msgstr "yarı çift yönlü"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:559
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:565
 msgid "hexadecimal encoded value"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:138
-msgid "hidden"
-msgstr "gizli"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:527
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:533
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:538
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:581
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:587
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:592
 msgid "hybrid mode"
 msgstr "hibrit mod"
 
@@ -5911,6 +6088,10 @@ msgstr "hibrit mod"
 msgid "if target is a network"
 msgstr "eğer hedef ağsa"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:63
+msgid "ignore"
+msgstr ""
+
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:177
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
@@ -5945,25 +6126,26 @@ msgstr ""
 msgid "key with either 5 or 13 characters"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:94
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:95
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr "yerel <abbr title=\"Domain Name System\">DNS</abbr> dosyası"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:952
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1168
+msgid "medium security"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1360
 msgid "minutes"
 msgstr "dakika"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:43
-msgid "mixed WPA/WPA2"
-msgstr ""
-
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:225
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:232
 msgid "no"
 msgstr "hayır"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:54
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:72
 msgid "no link"
 msgstr "bağlantı yok"
 
@@ -5971,7 +6153,7 @@ msgstr "bağlantı yok"
 msgid "non-empty value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1195
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1446
 msgid "none"
 msgstr "hiçbiri"
 
@@ -5981,7 +6163,9 @@ msgstr "hiçbiri"
 msgid "not present"
 msgstr "mevcut değil"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:363
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:341
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:776
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:780
 #: 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
@@ -5996,9 +6180,9 @@ msgstr "kapalı"
 msgid "on"
 msgstr "açık"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
-msgid "open"
-msgstr "açık"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1169
+msgid "open network"
+msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
@@ -6017,73 +6201,77 @@ msgstr ""
 msgid "positive integer value"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:34
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:56
 msgid "random"
 msgstr "rastgele"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:526
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:532
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:537
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:580
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:586
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:591
 msgid "relay mode"
 msgstr "anahtarlama modu"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:910
 msgid "routed"
 msgstr "yönlendirildi"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:525
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:534
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:968
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:977
 msgid "sec"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:525
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:531
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:579
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:585
 msgid "server mode"
 msgstr "sunucu modu"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:544
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:597
 msgid "stateful-only"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:542
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:595
 msgid "stateless"
 msgstr "durumsuz"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:543
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:596
 msgid "stateless + stateful"
 msgstr "durumsuz + durumlu"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:369
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1167
+msgid "strong security"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:346
 msgid "tagged"
 msgstr "etiketlendi"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:932
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1343
 msgid "time units (TUs / 1.024 ms) [1000-65535]"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:549
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:555
 msgid "unique value"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:448
 msgid "unknown"
 msgstr "bilinmeyen"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:15
 #: modules/luci-base/luasrc/view/lease_status.htm:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:238
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:390
+#: 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:414
 msgid "unlimited"
 msgstr "sınırsız"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1401
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1648
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:63
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:355
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:378
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:413
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:446
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:512
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:450
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:545
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:53
 #: modules/luci-base/luasrc/view/cbi/network_netlist.htm:38
 msgid "unspecified"
@@ -6093,7 +6281,7 @@ msgstr "tanımsız"
 msgid "unspecified -or- create:"
 msgstr "tanımsız -veya- oluşturun:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:366
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:344
 msgid "untagged"
 msgstr "etiketsiz"
 
@@ -6174,8 +6362,8 @@ msgstr ""
 msgid "valid address:port"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:523
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:527
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:529
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:533
 msgid "valid date (YYYY-MM-DD)"
 msgstr ""
 
@@ -6212,7 +6400,7 @@ msgstr ""
 msgid "valid network in address/netmask notation"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:498
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:504
 msgid "valid phone digit (0-9, \"*\", \"#\", \"!\" or \".\")"
 msgstr ""
 
@@ -6225,11 +6413,11 @@ msgstr ""
 msgid "valid port value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:503
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:509
 msgid "valid time (HH:MM:SS)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:425
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:431
 msgid "value between %d and %d characters"
 msgstr ""
 
@@ -6245,14 +6433,23 @@ msgstr ""
 msgid "value smaller or equal to %f"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:430
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:425
+msgid "value with %d characters"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:436
 msgid "value with at least %d characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:435
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:441
 msgid "value with at most %d characters"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1169
+msgid "weak security"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:221
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:232
@@ -6263,6 +6460,42 @@ msgstr "evet"
 msgid "« Back"
 msgstr "« Geri"
 
+#~ msgid "Disabled (default)"
+#~ msgstr "Devre dışı (varsayılan)"
+
+#~ msgid "Antenna 1"
+#~ msgstr "1. Anten"
+
+#~ msgid "Antenna 2"
+#~ msgstr "2. Anten"
+
+#~ msgid "Antenna Configuration"
+#~ msgstr "Anten Yapılandırması"
+
+#~ msgid "Back to overview"
+#~ msgstr "Genel Bakışa dön"
+
+#~ msgid "Back to scan results"
+#~ msgstr "Tarama sonuçlarına dön"
+
+#~ msgid "Connect"
+#~ msgstr "Bağlan"
+
+#~ msgid "Connection Limit"
+#~ msgstr "Bağlantı limiti"
+
+#~ msgid "Create Interface"
+#~ msgstr "Arabirim Oluştur"
+
+#~ msgid "Uploaded File"
+#~ msgstr "Yüklenen Dosya"
+
+#~ msgid "hidden"
+#~ msgstr "gizli"
+
+#~ msgid "open"
+#~ msgstr "açık"
+
 #~ msgid "Back"
 #~ msgstr "Geri"
 
diff --git a/modules/luci-base/po/uk/base.po b/modules/luci-base/po/uk/base.po
index 2d663af6d..83a1f98b5 100644
--- a/modules/luci-base/po/uk/base.po
+++ b/modules/luci-base/po/uk/base.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"PO-Revision-Date: 2019-07-30 02:20+0300\n"
+"PO-Revision-Date: 2019-09-21 21:54+0300\n"
 "Last-Translator: Yurii <yuripet@gmail.com>\n"
 "Language-Team: none\n"
 "Language: uk\n"
@@ -9,19 +9,20 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:133
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:857
 msgid "%.1f dB"
 msgstr "%.1f дБ"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:109
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:122
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 msgid "%d Bit"
 msgstr "%d біт"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1641
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2194
 msgid "%d invalid field(s)"
 msgstr "%d неприпустимі поля"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:281
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:31
 msgid "%s is untagged in multiple VLANs!"
 msgstr "%s є непозначеним у декількох VLAN!"
 
@@ -35,7 +36,7 @@ msgstr "(вікно - %d хв, інтервал - %d с)"
 
 #: modules/luci-mod-system/luasrc/view/admin_system/upgrade.htm:35
 msgid "(%s available)"
-msgstr "(доступно %s)"
+msgstr " (доступно %s)"
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:105
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:111
@@ -59,19 +60,19 @@ msgid "-- Additional Field --"
 msgstr "-- Додаткові поля --"
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:258
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1401
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1533
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:250
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:350
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1114
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1648
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1780
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:314
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:414
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1178
 #: modules/luci-base/luasrc/view/cbi/header.htm:5
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:26
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:88
 msgid "-- Please choose --"
 msgstr "-- Оберіть --"
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:259
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:351
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1115
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:415
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1179
 #: modules/luci-base/luasrc/view/cbi/header.htm:6
 msgid "-- custom --"
 msgstr "-- нетипово --"
@@ -94,7 +95,7 @@ msgstr "-- відповідно UUID --"
 msgid "-- please select --"
 msgstr "-- виберіть --"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:382
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:814
 msgid "0 = not using RSSI threshold, 1 = do not change driver default"
 msgstr ""
 "0 = не використовувати поріг RSSI, 1 = не змінюваим типові значення драйвера"
@@ -107,10 +108,11 @@ msgstr "Навантаження за 1 хвилину:"
 msgid "15 Minute Load:"
 msgstr "Навантаження за 15 хвилин:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:924
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1337
 msgid "4-character hexadecimal ID"
 msgstr "4-симв. шістнадцятковий ID"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:11
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:18
 msgid "464XLAT (CLAT)"
 msgstr "464XLAT (CLAT)"
@@ -119,54 +121,54 @@ msgstr "464XLAT (CLAT)"
 msgid "5 Minute Load:"
 msgstr "Навантаження за 5 хвилин:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:960
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1366
 msgid "6-octet identifier as a hex string - no colons"
 msgstr ""
 "6-октетний ідентифікатор у вигляді шістнадцяткового рядка – без двокрапок"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:891
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1310
 msgid "802.11r Fast Transition"
 msgstr "Швидкий перехід 802.11r"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1157
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1567
 msgid "802.11w Association SA Query maximum timeout"
 msgstr "Максимальний тайм-аут запиту асоціації 802.11w"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1574
 msgid "802.11w Association SA Query retry timeout"
 msgstr "Тайм-аут повторювання запиту асоціації 802.11w"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1133
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1533
 msgid "802.11w Management Frame Protection"
 msgstr "Захист кадрів управління 802.11w"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1156
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1567
 msgid "802.11w maximum timeout"
 msgstr "Максимальний тайм-аут 802.11w"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1165
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1574
 msgid "802.11w retry timeout"
 msgstr "Тайм-аут повторювання 802.11w"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:399
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:831
 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:224
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:225
 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:215
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:216
 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:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
 msgid ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
 "order of the resolvfile"
@@ -174,13 +176,13 @@ msgstr ""
 "<abbr title=\"Domain Name System — система доменних імен\">DNS</abbr>-"
 "сервери буде опитано в порядку, визначеному файлом <em>resolvfile</em>"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:388
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:820
 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:351
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:373
 #: 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>-адреса"
@@ -190,8 +192,8 @@ msgstr "<abbr title=\"Інтернет-протокол версії 4\">IPv4</a
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
 msgstr "<abbr title=\"Інтернет-протокол версії 4\">IPv4</abbr>-шлюз"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:555
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:35
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:506
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr "<abbr title=\"Інтернет-протокол версії 4\">IPv4</abbr>-маска"
 
@@ -207,32 +209,32 @@ 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:378
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:402
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
 msgstr "<abbr title=\"Інтернет-протокол версії 6\">IPv6</abbr>-суфікс (hex)"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:58
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:35
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:33
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr ""
 "Налаштування <abbr title=\"Light Emitting Diode — світлодіод\">LED</abbr>"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:67
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:51
 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:328
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:329
 #: 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:372
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 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:233
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:234
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> leases"
@@ -240,7 +242,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:242
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> packet size"
@@ -249,11 +251,11 @@ msgstr ""
 "\"Extension Mechanisms for Domain Name System — Механізми розширень для "
 "доменної системи імен\">EDNS0</abbr>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:251
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:252
 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
 msgstr "<abbr title=\"Максимум\">Макс.</abbr> одночасних запитів"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:10
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:42
 msgid ""
 "<br/>Note: you need to manually restart the cron service if the crontab file "
 "was empty before editing."
@@ -261,63 +263,67 @@ msgstr ""
 "<br/>Примітка: якщо перед редагуванням, файл crontab був порожній, вам "
 "потрібно вручну перезапустити служби cron."
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:817
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1605
+msgid "A directory with the same name already exists."
+msgstr "Каталог з такою ж назвою вже існує."
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:863
 msgid "A new login is required since the authentication session expired."
 msgstr ""
 "Оскільки сеанс автентифікації закінчився, потрібен новий вхід у систему."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:114
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:837
 msgid "A43C + J43 + A43"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:838
 msgid "A43C + J43 + A43 + V43"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:850
 msgid "ADSL"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:826
 msgid "ANSI T1.413"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:33
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:47
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:23
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:94
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:86
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:67
 msgid "APN"
 msgstr ""
 "<abbr title=\"Access Point Name — символічна назва точки доступу\">APN</abbr>"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:56
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:175
 msgid "ARP retry threshold"
 msgstr "Поріг повторювання ARP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:122
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:845
 msgid "ATM (Asynchronous Transfer Mode)"
 msgstr ""
 "<abbr title=\"Asynchronous Transfer Mode — асинхронний режим передавання"
 "\">ATM</abbr>"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:144
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:866
 msgid "ATM Bridges"
 msgstr "ATM-мости"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:178
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:21
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:898
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:66
 msgid "ATM Virtual Channel Identifier (VCI)"
 msgstr ""
 "Ідентифікатор віртуального каналу ATM (<abbr title=\"Virtual Channel "
 "Identifier\">VCI</abbr>)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:179
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:26
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:899
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:70
 msgid "ATM Virtual Path Identifier (VPI)"
 msgstr ""
 "Ідентифікатор віртуального шляху ATM (<abbr title=\"Virtual Path Identifier"
 "\">VPI</abbr>)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:866
 msgid ""
 "ATM bridges expose encapsulated ethernet in AAL5 connections as virtual "
 "Linux network interfaces which can be used in conjunction with DHCP or PPP "
@@ -327,8 +333,8 @@ msgstr ""
 "віртуальні мережеві інтерфейси Linux, котрі можуть використовуватися в "
 "поєднанні з DHCP або PPP для підключення до мережі провайдера."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:184
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:905
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:62
 msgid "ATM device number"
 msgstr "Номер ATM-пристрою"
 
@@ -337,17 +343,17 @@ msgid "ATU-C System Vendor ID"
 msgstr "Ідентифікатор постачальника системи ATU-C"
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:251
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:495
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:499
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:528
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:532
 msgid "Absent Interface"
 msgstr "Відсутній інтерфейс"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:19
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
 msgid "Access Concentrator"
 msgstr "Концентратор доступу"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:368
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:470
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:802
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
 msgid "Access Point"
 msgstr "Точка доступу"
 
@@ -370,7 +376,7 @@ msgid "Active Connections"
 msgstr "Активні підключення"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:68
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:30
 msgid "Active DHCP Leases"
 msgstr "Активні оренди DHCP"
 
@@ -378,55 +384,75 @@ msgstr "Активні оренди DHCP"
 msgid "Active DHCPv6 Leases"
 msgstr "Активні оренди DHCPv6"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1951
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:370
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:12
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2190
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:804
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:23
 msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:650
-#: modules/luci-base/htdocs/luci-static/resources/form.js:651
-#: modules/luci-base/htdocs/luci-static/resources/form.js:666
-#: modules/luci-base/htdocs/luci-static/resources/form.js:667
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1290
+#: modules/luci-base/htdocs/luci-static/resources/form.js:902
+#: modules/luci-base/htdocs/luci-static/resources/form.js:904
+#: modules/luci-base/htdocs/luci-static/resources/form.js:917
+#: modules/luci-base/htdocs/luci-static/resources/form.js:918
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1539
 #: modules/luci-base/luasrc/view/cbi/nsection.htm:25
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:189
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:197
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:39
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:47
 #: modules/luci-base/luasrc/view/cbi/ucisection.htm:54
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:703
 msgid "Add"
 msgstr "Додати"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:60
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:870
+msgid "Add ATM Bridge"
+msgstr "Додати ATM-міст"
+
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:92
 msgid "Add IPv4 address…"
 msgstr "Додати адресу IPv4…"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:129
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:204
 msgid "Add IPv6 address…"
 msgstr "Додати адресу IPv6…"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:143
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:149
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:38
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:47
+msgid "Add LED action"
+msgstr "Додати дію LED"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:215
+msgid "Add VLAN"
+msgstr "Додати VLAN"
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:14
+msgid "Add instance"
+msgstr "Додати реалізацію"
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:153
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:159
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:250
 msgid "Add key"
 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:155
 msgid "Add local domain suffix to names served from hosts files"
 msgstr "Додавати суфікс локального домену до імен, отриманих із файлів hosts"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:705
 msgid "Add new interface..."
 msgstr "Додати новий інтерфейс..."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:104
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:99
+msgid "Add peer"
+msgstr "Додати вузол"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:105
 msgid "Additional Hosts files"
 msgstr "Додаткові файли hosts"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:161
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
 msgid "Additional servers file"
 msgstr "Додаткові файли servers"
 
@@ -453,7 +479,7 @@ msgstr "Додаткові файли servers"
 msgid "Address"
 msgstr "Адреса"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:12
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:151
 msgid "Address to access local relay bridge"
 msgstr "Адреса для доступу до мосту локального ретранслятора"
 
@@ -462,13 +488,13 @@ msgstr "Адреса для доступу до мосту локального
 msgid "Administration"
 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:70
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:505
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:896
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:24
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:189
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:463
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:176
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:143
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:364
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:742
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:799
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:50
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:34
 msgid "Advanced Settings"
@@ -476,181 +502,181 @@ msgstr "Додаткові параметри"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:127
 msgid "Aggregate Transmit Power(ACTATP)"
-msgstr "Сумарна потужність передавання"
+msgstr "Сукупна потужність передавача"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:175
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:166
 msgid "Alert"
 msgstr "Тривога"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1628
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1834
 #: modules/luci-base/luasrc/model/network.lua:1416
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:54
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:78
 msgid "Alias Interface"
 msgstr "Інтерфейс псевдоніма"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:138
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:66
 msgid "Alias of \"%s\""
 msgstr "Псевдонім \"%s\""
 
-#: 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:170
 msgid "All Servers"
 msgstr "Усі сервери"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:114
 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:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:113
 msgid "Allocate IP sequentially"
 msgstr "Виділяти IP послідовно"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:24
 msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
 msgstr ""
 "Дозволити <abbr title=\"Secure Shell — безпечна оболонка\">SSH</abbr>-"
 "перевірку пароля"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:545
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:987
 msgid "Allow AP mode to disconnect STAs based on low ACK condition"
 msgstr ""
 "Дозволити режиму AP відключення абонентів на підставі низького рівня <abbr "
 "title=\"Підтвердження (Acknowledge) успішності отримання TCP-сегменту\">ACK</"
 "abbr>"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:462
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:589
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:891
 msgid "Allow all except listed"
 msgstr "Дозволити всі, крім зазначених"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:236
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:767
 msgid "Allow legacy 802.11b rates"
-msgstr "Дозволити застарілі швидкості 802.11b"
+msgstr "Дозволяти застарілі швидк. 802.11b"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:461
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:588
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:890
 msgid "Allow listed only"
 msgstr "Дозволити тільки зазначені"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:198
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:199
 msgid "Allow localhost"
 msgstr "Дозволити локальний вузол"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:47
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:35
 msgid "Allow remote hosts to connect to local SSH forwarded ports"
 msgstr ""
 "Дозволити віддаленим вузлам підключення до локальних переспрямованих портів "
 "SSH"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:38
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:30
 msgid "Allow root logins with password"
 msgstr "Дозволити root-вхід із паролем"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:39
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:30
 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:199
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:200
 msgid ""
 "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
 msgstr ""
 "Дозволити висхідні відповіді від клієнта на сервер у діапазоні 127.0.0.0/8, "
 "наприклад, для RBL-послуг"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:135
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:122
 msgid "Allowed IPs"
 msgstr "Дозволено IP-адреси"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:549
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:602
 msgid "Always announce default router"
 msgstr "Завжди оголошувати типовим маршрутизатором"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:259
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:782
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
 "option does not comply with IEEE 802.11n-2009!"
 msgstr ""
-"Завжди використовувати канали 40 МГц, навіть якщо вторинний канал "
+"Завжди використовувати канали '40 МГц', навіть якщо вторинний канал "
 "перекривається. Використання цієї опції не відповідає стандарту IEEE "
 "802.11n-2009!"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:95
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:818
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:119
 msgid "Annex"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:96
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:819
 msgid "Annex A + L + M (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:827
 msgid "Annex A G.992.1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:828
 msgid "Annex A G.992.2"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:829
 msgid "Annex A G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:830
 msgid "Annex A G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:97
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:820
 msgid "Annex B (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:823
 msgid "Annex B G.992.1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:824
 msgid "Annex B G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:102
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:825
 msgid "Annex B G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:98
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:821
 msgid "Annex J (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:831
 msgid "Annex L G.992.3 POTS 1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:99
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:822
 msgid "Annex M (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:109
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:832
 msgid "Annex M G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:833
 msgid "Annex M G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:550
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:602
 msgid "Announce as default router even if no public prefix is available."
 msgstr ""
 "Оголошувати типовим маршрутизатором, навіть якщо немає доступного публічного "
 "префікса."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:555
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:607
 msgid "Announced DNS domains"
 msgstr "Оголошено DNS-домени"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:554
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:606
 msgid "Announced DNS servers"
 msgstr "Оголошено DNS-сервери"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1093
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1496
 msgid "Anonymous Identity"
 msgstr "Анонімне посвідчення"
 
@@ -662,20 +688,6 @@ msgstr "Анонімне монтування"
 msgid "Anonymous Swap"
 msgstr "Анонімний своп"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:322
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:329
-msgid "Antenna 1"
-msgstr "Антена 1"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:323
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:330
-msgid "Antenna 2"
-msgstr "Антена 2"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:246
-msgid "Antenna Configuration"
-msgstr "Конфигурація антени"
-
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:71
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:160
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:181
@@ -683,11 +695,11 @@ msgstr "Конфигурація антени"
 msgid "Any zone"
 msgstr "Будь-яка зона"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1981
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2522
 msgid "Apply request failed with status <code>%h</code>"
 msgstr "Сталася помилка запиту на застосування зі статусом <code>%h</code>"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1867
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2409
 msgid "Apply unchecked"
 msgstr "Застосувати без позначки"
 
@@ -695,8 +707,8 @@ msgstr "Застосувати без позначки"
 msgid "Architecture"
 msgstr "Архітектура"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:19
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:184
+#: 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 ""
@@ -707,15 +719,15 @@ msgstr ""
 msgid "Assign interfaces..."
 msgstr "Призначення інтерфейсів..."
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:124
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:24
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:189
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:31
 msgid ""
 "Assign prefix parts using this hexadecimal subprefix ID for this interface."
 msgstr ""
 "Призначати для цього інтерфейсу частину префікса, використовуючи цей "
 "шістнадцятковий ID субпрефікса."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:148
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1967
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:22
 msgid "Associated Stations"
 msgstr "Приєднано станції"
@@ -724,20 +736,20 @@ msgstr "Приєднано станції"
 msgid "Associations"
 msgstr "З'єднань"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:39
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:37
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:101
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:64
 msgid "Auth Group"
 msgstr "Група автентифікації"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1027
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1421
 msgid "Authentication"
 msgstr "Автентифікація"
 
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:29
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:70
 msgid "Authentication Type"
 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:78
 msgid "Authoritative"
 msgstr "Надійний"
 
@@ -755,17 +767,19 @@ msgstr "Потрібна авторизація"
 msgid "Auto Refresh"
 msgstr "Автоматичне оновлення"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:53
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:7
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:17
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:67
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:24
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:36
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:42
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:36
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:106
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:24
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:98
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:50
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:94
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:81
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:55
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:68
 msgid "Automatic"
 msgstr "Автоматично"
 
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:7
 #: protocols/luci-proto-hnet/luasrc/model/network/proto_hnet.lua:7
 msgid "Automatic Homenet (HNCP)"
 msgstr "Автоматично Homenet (HNCP)"
@@ -809,21 +823,21 @@ msgstr "Доступно"
 msgid "Average:"
 msgstr "Середнє значення:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:116
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:839
 msgid "B43 + B43C"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:840
 msgid "B43 + B43C + V43"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:48
 msgid "BR / DMR / AFTR"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:43
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:75
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1620
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:176
 msgid "BSSID"
 msgstr "BSSID"
@@ -837,19 +851,11 @@ msgstr "Повернутися до переліку"
 msgid "Back to configuration"
 msgstr "Повернутися до конфігурації"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:48
-msgid "Back to overview"
-msgstr "Повернутися до переліку"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:20
-msgid "Back to scan results"
-msgstr "Повернутися до результатів сканування"
-
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:17
 msgid "Backup"
 msgstr "Резервне копіювання"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:38
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:36
 msgid "Backup / Flash Firmware"
 msgstr "Рез. копіювання / Перепрош."
 
@@ -862,11 +868,11 @@ msgid "Bad address specified!"
 msgstr "Вказано неправильну адресу!"
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:158
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:288
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:368
 msgid "Band"
 msgstr "Діапазон"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:261
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:785
 msgid "Beacon Interval"
 msgstr "Інтервал маяка"
 
@@ -880,7 +886,7 @@ msgstr ""
 "складається із позначених opkg змінених файлів конфігурації, невідокремних "
 "базових файлів, та файлів за користувацькими шаблонами резервного копіювання."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:293
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:294
 msgid ""
 "Bind dynamically to interfaces rather than wildcard address (recommended as "
 "linux default)"
@@ -888,74 +894,80 @@ msgstr ""
 "Прив'язувати динамічно до інтерфейсів, а не за шаблоном адреси (типово для "
 "linux, рекомендовано)"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:16
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:48
 msgid "Bind interface"
 msgstr "Прив'язка інтерфейсу"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:16
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:48
 msgid "Bind the tunnel to this interface (optional)."
 msgstr "Прив'язка тунелю до цього інтерфейсу (за бажання)."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:49
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:134
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:187
 msgid "Bitrate"
-msgstr "Швидкість передавання даних"
+msgstr "Швидкість потоку"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:172
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
 msgid "Bogus NX Domain Override"
 msgstr "Відкидати підробки NX-домену"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1634
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1840
 #: modules/luci-base/luasrc/model/network.lua:1420
 msgid "Bridge"
 msgstr "Міст"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:264
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:368
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:678
 msgid "Bridge interfaces"
 msgstr "Об'єднати інтерфейси в міст"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:906
 msgid "Bridge unit number"
 msgstr "Номер моста"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:250
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:364
 msgid "Bring up on boot"
 msgstr "Піднімати при завантаженні"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:35
-msgid "Broadcom 802.11%s Wireless Controller"
-msgstr "Бездротовий 802.11%s контролер Broadcom"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:45
-msgid "Broadcom BCM%04x 802.11 Wireless Controller"
-msgstr "Бездротовий 802.11 контролер Broadcom BCM%04x"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1697
+msgid "Browse…"
+msgstr "Огляд…"
 
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:18
 msgid "Buffered"
 msgstr "Буферизовано"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:75
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:134
 msgid "CA certificate; if empty it will be saved after the first connection."
 msgstr ""
 "Сертифікат CA; якщо порожньо, його буде збережено після першого підключення."
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:7
+msgid "CLAT configuration failed"
+msgstr "Помилка конфігурації <abbr title=\"464XLAT\">CLAT</abbr>"
+
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:13
 msgid "CPU usage (%)"
 msgstr "Завантаження ЦП, %"
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:21
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:53
 msgid "Call failed"
 msgstr "Не вдалося здійснити виклик"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1789
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:14
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:52
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:711
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:948
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1839
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:191
 #: modules/luci-mod-system/luasrc/view/admin_system/upgrade.htm:60
 msgid "Cancel"
 msgstr "Скасувати"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:6
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:17
 msgid "Category"
 msgstr "Категорія"
 
@@ -973,13 +985,7 @@ msgstr "Увага: систему буде оновлено примусово"
 msgid "Chain"
 msgstr "Ланцюжок"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:9
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:14
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:24
-msgid "Change login password"
-msgstr "Змінити пароль для входу"
-
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1744
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 msgid "Changes"
 msgstr "Зміни"
 
@@ -987,35 +993,23 @@ msgstr "Зміни"
 msgid "Changes applied."
 msgstr "Зміни застосовано."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2004
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2545
 msgid "Changes have been reverted."
 msgstr "Зміни було скасовано."
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:43
 msgid "Changes the administrator password for accessing the device"
 msgstr "Зміна пароля адміністратора для доступу до пристрою"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:10
-msgid "Changing password…"
-msgstr "Зміна пароля…"
-
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:162
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:45
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:87
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:174
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:376
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1618
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:186
 msgid "Channel"
 msgstr "Канал"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:119
-msgid ""
-"Channel %d is not available in the %s regulatory domain and has been auto-"
-"adjusted to %d."
-msgstr ""
-"Канал %d не доступний у %s регуляторному домені й був автоматично "
-"скоригований на %d."
-
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:229
 msgid "Check"
 msgstr "Перевірити"
@@ -1024,7 +1018,7 @@ msgstr "Перевірити"
 msgid "Check filesystems before mount"
 msgstr "Перевірити файлову систему перед монтуванням"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1806
 msgid "Check this option to delete the existing networks from this radio."
 msgstr "Позначте цей параметр, щоб видалити існуючі мережі з цього радіо."
 
@@ -1036,8 +1030,8 @@ msgstr "Контрольна сума"
 msgid "Choose mtdblock"
 msgstr "Виберіть mtdblock"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:358
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:443
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1829
 msgid ""
 "Choose the firewall zone you want to assign to this interface. Select "
 "<em>unspecified</em> to remove the interface from the associated zone or "
@@ -1049,7 +1043,7 @@ msgstr ""
 "або заповніть поле <em>створити</em>, щоб визначити нову зону і прикріпити "
 "до неї інтерфейс."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:834
 msgid ""
 "Choose the network(s) you want to attach to this wireless interface or fill "
 "out the <em>create</em> field to define a new network."
@@ -1057,11 +1051,11 @@ msgstr ""
 "Оберіть мережі, які ви хочете прикріпити до цього бездротового інтерфейсу "
 "або заповніть поле <em>створити</em>, щоб визначити нову мережу."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:614
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1023
 msgid "Cipher"
 msgstr "Шифр"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:61
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:91
 msgid "Cisco UDP encapsulation"
 msgstr "Інкапсуляція UDP Cisco"
 
@@ -1081,28 +1075,28 @@ msgstr ""
 "Натисніть \"Зберегти mtdblock\", щоб завантажити вказаний файл mtdblock. "
 "(ПРИМІТКА: ЦЕ ФУНКЦІЯ ДЛЯ ПРОФЕСІОНАЛІВ!)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1950
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:369
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:471
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2189
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:803
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:908
 msgid "Client"
 msgstr "Клієнт"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:55
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:52
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:47
 msgid "Client ID to send when requesting DHCP"
 msgstr "Ідентифікатор клієнта для відправки при запиті DHCP"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:145
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:151
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:155
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:161
 msgid "Close"
 msgstr "Закрити"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:146
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:119
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:125
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:127
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:98
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:119
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:157
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:141
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:115
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:138
 msgid ""
 "Close inactive connection after the given amount of seconds, use 0 to "
 "persist connection"
@@ -1117,12 +1111,9 @@ msgstr "Згорнути список..."
 #: modules/luci-base/luasrc/view/lease_status.htm:77
 #: modules/luci-base/luasrc/view/lease_status.htm:98
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:118
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:37
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:24
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1965
 #: modules/luci-mod-network/luasrc/view/admin_network/iface_status.htm:6
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:40
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:30
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:8
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:398
 #: modules/luci-mod-status/luasrc/view/admin_status/index/30-network.htm:11
 #: modules/luci-mod-status/luasrc/view/admin_status/index/50-dsl.htm:17
@@ -1136,15 +1127,19 @@ msgstr "Збирання даних..."
 msgid "Command"
 msgstr "Команда"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:193
+msgid "Command OK"
+msgstr "Команду виконано успішно"
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:41
+msgid "Command failed"
+msgstr "Не вдалося виконати команду"
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:64
 msgid "Comment"
 msgstr "Примітка"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:185
-msgid "Common Configuration"
-msgstr "Загальна конфігурація"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
 msgid ""
 "Complicates key reinstallation attacks on the client side by disabling "
 "retransmission of EAPOL-Key frames that are used to install keys. This "
@@ -1156,13 +1151,14 @@ msgstr ""
 "Може викликати проблеми сумісності та зниження стійкості узгодження ключа, "
 "особливо в середовищах з великою завантаженістю трафіку."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1744
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 #: modules/luci-base/luasrc/controller/admin/uci.lua:11
 #: modules/luci-mod-system/luasrc/view/admin_system/backupfiles.htm:9
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:13
 msgid "Configuration"
 msgstr "Конфігурація"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:21
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:63
 msgid "Configuration failed"
 msgstr "Помилка налаштування"
@@ -1171,42 +1167,52 @@ msgstr "Помилка налаштування"
 msgid "Configuration files will be kept"
 msgstr "Конфігураційні файли буде збережено"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1915
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2456
 msgid "Configuration has been applied."
 msgstr "Конфігурацію застосовано."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1848
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2395
 msgid "Configuration has been rolled back!"
 msgstr "Конфігурацію було відкочено!"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:43
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:942
+msgid "Confirm disconnect"
+msgstr "Підтвердіть від'єднання"
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:50
 msgid "Confirmation"
 msgstr "Підтвердження"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:32
-msgid "Connect"
-msgstr "Підключити"
-
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:72
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:105
 msgid "Connected"
 msgstr "Підключено"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:338
-msgid "Connection Limit"
-msgstr "Гранична кількість підключень"
-
 #: modules/luci-base/htdocs/luci-static/resources/network.js:7
 #: modules/luci-base/luasrc/model/network.lua:27
 msgid "Connection attempt failed"
 msgstr "Невдала спроба підключення"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:203
+msgid "Connection lost"
+msgstr "З'єднання втрачено"
+
 #: modules/luci-mod-status/luasrc/controller/admin/status.lua:32
 msgid "Connections"
 msgstr "Підключення"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1890
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:66
+msgid "Contents have been saved."
+msgstr "Вміст збережено."
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:618
+msgid "Continue"
+msgstr "Продовжити"
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2431
 msgid ""
 "Could not regain access to the device after applying the configuration "
 "changes. You might need to reconnect if you modified network related "
@@ -1217,47 +1223,37 @@ msgstr ""
 "налаштування мережі, такі як IP-адреса або облікові дані безпеки бездротової "
 "мережі."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:135
 msgid "Country"
 msgstr "Країна"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:227
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:233
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:337
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:764
 msgid "Country Code"
 msgstr "Код країни"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:36
-msgid "Cover the following interface"
-msgstr "Покривати такий інтерфейс"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:43
-msgid "Cover the following interfaces"
-msgstr "Покривати такі інтерфейси"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:357
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:86
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:443
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1829
 msgid "Create / Assign firewall-zone"
 msgstr "Створити / Визначити зону брандмауера"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:9
-msgid "Create Interface"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:735
+msgid "Create interface"
 msgstr "Створити інтерфейс"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:33
-msgid "Create a bridge over multiple interfaces"
-msgstr "Створити міст через кілька інтерфейсів"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:174
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:165
 msgid "Critical"
 msgstr "Критичний"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:178
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:169
 msgid "Cron Log Level"
 msgstr "Рівень виведення інформації Cron"
 
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:519
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:521
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:447
+msgid "Current power"
+msgstr "Поточна потужність"
+
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:552
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:554
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:51
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:53
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:82
@@ -1265,7 +1261,7 @@ msgstr "Рівень виведення інформації Cron"
 msgid "Custom Interface"
 msgstr "Інтерфейс користувача"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:36
 msgid "Custom delegated IPv6-prefix"
 msgstr "Користувацький делегований префікс IPv6"
 
@@ -1278,7 +1274,7 @@ msgstr ""
 "запобігти цьому, спочатку виконайте відновлення мікропрограми до її "
 "початкового стану."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:59
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:41
 msgid ""
 "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
 "\">LED</abbr>s if possible."
@@ -1286,46 +1282,47 @@ msgstr ""
 "Налаштування поведінки <abbr title=\"Light Emitting Diode — світлодіод"
 "\">LED</abbr>, якщо це можливо."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:799
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1223
 msgid "DAE-Client"
 msgstr "Клієнт DAE"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:807
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1231
 msgid "DAE-Port"
 msgstr "Порт DAE"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:815
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1239
 msgid "DAE-Secret"
 msgstr "Секрет DAE"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:448
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:459
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:279
 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:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:61
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:62
 msgid "DHCP and DNS"
 msgstr "DHCP та DNS"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1195
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1385
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:16
 #: modules/luci-base/luasrc/model/network.lua:968
 msgid "DHCP client"
 msgstr "Клієнт DHCP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:571
 msgid "DHCP-Options"
 msgstr "Параметри DHCP"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_dhcpv6.lua:7
 msgid "DHCPv6 client"
 msgstr "Клієнт DHCPv6"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:540
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:594
 msgid "DHCPv6-Mode"
 msgstr "Режим DHCPv6"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:529
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:583
 msgid "DHCPv6-Service"
 msgstr "Служба DHCPv6"
 
@@ -1342,31 +1339,31 @@ msgstr "Служба DHCPv6"
 msgid "DNS"
 msgstr "DNS"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:183
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
 msgid "DNS forwardings"
 msgstr "Переспрямовування<br />запитів DNS"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:30
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:37
 msgid "DNS-Label / FQDN"
 msgstr "DNS-мітка / FQDN"
 
-#: 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:136
 msgid "DNSSEC"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:139
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
 msgid "DNSSEC check unsigned"
 msgstr "Перевірка непідписаного DNSSEC"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:73
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:99
 msgid "DPD Idle Timeout"
 msgstr "Тайм-аут простою DPD"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:14
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:41
 msgid "DS-Lite AFTR address"
 msgstr "AFTR-адреса DS-Lite"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:92
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:815
 #: modules/luci-mod-status/luasrc/view/admin_status/index/50-dsl.htm:14
 msgid "DSL"
 msgstr "DSL"
@@ -1375,11 +1372,11 @@ msgstr "DSL"
 msgid "DSL Status"
 msgstr "Стан DSL"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:125
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:848
 msgid "DSL line mode"
 msgstr "Режим лінії DSL"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:519
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:963
 msgid "DTIM Interval"
 msgstr ""
 "Інтервал <abbr title=\"Delivery Traffic Indication Message — Повідомлення "
@@ -1393,42 +1390,45 @@ msgstr "DUID"
 msgid "Data Rate"
 msgstr "Швидк. передавання"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:169
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:180
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:160
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:171
 msgid "Debug"
 msgstr "Зневаджування"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:759
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:783
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:807
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1183
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1207
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1231
 msgid "Default %d"
 msgstr "Типово %d"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:82
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:107
 msgid "Default Route"
 msgstr "Типовий маршрут"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:17
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:81
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:51
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:32
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:48
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:85
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:65
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:80
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:108
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:146
 msgid "Default gateway"
 msgstr "Типовий шлюз"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:541
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:594
 msgid "Default is stateless + stateful"
 msgstr "Типовим є БЕЗ та ЗІ збереженням стану"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:70
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:54
 msgid "Default state"
 msgstr "Типовий стан"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:503
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:553
 msgid "Define a name for this network."
-msgstr "Визначення імені для цієї мережі."
+msgstr "Визначте назву для цієї мережі."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:514
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:571
 msgid ""
 "Define additional DHCP options, for example "
 "\"<code>6,192.168.2.1,192.168.2.2</code>\" which advertises different DNS "
@@ -1438,35 +1438,47 @@ msgstr ""
 "\"<code>6,192.168.2.1,192.168.2.2</code>\", щоб оголошувати різні DNS-"
 "сервери для клієнтів."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:705
-#: modules/luci-base/htdocs/luci-static/resources/form.js:958
-#: modules/luci-base/htdocs/luci-static/resources/form.js:959
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1271
+#: modules/luci-base/htdocs/luci-static/resources/form.js:966
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1210
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1216
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1524
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1758
 #: modules/luci-base/luasrc/view/cbi/nsection.htm:11
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:162
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:16
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:41
 msgid "Delete"
 msgstr "Видалити"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:178
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:187
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:193
 msgid "Delete key"
 msgstr "Видалити ключ"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:45
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1654
+msgid "Delete permission denied"
+msgstr "Дозволу на видалення не надано"
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1656
+msgid "Delete request failed: %d %s"
+msgstr "Помилка запиту на видалення: %d %s"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:723
 msgid "Delete this network"
 msgstr "Видалити цю мережу"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:519
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:963
 msgid "Delivery Traffic Indication Message Interval"
 msgstr "Інтервал повідомлень індикації доправлення трафіку"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:102
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:108
 msgid "Description"
 msgstr "Опис"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:224
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1754
+msgid "Deselect"
+msgstr "Скасувати вибір"
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:215
 msgid "Design"
 msgstr "Стиль"
 
@@ -1484,10 +1496,12 @@ msgstr "Зона призначення"
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:177
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:43
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:13
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:38
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:73
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:33
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:52
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:85
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:86
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:72
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:154
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:253
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:86
@@ -1495,15 +1509,24 @@ msgstr "Зона призначення"
 msgid "Device"
 msgstr "Пристрій"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:138
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:737
 msgid "Device Configuration"
 msgstr "Конфігурація пристрою"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:81
+msgid "Device is not active"
+msgstr "Пристрій не є активним"
+
 #: modules/luci-mod-system/luasrc/view/admin_system/reboot.htm:23
 msgid "Device is rebooting..."
 msgstr "Пристрій перезавантажується..."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1889
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:167
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:513
+msgid "Device is restarting…"
+msgstr "Пристрій перезавантажується…"
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2430
 msgid "Device unreachable!"
 msgstr "Пристрій недосяжний!"
 
@@ -1511,26 +1534,26 @@ msgstr "Пристрій недосяжний!"
 msgid "Device unreachable! Still waiting for device..."
 msgstr "Пристрій недосяжний! Досі чекаємо на пристрій..."
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:123
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:78
 #: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:61
 msgid "Diagnostics"
 msgstr "Діагностика"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:45
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:60
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:101
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:93
 msgid "Dial number"
 msgstr "Набір номера"
 
-#: modules/luci-base/luasrc/view/cbi/filebrowser.htm:99
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1554
 msgid "Directory"
 msgstr "Каталог"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:131
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:715
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:754
 msgid "Disable"
 msgstr "Вимкнути"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:472
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:531
 msgid ""
 "Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for "
 "this interface."
@@ -1538,71 +1561,66 @@ msgstr ""
 "Вимкнути <abbr title=\"Dynamic Host Configuration Protocol — протокол "
 "динамічної конфігурації вузла\">DHCP</abbr> для цього інтерфейсу."
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:64
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:93
 msgid "Disable Encryption"
 msgstr "Вимкнути шифрування"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:530
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:973
 msgid "Disable Inactivity Polling"
 msgstr "Вимкнути опитування неактивності"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:713
 msgid "Disable this network"
 msgstr "Вимкнути цю мережу"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:44
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:54
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:68
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:37
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:43
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:37
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1534
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:76
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:107
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:99
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:51
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:95
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:82
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:69
 msgid "Disabled"
 msgstr "Вимкнено"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1139
-msgid "Disabled (default)"
-msgstr "Вимкнено (типово)"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:544
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:987
 msgid "Disassociate On Low Acknowledgement"
 msgstr "Роз'єднувати за низького підтвердження"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:193
 msgid "Discard upstream RFC1918 responses"
 msgstr "Відкидати висхідні RFC1918-відповіді"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:92
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:114
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:956
 msgid "Disconnect"
 msgstr "Від’єднати"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:22
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:64
 msgid "Disconnection attempt failed"
 msgstr "Спроба від'єднання не вдалася"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1121
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1762
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1855
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:17
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1375
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1995
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2314
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2401
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1634
 msgid "Dismiss"
 msgstr "Відхилити"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:240
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:334
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:770
 msgid "Distance Optimization"
 msgstr "Оптимізація за відстанню"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:241
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:770
 msgid "Distance to farthest network member in meters."
 msgstr "Відстань до найвіддаленішого вузла мережі в метрах."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:347
-msgid "Diversity"
-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:61
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
@@ -1615,39 +1633,47 @@ msgstr ""
 "для брандмауерів <abbr title=\"Network Address Translation — перетворення "
 "(трансляція) мережевих адрес\">NAT</abbr>"
 
-#: 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:159
 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:123
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:124
 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:118
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
 msgid "Do not forward reverse lookups for local networks"
 msgstr ""
 "Не переспрямовувати зворотні <abbr title=\"Domain Name System — система "
 "доменних імен\">DNS</abbr>-запити для локальних мереж"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:173
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1639
+msgid "Do you really want to delete \"%s\" ?"
+msgstr "Справді видалити \"%s\"?"
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:188
 msgid "Do you really want to delete the following SSH key?"
 msgstr "Справді видалити такий SSH ключ?"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1637
+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:74
 msgid "Domain required"
 msgstr "Потрібен домен"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:205
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:206
 msgid "Domain whitelist"
 msgstr "\"Білий список\" доменів"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:34
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:67
 msgid "Don't Fragment"
 msgstr "Не фрагментувати"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:74
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:75
 msgid ""
 "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
 "<abbr title=\"Domain Name System\">DNS</abbr>-Name"
@@ -1668,19 +1694,19 @@ msgstr "Завантажити резервну копію"
 msgid "Download mtdblock"
 msgstr "Завантажити mtdblock"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:853
 msgid "Downstream SNR offset"
 msgstr "Низхідний зсув SNR"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:914
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1169
 msgid "Drag to reorder"
 msgstr "Перетягніть, щоб змінити порядок"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:9
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:11
 msgid "Dropbear Instance"
 msgstr "Реалізація Dropbear"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:6
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 msgid ""
 "Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access "
 "and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
@@ -1688,21 +1714,22 @@ msgstr ""
 "Dropbear — це <abbr title=\"Secure Shell — безпечна оболонка\">SSH</abbr>-"
 "сервер із вбудованим <abbr title=\"Secure Copy\">SCP</abbr>"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:11
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:14
 msgid "Dual-Stack Lite (RFC6333)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:493
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:547
 msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 msgstr ""
 "Динамічний <abbr title=\"Dynamic Host Configuration Protocol — протокол "
 "динамічної конфігурації вузла\">DHCP</abbr>"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:60
 msgid "Dynamic tunnel"
 msgstr "Динамічний тунель"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:494
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:547
 msgid ""
 "Dynamically allocate DHCP addresses for clients. If disabled, only clients "
 "having static leases will be served."
@@ -1710,21 +1737,21 @@ msgstr ""
 "Динамічне виділення DHCP-адрес для клієнтів. Якщо вимкнути, будуть "
 "обслуговуватися тільки клієнти, які мають статичні оренди."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:67
 msgid "EA-bits length"
 msgstr "Довжина EA-бітів"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:990
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1386
 msgid "EAP-Method"
 msgstr "EAP-Метод"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:934
-#: modules/luci-base/htdocs/luci-static/resources/form.js:935
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1199
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1188
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1191
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1450
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:154
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:160
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:38
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:291
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:720
 msgid "Edit"
 msgstr "Редагувати"
 
@@ -1736,24 +1763,24 @@ msgstr ""
 "Щоб виправити якусь помилку, відредагуйте вихідні дані конфігурації вище і "
 "натисніть \"Зберегти\", щоб перезавантажити сторінку."
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:38
-msgid "Edit this interface"
-msgstr "Редагувати цей інтерфейс"
-
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:718
 msgid "Edit this network"
 msgstr "Редагувати цю мережу"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:669
+msgid "Edit wireless network"
+msgstr "Редагування бездротової мережі"
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:167
 msgid "Emergency"
 msgstr "Аварійний"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:127
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:715
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:754
 msgid "Enable"
 msgstr "Увімкнути"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:414
 msgid ""
 "Enable <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> "
 "snooping"
@@ -1761,67 +1788,68 @@ msgstr ""
 "Увімкнути відстеження <abbr title=\"Internet Group Management Protocol"
 "\">IGMP</abbr>"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:271
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:412
 msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 msgstr "Увімкнути <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:41
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:60
 msgid "Enable HE.net dynamic endpoint update"
 msgstr "Увімкнути динамічне оновлення кінцевого вузла HE.net"
 
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:51
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:89
 msgid "Enable IPv6 negotiation"
 msgstr "Увімкнути узгодження IPv6"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:23
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:35
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:41
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:35
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:37
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:49
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:80
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:54
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:67
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:93
 msgid "Enable IPv6 negotiation on the PPP link"
 msgstr "Увімкнути узгодження IPv6 для PPP-з'єднань"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:143
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:188
 msgid "Enable Jumbo Frame passthrough"
 msgstr "Пропускати Jumbo-фрейми"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:244
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:235
 msgid "Enable NTP client"
 msgstr "Увімкнути клієнта NTP"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:69
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:96
 msgid "Enable Single DES"
 msgstr "Увімкнути Single DES"
 
-#: 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:267
 msgid "Enable TFTP server"
 msgstr "Увімкнути TFTP-сервер"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:134
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:180
 msgid "Enable VLAN functionality"
 msgstr "Увімкнути підтримку VLAN"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1595
 msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
 msgstr "Увімкнути кнопку WPS, потребує WPA(2)-PSK"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1175
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
 msgid "Enable key reinstallation (KRACK) countermeasures"
 msgstr "Увімкнути протидію<br />перевстановленню ключів (KRACK)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:138
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:183
 msgid "Enable learning and aging"
 msgstr "Увімкнути learning та aging"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:194
 msgid "Enable mirroring of incoming packets"
 msgstr "Увімкнути віддзеркалення вхідних пакетів"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:151
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:195
 msgid "Enable mirroring of outgoing packets"
 msgstr "Увімкнути віддзеркалення вихідних пакетів"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:34
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:67
 msgid "Enable the DF (Don't Fragment) flag of the encapsulating packets."
 msgstr "Увімкнути прапорець DF (Don't Fragment) для інкапсульованих пакетів."
 
@@ -1829,7 +1857,7 @@ msgstr "Увімкнути прапорець DF (Don't Fragment) для інк
 msgid "Enable this mount"
 msgstr "Увімкнути це монтування"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:713
 msgid "Enable this network"
 msgstr "Увімкнути цю мережу"
 
@@ -1837,21 +1865,21 @@ msgstr "Увімкнути цю мережу"
 msgid "Enable this swap"
 msgstr "Увімкнути цей своп"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:37
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:88
 msgid "Enable/Disable"
 msgstr "Увімкнено/Вимкнено"
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:76
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:152
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:251
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:41
 msgid "Enabled"
 msgstr "Увімкнено"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:277
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:414
 msgid "Enables IGMP snooping on this bridge"
 msgstr "Вмикає відстеження IGMP на цьому мосту"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:892
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1310
 msgid ""
 "Enables fast roaming among access points that belong to the same Mobility "
 "Domain"
@@ -1859,29 +1887,33 @@ msgstr ""
 "Вмикає швидкий роумінг між точками доступу, що належать до одного і того ж "
 "домену мобільності"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:272
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:412
 msgid "Enables the Spanning Tree Protocol on this bridge"
 msgstr ""
 "Вмикає <abbr title=\"Spanning Tree Protocol\">STP</abbr> на цьому мосту"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:120
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:180
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:59
+msgid "Encapsulation limit"
+msgstr "Межа інкапсуляції"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:843
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:901
 msgid "Encapsulation mode"
 msgstr "Режим інкапсуляції"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:76
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:603
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:129
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:992
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1621
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:177
 msgid "Encryption"
 msgstr "Шифрування"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:155
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:128
 msgid "Endpoint Host"
 msgstr "Кінцевий вузол"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:165
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:132
 msgid "Endpoint Port"
 msgstr "Порт кінцевого вузла"
 
@@ -1893,16 +1925,21 @@ msgstr "Введіть власне значення"
 msgid "Enter custom values"
 msgstr "Введіть власні значення"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:273
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:271
 msgid "Erasing..."
 msgstr "Видалення..."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:95
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:96
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:97
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:98
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:99
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:106
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:107
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:108
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:109
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:110
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:173
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:164
 msgid "Error"
 msgstr "Помилка"
 
@@ -1910,24 +1947,28 @@ msgstr "Помилка"
 msgid "Errored seconds (ES)"
 msgstr "Секунд з помилками (<abbr title=\"Errored seconds\">ES</abbr>)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1646
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1852
 #: modules/luci-base/luasrc/model/network.lua:1432
 msgid "Ethernet Adapter"
 msgstr "Ethernet-адаптер"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1637
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1843
 #: modules/luci-base/luasrc/model/network.lua:1422
 msgid "Ethernet Switch"
 msgstr "Ethernet-комутатор"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:303
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
 msgid "Exclude interfaces"
 msgstr "Виключити інтерфейси"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:153
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
 msgid "Expand hosts"
 msgstr "Розширення вузлів"
 
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:195
+msgid "Expecting an hexadecimal assignment hint"
+msgstr "Очікується шістнадцятковий натяк призначення"
+
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:59
 msgid "Expecting: %s"
 msgstr "Очікування: %s"
@@ -1936,60 +1977,76 @@ msgstr "Очікування: %s"
 msgid "Expires"
 msgstr "Збігає за"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:488
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:543
 msgid ""
 "Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
 msgstr "Термін оренди адрес, мінімум 2 хвилини (<code>2m</code>)."
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:8
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:19
 msgid "External"
 msgstr "Зовнішнє"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:971
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1377
 msgid "External R0 Key Holder List"
 msgstr "Зовнішній список власників ключів R0"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:980
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1381
 msgid "External R1 Key Holder List"
 msgstr "Зовнішній список власників ключів R1"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:150
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:141
 msgid "External system log server"
 msgstr "Зовнішній сервер системного журналу"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:155
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:146
 msgid "External system log server port"
 msgstr "Порт зовнішнього сервера системного журналу"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:160
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:151
 msgid "External system log server protocol"
 msgstr "Протокол зовнішнього сервера системного журналу"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:18
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:79
 msgid "Extra SSH command options"
 msgstr "Додаткові параметри команд SSH"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:940
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1351
 msgid "FT over DS"
 msgstr "FT через DS"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:941
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1352
 msgid "FT over the Air"
 msgstr "FT через повітря"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:938
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1349
 msgid "FT protocol"
 msgstr "Протокол FT"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1842
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:82
+msgid "Failed to change the system password."
+msgstr "Не вдалося змінити системний пароль."
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2389
 msgid "Failed to confirm apply within %ds, waiting for rollback…"
 msgstr "Не вдалося підтвердити застосування на протязі %d с, очікуємо відкату…"
 
-#: modules/luci-base/luasrc/view/cbi/filebrowser.htm:106
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:45
+msgid "Failed to execute \"/etc/init.d/%s %s\" action: %s"
+msgstr "Не вдалося виконати дію \"/etc/init.d/%s %s\": %s"
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1561
 msgid "File"
 msgstr "Файл"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:279
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1514
+msgid "File not accessible"
+msgstr "Файл недоступний"
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1698
+msgid "Filename"
+msgstr "Ім'я файлу"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:280
 msgid "Filename of the boot image advertised to clients"
 msgstr "І'мя завантажувального образу, що оголошується клієнтам"
 
@@ -1999,14 +2056,15 @@ msgstr "І'мя завантажувального образу, що оголо
 msgid "Filesystem"
 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:118
 msgid "Filter private"
 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:123
 msgid "Filter useless"
 msgstr "Фільтрувати непридатні"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:23
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:65
 msgid "Finalizing failed"
 msgstr "Завершення не вдалося"
@@ -2019,7 +2077,7 @@ msgstr ""
 "Знайти всі файлові системи та свопи, які наразі підключено і замінити "
 "конфігурацію типовою на підставі того, що було виявлено"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:696
 msgid "Find and join network"
 msgstr "Знайти мережу й приєднатися"
 
@@ -2031,11 +2089,11 @@ msgstr "Готово"
 msgid "Firewall"
 msgstr "Брандмауер"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:77
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:76
 msgid "Firewall Mark"
 msgstr "Позначка брандмауера"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:193
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:278
 msgid "Firewall Settings"
 msgstr "Налаштування брандмауера"
 
@@ -2043,7 +2101,7 @@ msgstr "Налаштування брандмауера"
 msgid "Firewall Status"
 msgstr "Стан брандмауера"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:137
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:860
 msgid "Firmware File"
 msgstr "Файл мікропрограми"
 
@@ -2051,7 +2109,7 @@ msgstr "Файл мікропрограми"
 msgid "Firmware Version"
 msgstr "Версія мікропрограми"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:225
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:226
 msgid "Fixed source port for outbound DNS queries"
 msgstr "Фіксований порт для вихідних DNS-запитів"
 
@@ -2071,35 +2129,35 @@ msgstr "Прошити новий образ мікропрограми"
 msgid "Flash operations"
 msgstr "Операції прошивання"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:194
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:192
 msgid "Flashing..."
 msgstr "Перепрошиваємо..."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:498
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:550
 msgid "Force"
 msgstr "Примусово"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:258
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:782
 msgid "Force 40MHz mode"
-msgstr "Примусово застосовувати режим '40MHz'"
+msgstr "Примусово режим '40MHz'"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:622
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1031
 msgid "Force CCMP (AES)"
 msgstr "Примусово CCMP (AES)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:499
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:550
 msgid "Force DHCP on this network even if another server is detected."
 msgstr "Примусово DHCP у цій мережі, навіть якщо виявлено інший сервер."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:623
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1032
 msgid "Force TKIP"
 msgstr "Примусово TKIP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:624
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1033
 msgid "Force TKIP and CCMP (AES)"
 msgstr "Примусово TKIP та CCMP (AES)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:795
 msgid "Force link"
 msgstr "Примусове з'єднання"
 
@@ -2107,7 +2165,7 @@ msgstr "Примусове з'єднання"
 msgid "Force upgrade"
 msgstr "Примусове оновлення"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:60
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:90
 msgid "Force use of NAT-T"
 msgstr "Примусово використовувати NAT-T"
 
@@ -2115,7 +2173,7 @@ msgstr "Примусово використовувати NAT-T"
 msgid "Form token mismatch"
 msgstr "Неузгодженість маркера форми"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:34
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:164
 msgid "Forward DHCP traffic"
 msgstr "Переспрямовувати DHCP-трафік"
 
@@ -2123,48 +2181,43 @@ msgstr "Переспрямовувати DHCP-трафік"
 msgid "Forward Error Correction Seconds (FECS)"
 msgstr "Секунди прямого коригування помилок (FECS)"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:28
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:161
 msgid "Forward broadcast traffic"
 msgstr "Переспрямовувати широкомовний трафік"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:375
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:809
 msgid "Forward mesh peer traffic"
 msgstr "Переспрямовувати одноранговий трафік"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:186
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:908
 msgid "Forwarding mode"
 msgstr "Режим переспрямовування"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:255
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:596
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:774
 msgid "Fragmentation Threshold"
 msgstr "Поріг фрагментації"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:332
-msgid "Frame Bursting"
-msgstr "Frame Bursting"
-
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:17
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:28
 msgid "Free"
 msgstr "Вільно"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:91
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:89
 msgid ""
-"Further information about WireGuard interfaces and peers at <a href=\"http://"
-"wireguard.com\">wireguard.com</a>."
+"Further information about WireGuard interfaces and peers at <a href='http://"
+"wireguard.com'>wireguard.com</a>."
 msgstr ""
-"Більш детальна інформація про інтерфейси та вузли WireGuard на <a href="
-"\"http://wireguard.com\">wireguard.com</a>."
+"Більш детальну інформацію про інтерфейси та вузли WireGuard наведено на "
+"сайті <a href='http://wireguard.com\">wireguard.com</a>."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:45
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:130
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:186
 msgid "GHz"
 msgstr "ГГц"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:29
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:36
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:91
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:77
 msgid "GPRS only"
 msgstr "Тільки GPRS"
 
@@ -2173,28 +2226,28 @@ msgstr "Тільки GPRS"
 msgid "Gateway"
 msgstr "Шлюз"
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:35
+msgid "Gateway Ports"
+msgstr "Порти шлюзу"
+
 #: modules/luci-base/htdocs/luci-static/resources/network.js:9
 #: modules/luci-base/luasrc/model/network.lua:29
 msgid "Gateway address is invalid"
 msgstr "Неприпустима адреса шлюзу"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:46
-msgid "Gateway ports"
-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:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:275
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:23
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:112
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:103
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:49
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:33
 msgid "General Settings"
 msgstr "Загальні параметри"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:188
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:462
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:175
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:141
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:361
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:504
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:895
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:741
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:796
 msgid "General Setup"
 msgstr "Загальні налаштування"
 
@@ -2202,7 +2255,7 @@ msgstr "Загальні налаштування"
 msgid "Generate Config"
 msgstr "Cтворити конфігурацію"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:945
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1355
 msgid "Generate PMK locally"
 msgstr "Генерувати PMK локально"
 
@@ -2210,11 +2263,7 @@ msgstr "Генерувати PMK локально"
 msgid "Generate archive"
 msgstr "Cтворити архів"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:63
-msgid "Generic 802.11%s Wireless Controller"
-msgstr "Бездротовий 802.11%s контролер"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:26
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:74
 msgid "Given password confirmation did not match, password not changed!"
 msgstr "Оскільки пароль і підтвердження не співпадають, то пароль не змінено!"
 
@@ -2222,7 +2271,7 @@ msgstr "Оскільки пароль і підтвердження не спі
 msgid "Global Settings"
 msgstr "Загальні параметри"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:806
 msgid "Global network options"
 msgstr "Глобальні параметри мережі"
 
@@ -2233,33 +2282,29 @@ msgstr "Глобальні параметри мережі"
 msgid "Go to password configuration..."
 msgstr "Перейти до конфігурації пароля..."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:857
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1369
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1112
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1616
 #: modules/luci-base/luasrc/view/cbi/full_valueheader.htm:4
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:58
 msgid "Go to relevant configuration page"
 msgstr "Перейти до відповідної сторінки конфігурації"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:38
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:66
 msgid "Group Password"
 msgstr "Пароль групи"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:11
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:22
 msgid "Guest"
 msgstr "Гість"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:73
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:81
 msgid "HE.net password"
 msgstr "Пароль HE.net"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:60
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:73
 msgid "HE.net username"
 msgstr "Ім'я користувача HE.net"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:310
-msgid "HT mode (802.11n)"
-msgstr "Режим HT (802.11n)"
-
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:16
 msgid "Hang Up"
 msgstr "Призупинити"
@@ -2270,7 +2315,7 @@ msgstr ""
 "Помилки коду помилок заголовка (<abbr title=\"Header Error Control\">HEC</"
 "abbr>)"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:103
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 msgid ""
 "Here you can configure the basic aspects of your device like its hostname or "
 "the timezone."
@@ -2278,9 +2323,7 @@ msgstr ""
 "Тут ви можете налаштувати основні параметри вигляду вашого пристрою, такі як "
 "назва (ім'я) вузла або часовий пояс."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:499
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:556
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:579
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:941
 msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr ""
 "Приховати <abbr title=\"Extended Service Set Identifier — ідентифікатор "
@@ -2293,14 +2336,15 @@ msgstr "Приховати порожні ланцюжки"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:92
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1959
 msgid "Host"
 msgstr "Вузол"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:20
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:21
 msgid "Host entries"
 msgstr "Записи вузлів"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:48
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:171
 msgid "Host expiry timeout"
 msgstr "Тайм-аут вузла"
 
@@ -2308,45 +2352,45 @@ msgstr "Тайм-аут вузла"
 msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
 msgstr "<abbr title=\"Internet Protocol Address\">IP</abbr> вузла або мережа"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:118
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:102
 msgid "Host-Uniq tag content"
 msgstr "Зміст тегу Host-Uniq"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:71
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:31
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:316
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:25
+#: 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:317
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:26
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:17
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:125
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:116
 msgid "Hostname"
 msgstr "Назва (ім'я) вузла"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:12
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:22
 msgid "Hostname to send when requesting DHCP"
 msgstr "Ім'я вузла для надсилання при запиті DHCP"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:18
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:19
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:67
 msgid "Hostnames"
 msgstr "Імена вузлів"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:13
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:24
 msgid "Hybrid"
 msgstr "Гібрид"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:45
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:75
 msgid "IKE DH Group"
 msgstr "Група IKE DH"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:41
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:59
 msgid "IP Addresses"
 msgstr "IP-адреси"
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:40
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:80
 msgid "IP Protocol"
 msgstr "IP-протокол"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:29
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:30
 msgid "IP address"
 msgstr "IP-адреса"
 
@@ -2365,6 +2409,11 @@ msgstr "Відсутня IP-адреса"
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:20
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:21
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:22
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:79
+#: 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/network.js:89
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:90
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:91
@@ -2372,7 +2421,7 @@ msgstr "Відсутня IP-адреса"
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:93
 #: 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/luasrc/model/cbi/admin_network/proto_ncm.lua:42
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:82
 msgid "IPv4"
 msgstr "IPv4"
 
@@ -2384,24 +2433,23 @@ msgstr "Брандмауер IPv4"
 msgid "IPv4 Upstream"
 msgstr "Висхідне з'єднання IPv4"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:57
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:178
 msgid "IPv4 address"
 msgstr "Адреса IPv4"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:26
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:33
 msgid "IPv4 assignment length"
 msgstr "Довжина присвоювання IPv4"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:104
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:181
 msgid "IPv4 broadcast"
 msgstr "Широкомовний IPv4"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:100
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:180
 msgid "IPv4 gateway"
 msgstr "Шлюз IPv4"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:92
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:179
 msgid "IPv4 netmask"
 msgstr "Маска мережі IPv4"
 
@@ -2409,24 +2457,25 @@ msgstr "Маска мережі IPv4"
 msgid "IPv4 network in address/netmask notation"
 msgstr "Мережа IPv4 у позначенні адреси / мережевої маски"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:25
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:52
 msgid "IPv4 prefix"
 msgstr "Префікс IPv4"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:42
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:30
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:55
 msgid "IPv4 prefix length"
 msgstr "Довжина префікса IPv4"
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:43
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:83
 msgid "IPv4+IPv6"
 msgstr "IPv4+IPv6"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:72
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:34
 msgid "IPv4-Address"
 msgstr "IPv4-адреса"
 
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:10
 #: protocols/luci-proto-ipip/luasrc/model/network/proto_ipip.lua:9
 msgid "IPv4-in-IPv4 (RFC2003)"
 msgstr "IPv4 у IPv4 (RFC2003)"
@@ -2441,6 +2490,16 @@ msgstr "IPv4 у IPv4 (RFC2003)"
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:30
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:31
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:32
+#: 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/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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:89
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:90
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:91
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:92
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:95
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:96
@@ -2453,7 +2512,7 @@ msgstr "IPv4 у IPv4 (RFC2003)"
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:103
 #: 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/luasrc/model/cbi/admin_network/proto_ncm.lua:44
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:84
 msgid "IPv6"
 msgstr "IPv6"
 
@@ -2465,11 +2524,11 @@ msgstr "Брандмауер IPv6"
 msgid "IPv6 Neighbours"
 msgstr "Сусіди IPv6"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:464
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:506
 msgid "IPv6 Settings"
 msgstr "Налаштування IPv6"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:195
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:810
 msgid "IPv6 ULA-Prefix"
 msgstr ""
 "<abbr title=\"Unique Local Address — унікальна локальна адреса\">ULA</abbr>-"
@@ -2479,21 +2538,21 @@ msgstr ""
 msgid "IPv6 Upstream"
 msgstr "Висхідне з'єднання IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:202
 msgid "IPv6 address"
 msgstr "Адреса IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:23
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:189
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:31
 msgid "IPv6 assignment hint"
 msgstr "Натяк призначення IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:18
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:184
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:27
 msgid "IPv6 assignment length"
 msgstr "Довжина призначення IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:207
 msgid "IPv6 gateway"
 msgstr "Шлюз IPv6"
 
@@ -2501,22 +2560,22 @@ msgstr "Шлюз IPv6"
 msgid "IPv6 network in address/netmask notation"
 msgstr "Мережа IPv6 у позначенні адреси / мережевої маски"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:37
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:59
 msgid "IPv6 prefix"
 msgstr "Префікс IPv6"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:34
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:45
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:63
 msgid "IPv6 prefix length"
 msgstr "Довжина префікса IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:33
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:211
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:57
 msgid "IPv6 routed prefix"
 msgstr "Надісланий префікс IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:143
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:215
 msgid "IPv6 suffix"
 msgstr "Суфікс IPv6"
 
@@ -2526,31 +2585,35 @@ msgid "IPv6-Address"
 msgstr "IPv6-адреса"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:93
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:104
 msgid "IPv6-PD"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:10
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:13
 msgid "IPv6-in-IPv4 (RFC4213)"
 msgstr "IPv6 у IPv4 (RFC4213)"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:17
 msgid "IPv6-over-IPv4 (6rd)"
 msgstr "IPv6 через IPv4 (6rd)"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:15
 msgid "IPv6-over-IPv4 (6to4)"
 msgstr "IPv6 через IPv4 (6to4)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1075
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1478
 msgid "Identity"
 msgstr "Посвідчення"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:70
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:96
 msgid "If checked, 1DES is enabled"
 msgstr "Якщо позначено, 1DES увімкнено"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:65
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:93
 msgid "If checked, encryption is disabled"
 msgstr "Якщо позначено, шифрування вимкнено"
 
@@ -2571,36 +2634,36 @@ msgstr ""
 "Якщо обрано, монтувати пристрій за міткою його розділу замість фіксованого "
 "вузла пристрою"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:27
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:71
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:18
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:82
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:52
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:17
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:29
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:33
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:68
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:85
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:32
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:45
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:45
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:24
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:44
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:116
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:48
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:85
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:65
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:33
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:80
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:108
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:146
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:74
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:97
 msgid "If unchecked, no default route is configured"
 msgstr "Якщо не позначено, типовий маршрут не налаштовано"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:34
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:86
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:35
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:99
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:47
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:60
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:60
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:39
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:59
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:124
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:39
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:116
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:59
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:103
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:64
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:77
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:100
 msgid "If unchecked, the advertised DNS server addresses are ignored"
 msgstr "Якщо не позначено, оголошувані адреси DNS-серверів ігноруються"
 
@@ -2619,15 +2682,15 @@ msgstr ""
 "своп-пристрої не можуть бути доступні з такою високою швидкістю, як <abbr "
 "title=\"Random Access Memory\">RAM</abbr>."
 
-#: 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:102
 msgid "Ignore <code>/etc/hosts</code>"
-msgstr "Ігнорувати<code>/etc/hosts</code>"
+msgstr "Ігнорувати <code>/etc/hosts</code>"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:471
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:531
 msgid "Ignore interface"
 msgstr "Ігнорувати интерфейс"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:90
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:91
 msgid "Ignore resolve file"
 msgstr "Ігнорувати файли resolv"
 
@@ -2648,12 +2711,12 @@ msgstr ""
 "заблоковано. Натисніть \"Продовжити »\" нижче, щоб повернутися до "
 "попередньої сторінки."
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:145
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:118
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:124
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:126
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:97
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:118
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:157
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:141
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:115
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:138
 msgid "Inactivity timeout"
 msgstr "Тайм-аут бездіяльності"
 
@@ -2661,23 +2724,25 @@ msgstr "Тайм-аут бездіяльності"
 msgid "Inbound:"
 msgstr "Вхідний:"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:170
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:161
 msgid "Info"
 msgstr "Інформація"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:105
 msgid "Information"
 msgstr "Інформація"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:25
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:67
 msgid "Initialization failure"
 msgstr "Помилка ініціалізації"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:34
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:87
 msgid "Initscript"
 msgstr "Скрипт ініціалізації"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:26
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:122
 msgid "Initscripts"
 msgstr "Скрипти ініціалізації"
 
@@ -2685,55 +2750,74 @@ msgstr "Скрипти ініціалізації"
 msgid "Install iputils-traceroute6 for IPv6 traceroute"
 msgstr "Інсталюйте iputils-traceroute6 для трасування IPv6"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:223
-msgid "Install package %q"
-msgstr "Інсталяція пакета %q"
-
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:220
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:120
 msgid "Install protocol extensions..."
 msgstr "Інсталяція розширень протоколу..."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:416
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:423
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:683
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:687
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:26
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:284
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:342
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:47
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:134
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:14
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:16
 msgid "Interface"
 msgstr "Інтерфейс"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:58
 msgid "Interface %q device auto-migrated from %q to %q."
 msgstr "Пристрій інтерфейсу %q автоматичного мігрував із %q на %q."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:356
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:792
 msgid "Interface Configuration"
 msgstr "Конфігурація інтерфейсу"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:51
-msgid "Interface Overview"
-msgstr "Огляд інтерфейсів"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:99
+msgid "Interface has %d pending changes"
+msgstr "Інтерфейс має %d змін, що очікують"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:57
+msgid "Interface is marked for deletion"
+msgstr "Інтерфейс позначено для видалення"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:162
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:3
 msgid "Interface is reconnecting..."
-msgstr "Перепідключення інтерфейсу..."
+msgstr "Перепідключення інтерфейсу…"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:162
+msgid "Interface is shutting down..."
+msgstr "Інтерфейс завершує роботу…"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:205
+msgid "Interface is starting..."
+msgstr "Інтерфейс запускається…"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:208
+msgid "Interface is stopping..."
+msgstr "Інтерфейс зупиняється…"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:954
 msgid "Interface name"
-msgstr "Ім'я інтерфейсу"
+msgstr "Назва інтерфейсу"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:34
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:224
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:131
 msgid "Interface not present or not connected yet."
 msgstr "Інтерфейс відсутній або його ще не підключено."
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:88
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:16
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:11
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:287
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:54
 msgid "Interfaces"
 msgstr "Інтерфейси"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:9
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:20
 msgid "Internal"
 msgstr "Внутрішній"
 
@@ -2746,22 +2830,38 @@ msgstr "Внутрішня помилка сервера"
 msgid "Invalid"
 msgstr "Неприпустимо"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:311
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:10
+msgid "Invalid Base64 key string"
+msgstr "Неприпустимий рядок ключа Base64"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:281
 msgid "Invalid VLAN ID given! Only IDs between %d and %d are allowed."
 msgstr ""
 "Задано неприпустимий VLAN ID! Доступні тільки ідентифікатори в межах між %d "
 "і %d."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:307
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:290
 msgid "Invalid VLAN ID given! Only unique IDs are allowed"
 msgstr ""
 "Задано неприпустимий VLAN ID! Доступні тільки унікальні ідентифікатори."
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:195
+msgid "Invalid argument"
+msgstr "Неприпустимий аргумент"
+
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:194
+msgid "Invalid command"
+msgstr "Неприпустима команда"
+
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:80
+msgid "Invalid hexadecimal value"
+msgstr "Неприпустиме шістнадцяткове значення"
+
 #: modules/luci-base/luasrc/view/sysauth.htm:12
 msgid "Invalid username and/or password! Please try again."
 msgstr "Неприпустиме ім'я користувача та/або пароль! Спробуйте ще раз."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:508
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:950
 msgid "Isolate Clients"
 msgstr "Ізолювати клієнтів"
 
@@ -2780,15 +2880,15 @@ msgstr ""
 msgid "JavaScript required!"
 msgstr "Потрібен JavaScript!"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:52
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1691
 msgid "Join Network"
 msgstr "Підключення до мережі"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:22
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1628
 msgid "Join Network: Wireless Scan"
 msgstr "Підключення до мережі: Сканування бездротових мереж"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:19
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1833
 msgid "Joining Network: %q"
 msgstr "Приєднання до мережі: %q"
 
@@ -2805,15 +2905,15 @@ msgstr "Журнал ядра"
 msgid "Kernel Version"
 msgstr "Версія ядра"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:823
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1248
 msgid "Key"
 msgstr "Ключ"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:851
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:852
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:853
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:854
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:870
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1277
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1278
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1279
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1291
 msgid "Key #%d"
 msgstr "Ключ #%d"
 
@@ -2821,33 +2921,34 @@ msgstr "Ключ #%d"
 msgid "Kill"
 msgstr "Знищити"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:10
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:21
 msgid "L2TP"
 msgstr "L2TP"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:10
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:40
 msgid "L2TP Server"
 msgstr "Сервер L2TP"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:100
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:74
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:80
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:74
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:53
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:73
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:131
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:102
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:89
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:112
 msgid "LCP echo failure threshold"
 msgstr "Поріг помилок ехо-запитів LCP"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:118
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:89
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:95
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:89
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:68
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:91
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:144
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:102
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:125
 msgid "LCP echo interval"
 msgstr "Інтервал ехо-запитів LCP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:181
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:902
 msgid "LLC"
 msgstr "LLC"
 
@@ -2856,11 +2957,11 @@ msgstr "LLC"
 msgid "Label"
 msgstr "Мітка"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:213
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:204
 msgid "Language"
 msgstr "Мова"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:115
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:106
 msgid "Language and Style"
 msgstr "Мова та стиль"
 
@@ -2868,52 +2969,52 @@ msgstr "Мова та стиль"
 msgid "Latency"
 msgstr "Затримка"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:10
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:21
 msgid "Leaf"
 msgstr "Лист"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:369
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:487
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:393
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:543
 msgid "Lease time"
 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:87
 msgid "Leasefile"
 msgstr "Файл оренд"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:74
 #: modules/luci-base/luasrc/view/lease_status.htm:95
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:34
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
 msgid "Leasetime remaining"
 msgstr "Час оренди, що лишився"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:9
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:20
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:27
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:50
 msgid "Leave empty to autodetect"
 msgstr "Залиште поле порожнім для автовизначення"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:21
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:45
 msgid "Leave empty to use the current WAN address"
 msgstr "Залиште порожнім, щоб використовувати поточну адресу WAN"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1746
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2299
 msgid "Legend:"
 msgstr "Легенда:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:481
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:538
 msgid "Limit"
 msgstr "Межа"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:287
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:288
 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:299
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:300
 msgid "Limit listening to these interfaces, and loopback."
 msgstr ""
 "Обмежитися прослуховуванням цих інтерфейсів і повернутися до початку циклу."
@@ -2934,11 +3035,11 @@ msgstr "Стан лінії"
 msgid "Line Uptime"
 msgstr "Час безперервної роботи лінії"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:101
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:88
 msgid "Link On"
 msgstr "Зв'язок встановлено"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:185
 msgid ""
 "List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
 "requests to"
@@ -2946,7 +3047,7 @@ msgstr ""
 "Список <abbr title=\"Domain Name System\">DNS</abbr>-серверів для "
 "переспрямовування запитів"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:972
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1377
 msgid ""
 "List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-"
 "Identifier,128-bit key as hex string. <br />This list is used to map R0KH-ID "
@@ -2962,7 +3063,7 @@ msgstr ""
 "ключа R0\">R0KH</abbr>, як станції, що була використана під час початкової "
 "асоціації домену мобільності."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:981
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1381
 msgid ""
 "List of R1KHs in the same Mobility Domain. <br />Format: MAC-address,R1KH-ID "
 "as 6 octets with colons,128-bit key as hex string. <br />This list is used "
@@ -2980,33 +3081,33 @@ msgstr ""
 "abbr> у формі <abbr title=\"Message Digest — дайджест повідомлення\">MD</"
 "abbr>, які можуть запитувати ключі PMK-R1."
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:21
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:82
 msgid "List of SSH key files for auth"
 msgstr "Список файлів SSH-ключів для авторизації"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:206
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:207
 msgid "List of domains to allow RFC1918 responses for"
 msgstr "Список доменів, для яких дозволено RFC1918-відповіді"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:174
 msgid "List of hosts that supply bogus NX domain results"
 msgstr "Список доменів, які підтримують результати підробки NX-доменів"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:298
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:299
 msgid "Listen Interfaces"
 msgstr "Інтерфейси прослуховування"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:30
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:54
 msgid "Listen Port"
 msgstr "Порти прослуховування"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:15
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:16
 msgid "Listen only on the given interface or, if unspecified, on all"
 msgstr ""
 "Прослуховувати тільки на цьому інтерфейсі, або на всіх (якщо <em>не "
 "визначено</em>)"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:216
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:217
 msgid "Listening port for inbound DNS queries"
 msgstr "Порт прослуховування для вхідних DNS-запитів"
 
@@ -3025,11 +3126,11 @@ msgstr "Середнє навантаження"
 msgid "Loading"
 msgstr "Завантаження"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:35
-msgid "Loading SSH keys…"
-msgstr "Завантаження SSH-ключів…"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1819
+msgid "Loading directory contents…"
+msgstr "Завантаження вмісту каталогу…"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1204
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1296
 #: modules/luci-base/luasrc/view/view.htm:4
 msgid "Loading view…"
 msgstr "Завантаження подання…"
@@ -3039,41 +3140,41 @@ msgstr "Завантаження подання…"
 msgid "Local IP address is invalid"
 msgstr "Неприпустима локальна ІР-адреса"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:25
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:86
 msgid "Local IP address to assign"
 msgstr "Локальна IP-адреса для призначення"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:10
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:11
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:44
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:39
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:151
 msgid "Local IPv4 address"
 msgstr "Локальна адреса IPv4"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:20
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:54
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:45
 msgid "Local IPv6 address"
 msgstr "Локальна адреса IPv6"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:286
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:287
 msgid "Local Service Only"
 msgstr "Тільки локальна служба"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:81
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:126
 msgid "Local Startup"
 msgstr "Локальний запуск"
 
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:25
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:121
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:112
 msgid "Local Time"
 msgstr "Місцевий час"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:149
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
 msgid "Local domain"
 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:147
 msgid ""
 "Local domain specification. Names matching this domain are never forwarded "
 "and are resolved from DHCP or hosts files only"
@@ -3082,17 +3183,17 @@ msgstr ""
 "не пересилаються і вирізняються тільки з файлу DHCP (/etc/config/dhcp) або "
 "файлу hosts (/etc/hosts)"
 
-#: 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:151
 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:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
 msgid "Local server"
 msgstr "Локальний сервер"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:129
 msgid ""
 "Localise hostname depending on the requesting subnet if multiple IPs are "
 "available"
@@ -3100,23 +3201,19 @@ msgstr ""
 "Локалізувати ім'я хоста залежно від запитуючої підмережі, якщо доступно "
 "кілька IP-адрес"
 
-#: 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:128
 msgid "Localise queries"
 msgstr "Локалізувати запити"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:175
-msgid "Locked to channel %s used by: %s"
-msgstr "Заблоковано до каналу %s, який використовує: %s"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:168
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:159
 msgid "Log output level"
 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:181
 msgid "Log queries"
 msgstr "Журнал запитів"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:113
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:104
 msgid "Logging"
 msgstr "Журналювання"
 
@@ -3124,7 +3221,7 @@ msgstr "Журналювання"
 msgid "Login"
 msgstr "Увійти"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:95
+#: modules/luci-base/luasrc/controller/admin/index.lua:103
 msgid "Logout"
 msgstr "Вийти"
 
@@ -3134,11 +3231,13 @@ msgstr ""
 "Втрата сигналу в секундах (<abbr title=\"Loss of Signal Seconds\">LOSS</"
 "abbr>)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:476
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:533
 msgid "Lowest leased address as offset from the network address."
 msgstr "Найнижча орендована адреса."
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:40
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:75
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:35
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:86
 msgid "MAC"
@@ -3146,32 +3245,32 @@ msgstr "MAC"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:73
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:109
-#: 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:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1958
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:86
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:133
 msgid "MAC-Address"
 msgstr "MAC-адреса"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:457
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:586
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:886
 msgid "MAC-Address Filter"
 msgstr "Фільтр MAC-адрес"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:142
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:363
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:798
 msgid "MAC-Filter"
 msgstr "MAC-фільтр"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:464
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:590
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:893
 msgid "MAC-List"
 msgstr "MAC-список"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:13
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:16
 msgid "MAP / LW4over6"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:62
 msgid "MAP rule is invalid"
 msgstr "Неприпустиме правило MAP"
@@ -3189,8 +3288,8 @@ msgid "MHz"
 msgstr " МГц"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:53
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:29
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:66
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:53
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:71
 msgid "MTU"
 msgstr "MTU"
 
@@ -3202,16 +3301,17 @@ msgstr ""
 "Переконайтеся, що ви клонуєте кореневу файлову систему, використовуючи такі "
 "команди:"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:55
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:69
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:26
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:38
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:38
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:108
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:52
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:96
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:83
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:57
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:70
 msgid "Manual"
 msgstr "Вручну"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1949
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2188
 msgid "Master"
 msgstr "Основний"
 
@@ -3219,50 +3319,46 @@ msgstr "Основний"
 msgid "Max. Attainable Data Rate (ATTNDR)"
 msgstr "Макс. досяжна швидкість передачі даних (ATTNDR)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:539
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:982
 msgid "Maximum allowed Listen Interval"
 msgstr "Максимальний дозволений інтервал прослуховування"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:234
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
 msgid "Maximum allowed number of active DHCP leases"
 msgstr "Максимально допустима кількість активних оренд DHCP"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:252
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:253
 msgid "Maximum allowed number of concurrent DNS queries"
 msgstr "Максимально допустима кількість одночасних DNS-запитів"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:244
 msgid "Maximum allowed size of EDNS.0 UDP packets"
 msgstr "Максимально допустимий розмір UDP-пакетів EDNS.0"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:63
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:77
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:57
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:112
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:104
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:93
 msgid "Maximum amount of seconds to wait for the modem to become ready"
 msgstr "Максимальний час очікування готовності модему (секунд)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:27
-msgid ""
-"Maximum length of the name is 15 characters including the automatic protocol/"
-"bridge prefix (br-, 6in4-, pppoe- etc.)"
-msgstr ""
-"Максимальна довжина імені становить 15 символів, включаючи префікс "
-"автоматичного протоколу/мосту (br-, 6in4-, pppoe та ін.)"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:482
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:538
 msgid "Maximum number of leased addresses."
 msgstr "Максимальна кількість орендованих адрес."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:761
+msgid "Maximum transmit power"
+msgstr "Максимальна потужність передавача"
+
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:21
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:49
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:134
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:187
 #: modules/luci-mod-status/luasrc/view/admin_status/bandwidth.htm:79
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:284
 msgid "Mbit/s"
 msgstr "Мбіт/с"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:18
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:32
 msgid "Medium"
 msgstr "Середня"
 
@@ -3274,42 +3370,43 @@ msgstr "Пам'ять"
 msgid "Memory usage (%)"
 msgstr "Використання пам'яті, %"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1952
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2191
 msgid "Mesh"
 msgstr "Mesh"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:372
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:806
 msgid "Mesh Id"
 msgstr "Mesh Id"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:196
+msgid "Method not found"
+msgstr "Метод не знайдено"
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:45
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:76
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:104
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:54
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:66
 msgid "Metric"
 msgstr "Метрика"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:154
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:198
 msgid "Mirror monitor port"
 msgstr "Дзеркало порту диспетчера"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:153
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:197
 msgid "Mirror source port"
 msgstr "Дзеркало вихідного порту"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:408
-msgid "Missing protocol extension for proto %q"
-msgstr "Відсутні розширення для протоколу %q"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:923
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1337
 msgid "Mobility Domain"
 msgstr "Домен мобільності"
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:154
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:41
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:74
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:366
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:31
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:360
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:801
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1619
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:175
 msgid "Mode"
 msgstr "Режим"
@@ -3318,39 +3415,38 @@ msgstr "Режим"
 msgid "Model"
 msgstr "Модель"
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:31
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:72
 msgid "Modem default"
 msgstr "Типові налаштування модема"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:11
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:19
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:11
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:10
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:73
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:73
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:57
 msgid "Modem device"
 msgstr "Модем"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:24
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:66
 msgid "Modem information query failed"
 msgstr "Помилка запиту інформації про модем"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:62
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:76
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:56
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:112
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:104
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:93
 msgid "Modem init timeout"
 msgstr "Тайм-аут ініціалізації модему"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1953
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:452
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:554
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:577
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2192
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:880
 msgid "Monitor"
 msgstr "Диспетчер"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:14
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
 msgid "More Characters"
 msgstr "Більше символів"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:802
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1057
 msgid "More…"
 msgstr "Докладніше…"
 
@@ -3363,7 +3459,7 @@ msgstr "Вхід монтування"
 msgid "Mount Point"
 msgstr "Точка монтування"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:26
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:36
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:137
 msgid "Mount Points"
@@ -3413,56 +3509,55 @@ msgstr "Вниз"
 msgid "Move up"
 msgstr "Вгору"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:912
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
 msgid "NAS ID"
 msgstr "Ідентифікатор NAS"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:57
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:87
 msgid "NAT-T Mode"
 msgstr "Режим NAT-T"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:9
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 msgid "NAT64 Prefix"
 msgstr "Префікс NAT64"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:31
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:26
 msgid "NCM"
 msgstr "NCM"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:535
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:589
 msgid "NDP-Proxy"
 msgstr "NDP-проксі"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:43
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:72
 msgid "NT Domain"
 msgstr "Домен NT"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:273
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:264
 msgid "NTP server candidates"
 msgstr "Кандидати для синхронізації сервера NTP"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:837
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1092
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:27
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:502
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:65
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:553
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:658
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:49
 msgid "Name"
 msgstr "Ім'я"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:17
-msgid "Name of the new interface"
-msgstr "Ім'я нового інтерфейсу"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1808
 msgid "Name of the new network"
-msgstr "Назва (ім'я) нової мережі"
+msgstr "Назва нової мережі"
 
 #: themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm:198
 msgid "Navigation"
 msgstr "Навігація"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:62
+#: modules/luci-base/luasrc/controller/admin/index.lua:69
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:108
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:402
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:834
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1957
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:389
 #: modules/luci-mod-status/luasrc/view/admin_status/index/30-network.htm:8
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:73
@@ -3474,7 +3569,7 @@ msgstr "Мережа"
 msgid "Network Utilities"
 msgstr "Мережеві утиліти"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:278
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:279
 msgid "Network boot image"
 msgstr "Образ для мережевого завантаження"
 
@@ -3487,53 +3582,59 @@ msgstr "Мережевий пристрій відсутній"
 msgid "Network without interfaces."
 msgstr "Мережа без інтерфейсів."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:661
+msgid "New interface name…"
+msgstr "Нова назва інтерфейсу…"
+
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:11
 msgid "Next »"
 msgstr "Наступний »"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1507
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1754
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:108
 msgid "No"
 msgstr "№"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:453
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:514
 msgid "No DHCP Server configured for this interface"
 msgstr "Немає DHCP-сервера, налаштованого для цього інтерфейсу"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1162
+msgid "No Encryption"
+msgstr "Без шифрування"
+
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:89
 msgid "No NAT-T"
 msgstr "Немає NAT-T"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:198
+msgid "No data received"
+msgstr "Жодних даних не отримано"
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1764
+msgid "No entries in this directory"
+msgstr "У цьому каталозі немає записів"
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/backupfiles.lua:82
 msgid "No files found"
 msgstr "Файли не знайдено"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:550
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:191
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:180
 msgid "No information available"
 msgstr "Інформація відсутня"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:8
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:63
 msgid "No matching prefix delegation"
 msgstr "Делегування відповідних префіксів відсутнє"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:157
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
 msgid "No negative cache"
 msgstr "Ніяких негативних кешувань"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:53
-msgid "No network configured on this device"
-msgstr "На цьому пристрої немає налаштованої мережі"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:65
-msgid "No network name specified"
-msgstr "Ім'я мережі не визначено"
-
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:147
-msgid "No networks in range"
-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
@@ -3541,7 +3642,12 @@ msgstr "Немає мереж у межах досяжності"
 msgid "No password set!"
 msgstr "Пароль не встановлено!"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:116
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:104
+msgid "No peers defined yet"
+msgstr "Жодного вузла ще не визначено"
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:129
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:271
 msgid "No public keys present yet."
 msgstr "Відкритих ключів поки що немає."
 
@@ -3549,19 +3655,19 @@ msgstr "Відкритих ключів поки що немає."
 msgid "No rules in this chain."
 msgstr "У цьму ланцюжку нема правил."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:150
-msgid "No scan results available yet..."
-msgstr "Результати сканування наразі недоступні…"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:53
+msgid "No signal"
+msgstr "Немає сигналу"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:7
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:756
 msgid "No zone assigned"
 msgstr "Зону не призначено"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:111
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:35
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:48
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:133
 msgid "Noise"
 msgstr "Шум"
 
@@ -3577,16 +3683,16 @@ msgstr "Шум:"
 msgid "Non Pre-emtive CRC errors (CRC_P)"
 msgstr "Не запобіжні помилки CRC (CRC_P)"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:292
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:293
 msgid "Non-wildcard"
 msgstr "Без шаблону заміни"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:129
 msgid "None"
 msgstr "Жоден"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:181
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:172
 msgid "Normal"
 msgstr "Нормальний"
 
@@ -3594,25 +3700,29 @@ msgstr "Нормальний"
 msgid "Not Found"
 msgstr "Не знайдено"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:27
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:5
-msgid "Not associated"
-msgstr "Не пов'язаний"
-
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:87
 msgid "Not connected"
 msgstr "Не підключено"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:38
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:139
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:232
+msgid "Not present"
+msgstr "Не існує"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:105
 msgid "Not started on boot"
 msgstr "Не запущено під час завантаження"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:26
-msgid "Note: interface name length"
-msgstr "Примітка: довжина імені інтерфейсу"
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:201
+msgid "Not supported"
+msgstr "Не підтримується"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:171
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:162
 msgid "Notice"
 msgstr "Попередження"
 
@@ -3620,63 +3730,50 @@ msgstr "Попередження"
 msgid "Nslookup"
 msgstr "DNS-запит"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:261
 msgid "Number of cached DNS entries (max is 10000, 0 is no caching)"
 msgstr "Кількість кешованих записів DNS (макс. - 10000, 0 - без кешування)"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:203
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:194
 msgid "Number of parallel threads used for compression"
 msgstr "Кількість паралельних потоків, що використовуються для стиснення"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:40
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:69
 msgid "Obfuscated Group Password"
 msgstr "Обфусований груповий пароль"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:35
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:61
 msgid "Obfuscated Password"
 msgstr "Обфусований пароль"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:22
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:34
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:40
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:105
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:97
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:49
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:80
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:54
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:67
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:93
 msgid "Obtain IPv6-Address"
 msgstr "Отримати IPv6-адресу"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:83
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:68
 msgid "Off-State Delay"
 msgstr "Затримка Off-State"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:16
-msgid ""
-"On this page you can configure the network interfaces. You can bridge "
-"several interfaces by ticking the \"bridge interfaces\" field and enter the "
-"names of several network interfaces separated by spaces. You can also use "
-"<abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
-"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
-"<samp>eth0.1</samp>)."
-msgstr ""
-"На цій сторінці ви можете налаштувати мережеві інтерфейси. Ви можете "
-"об'єднати кілька інтерфейсів мостом, відзначивши поле \"Об'єднати інтерфейси "
-"в міст\" та ввівши імена кількох мережевих інтерфейсів, розділені пробілами. "
-"Також ви можете використовувати <abbr title=\"Virtual Local Area Network — "
-"віртуальна локальна комп'ютерна мережа\">VLAN</abbr>-позначення "
-"<samp>ІНТЕРФЕЙС.НОМЕР_VLAN</samp> (наприклад, <samp>eth0.1</samp>)."
-
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:95
 msgid "On-Link route"
 msgstr "Маршрут On-Link"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:80
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:64
 msgid "On-State Delay"
 msgstr "Затримка On-State"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:360
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:382
 msgid "One of hostname or mac address must be specified!"
 msgstr "Має бути зазначено одне з двох – ім'я вузла або МАС-адреса!"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:456
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:462
 msgid "One of the following: %s"
 msgstr "Одне з нижченаведеного: %s"
 
@@ -3698,28 +3795,29 @@ msgstr "Одне або декілька обов'язкових полів не
 msgid "Open list..."
 msgstr "Відкрити список..."
 
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:61
 #: protocols/luci-proto-openconnect/luasrc/model/network/proto_openconnect.lua:9
 msgid "OpenConnect (CISCO AnyConnect)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:757
 msgid "Operating frequency"
 msgstr "Робоча частота"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1753
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2306
 msgid "Option changed"
 msgstr "Опція змінена"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1755
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2308
 msgid "Option removed"
 msgstr "Опція видалена"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1140
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:55
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1535
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:66
 msgid "Optional"
 msgstr "Необов'язково"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:78
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:76
 msgid ""
 "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, "
 "starting with <code>0x</code>."
@@ -3727,7 +3825,7 @@ msgstr ""
 "Необов'язково. 32-бітна мітка для вихідних зашифрованих пакетів. Введіть "
 "значення в шістнадцятковому форматі, починаючи з <code>0x</code>."
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:144
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:215
 msgid ""
 "Optional. Allowed values: 'eui64', 'random', fixed value like '::1' or "
 "'::1:2'. When IPv6 prefix (like 'a:b:c:d::') is received from a delegating "
@@ -3739,7 +3837,7 @@ msgstr ""
 "отримано від сервера делегування, для формування IPv6-адреси інтерфейсу  "
 "(наприклад, 'a:b:c:d::1') використовуйте суфікс ('::1')."
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:123
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:117
 msgid ""
 "Optional. Base64-encoded preshared key. Adds in an additional layer of "
 "symmetric-key cryptography for post-quantum resistance."
@@ -3748,30 +3846,30 @@ msgstr ""
 "Додавання додатково рівня шифрування із симетричним ключем для пост-"
 "квантової стійкості."
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:148
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:126
 msgid "Optional. Create routes for Allowed IPs for this peer."
 msgstr "Необов'язково. Створити для цього вузла маршрути для дозволених IP."
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:103
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:108
 msgid "Optional. Description of peer."
 msgstr "Необов'язково. Опис вузла."
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:156
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:128
 msgid ""
 "Optional. Host of peer. Names are resolved prior to bringing up the "
 "interface."
 msgstr "Необов'язково. Хост вузла. Імена буде виділено до підняття інтерфейсу."
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:67
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:71
 msgid "Optional. Maximum Transmission Unit of tunnel interface."
 msgstr ""
 "Необов'язково. Максимальний блок передаваних даних тунельного інтерфейсу."
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:166
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:132
 msgid "Optional. Port of peer."
 msgstr "Необов'язково. Порт вузла."
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:175
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:136
 msgid ""
 "Optional. Seconds between keep alive messages. Default is 0 (disabled). "
 "Recommended value if this device is behind a NAT is 25."
@@ -3780,7 +3878,7 @@ msgstr ""
 "значення - 0 (вимкнено). Рекомендоване значення для цього пристрою за NAT - "
 "25."
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:31
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:54
 msgid "Optional. UDP port used for outgoing and incoming packets."
 msgstr ""
 "Необов'язково. UDP-порт, який використовується для вихідних та вхідних "
@@ -3803,7 +3901,7 @@ msgstr "Вих."
 msgid "Outbound:"
 msgstr "Вихідний:"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:26
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:50
 msgid "Output Interface"
 msgstr "Вихідний інтерфейс"
 
@@ -3812,45 +3910,45 @@ msgstr "Вихідний інтерфейс"
 msgid "Output zone"
 msgstr "Вихідна зона"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:63
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:155
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:33
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:54
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:54
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:219
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:50
 msgid "Override MAC address"
 msgstr "Перевизначити MAC-адресу"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:66
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:35
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:56
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:88
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:125
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:131
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:133
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:104
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:61
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:58
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:223
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:44
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:54
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:154
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:71
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:145
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:132
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:110
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:119
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:97
 msgid "Override MTU"
 msgstr "Перевизначити MTU"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:30
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:63
 msgid "Override TOS"
 msgstr "Перевизначити TOS"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:25
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:58
 msgid "Override TTL"
 msgstr "Перевизначити TTL"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:954
 msgid "Override default interface name"
 msgstr "Перевизначення типового імені інтерфейсу"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:41
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:167
 msgid "Override the gateway in DHCP responses"
 msgstr "Перевизначення шлюзу у відповідях DHCP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:507
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:555
 msgid ""
 "Override the netmask sent to clients. Normally it is calculated from the "
 "subnet that is served."
@@ -3858,7 +3956,7 @@ msgstr ""
 "Перевизначення мережевої маски, яка надсилається клієнтам. Зазвичай вона "
 "обчислюється від підмережі, що обслуговується."
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:65
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:179
 msgid "Override the table used for internal routes"
 msgstr ""
 "Перевизначення таблиці, що використовужться для внутрішніх спрямовувань"
@@ -3867,29 +3965,33 @@ msgstr ""
 msgid "Overview"
 msgstr "Огляд"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1606
+msgid "Overwrite existing file \"%s\" ?"
+msgstr "Перезаписати існуючий файл \"%s\"?"
+
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:11
 msgid "Owner"
 msgstr "Власник"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:42
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:56
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:17
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:28
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:34
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:14
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:18
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:43
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:98
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:45
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:44
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:63
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:82
 msgid "PAP/CHAP password"
 msgstr "Пароль PAP/CHAP"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:39
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:53
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:14
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:11
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:15
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:96
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:88
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:43
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:74
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:42
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:61
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:77
 msgid "PAP/CHAP username"
 msgstr "Ім'я користувача PAP/CHAP"
 
@@ -3897,9 +3999,9 @@ msgstr "Ім'я користувача PAP/CHAP"
 msgid "PID"
 msgstr "<abbr title=\"Process Identifier — Ідентифікатор процесу\">PID</abbr>"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:36
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:50
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:26
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:95
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:87
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:68
 msgid "PIN"
 msgstr ""
 "<abbr title=\"Personal Identification Number — Персональний ідентифікаційний "
@@ -3910,114 +4012,116 @@ msgstr ""
 msgid "PIN code rejected"
 msgstr "PIN-код відхилено"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:966
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1372
 msgid "PMK R1 Push"
 msgstr "Проштовхуваня PMK R1"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:43
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:13
 msgid "PPP"
 msgstr "PPP"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:11
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:58
 msgid "PPPoA Encapsulation"
 msgstr "Інкапсуляція PPPoA"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:19
 msgid "PPPoATM"
 msgstr "PPPoATM"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:17
 msgid "PPPoE"
 msgstr "PPPoE"
 
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:28
 #: protocols/luci-proto-pppossh/luasrc/model/network/proto_pppossh.lua:9
 msgid "PPPoSSH"
 msgstr "PPPoSSH"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:15
 msgid "PPtP"
 msgstr "PPtP"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:59
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:73
 msgid "PSID offset"
 msgstr "Зсув PSID"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:56
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:70
 msgid "PSID-bits length"
 msgstr "Довжина PSID у бітах"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:123
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:846
 msgid "PTM/EFM (Packet Transfer Mode)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:78
-msgid "Package libiwinfo required!"
-msgstr "Потрібен пакет libiwinfo!"
-
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:45
 msgid "Packets"
 msgstr "Пакети"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:7
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:756
 msgid "Part of zone %q"
 msgstr "Частина зони %q"
 
 #: modules/luci-base/luasrc/view/sysauth.htm:29
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1111
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:35
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:42
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1514
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:46
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:104
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:58
 msgid "Password"
 msgstr "Пароль"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:29
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:24
 msgid "Password authentication"
 msgstr "Автентифікація за паролем"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1019
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1414
 msgid "Password of Private Key"
 msgstr "Пароль закритого ключа"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1067
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1471
 msgid "Password of inner Private Key"
 msgstr "Пароль внутрішнього закритого ключа"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:14
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:16
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:18
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:20
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:32
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:34
 msgid "Password strength"
 msgstr "Надійність пароля"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:44
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:107
 msgid "Password2"
 msgstr "Пароль2"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:37
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:244
 msgid "Paste or drag SSH key file…"
 msgstr "Вставте або перетягніть файл SSH-ключа…"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1000
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1396
 msgid "Path to CA-Certificate"
 msgstr "Шлях до центру сертифікції"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1007
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1402
 msgid "Path to Client-Certificate"
 msgstr "Шлях до сертифікату клієнта"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1013
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1408
 msgid "Path to Private Key"
 msgstr "Шлях до закритого ключа"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1049
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1453
 msgid "Path to inner CA-Certificate"
 msgstr "Шлях до внутрішнього CA-сертифікату"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1055
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1459
 msgid "Path to inner Client-Certificate"
 msgstr "Шлях до внутрішнього сертифікату клієнта"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1061
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1465
 msgid "Path to inner Private Key"
 msgstr "Шлях до внутрішнього закритого ключа"
 
@@ -4035,7 +4139,7 @@ msgstr "Шлях до внутрішнього закритого ключа"
 msgid "Peak:"
 msgstr "Пік:"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:28
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:89
 msgid "Peer IP address to assign"
 msgstr "Запит IP-адреси призначення"
 
@@ -4044,11 +4148,11 @@ msgstr "Запит IP-адреси призначення"
 msgid "Peer address is missing"
 msgstr "Відсутня адреса вузла"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:90
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:89
 msgid "Peers"
 msgstr "Вузли"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:50
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:80
 msgid "Perfect Forward Secrecy"
 msgstr "Perfect Forward Secrecy"
 
@@ -4060,7 +4164,11 @@ msgstr "Виконати перезавантаження"
 msgid "Perform reset"
 msgstr "Виконати відновлення"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:174
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:199
+msgid "Permission denied"
+msgstr "Дозволу не надано"
+
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:136
 msgid "Persistent Keep Alive"
 msgstr "Завжди тримати ввімкненим"
 
@@ -4068,7 +4176,7 @@ msgstr "Завжди тримати ввімкненим"
 msgid "Phy Rate:"
 msgstr "Фізична швидкість:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:190
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:277
 msgid "Physical Settings"
 msgstr "Фізичні параметри"
 
@@ -4079,6 +4187,10 @@ msgstr "Ехо-запит"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:16
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:17
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:41
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:77
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:87
@@ -4096,15 +4208,19 @@ msgstr "Введіть ім'я користувача і пароль."
 msgid "Policy"
 msgstr "Політика"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:22
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:20
 msgid "Port"
 msgstr "Порт"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:18
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:133
+msgid "Port %s"
+msgstr "Порт %s"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:274
 msgid "Port status:"
 msgstr "Стан порту:"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:482
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:488
 msgid "Potential negation of: %s"
 msgstr "Потенційне заперечення: %s"
 
@@ -4116,11 +4232,11 @@ msgstr "Режим керування живленням"
 msgid "Pre-emtive CRC errors (CRCP_P)"
 msgstr "Попереджувати помилки CRC (CRCP_P)"
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:32
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:73
 msgid "Prefer LTE"
 msgstr "Переважно LTE"
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:33
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:74
 msgid "Prefer UMTS"
 msgstr "Переважно UMTS"
 
@@ -4128,16 +4244,16 @@ msgstr "Переважно UMTS"
 msgid "Prefix Delegated"
 msgstr "Делеговано префікс"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:122
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:117
 msgid "Preshared Key"
 msgstr "Заздалегідь установлений спільний ключ"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:101
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:75
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:81
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:75
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:54
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:74
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:131
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:102
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:89
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:112
 msgid ""
 "Presume peer to be dead after given amount of LCP echo failures, use 0 to "
 "ignore failures"
@@ -4145,16 +4261,15 @@ msgstr ""
 "Вважати вузол недоступним після визначеної кількості невдач отримання ехо-"
 "пакета LCP, використовуйте 0, щоб ігнорувати невдачі"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:305
 msgid "Prevent listening on these interfaces."
 msgstr "Перешкоджати прослуховуванню цих інтерфейсів."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:509
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:562
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:950
 msgid "Prevents client-to-client communication"
 msgstr "Перешкоджати спілкуванню клієнт-клієнт"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:18
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:49
 msgid "Private Key"
 msgstr "Приватний ключ"
 
@@ -4175,39 +4290,33 @@ msgstr "Профіль"
 msgid "Prot."
 msgstr "Прот."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:72
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:349
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:675
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:84
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:216
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:87
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:390
 msgid "Protocol"
 msgstr "Протокол"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:31
-msgid "Protocol of the new interface"
-msgstr "Протокол нового інтерфейсу"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:222
-msgid "Protocol support is not installed"
-msgstr "Підтримка протоколу не інстальована"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:269
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:260
 msgid "Provide NTP server"
 msgstr "Забезпечувати сервер NTP"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:701
 msgid "Provide new network"
 msgstr "Укажіть нову мережу"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:451
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:879
 msgid "Pseudo Ad-Hoc (ahdemo)"
 msgstr "Псевдо Ad-Hoc (ahdemo)"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:112
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:113
 msgid "Public Key"
 msgstr "Відкритий ключ"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:278
 msgid ""
 "Public keys allow for the passwordless SSH logins with a higher security "
 "compared to the use of plain passwords. In order to upload a new key to the "
@@ -4219,20 +4328,20 @@ msgstr ""
 "ключ, вставте сумісний із OpenSSH відкритий ключ або перетягніть файл <code>."
 "pub</code> у поле введення."
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:139
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:211
 msgid "Public prefix routed to this device for distribution to clients."
 msgstr "Публічний префікс надісланий на цей пристрій для поширення клієнтам."
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:27
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:9
 msgid "QMI Cellular"
 msgstr "Стільниковий QMI"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:173
 msgid "Quality"
 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:171
 msgid ""
 "Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> "
 "servers"
@@ -4240,28 +4349,29 @@ msgstr ""
 "Запит усіх наявних висхідних <abbr title=\"Domain Name System — система "
 "доменних імен\">DNS</abbr>-серверів"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:952
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1360
 msgid "R0 Key Lifetime"
 msgstr "Тривалість життя ключа R0"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:959
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1366
 msgid "R1 Key Holder"
 msgstr "Власник ключа R1"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:58
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:88
 msgid "RFC3947 NAT-T mode"
 msgstr "Режим RFC3947 NAT-T"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:381
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:814
 msgid "RSSI threshold for joining"
 msgstr "Поріг RSSI для приєднання"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:256
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:597
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:778
 msgid "RTS/CTS Threshold"
 msgstr "Поріг RTS/CTS"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:41
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:76
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:87
 msgid "RX"
@@ -4271,37 +4381,41 @@ msgstr "Одержано"
 msgid "RX Rate"
 msgstr "Швидкість приймання"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:783
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1961
+msgid "RX Rate / TX Rate"
+msgstr "Швидкість прийм./перед."
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1207
 msgid "Radius-Accounting-Port"
 msgstr "Порт Radius-Accounting"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:791
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1215
 msgid "Radius-Accounting-Secret"
 msgstr "Секрет Radius-Accounting"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:775
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1199
 msgid "Radius-Accounting-Server"
 msgstr "Сервер Radius-Accounting"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:759
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1183
 msgid "Radius-Authentication-Port"
 msgstr "Порт Radius-Authentication"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:767
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1191
 msgid "Radius-Authentication-Secret"
 msgstr "Секрет Radius-Authentication"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:751
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1175
 msgid "Radius-Authentication-Server"
 msgstr "Сервер Radius-Authentication"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:119
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:102
 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:83
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:84
 msgid ""
 "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-Server"
@@ -4318,20 +4432,11 @@ msgstr ""
 "Дійсно видалити цей інтерфейс? Скасувати видалення неможливо! Ви можете "
 "втратити доступ до цього пристрою, якщо вас підключено через цей інтерфейс."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2
-msgid ""
-"Really delete this wireless network? The deletion cannot be undone! You "
-"might lose access to this device if you are connected via this network."
-msgstr ""
-"Дійсно видалити цю бездротову мережу? Скасувати видалення неможливо! Ви "
-"можете втратити доступ до цього пристрою, якщо вас підключено через цю "
-"мережу."
-
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:40
 msgid "Really reset all changes?"
 msgstr "Дійсно скинути всі зміни?"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:237
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:354
 msgid "Really switch protocol?"
 msgstr "Дійсно змінити протокол?"
 
@@ -4355,15 +4460,15 @@ msgstr "Трафік у реальному часі"
 msgid "Realtime Wireless"
 msgstr "Бездротові мережі у реальному часі"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:931
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1343
 msgid "Reassociation Deadline"
 msgstr "Кінцевий термін реассоціації"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:191
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
 msgid "Rebind protection"
 msgstr "Захист від переприв'язки"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:48
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:46
 #: modules/luci-mod-system/luasrc/view/admin_system/reboot.htm:9
 msgid "Reboot"
 msgstr "Перезавантаження"
@@ -4377,21 +4482,15 @@ msgstr "Перезавантаження..."
 msgid "Reboots the operating system of your device"
 msgstr "Перезавантажити операційну систему вашого пристрою"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:103
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:90
 msgid "Receive"
 msgstr "Приймання"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:325
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:350
-msgid "Receiver Antenna"
-msgstr "Антена приймача"
-
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:42
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:59
 msgid "Recommended. IP addresses of the WireGuard interface."
 msgstr "Рекомендовано. IP-адреси інтерфейсу WireGuard."
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:28
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:300
 msgid "Reconnect this interface"
 msgstr "Перепідключити цей інтерфейс"
 
@@ -4399,73 +4498,71 @@ msgstr "Перепідключити цей інтерфейс"
 msgid "References"
 msgstr "Посилання"
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:39
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:153
 msgid "Relay"
 msgstr "Ретранслятор"
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:36
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:157
 msgid "Relay Bridge"
 msgstr "Міст-ретранслятор"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:17
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:154
 msgid "Relay between networks"
 msgstr "Міжмережевий ретранслятор"
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:64
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:12
 msgid "Relay bridge"
 msgstr "Міст-ретранслятор"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:18
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:50
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:49
 msgid "Remote IPv4 address"
 msgstr "Віддалена адреса IPv4"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:8
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:40
 msgid "Remote IPv4 address or FQDN"
 msgstr "Віддалена адреса IPv4 або FQDN"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:45
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:725
 msgid "Remove"
 msgstr "Видалити"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:53
-msgid "Repeat scan"
-msgstr "Повторити сканування"
-
-#: modules/luci-base/luasrc/view/cbi/upload.htm:11
-msgid "Replace entry"
-msgstr "Замінити запис"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:46
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:51
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1806
 msgid "Replace wireless configuration"
 msgstr "Замінити конфігурацію бездротової мережі"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:8
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:17
 msgid "Request IPv6-address"
 msgstr "Запит IPv6-адреси"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:16
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:23
 msgid "Request IPv6-prefix of length"
 msgstr "Запит довжини IPv6-префіксу"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1141
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:200
+msgid "Request timeout"
+msgstr "Час очікування запиту минув"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1536
 msgid "Required"
 msgstr "Вимагається"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:20
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:31
 msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3"
 msgstr "Вимагається для деяких провайдерів, наприклад, Charter із DOCSIS 3"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:19
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:49
 msgid "Required. Base64-encoded private key for this interface."
 msgstr "Вимагається. Base64-кодований закритий ключ для цього інтерфейсу."
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:113
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:113
 msgid "Required. Base64-encoded public key of peer."
 msgstr "Вимагається. Base64-кодований відкритий ключ вузла."
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:136
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:122
 msgid ""
 "Required. IP addresses and prefixes that this peer is allowed to use inside "
 "the tunnel. Usually the peer's tunnel IP addresses and the networks the peer "
@@ -4475,7 +4572,27 @@ msgstr ""
 "використовувати всередині тунелю. Зазвичай тунельні IP-адреси вузла та "
 "мережі маршрутів вузла через тунель."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1134
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1095
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1096
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1097
+msgid "Requires hostapd"
+msgstr "Потребує hostapd"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1101
+msgid "Requires hostapd with EAP support"
+msgstr "Потребує hostapd з підтримкою EAP"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1102
+msgid "Requires hostapd with OWE support"
+msgstr "Потребує hostapd з підтримкою OWE"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1098
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1099
+msgid "Requires hostapd with SAE support"
+msgstr "Потребує hostapd з підтримкою SAE"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1533
 msgid ""
 "Requires the 'full' version of wpad/hostapd and support from the wifi driver "
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
@@ -4483,7 +4600,7 @@ msgstr ""
 "Потребує \"повної\" версії wpad/hostapd та підтримки драйвером WiFi <br /"
 ">(станом на січень 2019 року: ath9k, ath10k, mwlwifi та mt76)"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:141
 msgid ""
 "Requires upstream supports DNSSEC; verify unsigned domain responses really "
 "come from unsigned domains"
@@ -4491,7 +4608,31 @@ msgstr ""
 "Потребує підтримки висхідною мережею DNSSEC; переконайтеся, що відповіді "
 "непідписаного домену дійсно походять із непідписаних доменів"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1268
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1109
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1119
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1120
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1121
+msgid "Requires wpa-supplicant"
+msgstr "Потребує wpa-суплікатора"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1113
+msgid "Requires wpa-supplicant with EAP support"
+msgstr "Потребує wpa-суплікатора з підтримкою EAP"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1114
+msgid "Requires wpa-supplicant with OWE support"
+msgstr "Потребує wpa-суплікатора з підтримкою OWE"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1111
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1124
+msgid "Requires wpa-supplicant with SAE support"
+msgstr "Потребує wpa-суплікатора з підтримкою SAE"
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1355
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:17
 #: modules/luci-base/luasrc/view/cbi/footer.htm:30
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:66
@@ -4507,17 +4648,22 @@ msgstr "Скинути лічильники"
 msgid "Reset to defaults"
 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:68
 msgid "Resolv and Hosts Files"
 msgstr "Файли resolv і hosts"
 
-#: 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:94
 msgid "Resolve file"
 msgstr "Файл resolv"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:28
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:14
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:71
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:197
+msgid "Resource not found"
+msgstr "Ресурс не знайдено"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:302
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:693
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:90
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:112
 msgid "Restart"
 msgstr "Перезавантажити"
 
@@ -4525,7 +4671,7 @@ msgstr "Перезавантажити"
 msgid "Restart Firewall"
 msgstr "Перезавантажити брандмауер"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:14
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:691
 msgid "Restart radio interface"
 msgstr "Перезавантажити радіоінтерфейс"
 
@@ -4537,26 +4683,24 @@ msgstr "Відновлення"
 msgid "Restore backup"
 msgstr "Відновити з резервної копії"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:113
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:114
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:38
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:46
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:119
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:120
 msgid "Reveal/hide password"
 msgstr "Показати/приховати пароль"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1774
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2322
 msgid "Revert"
 msgstr "Скасувати"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1861
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2405
 msgid "Revert changes"
 msgstr "Скасувати зміни"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2013
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2554
 msgid "Revert request failed with status <code>%h</code>"
 msgstr "Помилка запиту на скасування зі статусом <code>%h</code>"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1993
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2534
 msgid "Reverting configuration…"
 msgstr "Відкат конфігурації…"
 
@@ -4564,7 +4708,7 @@ msgstr "Відкат конфігурації…"
 msgid "Root"
 msgstr "Корінь"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:271
 msgid "Root directory for files served via TFTP"
 msgstr "Кореневий каталог для файлів TFTP"
 
@@ -4572,7 +4716,7 @@ msgstr "Кореневий каталог для файлів TFTP"
 msgid "Root preparation"
 msgstr "Підготовка Root"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:147
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:126
 msgid "Route Allowed IPs"
 msgstr "Маршрутизація дозволених IP-адрес"
 
@@ -4584,12 +4728,12 @@ msgstr "Таблиця маршрутів"
 msgid "Route type"
 msgstr "Тип маршруту"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:523
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:577
 msgid "Router Advertisement-Service"
 msgstr "Служба оголошень маршрутизатора"
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:43
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:15
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:27
 msgid "Router Password"
 msgstr "Пароль маршрутизатора"
 
@@ -4619,7 +4763,7 @@ msgstr "Виконати перевірку файлової системи пе
 msgid "Run filesystem check"
 msgstr "Виконати перевірку файлової системи"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:651
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:669
 msgid "Runtime error"
 msgstr "Помилка виконання"
 
@@ -4631,31 +4775,31 @@ msgstr ""
 msgid "SNR"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:5
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:18
 msgid "SSH Access"
 msgstr "SSH-доступ"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:10
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:70
 msgid "SSH server address"
 msgstr "Адреса сервера SSH"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:13
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:74
 msgid "SSH server port"
 msgstr "Порт сервера SSH"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:8
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:58
 msgid "SSH username"
 msgstr "Ім'я користувача SSH"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:27
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:277
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
 msgid "SSH-Keys"
 msgstr "SSH-ключі"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:42
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:73
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:29
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1617
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:174
 msgid "SSID"
 msgstr "SSID"
@@ -4664,17 +4808,17 @@ msgstr "SSID"
 msgid "SWAP"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1127
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1262
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1379
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1351
 #: modules/luci-base/luasrc/view/cbi/error.htm:17
 #: modules/luci-base/luasrc/view/cbi/footer.htm:26
 #: modules/luci-base/luasrc/view/cbi/header.htm:17
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:54
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:133
 msgid "Save"
 msgstr "Зберегти"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1256
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1768
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1347
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2318
 #: modules/luci-base/luasrc/view/cbi/footer.htm:22
 msgid "Save & Apply"
 msgstr "Зберегти і застосувати"
@@ -4687,28 +4831,20 @@ msgstr "Зберегти mtdblock"
 msgid "Save mtdblock contents"
 msgstr "Зберегти вміст mtdblock"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
-msgid "Saving keys…"
-msgstr "Збереження ключів…"
-
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:698
 msgid "Scan"
 msgstr "Сканувати"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:109
-msgid "Scan request failed"
-msgstr "Помилка запиту на сканування"
-
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:8
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:39
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:23
 msgid "Scheduled Tasks"
 msgstr "Заплановані завдання"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1749
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2302
 msgid "Section added"
 msgstr "Секцію додано"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1751
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2304
 msgid "Section removed"
 msgstr "Секцію видалено"
 
@@ -4726,12 +4862,18 @@ msgstr ""
 "виберіть \"Примусове оновлення\". Використовуйте тільки якщо ви впевнені, що "
 "мікропрограма є правильною і призначена для вашого пристрою!"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:119
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:90
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:96
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:90
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:69
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:92
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1516
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1646
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1809
+msgid "Select file…"
+msgstr "Виберіть файл…"
+
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:144
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:102
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:125
 msgid ""
 "Send LCP echo requests at the given interval in seconds, only effective in "
 "conjunction with failure threshold"
@@ -4739,36 +4881,32 @@ msgstr ""
 "Надсилати ехо-пакети LCP зі вказаним інтервалом (секунди), ефективно тільки "
 "в поєднанні з порогом помилок"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:561
-msgid "Separate Clients"
-msgstr "Розділяти клієнтів"
-
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:62
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:63
 msgid "Server Settings"
 msgstr "Налаштування сервера"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:26
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:50
 msgid "Service Name"
-msgstr "Назва (ім'я) сервісу"
+msgstr "Назва сервісу"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:25
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:30
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:87
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:71
 msgid "Service Type"
 msgstr "Тип сервісу"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:55
+#: modules/luci-base/luasrc/controller/admin/index.lua:62
 msgid "Services"
 msgstr "Сервіси"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:815
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:861
 msgid "Session expired"
 msgstr "Час сеансу минув"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:83
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:107
 msgid "Set VPN as Default Route"
 msgstr "Встановити VPN типовим маршрутом"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:258
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:795
 msgid ""
 "Set interface properties regardless of the link carrier (If set, carrier "
 "sense events do not invoke hotplug handlers)."
@@ -4776,15 +4914,18 @@ msgstr ""
 "Властивості інтерфейсу встановлюються незалежно від каналу зв'язку (якщо "
 "позначено, обробник автовизначення не викликається при змінах)."
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:23
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:55
 msgid "Setting PLMN failed"
 msgstr "Не вдалося налаштувати PLMN"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:26
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:68
 msgid "Setting operation mode failed"
 msgstr "Не вдалося налаштувати режим роботи"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:454
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:517
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:527
 msgid "Setup DHCP Server"
 msgstr "Налаштування DHCP-сервера"
 
@@ -4798,7 +4939,7 @@ msgstr ""
 msgid "Short GI"
 msgstr "Short GI"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:516
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:960
 msgid "Short Preamble"
 msgstr "Коротка преамбула"
 
@@ -4810,21 +4951,23 @@ msgstr "Показати поточний список файлів резерв
 msgid "Show empty chains"
 msgstr "Показати порожні ланцюжки"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:306
 msgid "Shutdown this interface"
 msgstr "Вимкнути цей інтерфейс"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:111
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:34
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:47
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:132
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1616
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:173
 msgid "Signal"
 msgstr "Сигнал"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1960
+msgid "Signal / Noise"
+msgstr "Сигнал / шум"
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:125
 msgid "Signal Attenuation (SATN)"
 msgstr "Затухання сигналу (SATN)"
@@ -4837,11 +4980,11 @@ msgstr "Сигнал:"
 msgid "Size"
 msgstr "Розмір"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:259
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:260
 msgid "Size of DNS query cache"
 msgstr "Розмір кешу запитів DNS"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:191
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
 msgid "Size of the ZRam device in megabytes"
 msgstr "Розмір пристрою ZRam у мегабайтах"
 
@@ -4858,11 +5001,7 @@ msgstr "Перейти до вмісту"
 msgid "Skip to navigation"
 msgstr "Перейти до навігації"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:335
-msgid "Slot time"
-msgstr "Час слота"
-
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1640
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1846
 #: modules/luci-base/luasrc/model/network.lua:1427
 msgid "Software VLAN"
 msgstr "Програмово реалізований VLAN"
@@ -4903,11 +5042,7 @@ msgstr "Адреса джерела"
 msgid "Specifies the directory the device is attached to"
 msgstr "Визначає каталог, до якого приєднаний пристрій"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:23
-msgid "Specifies the listening port of this <em>Dropbear</em> instance"
-msgstr "Визначає порт прослуховування цієї реалізації <em>Dropbear</em>"
-
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:57
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:175
 msgid ""
 "Specifies the maximum amount of failed ARP requests until hosts are presumed "
 "to be dead"
@@ -4915,7 +5050,7 @@ msgstr ""
 "Визначає максимальну кількість невдалих ARP-запитів до вузлів, після якого "
 "вважається, що вузли \"мертві\""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:49
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:171
 msgid ""
 "Specifies the maximum amount of seconds after which hosts are presumed to be "
 "dead"
@@ -4923,11 +5058,21 @@ msgstr ""
 "Визначає максимальний час (секунди), після якого вважається, що вузли "
 "\"мертві\""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:761
+msgid ""
+"Specifies the maximum transmit power the wireless radio may use. Depending "
+"on regulatory requirements and wireless usage, the actual transmit power may "
+"be reduced by the driver."
+msgstr ""
+"Визначає максимальну потужність передавача, яку може використовувати "
+"бездротове радіо. Залежно від нормативних вимог та його використання, "
+"реальна потужність передавача може зменшуватися драйвером."
+
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:63
 msgid "Specify a TOS (Type of Service)."
 msgstr "Вкажіть TOS (Type of Service — тип послуги)."
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:25
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:58
 msgid ""
 "Specify a TTL (Time to Live) for the encapsulating packet other than the "
 "default (64)."
@@ -4935,7 +5080,7 @@ msgstr ""
 "Вкажіть TTL (Time to Live — час життя) для пакета інкапсуляції, відмінний "
 "від типового (64)."
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:53
 msgid ""
 "Specify an MTU (Maximum Transmission Unit) other than the default (1280 "
 "bytes)."
@@ -4943,29 +5088,30 @@ msgstr ""
 "Вкажіть MTU (Maximum Transmission Unit — максимальний блок передавання), "
 "відмінний від типового (1280 байт)."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:60
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "Specify the secret encryption key here."
 msgstr "Вкажіть тут секретний ключ шифрування."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:475
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:64
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:533
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:89
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:111
 msgid "Start"
 msgstr "Запустити"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:33
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:86
 msgid "Start priority"
 msgstr "Стартовий пріоритет"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1958
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2499
 msgid "Starting configuration apply…"
 msgstr "Розпочато застосування конфігурації…"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1626
 msgid "Starting wireless scan..."
 msgstr "Розпочато сканування бездротових мереж..."
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:24
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:120
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
 msgid "Startup"
 msgstr "Запуск"
 
@@ -4977,20 +5123,21 @@ msgstr "Статичні маршрути IPv4"
 msgid "Static IPv6 Routes"
 msgstr "Статичні маршрути IPv6"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:70
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:71
 msgid "Static Leases"
 msgstr "Статичні оренди"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:118
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:73
 msgid "Static Routes"
 msgstr "Статичні маршрути"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1194
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1384
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:172
 #: modules/luci-base/luasrc/model/network.lua:966
 msgid "Static address"
 msgstr "Статична адреса"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:308
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:309
 msgid ""
 "Static leases are used to assign fixed IP addresses and symbolic hostnames "
 "to DHCP clients. They are also required for non-dynamic interface "
@@ -5001,39 +5148,41 @@ msgstr ""
 "конфігурацій інтерфейсів, коли обслуговуються тільки вузли з відповідною "
 "орендою."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:534
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:977
 msgid "Station inactivity limit"
 msgstr "Обмеження бездіяльності станції"
 
 #: modules/luci-base/luasrc/controller/admin/index.lua:40
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:197
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:337
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:746
 #: modules/luci-mod-status/luasrc/view/admin_status/index.htm:128
 msgid "Status"
 msgstr "Стан"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:35
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:75
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:308
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:91
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:113
 msgid "Stop"
 msgstr "Зупинити"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:165
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Strict order"
 msgstr "Строгий порядок"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:16
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:30
 msgid "Strong"
 msgstr "Висока"
 
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1843
 msgid "Submit"
 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:108
 msgid "Suppress logging"
 msgstr "Блокувати журналювання"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:109
 msgid "Suppress logging of the routine operation of these protocols"
 msgstr "Блокувати ведення журналу звичайної роботи цих протоколів"
 
@@ -5045,44 +5194,46 @@ msgstr "Своп"
 msgid "Swap Entry"
 msgstr "Вхід своп"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:23
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:5
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:135
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:21
 msgid "Switch"
 msgstr "Комутатор"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:129
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:168
 msgid "Switch %q"
 msgstr "Комутатор %q"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:128
-msgid "Switch %q (%s)"
-msgstr "Комутатор %q (%s)"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:66
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:146
 msgid ""
 "Switch %q has an unknown topology - the VLAN settings might not be accurate."
 msgstr ""
 "Комутатор %q має невідому топологію – параметри VLAN можуть бути "
 "неправильними."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:146
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:142
 msgid "Switch Port Mask"
 msgstr "Маска портів комутатора"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1640
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1846
 #: modules/luci-base/luasrc/model/network.lua:1425
 msgid "Switch VLAN"
 msgstr "VLAN комутатора"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:238
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:355
 msgid "Switch protocol"
 msgstr "Протокол комутатора"
 
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:103
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:104
 #: modules/luci-base/luasrc/view/cbi/ipaddr.htm:26
 msgid "Switch to CIDR list notation"
 msgstr "Перейти до позначення списку CIDR"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:77
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1547
+msgid "Symbolic link"
+msgstr "Символічне посилання"
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:71
 msgid "Sync with NTP-Server"
 msgstr "Синхронізувати з NTP-сервером"
 
@@ -5092,7 +5243,7 @@ msgstr "Синхронізувати з браузером"
 
 #: modules/luci-base/luasrc/controller/admin/index.lua:47
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:14
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:102
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:94
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
 #: modules/luci-mod-system/luasrc/view/admin_system/applyreboot.htm:39
 msgid "System"
@@ -5103,11 +5254,11 @@ msgstr "Система"
 msgid "System Log"
 msgstr "Системний журнал"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:108
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:99
 msgid "System Properties"
 msgstr "Властивості системи"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:145
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:136
 msgid "System log buffer size"
 msgstr "Розмір буфера системного журналу"
 
@@ -5115,15 +5266,17 @@ msgstr "Розмір буфера системного журналу"
 msgid "TCP:"
 msgstr "TCP:"
 
-#: 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:69
 msgid "TFTP Settings"
 msgstr "Налаштування TFTP"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:269
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
 msgid "TFTP server root"
 msgstr "Корінь TFTP-сервера"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:17
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:77
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:88
 msgid "TX"
@@ -5146,7 +5299,7 @@ msgstr "Таблиця"
 msgid "Target"
 msgstr "Ціль"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:77
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:103
 msgid "Target network"
 msgstr "Цільова мережа"
 
@@ -5154,30 +5307,7 @@ msgstr "Цільова мережа"
 msgid "Terminate"
 msgstr "Завершити"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:27
-msgid ""
-"The <em>Device Configuration</em> section covers physical settings of the "
-"radio hardware such as channel, transmit power or antenna selection which "
-"are shared among all defined wireless networks (if the radio hardware is "
-"multi-SSID capable). Per network settings like encryption or operation mode "
-"are grouped in the <em>Interface Configuration</em>."
-msgstr ""
-"Розділ <em>Конфігурація пристрою</em> охоплює фізичні параметри апаратних "
-"радіо-засобів, такі, як канал, потужність передавача або вибір антени, які є "
-"спільними для всіх визначених бездротових мереж (якщо апаратні радіо-засоби "
-"здатні підтримувати кілька SSID). Параметри окремих мереж, такі, як "
-"шифрування або режим роботи, згруповано в розділі <em>Конфігурація "
-"інтерфейсу</em>."
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:79
-msgid ""
-"The <em>libiwinfo-lua</em> package is not installed. You must install this "
-"component for working wireless configuration!"
-msgstr ""
-"Пакет <em>libiwinfo-lua</em> не інстальований. Щоб мати можливість "
-"налаштувати безпровідні мережі, слід інсталювати цей компонент!"
-
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:66
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:77
 msgid ""
 "The HE.net endpoint update configuration changed, you must now use the plain "
 "username instead of the user ID!"
@@ -5185,21 +5315,20 @@ msgstr ""
 "Конфігурацію оновлення кінцевого вузла HE.net змінено, тепер потрібно "
 "використовувати звичайне ім'я користувача замість ідентифікатора користувача!"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:8
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:40
 msgid ""
 "The IPv4 address or the fully-qualified domain name of the remote tunnel end."
 msgstr "Адреса IPv4 або повне доменне ім'я віддаленого кінця тунелю."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:27
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:38
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:59
 msgid ""
 "The IPv6 prefix assigned to the provider, usually ends with <code>::</code>"
 msgstr ""
 "Призначений провайдером IPv6-префікс, зазвичай закінчується на <code>::</"
 "code>"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:18
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1808
 msgid ""
 "The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
 "code> and <code>_</code>"
@@ -5215,7 +5344,7 @@ msgstr "Архів резервної копії не є правильним ф
 msgid "The configuration file could not be loaded due to the following error:"
 msgstr "Файл конфігурації не вдалося завантажити через таку помилку:"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1849
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2396
 msgid ""
 "The device could not be reached within %d seconds after applying the pending "
 "changes, which caused the configuration to be rolled back for safety "
@@ -5239,6 +5368,14 @@ msgid ""
 "</abbr> <code>/dev/sda1</code>)"
 msgstr "Файл пристрою пам'яті або розділу (наприклад, <code>/dev/sda1</code>)"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:612
+msgid ""
+"The existing wireless configuration needs to be changed for LuCI to function "
+"properly."
+msgstr ""
+"Для правильного функціонування LuCI, потрібно змінити існуючу конфігурацію "
+"бездротового зв'язку."
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:127
 msgid ""
 "The filesystem that was used to format the memory (<abbr title=\"for example"
@@ -5263,11 +5400,15 @@ msgstr ""
 msgid "The following rules are currently active on this system."
 msgstr "Наразі в цій системі активні такі правила."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:144
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:154
+msgid "The gateway address must not be a local IP address"
+msgstr "Адреса шлюзу не повинна бути локальною IP-адресою"
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:154
 msgid "The given SSH public key has already been added."
 msgstr "Наданий відкритий SSH-ключ вже було додано."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:150
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:160
 msgid ""
 "The given SSH public key is invalid. Please supply proper public RSA or "
 "ECDSA keys."
@@ -5275,35 +5416,35 @@ msgstr ""
 "Наданий відкритий SSH-ключ є недійсним. Надавайте належні відкриті ключі RSA "
 "або ECDSA."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:67
-msgid "The given network name is not unique"
-msgstr "Задане мережеве ім'я не є унікальним"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:664
+msgid "The interface name is already used"
+msgstr "Назва інтерфейсу вже використовується"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:52
-msgid ""
-"The hardware is not multi-SSID capable and the existing configuration will "
-"be replaced if you proceed."
-msgstr ""
-"Обладнання не підтримує мульти-SSID і, якщо ви продовжите, існуючу "
-"конфігурацію буде замінено."
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:670
+msgid "The interface name is too long"
+msgstr "Назва інтерфейсу занадто довга"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:43
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:31
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:55
 msgid ""
 "The length of the IPv4 prefix in bits, the remainder is used in the IPv6 "
 "addresses."
 msgstr "Довжина IPv4-префікса в бітах, решта використовується в IPv6-адресах."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:35
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:46
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:63
 msgid "The length of the IPv6 prefix in bits"
 msgstr "Довжина IPv6-префікса в бітах"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:12
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:44
 msgid "The local IPv4 address over which the tunnel is created (optional)."
 msgstr "Локальна адреса IPv4, за якою створюється тунель (необов'язково)."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:5
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1814
+msgid "The network name is already used"
+msgstr "Назва мережі вже використовується"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:135
 msgid ""
 "The network ports on this device can be combined to several <abbr title="
 "\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
@@ -5321,16 +5462,15 @@ msgstr ""
 "більшою мережею, такою наприклад, як Інтернет, а інші порти — для локальної "
 "мережі."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:77
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:395
-msgid "The selected protocol needs a device assigned"
-msgstr "Обраний протокол потребує призначених пристроїв"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1149
+msgid "The selected %s mode is incompatible with %s encryption"
+msgstr "Обраний режим %s несумісний із шифруванням %s"
 
 #: modules/luci-base/luasrc/view/csrftoken.htm:11
 msgid "The submitted security token is invalid or already expired!"
 msgstr "Поданий маркер безпеки недійсний або вже збіг!"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:274
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:272
 msgid ""
 "The system is erasing the configuration partition now and will reboot itself "
 "when finished."
@@ -5338,7 +5478,7 @@ msgstr ""
 "Зараз система видаляє розділ конфігурації і коли закінчить, "
 "перезавантажиться."
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:195
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:193
 msgid ""
 "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
 "few minutes before you try to reconnect. It might be necessary to renew the "
@@ -5350,7 +5490,7 @@ msgstr ""
 "під'єднатися. Залежно від налаштувань, можливо, треба буде оновити адресу "
 "вашого комп'ютера, щоб знову отримати доступ до пристрою."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:15
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:80
 msgid "The system password has been successfully changed."
 msgstr "Системний пароль успішно змінено."
 
@@ -5362,7 +5502,7 @@ msgstr ""
 "Завантажений файл образу не містить підтримуваний формат. Переконайтеся, що "
 "ви вибираєте універсальний формат образу для вашої платформи."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:427
 msgid "There are no active leases"
 msgstr "Немає жодних активних оренд"
 
@@ -5371,18 +5511,10 @@ msgstr "Немає жодних активних оренд"
 msgid "There are no active leases."
 msgstr "Активних оренд немає."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1973
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2514
 msgid "There are no changes to apply"
 msgstr "Немає жодних змін до застосування"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:204
-msgid ""
-"There is no device assigned yet, please attach a network device in the "
-"\"Physical Settings\" tab"
-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
@@ -5394,11 +5526,19 @@ msgstr ""
 "Цей маршрутизатор не має пароля. Встановіть пароль, щоб захистити веб-"
 "інтерфейс і увімкнути SSH."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:19
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:49
 msgid "This IPv4 address of the relay"
 msgstr "Це IPv4-адреса ретранслятора"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1448
+msgid "This authentication type is not applicable to the selected EAP method."
+msgstr "Цей тип автентифікації не застосовується до вибраного методу EAP."
+
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:54
+msgid "This does not look like a valid PEM file"
+msgstr "Це не схоже на дійсний файл PEM"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
 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 "
@@ -5418,7 +5558,7 @@ msgstr ""
 "резервної копії. Змінені файли у <code>/etc/config/</code> та деякі інші "
 "зберігаються автоматично."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:74
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:81
 msgid ""
 "This is either the \"Update Key\" configured for the tunnel or the account "
 "password if no update key has been configured"
@@ -5426,7 +5566,7 @@ msgstr ""
 "Це або \"Update Key\", сконфігурований для тунелю, або пароль облікового "
 "запису, якщо ключ оновлення не налаштовано"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:82
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:127
 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."
@@ -5434,7 +5574,7 @@ msgstr ""
 "Це вміст файлу <code>/etc/rc.local</code>. Вставте тут ваші власні команди "
 "(перед 'exit 0'), щоб виконати їх у кінці процесу завантаження."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:27
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:54
 msgid ""
 "This is the local endpoint address assigned by the tunnel broker, it usually "
 "ends with <code>...:2/64</code>"
@@ -5442,7 +5582,7 @@ msgstr ""
 "Це локальна адреса кінцевого вузла, яку присвоєно тунельним брокером, вона "
 "зазвичай закінчується на <code>…:2/64</code>"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:79
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> in the local network"
@@ -5450,24 +5590,24 @@ msgstr ""
 "Тільки для <abbr title=\"Dynamic Host Configuration Protocol — протокол "
 "динамічної конфігурації вузла\">DHCP</abbr> у локальній мережі"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:73
 msgid "This is the plain username for logging into the account"
 msgstr "Це звичайне ім'я користувача для входу до облікового запису"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:34
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:57
 msgid ""
 "This is the prefix routed to you by the tunnel broker for use by clients"
 msgstr ""
 "Це префікс, що надсилається до вас тунельним брокером для використання "
 "клієнтами"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:9
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:41
 msgid "This is the system crontab in which scheduled tasks can be defined."
 msgstr ""
 "Це системна таблиця Cron (crontab), у якій можна визначити заплановані "
 "завдання."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:19
+#: 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 ""
@@ -5484,28 +5624,28 @@ msgstr "У цьому списку наведено працюючі нараз
 msgid "This page gives an overview over currently active network connections."
 msgstr "Ця сторінка надає огляд поточних активних мережевих підключень."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:726
-#: modules/luci-base/htdocs/luci-static/resources/form.js:809
+#: modules/luci-base/htdocs/luci-static/resources/form.js:936
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1064
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:172
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:32
 msgid "This section contains no values yet"
 msgstr "Ця секція поки що не містить значень"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:114
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:105
 msgid "Time Synchronization"
 msgstr "Синхронізація часу"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:525
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:968
 msgid "Time interval for rekeying GTK"
 msgstr "Інтервал часу для зміни ключа GTK"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:128
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:119
 msgid "Timezone"
 msgstr "Часовий пояс"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:825
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:871
 msgid "To login…"
-msgstr "Для входу…"
+msgstr "До входу…"
 
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:32
 msgid ""
@@ -5518,7 +5658,7 @@ msgstr ""
 "натисніть кнопку \"Виконати відновлення\" (можливо тільки з образами "
 "SquashFS)."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:835
 msgid "Tone"
 msgstr "Тоновий"
 
@@ -5542,55 +5682,41 @@ msgstr "Трафік"
 msgid "Transfer"
 msgstr "Передано"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:595
-msgid "Transmission Rate"
-msgstr "Швидкість передавання"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:102
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:89
 msgid "Transmit"
 msgstr "Передавання"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:211
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:273
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:345
-msgid "Transmit Power"
-msgstr "Потужність передавача"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:318
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:349
-msgid "Transmitter Antenna"
-msgstr "Антена передавача"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:73
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:57
 msgid "Trigger"
 msgstr "Тригер"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:98
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:84
 msgid "Trigger Mode"
 msgstr "Режим запуску"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:54
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:69
 msgid "Tunnel ID"
 msgstr "Ідентифікатор тунелю"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1643
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1849
 #: modules/luci-base/luasrc/model/network.lua:1430
 msgid "Tunnel Interface"
 msgstr "Інтерфейс тунелю"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:44
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:55
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:76
 msgid "Tunnel Link"
 msgstr "Посилання тунелю"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:46
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:131
 msgid "Tx-Power"
 msgstr "Потужність передавача"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:32
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:185
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:11
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:43
 msgid "Type"
 msgstr "Тип"
 
@@ -5598,19 +5724,20 @@ msgstr "Тип"
 msgid "UDP:"
 msgstr "UDP:"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:28
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:90
 msgid "UMTS only"
 msgstr "Тільки UMTS"
 
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:43
 #: protocols/luci-proto-3g/luasrc/model/network/proto_3g.lua:10
 msgid "UMTS/GPRS/EV-DO"
 msgstr "UMTS/GPRS/EV-DO"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:106
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:93
 msgid "USB Device"
 msgstr "USB-пристрій"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:122
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:110
 msgid "USB Ports"
 msgstr "USB-порт"
 
@@ -5640,10 +5767,12 @@ msgstr "Не вдається визначити висхідний інтерф
 msgid "Unable to dispatch"
 msgstr "Не вдається опрацювати запит"
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:22
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:54
 msgid "Unable to obtain client ID"
 msgstr "Не вдається отримати ідентифікатор клієнта"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:61
 msgid "Unable to resolve AFTR host name"
 msgstr "Не вдається розрізнити ім'я хоста AFTR"
@@ -5653,21 +5782,31 @@ msgstr "Не вдається розрізнити ім'я хоста AFTR"
 msgid "Unable to resolve peer host name"
 msgstr "Не вдається розрізнити ім'я хоста вузла"
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:33
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:68
+msgid "Unable to save contents: %s"
+msgstr "Не вдалося зберегти вміст: %s"
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:132
 msgid "Unavailable Seconds (UAS)"
 msgstr "Недоступні секунди (<abbr title=\"Unavailable Seconds\">UAS</abbr>)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1196
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1386
 #: modules/luci-base/luasrc/model/network.lua:970
 msgid "Unknown"
 msgstr "Невідомо"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1349
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1539
 #: modules/luci-base/luasrc/model/network.lua:1137
 msgid "Unknown error (%s)"
 msgstr "Невідома помилка (%s)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1193
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:204
+msgid "Unknown error code"
+msgstr "Невідомий код помилки"
+
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1383
+#: modules/luci-base/htdocs/luci-static/resources/protocol/none.js:6
 #: modules/luci-base/luasrc/model/network.lua:964
 msgid "Unmanaged"
 msgstr "Некерований"
@@ -5677,22 +5816,30 @@ msgstr "Некерований"
 msgid "Unmount"
 msgstr "Демонтувати"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:107
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:262
 msgid "Unnamed key"
 msgstr "Безіменний ключ"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1708
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2261
 msgid "Unsaved Changes"
 msgstr "Незбережені зміни"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:202
+msgid "Unspecified error"
+msgstr "Невизначена помилка"
+
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:64
 msgid "Unsupported MAP type"
 msgstr "Непідтримуваний тип MAP"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:27
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:69
 msgid "Unsupported modem"
 msgstr "Непідтримуваний модем"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:219
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:119
 msgid "Unsupported protocol type."
 msgstr "Непідтримуваний тип протоколу."
@@ -5715,56 +5862,73 @@ msgstr ""
 msgid "Upload archive..."
 msgstr "Відвантажити архів..."
 
-#: modules/luci-base/luasrc/view/cbi/upload.htm:8
-msgid "Uploaded File"
-msgstr "Відвантажений файл"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1703
+msgid "Upload file"
+msgstr "Відвантажити файл"
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1678
+msgid "Upload file…"
+msgstr "Відвантажити файл…"
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1623
+msgid "Upload request failed: %s"
+msgstr "Не вдалося виконати запит на відвантаження: %s"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:613
+msgid ""
+"Upon pressing \"Continue\", anonymous \"wifi-iface\" sections will be "
+"assigned with a name in the form <em>wifinet#</em> and the network will be "
+"restarted to apply the updated configuration."
+msgstr ""
+"Після натискання \"Продовжити\" безіменним розділам \"wifi-iface\" будуть "
+"призначені назви у формі <em>wifinet#</em>, і мережу буде перезапущено для "
+"застосування оновленої конфігурації."
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:14
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:74
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:85
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:26
 msgid "Uptime"
 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:83
 msgid "Use <code>/etc/ethers</code>"
 msgstr "Використовувати <code>/etc/ethers</code>"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:40
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:167
 msgid "Use DHCP gateway"
 msgstr "Використовувати DHCP-шлюз"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:33
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:85
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:34
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:98
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:46
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:65
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:38
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:58
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:124
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:39
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:116
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:59
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:103
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:64
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:77
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:100
 msgid "Use DNS servers advertised by peer"
 msgstr "Використовувати DNS-сервери, оголошувані вузлом"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:227
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:233
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:479
 msgid "Use ISO/IEC 3166 alpha2 country codes."
 msgstr "Використовуйте коди країн згідно ISO/IEC 3166 alpha2."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:31
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:100
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:70
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:35
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:51
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:86
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:56
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:97
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:77
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:75
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:92
 msgid "Use MTU on tunnel interface"
 msgstr "Використовувати на тунельному інтерфейсі MTU"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:95
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:65
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:30
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:46
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:81
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:93
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:73
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:88
 msgid "Use TTL on tunnel interface"
 msgstr "Використовувати на тунельному інтерфейсі TTL"
 
@@ -5776,68 +5940,65 @@ msgstr "Використовувати як зовнішній оверлей (/
 msgid "Use as root filesystem (/)"
 msgstr "Використовувати як кореневу файлову систему (/)"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:19
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:31
 msgid "Use broadcast flag"
 msgstr "Використовувати прапорець широкомовності"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:253
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:791
 msgid "Use builtin IPv6-management"
 msgstr "Використовувати вбудоване керування IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:40
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:109
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:92
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:45
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:105
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:53
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:72
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:45
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:65
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:40
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:182
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:127
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:42
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:119
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:62
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:67
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:80
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:103
 msgid "Use custom DNS servers"
 msgstr "Використовувати особливі DNS-сервери"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:26
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:70
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:16
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:28
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:84
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:24
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:50
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:23
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:43
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:116
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:33
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:74
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:97
 msgid "Use default gateway"
 msgstr "Використовувати типовий шлюз"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:48
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:164
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:77
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:24
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:88
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:58
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:23
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:39
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:74
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:90
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:38
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:57
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:30
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:50
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:45
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:227
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:119
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:51
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:88
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:68
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:52
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:70
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:83
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:111
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:149
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:67
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:111
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:98
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:72
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:85
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:108
 msgid "Use gateway metric"
 msgstr "Використовувати метрику шлюзу"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:64
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:179
 msgid "Use routing table"
 msgstr "Використовувати таблицю маршрутизації"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:309
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:310
 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 "
@@ -5848,17 +6009,20 @@ msgstr ""
 "Використовуйте кнопку <em>Додати</em>, щоб додати новий запис оренди. "
 "<em>MAC-адреса</em> ідентифікує вузол, <em>IPv4-адреса</em> визначає "
 "фіксовану адресу, яка буде використовуватися, а <em>Назва (ім'я) вузла</em> "
-"призначає символічне ім'я вузла."
+"призначає символічне ім'я вузла. Необов'язковий параметр <em>Час оренди</em> "
+"можна використовувати для встановлення нестандартного специфічного для вузла "
+"часу оренди, наприклад 12h, 3d чи <abbr title=\"необмежений\">infinite</"
+"abbr>."
 
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:111
 msgid "Used"
 msgstr "Використано"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:848
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1273
 msgid "Used Key Slot"
 msgstr "Використовується слот ключа"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:913
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
 msgid ""
 "Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not "
 "needed with normal WPA(2)-PSK."
@@ -5867,67 +6031,68 @@ msgstr ""
 "\"ідентифікатор власника ключа R0\">R0KH-ID</abbr>. Не потрібно за "
 "звичайного WPA(2)-PSK."
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:48
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:110
 msgid "User certificate (PEM encoded)"
 msgstr "Сертифікат користувача (PEM-кодований)"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:61
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:122
 msgid "User key (PEM encoded)"
 msgstr "Ключ користувача (PEM-кодований)"
 
 #: modules/luci-base/luasrc/view/sysauth.htm:23
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:41
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:32
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:102
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:56
 msgid "Username"
 msgstr "Ім'я користувача"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:182
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:903
 msgid "VC-Mux"
 msgstr "VC-Mux"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:851
 msgid "VDSL"
 msgstr "VDSL"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:172
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:169
 msgid "VLANs on %q"
 msgstr "VLAN на %q"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:171
-msgid "VLANs on %q (%s)"
-msgstr "VLAN на %q (%s)"
+#: modules/luci-base/luasrc/controller/admin/index.lua:55
+msgid "VPN"
+msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:18
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:42
 msgid "VPN Local address"
 msgstr "Локальна адреса VPN"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:22
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:46
 msgid "VPN Local port"
 msgstr "Локальний порт VPN"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:15
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:11
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:15
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:58
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:39
 msgid "VPN Server"
 msgstr "VPN-сервер"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:18
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:96
 msgid "VPN Server port"
 msgstr "Порт VPN-сервера"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:37
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:100
 msgid "VPN Server's certificate SHA1 hash"
 msgstr "SHA1-геш сертифіката VPN-сервера"
 
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:9
 #: protocols/luci-proto-vpnc/luasrc/model/network/proto_vpnc.lua:9
 msgid "VPNC (CISCO 3000 (and others) VPN)"
 msgstr "VPNC (CISCO 3000 (та інш.) VPN)"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:44
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:73
 msgid "Vendor"
 msgstr "Постачальник"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:60
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:52
 msgid "Vendor Class to send when requesting DHCP"
 msgstr "Клас постачальника для відправки при запиті DHCP"
 
@@ -5935,41 +6100,37 @@ msgstr "Клас постачальника для відправки при з
 msgid "Verify"
 msgstr "Перевірте"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:52
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:76
 msgid "Virtual dynamic interface"
 msgstr "Віртуальний динамічний інтерфейс"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:470
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:471
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:553
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:576
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:908
 msgid "WDS"
 msgstr "WDS"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:667
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1160
 msgid "WEP Open System"
 msgstr "Відкрита система WEP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:668
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1161
 msgid "WEP Shared Key"
 msgstr "Спільний ключ WEP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "WEP passphrase"
 msgstr "Парольна фраза WEP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:503
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:566
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:945
 msgid "WMM Mode"
 msgstr "Режим <abbr title=\"Wi-Fi Multimedia\">WMM</abbr>"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "WPA passphrase"
 msgstr "Парольна фраза WPA"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:716
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:735
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:740
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1074
 msgid ""
 "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
 "and ad-hoc mode) to be installed."
@@ -5985,7 +6146,7 @@ msgstr "Очікуємо, доки зміни наберуть чинності.
 msgid "Waiting for command to complete..."
 msgstr "Очікуємо завершення виконання команди..."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1940
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2481
 msgid "Waiting for configuration to get applied… %ds"
 msgstr "Очікування на застосування конфігурації… %d c"
 
@@ -5993,8 +6154,8 @@ msgstr "Очікування на застосування конфігурац
 msgid "Waiting for device..."
 msgstr "Очікуємо пристрій..."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:172
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:163
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:173
 msgid "Warning"
 msgstr "Застереження"
 
@@ -6003,11 +6164,11 @@ msgid "Warning: There are unsaved changes that will get lost on reboot!"
 msgstr ""
 "Застереження: Є незбережені зміни, які буде втрачено при перезавантаженні!"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:20
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:34
 msgid "Weak"
 msgstr "Слабка"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:946
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1355
 msgid ""
 "When using a PSK, the PMK can be automatically generated. When enabled, the "
 "R0/R1 key options below are not applied. Disable this to use the R0 and R1 "
@@ -6018,78 +6179,87 @@ msgstr ""
 "параметри ключів R0 та R1, вимкніть цю функцію."
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:383
 msgid "Width"
 msgstr "Ширина"
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:17
 #: protocols/luci-proto-wireguard/luasrc/model/network/proto_wireguard.lua:9
 msgid "WireGuard VPN"
 msgstr "WireGuard VPN"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:58
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:40
 #: modules/luci-mod-status/luasrc/controller/admin/status.lua:28
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:14
 msgid "Wireless"
 msgstr "Бездротові мережі"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1631
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1837
 #: modules/luci-base/luasrc/model/network.lua:1418
 msgid "Wireless Adapter"
 msgstr "Бездротовий адаптер"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1617
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2052
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1823
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2288
 #: modules/luci-base/luasrc/model/network.lua:1404
 #: modules/luci-base/luasrc/model/network.lua:1865
 msgid "Wireless Network"
 msgstr "Бездротова мережа"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:629
 msgid "Wireless Overview"
 msgstr "Огляд бездротових мереж"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:362
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:797
 msgid "Wireless Security"
 msgstr "Безпека бездротової мережі"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:54
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:611
+msgid "Wireless configuration migration"
+msgstr "Перенесення конфігурації бездротових мереж"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:139
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:179
 msgid "Wireless is disabled"
 msgstr "Бездротову мережу вимкнено"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:54
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:139
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:179
 msgid "Wireless is not associated"
 msgstr "Бездротову мережу не пов'язано"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:15
-msgid "Wireless is restarting..."
-msgstr "Бездротова мережа перезапускається..."
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:752
 msgid "Wireless network is disabled"
 msgstr "Бездротову мережу вимкнено"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:752
 msgid "Wireless network is enabled"
 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:182
 msgid "Write received DNS requests to syslog"
 msgstr "Записувати отримані DNS-запити до системного журналу"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:164
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:155
 msgid "Write system log to file"
 msgstr "Записувати cистемний журнал до файлу"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1507
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:85
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1754
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:109
 msgid "Yes"
 msgstr "Так"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:26
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:943
+msgid ""
+"You appear to be currently connected to the device via the \"%h\" interface. "
+"Do you really want to shut down the interface?"
+msgstr ""
+"Здається, ви наразі підключені до пристрою через інтерфейс \"%h\". Справді "
+"вимкнути його?"
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:123
 msgid ""
 "You can enable or disable installed init scripts here. Changes will applied "
 "after a device reboot.<br /><strong>Warning: If you disable essential init "
@@ -6110,38 +6280,34 @@ msgstr ""
 "Вам слід увімкнути JavaScript у вашому браузері, або LuCI не буде працювати "
 "належним чином."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:196
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:187
 msgid "ZRam Compression Algorithm"
 msgstr "Алгоритм стиснення ZRam"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:203
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:194
 msgid "ZRam Compression Streams"
 msgstr "Потоки стиснення ZRam"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:189
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:180
 msgid "ZRam Settings"
 msgstr "Налаштування ZRam"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:191
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
 msgid "ZRam Size"
 msgstr "Розмір ZRam"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:229
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:230
 msgid "any"
 msgstr "будь-який"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:113
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:121
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:126
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:218
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:282
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:321
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:328
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:621
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:37
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:22
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:29
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:121
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:836
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:844
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:849
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1030
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:78
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:48
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:51
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:103
 msgid "auto"
 msgstr "авто"
 
@@ -6149,11 +6315,11 @@ msgstr "авто"
 msgid "automatic"
 msgstr "автоматично"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:45
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:78
 msgid "baseT"
 msgstr "baseT"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:909
 msgid "bridged"
 msgstr "з'єд. мостом"
 
@@ -6169,22 +6335,21 @@ msgstr "створити"
 msgid "create:"
 msgstr "створити:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:264
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:368
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:678
 msgid "creates a bridge over specified interface(s)"
-msgstr "Створити міст через зазначені інтерфейси"
+msgstr "Створює мережевий міст через зазначені інтерфейси"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:277
 msgid "dB"
 msgstr "дБ"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:34
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:35
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:46
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:47
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:48
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:131
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:132
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:133
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:277
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:279
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:331
@@ -6196,26 +6361,30 @@ msgstr "дБ"
 msgid "dBm"
 msgstr "дБм"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:460
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:587
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:889
 msgid "disable"
 msgstr "вимкнено"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:119
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:524
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:530
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:536
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:18
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:578
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:584
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:590
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:25
 msgid "disabled"
 msgstr "вимкнено"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:433
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:467
+msgid "driver default"
+msgstr "типово для драйвера"
+
 #: modules/luci-base/luasrc/view/lease_status.htm:17
 #: modules/luci-base/luasrc/view/lease_status.htm:46
-#: 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:416
 msgid "expired"
 msgstr "минув"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:88
 msgid ""
 "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr>-leases will be stored"
@@ -6229,25 +6398,21 @@ msgstr ""
 msgid "forward"
 msgstr "переспрямувати"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:80
 msgid "full-duplex"
 msgstr "повний дуплекс"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:80
 msgid "half-duplex"
 msgstr "напівдуплекс"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:559
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:565
 msgid "hexadecimal encoded value"
 msgstr "шістнадцяткове кодоване значення"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:138
-msgid "hidden"
-msgstr "прихований"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:527
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:533
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:538
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:581
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:587
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:592
 msgid "hybrid mode"
 msgstr "гібридний режим"
 
@@ -6255,6 +6420,10 @@ msgstr "гібридний режим"
 msgid "if target is a network"
 msgstr "якщо ціль — мережа"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:63
+msgid "ignore"
+msgstr "ігнорувати"
+
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:177
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
@@ -6289,27 +6458,28 @@ 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:94
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:95
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr ""
 "Локальний <abbr title=\"Domain Name System — система доменних імен\">DNS</"
 "abbr>-файл"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:952
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1168
+msgid "medium security"
+msgstr "середній рівень безпеки"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1360
 msgid "minutes"
 msgstr "хв."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:43
-msgid "mixed WPA/WPA2"
-msgstr "змішаний WPA/WPA2"
-
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:225
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:232
 msgid "no"
 msgstr "ні"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:54
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:72
 msgid "no link"
 msgstr "нема з'єднання"
 
@@ -6317,7 +6487,7 @@ msgstr "нема з'єднання"
 msgid "non-empty value"
 msgstr "непусте значення"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1195
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1446
 msgid "none"
 msgstr "нема нічого"
 
@@ -6327,7 +6497,9 @@ msgstr "нема нічого"
 msgid "not present"
 msgstr "не присутній"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:363
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:341
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:776
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:780
 #: 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
@@ -6342,9 +6514,9 @@ msgstr "вимкнено"
 msgid "on"
 msgstr "увімкнено"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
-msgid "open"
-msgstr "відкрита"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1169
+msgid "open network"
+msgstr "відкрита мережа"
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
@@ -6363,73 +6535,77 @@ msgstr "додатне десяткове значення"
 msgid "positive integer value"
 msgstr "додатне ціле значення"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:34
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:56
 msgid "random"
 msgstr "випадковий"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:526
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:532
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:537
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:580
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:586
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:591
 msgid "relay mode"
 msgstr "режим реле"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:910
 msgid "routed"
 msgstr "спрямовано"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:525
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:534
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:968
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:977
 msgid "sec"
 msgstr "с"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:525
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:531
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:579
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:585
 msgid "server mode"
 msgstr "режим сервера"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:544
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:597
 msgid "stateful-only"
 msgstr "тільки ЗІ збереженням стану"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:542
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:595
 msgid "stateless"
 msgstr "БЕЗ збереження стану"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:543
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:596
 msgid "stateless + stateful"
 msgstr "БЕЗ та ЗІ збереженням стану"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:369
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1167
+msgid "strong security"
+msgstr "високий рівень безпеки"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:346
 msgid "tagged"
 msgstr "позначено"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:932
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1343
 msgid "time units (TUs / 1.024 ms) [1000-65535]"
 msgstr "одиниці часу (TUs / 1.024 ms) [1000-65535]"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:549
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:555
 msgid "unique value"
 msgstr "унікальне значення"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:448
 msgid "unknown"
 msgstr "невідомий"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:15
 #: modules/luci-base/luasrc/view/lease_status.htm:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:238
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:390
+#: 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:414
 msgid "unlimited"
 msgstr "необмежений"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1401
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1648
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:63
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:355
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:378
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:413
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:446
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:512
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:450
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:545
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:53
 #: modules/luci-base/luasrc/view/cbi/network_netlist.htm:38
 msgid "unspecified"
@@ -6439,7 +6615,7 @@ msgstr "не визначено"
 msgid "unspecified -or- create:"
 msgstr "не визначено -або- створити:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:366
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:344
 msgid "untagged"
 msgstr "не позначено"
 
@@ -6520,8 +6696,8 @@ msgstr "дійсний UCI-ідентифікатор, ім'я хоста або
 msgid "valid address:port"
 msgstr "дійсна адреса:порт"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:523
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:527
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:529
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:533
 msgid "valid date (YYYY-MM-DD)"
 msgstr "дійсна дата (РРРР-ММ-ДД)"
 
@@ -6558,7 +6734,7 @@ msgstr "дійсне ціле значення"
 msgid "valid network in address/netmask notation"
 msgstr "дійсна мережа в записі адреса/маска мережі"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:498
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:504
 msgid "valid phone digit (0-9, \"*\", \"#\", \"!\" or \".\")"
 msgstr "дійсний символ номера телефону (0-9, \"*\", \"#\", \"!\" or \".\")"
 
@@ -6571,11 +6747,11 @@ msgstr "дійсний порт або діапазон портів (порт1-
 msgid "valid port value"
 msgstr "дійсне значення порту"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:503
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:509
 msgid "valid time (HH:MM:SS)"
 msgstr "дійсний час (ГГ:ХХ:СС)"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:425
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:431
 msgid "value between %d and %d characters"
 msgstr "значення від %d до %d символів"
 
@@ -6591,14 +6767,23 @@ msgstr "значення, що більше або дорівнює %f"
 msgid "value smaller or equal to %f"
 msgstr "значення, що менше або дорівнює %f"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:430
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:425
+msgid "value with %d characters"
+msgstr "значення з %d симв."
+
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:436
 msgid "value with at least %d characters"
 msgstr "значення з принаймні %d символів"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:435
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:441
 msgid "value with at most %d characters"
 msgstr "значення з не більше %d символів"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1169
+msgid "weak security"
+msgstr "слабкий рівень безпеки"
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:221
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:232
diff --git a/modules/luci-base/po/vi/base.po b/modules/luci-base/po/vi/base.po
index 349b2290b..3d6efa1a9 100644
--- a/modules/luci-base/po/vi/base.po
+++ b/modules/luci-base/po/vi/base.po
@@ -12,19 +12,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:133
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:857
 msgid "%.1f dB"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:109
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:122
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 msgid "%d Bit"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1641
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2194
 msgid "%d invalid field(s)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:281
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:31
 msgid "%s is untagged in multiple VLANs!"
 msgstr ""
 
@@ -63,19 +64,19 @@ msgid "-- Additional Field --"
 msgstr "---Mục bổ sung---"
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:258
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1401
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1533
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:250
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:350
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1114
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1648
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1780
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:314
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:414
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1178
 #: modules/luci-base/luasrc/view/cbi/header.htm:5
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:26
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:88
 msgid "-- Please choose --"
 msgstr "--Hãy chọn--"
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:259
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:351
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1115
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:415
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1179
 #: modules/luci-base/luasrc/view/cbi/header.htm:6
 msgid "-- custom --"
 msgstr "--tùy chỉnh--"
@@ -98,7 +99,7 @@ msgstr ""
 msgid "-- please select --"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:382
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:814
 msgid "0 = not using RSSI threshold, 1 = do not change driver default"
 msgstr ""
 
@@ -110,10 +111,11 @@ msgstr ""
 msgid "15 Minute Load:"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:924
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1337
 msgid "4-character hexadecimal ID"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:11
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:18
 msgid "464XLAT (CLAT)"
 msgstr ""
@@ -122,57 +124,57 @@ msgstr ""
 msgid "5 Minute Load:"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:960
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1366
 msgid "6-octet identifier as a hex string - no colons"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:891
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1310
 msgid "802.11r Fast Transition"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1157
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1567
 msgid "802.11w Association SA Query maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1574
 msgid "802.11w Association SA Query retry timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1133
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1533
 msgid "802.11w Management Frame Protection"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1156
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1567
 msgid "802.11w maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1165
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1574
 msgid "802.11w retry timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:399
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:831
 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:224
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:225
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:215
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:216
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
 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:167
 msgid ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
 "order of the resolvfile"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:388
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:820
 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:351
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:373
 #: 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"
@@ -182,8 +184,8 @@ msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
 msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:555
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:35
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:506
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 
@@ -199,107 +201,111 @@ 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:378
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:402
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:58
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:35
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:33
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:67
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:51
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:328
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:329
 #: 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:372
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:233
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:234
 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:242
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
 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:251
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:252
 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:10
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:42
 msgid ""
 "<br/>Note: you need to manually restart the cron service if the crontab file "
 "was empty before editing."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:817
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1605
+msgid "A directory with the same name already exists."
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:863
 msgid "A new login is required since the authentication session expired."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:114
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:837
 msgid "A43C + J43 + A43"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:838
 msgid "A43C + J43 + A43 + V43"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:850
 msgid "ADSL"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:826
 msgid "ANSI T1.413"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:33
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:47
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:23
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:94
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:86
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:67
 msgid "APN"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:56
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:175
 msgid "ARP retry threshold"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:122
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:845
 msgid "ATM (Asynchronous Transfer Mode)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:144
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:866
 msgid "ATM Bridges"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:178
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:21
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:898
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:66
 msgid "ATM Virtual Channel Identifier (VCI)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:179
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:26
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:899
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:70
 msgid "ATM Virtual Path Identifier (VPI)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:866
 msgid ""
 "ATM bridges expose encapsulated ethernet in AAL5 connections as virtual "
 "Linux network interfaces which can be used in conjunction with DHCP or PPP "
 "to dial into the provider network."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:184
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:905
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:62
 msgid "ATM device number"
 msgstr ""
 
@@ -308,17 +314,17 @@ msgid "ATU-C System Vendor ID"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:251
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:495
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:499
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:528
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:532
 msgid "Absent Interface"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:19
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
 msgid "Access Concentrator"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:368
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:470
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:802
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
 msgid "Access Point"
 msgstr "Điểm truy cập"
 
@@ -341,7 +347,7 @@ msgid "Active Connections"
 msgstr "kết nối đang hoạt động"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:68
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:30
 msgid "Active DHCP Leases"
 msgstr ""
 
@@ -349,55 +355,75 @@ msgstr ""
 msgid "Active DHCPv6 Leases"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1951
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:370
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:12
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2190
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:804
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:23
 msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:650
-#: modules/luci-base/htdocs/luci-static/resources/form.js:651
-#: modules/luci-base/htdocs/luci-static/resources/form.js:666
-#: modules/luci-base/htdocs/luci-static/resources/form.js:667
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1290
+#: modules/luci-base/htdocs/luci-static/resources/form.js:902
+#: modules/luci-base/htdocs/luci-static/resources/form.js:904
+#: modules/luci-base/htdocs/luci-static/resources/form.js:917
+#: modules/luci-base/htdocs/luci-static/resources/form.js:918
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1539
 #: modules/luci-base/luasrc/view/cbi/nsection.htm:25
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:189
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:197
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:39
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:47
 #: modules/luci-base/luasrc/view/cbi/ucisection.htm:54
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:703
 msgid "Add"
 msgstr "Thêm vào"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:60
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:870
+msgid "Add ATM Bridge"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:92
 msgid "Add IPv4 address…"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:129
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:204
 msgid "Add IPv6 address…"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:143
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:149
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:38
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:47
+msgid "Add LED action"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:215
+msgid "Add VLAN"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:14
+msgid "Add instance"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:153
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:159
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:250
 msgid "Add key"
 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:155
 msgid "Add local domain suffix to names served from hosts files"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:705
 msgid "Add new interface..."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:104
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:99
+msgid "Add peer"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:105
 msgid "Additional Hosts files"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:161
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
 msgid "Additional servers file"
 msgstr ""
 
@@ -424,7 +450,7 @@ msgstr ""
 msgid "Address"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:12
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:151
 msgid "Address to access local relay bridge"
 msgstr ""
 
@@ -433,13 +459,13 @@ msgstr ""
 msgid "Administration"
 msgstr "Quản trị"
 
-#: 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:70
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:505
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:896
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:24
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:189
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:463
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:176
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:143
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:364
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:742
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:799
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:50
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:34
 msgid "Advanced Settings"
@@ -449,165 +475,165 @@ msgstr ""
 msgid "Aggregate Transmit Power(ACTATP)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:175
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:166
 msgid "Alert"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1628
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1834
 #: modules/luci-base/luasrc/model/network.lua:1416
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:54
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:78
 msgid "Alias Interface"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:138
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:66
 msgid "Alias of \"%s\""
 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:170
 msgid "All Servers"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:114
 msgid ""
 "Allocate IP addresses sequentially, starting from the lowest available "
 "address"
 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:113
 msgid "Allocate IP sequentially"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:24
 msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
 msgstr "Cho phép <abbr title=\"Secure Shell\">SSH</abbr> xác thực mật mã"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:545
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:987
 msgid "Allow AP mode to disconnect STAs based on low ACK condition"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:462
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:589
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:891
 msgid "Allow all except listed"
 msgstr "Cho phép tất cả trừ danh sách liệt kê"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:236
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:767
 msgid "Allow legacy 802.11b rates"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:461
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:588
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:890
 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:198
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:199
 msgid "Allow localhost"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:47
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:35
 msgid "Allow remote hosts to connect to local SSH forwarded ports"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:38
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:30
 msgid "Allow root logins with password"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:39
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:30
 msgid "Allow the <em>root</em> user to login with password"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:199
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:200
 msgid ""
 "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:135
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:122
 msgid "Allowed IPs"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:549
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:602
 msgid "Always announce default router"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:259
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:782
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
 "option does not comply with IEEE 802.11n-2009!"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:95
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:818
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:119
 msgid "Annex"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:96
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:819
 msgid "Annex A + L + M (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:827
 msgid "Annex A G.992.1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:828
 msgid "Annex A G.992.2"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:829
 msgid "Annex A G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:830
 msgid "Annex A G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:97
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:820
 msgid "Annex B (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:823
 msgid "Annex B G.992.1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:824
 msgid "Annex B G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:102
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:825
 msgid "Annex B G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:98
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:821
 msgid "Annex J (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:831
 msgid "Annex L G.992.3 POTS 1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:99
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:822
 msgid "Annex M (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:109
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:832
 msgid "Annex M G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:833
 msgid "Annex M G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:550
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:602
 msgid "Announce as default router even if no public prefix is available."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:555
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:607
 msgid "Announced DNS domains"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:554
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:606
 msgid "Announced DNS servers"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1093
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1496
 msgid "Anonymous Identity"
 msgstr ""
 
@@ -619,20 +645,6 @@ msgstr ""
 msgid "Anonymous Swap"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:322
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:329
-msgid "Antenna 1"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:323
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:330
-msgid "Antenna 2"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:246
-msgid "Antenna Configuration"
-msgstr ""
-
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:71
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:160
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:181
@@ -640,11 +652,11 @@ msgstr ""
 msgid "Any zone"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1981
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2522
 msgid "Apply request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1867
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2409
 msgid "Apply unchecked"
 msgstr ""
 
@@ -652,8 +664,8 @@ msgstr ""
 msgid "Architecture"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:19
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:184
+#: 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 ""
@@ -662,13 +674,13 @@ msgstr ""
 msgid "Assign interfaces..."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:124
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:24
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:189
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:31
 msgid ""
 "Assign prefix parts using this hexadecimal subprefix ID for this interface."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:148
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1967
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:22
 msgid "Associated Stations"
 msgstr ""
@@ -677,20 +689,20 @@ msgstr ""
 msgid "Associations"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:39
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:37
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:101
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:64
 msgid "Auth Group"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1027
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1421
 msgid "Authentication"
 msgstr "Xác thực"
 
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:29
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:70
 msgid "Authentication Type"
 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:78
 msgid "Authoritative"
 msgstr "Authoritative"
 
@@ -708,17 +720,19 @@ msgstr "Yêu cầu ủy quyền"
 msgid "Auto Refresh"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:53
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:7
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:17
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:67
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:24
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:36
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:42
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:36
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:106
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:24
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:98
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:50
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:94
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:81
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:55
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:68
 msgid "Automatic"
 msgstr ""
 
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:7
 #: protocols/luci-proto-hnet/luasrc/model/network/proto_hnet.lua:7
 msgid "Automatic Homenet (HNCP)"
 msgstr ""
@@ -761,21 +775,21 @@ msgstr "Sẵn có"
 msgid "Average:"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:116
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:839
 msgid "B43 + B43C"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:840
 msgid "B43 + B43C + V43"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:48
 msgid "BR / DMR / AFTR"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:43
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:75
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1620
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:176
 msgid "BSSID"
 msgstr ""
@@ -789,19 +803,11 @@ msgstr ""
 msgid "Back to configuration"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:48
-msgid "Back to overview"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:20
-msgid "Back to scan results"
-msgstr ""
-
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:17
 msgid "Backup"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:38
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:36
 msgid "Backup / Flash Firmware"
 msgstr ""
 
@@ -814,11 +820,11 @@ msgid "Bad address specified!"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:158
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:288
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:368
 msgid "Band"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:261
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:785
 msgid "Beacon Interval"
 msgstr ""
 
@@ -829,79 +835,85 @@ msgid ""
 "defined backup patterns."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:293
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:294
 msgid ""
 "Bind dynamically to interfaces rather than wildcard address (recommended as "
 "linux default)"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:16
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:48
 msgid "Bind interface"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:16
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:48
 msgid "Bind the tunnel to this interface (optional)."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:49
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:134
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:187
 msgid "Bitrate"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:172
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
 msgid "Bogus NX Domain Override"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1634
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1840
 #: modules/luci-base/luasrc/model/network.lua:1420
 msgid "Bridge"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:264
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:368
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:678
 msgid "Bridge interfaces"
 msgstr "Giao diện cầu nối"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:906
 msgid "Bridge unit number"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:250
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:364
 msgid "Bring up on boot"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:35
-msgid "Broadcom 802.11%s Wireless Controller"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:45
-msgid "Broadcom BCM%04x 802.11 Wireless Controller"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1697
+msgid "Browse…"
 msgstr ""
 
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:18
 msgid "Buffered"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:75
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:134
 msgid "CA certificate; if empty it will be saved after the first connection."
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:7
+msgid "CLAT configuration failed"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:13
 msgid "CPU usage (%)"
 msgstr "CPU usage (%)"
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:21
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:53
 msgid "Call failed"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1789
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:14
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:52
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:711
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:948
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1839
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:191
 #: modules/luci-mod-system/luasrc/view/admin_system/upgrade.htm:60
 msgid "Cancel"
 msgstr "Bỏ qua"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:6
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:17
 msgid "Category"
 msgstr ""
 
@@ -919,13 +931,7 @@ msgstr ""
 msgid "Chain"
 msgstr "chuỗi"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:9
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:14
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:24
-msgid "Change login password"
-msgstr ""
-
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1744
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 msgid "Changes"
 msgstr "Thay đổi"
 
@@ -933,33 +939,23 @@ msgstr "Thay đổi"
 msgid "Changes applied."
 msgstr "Thay đổi đã áp dụng"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2004
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2545
 msgid "Changes have been reverted."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:43
 msgid "Changes the administrator password for accessing the device"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:10
-msgid "Changing password…"
-msgstr ""
-
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:162
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:45
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:87
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:174
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:376
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1618
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:186
 msgid "Channel"
 msgstr "Kênh"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:119
-msgid ""
-"Channel %d is not available in the %s regulatory domain and has been auto-"
-"adjusted to %d."
-msgstr ""
-
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:229
 msgid "Check"
 msgstr ""
@@ -968,7 +964,7 @@ msgstr ""
 msgid "Check filesystems before mount"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1806
 msgid "Check this option to delete the existing networks from this radio."
 msgstr ""
 
@@ -980,8 +976,8 @@ msgstr "Checksum"
 msgid "Choose mtdblock"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:358
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:443
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1829
 msgid ""
 "Choose the firewall zone you want to assign to this interface. Select "
 "<em>unspecified</em> to remove the interface from the associated zone or "
@@ -989,17 +985,17 @@ msgid ""
 "interface to it."
 msgstr "Giao diện này chưa thuộc về bất kỳ firewall zone nào."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:834
 msgid ""
 "Choose the network(s) you want to attach to this wireless interface or fill "
 "out the <em>create</em> field to define a new network."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:614
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1023
 msgid "Cipher"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:61
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:91
 msgid "Cisco UDP encapsulation"
 msgstr ""
 
@@ -1015,28 +1011,28 @@ msgid ""
 "FEATURE IS FOR PROFESSIONALS! )"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1950
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:369
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:471
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2189
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:803
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:908
 msgid "Client"
 msgstr "Client"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:55
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:52
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:47
 msgid "Client ID to send when requesting DHCP"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:145
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:151
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:155
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:161
 msgid "Close"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:146
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:119
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:125
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:127
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:98
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:119
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:157
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:141
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:115
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:138
 msgid ""
 "Close inactive connection after the given amount of seconds, use 0 to "
 "persist connection"
@@ -1049,12 +1045,9 @@ msgstr ""
 #: modules/luci-base/luasrc/view/lease_status.htm:77
 #: modules/luci-base/luasrc/view/lease_status.htm:98
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:118
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:37
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:24
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1965
 #: modules/luci-mod-network/luasrc/view/admin_network/iface_status.htm:6
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:40
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:30
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:8
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:398
 #: modules/luci-mod-status/luasrc/view/admin_status/index/30-network.htm:11
 #: modules/luci-mod-status/luasrc/view/admin_status/index/50-dsl.htm:17
@@ -1068,15 +1061,19 @@ msgstr ""
 msgid "Command"
 msgstr "Lệnh"
 
-#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:64
-msgid "Comment"
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:193
+msgid "Command OK"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:185
-msgid "Common Configuration"
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:41
+msgid "Command failed"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1176
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:64
+msgid "Comment"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
 msgid ""
 "Complicates key reinstallation attacks on the client side by disabling "
 "retransmission of EAPOL-Key frames that are used to install keys. This "
@@ -1084,13 +1081,14 @@ msgid ""
 "negotiation especially in environments with heavy traffic load."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1744
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 #: modules/luci-base/luasrc/controller/admin/uci.lua:11
 #: modules/luci-mod-system/luasrc/view/admin_system/backupfiles.htm:9
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:13
 msgid "Configuration"
 msgstr "Cấu hình"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:21
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:63
 msgid "Configuration failed"
 msgstr ""
@@ -1099,89 +1097,89 @@ msgstr ""
 msgid "Configuration files will be kept"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1915
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2456
 msgid "Configuration has been applied."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1848
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2395
 msgid "Configuration has been rolled back!"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:43
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:942
+msgid "Confirm disconnect"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:50
 msgid "Confirmation"
 msgstr "Xác nhận"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:32
-msgid "Connect"
-msgstr ""
-
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:72
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:105
 msgid "Connected"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:338
-msgid "Connection Limit"
-msgstr "Giới hạn kết nối"
-
 #: modules/luci-base/htdocs/luci-static/resources/network.js:7
 #: modules/luci-base/luasrc/model/network.lua:27
 msgid "Connection attempt failed"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:203
+msgid "Connection lost"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/controller/admin/status.lua:32
 msgid "Connections"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1890
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:66
+msgid "Contents have been saved."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:618
+msgid "Continue"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2431
 msgid ""
 "Could not regain access to the device after applying the configuration "
 "changes. You might need to reconnect if you modified network related "
 "settings such as the IP address or wireless security credentials."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:135
 msgid "Country"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:227
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:233
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:337
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:764
 msgid "Country Code"
 msgstr "Mã quốc gia"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:36
-msgid "Cover the following interface"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:43
-msgid "Cover the following interfaces"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:357
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:86
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:443
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1829
 msgid "Create / Assign firewall-zone"
 msgstr "Tạo/ gán firewall-zone"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:9
-msgid "Create Interface"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:735
+msgid "Create interface"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:33
-msgid "Create a bridge over multiple interfaces"
-msgstr ""
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:174
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:165
 msgid "Critical"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:178
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:169
 msgid "Cron Log Level"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:519
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:521
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:447
+msgid "Current power"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:552
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:554
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:51
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:53
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:82
@@ -1189,7 +1187,7 @@ msgstr ""
 msgid "Custom Interface"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:36
 msgid "Custom delegated IPv6-prefix"
 msgstr ""
 
@@ -1199,7 +1197,7 @@ msgid ""
 "this, perform a factory-reset first."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:59
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:41
 msgid ""
 "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
 "\">LED</abbr>s if possible."
@@ -1207,46 +1205,47 @@ msgstr ""
 "Tùy chỉnh chế độ của thiết bị <abbr title=\"Light Emitting Diode\">LED</"
 "abbr>s nếu có thể."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:799
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1223
 msgid "DAE-Client"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:807
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1231
 msgid "DAE-Port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:815
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1239
 msgid "DAE-Secret"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:448
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:459
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:279
 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:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:61
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:62
 msgid "DHCP and DNS"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1195
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1385
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:16
 #: modules/luci-base/luasrc/model/network.lua:968
 msgid "DHCP client"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:571
 msgid "DHCP-Options"
 msgstr "Tùy chọn DHCP"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_dhcpv6.lua:7
 msgid "DHCPv6 client"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:540
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:594
 msgid "DHCPv6-Mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:529
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:583
 msgid "DHCPv6-Service"
 msgstr ""
 
@@ -1263,31 +1262,31 @@ msgstr ""
 msgid "DNS"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:183
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
 msgid "DNS forwardings"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:30
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:37
 msgid "DNS-Label / FQDN"
 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:136
 msgid "DNSSEC"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:139
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
 msgid "DNSSEC check unsigned"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:73
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:99
 msgid "DPD Idle Timeout"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:14
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:41
 msgid "DS-Lite AFTR address"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:92
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:815
 #: modules/luci-mod-status/luasrc/view/admin_status/index/50-dsl.htm:14
 msgid "DSL"
 msgstr ""
@@ -1296,11 +1295,11 @@ msgstr ""
 msgid "DSL Status"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:125
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:848
 msgid "DSL line mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:519
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:963
 msgid "DTIM Interval"
 msgstr ""
 
@@ -1312,77 +1311,92 @@ msgstr ""
 msgid "Data Rate"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:169
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:180
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:160
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:171
 msgid "Debug"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:759
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:783
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:807
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1183
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1207
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1231
 msgid "Default %d"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:82
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:107
 msgid "Default Route"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:17
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:81
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:51
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:32
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:48
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:85
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:65
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:80
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:108
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:146
 msgid "Default gateway"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:541
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:594
 msgid "Default is stateless + stateful"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:70
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:54
 msgid "Default state"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:503
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:553
 msgid "Define a name for this network."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:514
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:571
 msgid ""
 "Define additional DHCP options, for example "
 "\"<code>6,192.168.2.1,192.168.2.2</code>\" which advertises different DNS "
 "servers to clients."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:705
-#: modules/luci-base/htdocs/luci-static/resources/form.js:958
-#: modules/luci-base/htdocs/luci-static/resources/form.js:959
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1271
+#: modules/luci-base/htdocs/luci-static/resources/form.js:966
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1210
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1216
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1524
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1758
 #: modules/luci-base/luasrc/view/cbi/nsection.htm:11
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:162
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:16
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:41
 msgid "Delete"
 msgstr "Xóa"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:178
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:187
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:193
 msgid "Delete key"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:45
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1654
+msgid "Delete permission denied"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1656
+msgid "Delete request failed: %d %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:723
 msgid "Delete this network"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:519
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:963
 msgid "Delivery Traffic Indication Message Interval"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:102
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:108
 msgid "Description"
 msgstr "Mô tả"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:224
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1754
+msgid "Deselect"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:215
 msgid "Design"
 msgstr "Thiết kế"
 
@@ -1400,10 +1414,12 @@ msgstr ""
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:177
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:43
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:13
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:38
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:73
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:33
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:52
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:85
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:86
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:72
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:154
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:253
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:86
@@ -1411,15 +1427,24 @@ msgstr ""
 msgid "Device"
 msgstr "Công cụ"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:138
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:737
 msgid "Device Configuration"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:81
+msgid "Device is not active"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/reboot.htm:23
 msgid "Device is rebooting..."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1889
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:167
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:513
+msgid "Device is restarting…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2430
 msgid "Device unreachable!"
 msgstr ""
 
@@ -1427,96 +1452,91 @@ msgstr ""
 msgid "Device unreachable! Still waiting for device..."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:123
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:78
 #: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:61
 msgid "Diagnostics"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:45
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:60
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:101
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:93
 msgid "Dial number"
 msgstr ""
 
-#: modules/luci-base/luasrc/view/cbi/filebrowser.htm:99
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1554
 msgid "Directory"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:131
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:715
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:754
 msgid "Disable"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:472
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:531
 msgid ""
 "Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for "
 "this interface."
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:64
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:93
 msgid "Disable Encryption"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:530
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:973
 msgid "Disable Inactivity Polling"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:713
 msgid "Disable this network"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:44
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:54
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:68
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:37
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:43
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:37
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1534
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:76
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:107
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:99
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:51
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:95
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:82
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:69
 msgid "Disabled"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1139
-msgid "Disabled (default)"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:544
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:987
 msgid "Disassociate On Low Acknowledgement"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:193
 msgid "Discard upstream RFC1918 responses"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:92
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:114
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:956
 msgid "Disconnect"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:22
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:64
 msgid "Disconnection attempt failed"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1121
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1762
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1855
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:17
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1375
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1995
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2314
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2401
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1634
 msgid "Dismiss"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:240
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:334
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:770
 msgid "Distance Optimization"
 msgstr "Khoảng cách tối ưu"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:241
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:770
 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/luasrc/model/cbi/admin_network/wifi.lua:347
-msgid "Diversity"
-msgstr "Tính đa dạng"
-
-#: 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:61
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
@@ -1528,35 +1548,43 @@ msgstr ""
 "Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> "
 "firewalls"
 
-#: 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:159
 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:123
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:124
 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:118
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
 msgid "Do not forward reverse lookups for local networks"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:173
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1639
+msgid "Do you really want to delete \"%s\" ?"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:188
 msgid "Do you really want to delete the following SSH key?"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1637
+msgid "Do you really want to recursively delete the directory \"%s\" ?"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:74
 msgid "Domain required"
 msgstr "Domain yêu cầu"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:205
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:206
 msgid "Domain whitelist"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:34
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:67
 msgid "Don't Fragment"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:74
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:75
 msgid ""
 "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
 "<abbr title=\"Domain Name System\">DNS</abbr>-Name"
@@ -1576,19 +1604,19 @@ msgstr ""
 msgid "Download mtdblock"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:853
 msgid "Downstream SNR offset"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:914
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1169
 msgid "Drag to reorder"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:9
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:11
 msgid "Dropbear Instance"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:6
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 msgid ""
 "Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access "
 "and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
@@ -1596,40 +1624,41 @@ msgstr ""
 "Dropbear cung cấp <abbr title=\"Secure Shell\">SSH</abbr> mạng lưới shell "
 "truy cập và một <abbr title=\"Secure Copy\">SCP</abbr> server tích hợp"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:11
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:14
 msgid "Dual-Stack Lite (RFC6333)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:493
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:547
 msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 msgstr ""
 "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:60
 msgid "Dynamic tunnel"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:494
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:547
 msgid ""
 "Dynamically allocate DHCP addresses for clients. If disabled, only clients "
 "having static leases will be served."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:67
 msgid "EA-bits length"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:990
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1386
 msgid "EAP-Method"
 msgstr "EAP-Method"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:934
-#: modules/luci-base/htdocs/luci-static/resources/form.js:935
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1199
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1188
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1191
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1450
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:154
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:160
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:38
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:291
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:720
 msgid "Edit"
 msgstr "Chỉnh sửa"
 
@@ -1639,90 +1668,91 @@ msgid ""
 "reload the page."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:38
-msgid "Edit this interface"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:718
+msgid "Edit this network"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:42
-msgid "Edit this network"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:669
+msgid "Edit wireless network"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:176
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:167
 msgid "Emergency"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:127
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:715
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:754
 msgid "Enable"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:414
 msgid ""
 "Enable <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> "
 "snooping"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:271
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:412
 msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 msgstr "Kích hoạt <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:41
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:60
 msgid "Enable HE.net dynamic endpoint update"
 msgstr ""
 
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:51
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:89
 msgid "Enable IPv6 negotiation"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:23
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:35
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:41
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:35
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:37
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:49
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:80
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:54
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:67
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:93
 msgid "Enable IPv6 negotiation on the PPP link"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:143
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:188
 msgid "Enable Jumbo Frame passthrough"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:244
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:235
 msgid "Enable NTP client"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:69
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:96
 msgid "Enable Single DES"
 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:267
 msgid "Enable TFTP server"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:134
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:180
 msgid "Enable VLAN functionality"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1595
 msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1175
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
 msgid "Enable key reinstallation (KRACK) countermeasures"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:138
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:183
 msgid "Enable learning and aging"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:194
 msgid "Enable mirroring of incoming packets"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:151
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:195
 msgid "Enable mirroring of outgoing packets"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:34
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:67
 msgid "Enable the DF (Don't Fragment) flag of the encapsulating packets."
 msgstr ""
 
@@ -1730,7 +1760,7 @@ msgstr ""
 msgid "Enable this mount"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:713
 msgid "Enable this network"
 msgstr ""
 
@@ -1738,48 +1768,52 @@ msgstr ""
 msgid "Enable this swap"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:37
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:88
 msgid "Enable/Disable"
 msgstr "Cho kích hoạt/ Vô hiệu hóa"
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:76
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:152
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:251
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:41
 msgid "Enabled"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:277
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:414
 msgid "Enables IGMP snooping on this bridge"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:892
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1310
 msgid ""
 "Enables fast roaming among access points that belong to the same Mobility "
 "Domain"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:272
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:412
 msgid "Enables the Spanning Tree Protocol on this bridge"
 msgstr "Kích hoạt Spanning Tree Protocol trên cầu nối này"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:120
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:180
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:59
+msgid "Encapsulation limit"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:843
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:901
 msgid "Encapsulation mode"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:76
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:603
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:129
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:992
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1621
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:177
 msgid "Encryption"
 msgstr "Encryption"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:155
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:128
 msgid "Endpoint Host"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:165
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:132
 msgid "Endpoint Port"
 msgstr ""
 
@@ -1791,16 +1825,21 @@ msgstr ""
 msgid "Enter custom values"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:273
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:271
 msgid "Erasing..."
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:95
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:96
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:97
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:98
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:99
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:106
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:107
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:108
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:109
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:110
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:173
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:164
 msgid "Error"
 msgstr "Lỗi"
 
@@ -1808,24 +1847,28 @@ msgstr "Lỗi"
 msgid "Errored seconds (ES)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1646
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1852
 #: modules/luci-base/luasrc/model/network.lua:1432
 msgid "Ethernet Adapter"
 msgstr "Bộ tương hợp ethernet"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1637
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1843
 #: modules/luci-base/luasrc/model/network.lua:1422
 msgid "Ethernet Switch"
 msgstr "Bộ chuyển đảo ethernet"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:303
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
 msgid "Exclude interfaces"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:153
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
 msgid "Expand hosts"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:195
+msgid "Expecting an hexadecimal assignment hint"
+msgstr ""
+
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:59
 msgid "Expecting: %s"
 msgstr ""
@@ -1834,60 +1877,76 @@ msgstr ""
 msgid "Expires"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:488
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:543
 msgid ""
 "Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:8
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:19
 msgid "External"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:971
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1377
 msgid "External R0 Key Holder List"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:980
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1381
 msgid "External R1 Key Holder List"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:150
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:141
 msgid "External system log server"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:155
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:146
 msgid "External system log server port"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:160
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:151
 msgid "External system log server protocol"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:18
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:79
 msgid "Extra SSH command options"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:940
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1351
 msgid "FT over DS"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:941
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1352
 msgid "FT over the Air"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:938
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1349
 msgid "FT protocol"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1842
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:82
+msgid "Failed to change the system password."
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2389
 msgid "Failed to confirm apply within %ds, waiting for rollback…"
 msgstr ""
 
-#: modules/luci-base/luasrc/view/cbi/filebrowser.htm:106
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:45
+msgid "Failed to execute \"/etc/init.d/%s %s\" action: %s"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1561
 msgid "File"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:279
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1514
+msgid "File not accessible"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1698
+msgid "Filename"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:280
 msgid "Filename of the boot image advertised to clients"
 msgstr ""
 
@@ -1897,14 +1956,15 @@ msgstr ""
 msgid "Filesystem"
 msgstr "Tập tin hệ thống"
 
-#: 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:118
 msgid "Filter private"
 msgstr "Filter private"
 
-#: 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:123
 msgid "Filter useless"
 msgstr "Lọc không hữu dụng"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:23
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:65
 msgid "Finalizing failed"
 msgstr ""
@@ -1915,7 +1975,7 @@ msgid ""
 "with defaults based on what was detected"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:696
 msgid "Find and join network"
 msgstr ""
 
@@ -1927,11 +1987,11 @@ msgstr ""
 msgid "Firewall"
 msgstr "Firewall"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:77
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:76
 msgid "Firewall Mark"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:193
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:278
 msgid "Firewall Settings"
 msgstr ""
 
@@ -1939,7 +1999,7 @@ msgstr ""
 msgid "Firewall Status"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:137
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:860
 msgid "Firmware File"
 msgstr ""
 
@@ -1947,7 +2007,7 @@ msgstr ""
 msgid "Firmware Version"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:225
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:226
 msgid "Fixed source port for outbound DNS queries"
 msgstr ""
 
@@ -1967,35 +2027,35 @@ msgstr ""
 msgid "Flash operations"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:194
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:192
 msgid "Flashing..."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:498
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:550
 msgid "Force"
 msgstr "Force"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:258
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:782
 msgid "Force 40MHz mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:622
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1031
 msgid "Force CCMP (AES)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:499
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:550
 msgid "Force DHCP on this network even if another server is detected."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:623
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1032
 msgid "Force TKIP"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:624
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1033
 msgid "Force TKIP and CCMP (AES)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:795
 msgid "Force link"
 msgstr ""
 
@@ -2003,7 +2063,7 @@ msgstr ""
 msgid "Force upgrade"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:60
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:90
 msgid "Force use of NAT-T"
 msgstr ""
 
@@ -2011,7 +2071,7 @@ msgstr ""
 msgid "Form token mismatch"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:34
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:164
 msgid "Forward DHCP traffic"
 msgstr ""
 
@@ -2019,46 +2079,41 @@ msgstr ""
 msgid "Forward Error Correction Seconds (FECS)"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:28
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:161
 msgid "Forward broadcast traffic"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:375
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:809
 msgid "Forward mesh peer traffic"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:186
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:908
 msgid "Forwarding mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:255
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:596
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:774
 msgid "Fragmentation Threshold"
 msgstr "Ngưỡng cửa Phân đoạn"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:332
-msgid "Frame Bursting"
-msgstr "Khung nổ"
-
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:17
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:28
 msgid "Free"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:91
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:89
 msgid ""
-"Further information about WireGuard interfaces and peers at <a href=\"http://"
-"wireguard.com\">wireguard.com</a>."
+"Further information about WireGuard interfaces and peers at <a href='http://"
+"wireguard.com'>wireguard.com</a>."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:45
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:130
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:186
 msgid "GHz"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:29
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:36
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:91
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:77
 msgid "GPRS only"
 msgstr ""
 
@@ -2067,28 +2122,28 @@ msgstr ""
 msgid "Gateway"
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:35
+msgid "Gateway Ports"
+msgstr ""
+
 #: modules/luci-base/htdocs/luci-static/resources/network.js:9
 #: modules/luci-base/luasrc/model/network.lua:29
 msgid "Gateway address is invalid"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:46
-msgid "Gateway ports"
-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:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:275
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:23
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:112
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:103
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:49
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:33
 msgid "General Settings"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:188
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:462
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:175
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:141
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:361
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:504
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:895
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:741
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:796
 msgid "General Setup"
 msgstr ""
 
@@ -2096,7 +2151,7 @@ msgstr ""
 msgid "Generate Config"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:945
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1355
 msgid "Generate PMK locally"
 msgstr ""
 
@@ -2104,11 +2159,7 @@ msgstr ""
 msgid "Generate archive"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:63
-msgid "Generic 802.11%s Wireless Controller"
-msgstr ""
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:26
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:74
 msgid "Given password confirmation did not match, password not changed!"
 msgstr ""
 
@@ -2116,7 +2167,7 @@ msgstr ""
 msgid "Global Settings"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:806
 msgid "Global network options"
 msgstr ""
 
@@ -2127,33 +2178,29 @@ msgstr ""
 msgid "Go to password configuration..."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:857
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1369
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1112
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1616
 #: modules/luci-base/luasrc/view/cbi/full_valueheader.htm:4
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:58
 msgid "Go to relevant configuration page"
 msgstr "Đi tới trang cấu hình thích hợp"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:38
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:66
 msgid "Group Password"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:11
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:22
 msgid "Guest"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:73
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:81
 msgid "HE.net password"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:60
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:73
 msgid "HE.net username"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:310
-msgid "HT mode (802.11n)"
-msgstr ""
-
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:16
 msgid "Hang Up"
 msgstr "Hang Up"
@@ -2162,7 +2209,7 @@ msgstr "Hang Up"
 msgid "Header Error Code Errors (HEC)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:103
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 msgid ""
 "Here you can configure the basic aspects of your device like its hostname or "
 "the timezone."
@@ -2170,9 +2217,7 @@ msgstr ""
 "Ở đây bạn có thể cấu hình những đặc tính cơ bản của thiết bị như tên máy chủ "
 "hoặc múi giờ."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:499
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:556
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:579
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:941
 msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "Giấu <abbr title=\"Chế độ mở rộng đặt Identifier\">ESSID</abbr>"
 
@@ -2183,14 +2228,15 @@ msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:92
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1959
 msgid "Host"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:20
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:21
 msgid "Host entries"
 msgstr "Host entries"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:48
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:171
 msgid "Host expiry timeout"
 msgstr ""
 
@@ -2198,45 +2244,45 @@ msgstr ""
 msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
 msgstr "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:118
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:102
 msgid "Host-Uniq tag content"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:71
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:31
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:316
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:25
+#: 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:317
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:26
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:17
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:125
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:116
 msgid "Hostname"
 msgstr "Tên host"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:12
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:22
 msgid "Hostname to send when requesting DHCP"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:18
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:19
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:67
 msgid "Hostnames"
 msgstr "Tên host"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:13
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:24
 msgid "Hybrid"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:45
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:75
 msgid "IKE DH Group"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:41
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:59
 msgid "IP Addresses"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:40
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:80
 msgid "IP Protocol"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:29
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:30
 msgid "IP address"
 msgstr "Địa chỉ IP"
 
@@ -2255,6 +2301,11 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:20
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:21
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:22
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:79
+#: 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/network.js:89
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:90
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:91
@@ -2262,7 +2313,7 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:93
 #: 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/luasrc/model/cbi/admin_network/proto_ncm.lua:42
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:82
 msgid "IPv4"
 msgstr ""
 
@@ -2274,24 +2325,23 @@ msgstr ""
 msgid "IPv4 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:57
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:178
 msgid "IPv4 address"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:26
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:33
 msgid "IPv4 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:104
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:181
 msgid "IPv4 broadcast"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:100
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:180
 msgid "IPv4 gateway"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:92
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:179
 msgid "IPv4 netmask"
 msgstr ""
 
@@ -2299,24 +2349,25 @@ msgstr ""
 msgid "IPv4 network in address/netmask notation"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:25
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:52
 msgid "IPv4 prefix"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:42
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:30
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:55
 msgid "IPv4 prefix length"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:43
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:83
 msgid "IPv4+IPv6"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:72
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:34
 msgid "IPv4-Address"
 msgstr ""
 
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:10
 #: protocols/luci-proto-ipip/luasrc/model/network/proto_ipip.lua:9
 msgid "IPv4-in-IPv4 (RFC2003)"
 msgstr ""
@@ -2331,6 +2382,16 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:30
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:31
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:32
+#: 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/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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:89
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:90
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:91
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:92
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:95
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:96
@@ -2343,7 +2404,7 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:103
 #: 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/luasrc/model/cbi/admin_network/proto_ncm.lua:44
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:84
 msgid "IPv6"
 msgstr "IPv6"
 
@@ -2355,11 +2416,11 @@ msgstr ""
 msgid "IPv6 Neighbours"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:464
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:506
 msgid "IPv6 Settings"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:195
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:810
 msgid "IPv6 ULA-Prefix"
 msgstr ""
 
@@ -2367,21 +2428,21 @@ msgstr ""
 msgid "IPv6 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:202
 msgid "IPv6 address"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:23
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:189
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:31
 msgid "IPv6 assignment hint"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:18
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:184
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:27
 msgid "IPv6 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:207
 msgid "IPv6 gateway"
 msgstr ""
 
@@ -2389,22 +2450,22 @@ msgstr ""
 msgid "IPv6 network in address/netmask notation"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:37
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:59
 msgid "IPv6 prefix"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:34
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:45
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:63
 msgid "IPv6 prefix length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:33
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:211
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:57
 msgid "IPv6 routed prefix"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:143
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:215
 msgid "IPv6 suffix"
 msgstr ""
 
@@ -2414,31 +2475,35 @@ msgid "IPv6-Address"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:93
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:104
 msgid "IPv6-PD"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:10
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:13
 msgid "IPv6-in-IPv4 (RFC4213)"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:17
 msgid "IPv6-over-IPv4 (6rd)"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:15
 msgid "IPv6-over-IPv4 (6to4)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1075
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1478
 msgid "Identity"
 msgstr "Nhận dạng"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:70
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:96
 msgid "If checked, 1DES is enabled"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:65
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:93
 msgid "If checked, encryption is disabled"
 msgstr ""
 
@@ -2455,36 +2520,36 @@ msgid ""
 "device node"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:27
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:71
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:18
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:82
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:52
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:17
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:29
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:33
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:68
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:85
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:32
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:45
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:45
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:24
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:44
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:116
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:48
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:85
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:65
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:33
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:80
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:108
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:146
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:74
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:97
 msgid "If unchecked, no default route is configured"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:34
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:86
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:35
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:99
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:47
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:60
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:60
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:39
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:59
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:124
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:39
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:116
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:59
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:103
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:64
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:77
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:100
 msgid "If unchecked, the advertised DNS server addresses are ignored"
 msgstr ""
 
@@ -2502,15 +2567,15 @@ 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:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:102
 msgid "Ignore <code>/etc/hosts</code>"
 msgstr "Lờ đi <code>/etc/hosts</code>"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:471
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:531
 msgid "Ignore interface"
 msgstr "Lờ đi giao diện"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:90
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:91
 msgid "Ignore resolve file"
 msgstr "Lờ đi tập tin resolve"
 
@@ -2528,12 +2593,12 @@ msgid ""
 "blocked. Click \"Continue »\" below to return to the previous page."
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:145
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:118
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:124
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:126
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:97
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:118
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:157
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:141
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:115
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:138
 msgid "Inactivity timeout"
 msgstr ""
 
@@ -2541,23 +2606,25 @@ msgstr ""
 msgid "Inbound:"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:170
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:161
 msgid "Info"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:105
 msgid "Information"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:25
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:67
 msgid "Initialization failure"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:34
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:87
 msgid "Initscript"
 msgstr "Initscript"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:26
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:122
 msgid "Initscripts"
 msgstr "Initscripts"
 
@@ -2565,55 +2632,74 @@ msgstr "Initscripts"
 msgid "Install iputils-traceroute6 for IPv6 traceroute"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:223
-msgid "Install package %q"
-msgstr ""
-
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:220
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:120
 msgid "Install protocol extensions..."
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:416
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:423
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:683
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:687
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:26
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:284
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:342
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:47
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:134
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:14
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:16
 msgid "Interface"
 msgstr "Giao diện "
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:58
 msgid "Interface %q device auto-migrated from %q to %q."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:356
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:792
 msgid "Interface Configuration"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:51
-msgid "Interface Overview"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:99
+msgid "Interface has %d pending changes"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:57
+msgid "Interface is marked for deletion"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:162
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:3
 msgid "Interface is reconnecting..."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:162
+msgid "Interface is shutting down..."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:205
+msgid "Interface is starting..."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:208
+msgid "Interface is stopping..."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:954
 msgid "Interface name"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:34
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:224
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:131
 msgid "Interface not present or not connected yet."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:88
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:16
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:11
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:287
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:54
 msgid "Interfaces"
 msgstr "Giao diện "
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:9
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:20
 msgid "Internal"
 msgstr ""
 
@@ -2626,19 +2712,35 @@ msgstr ""
 msgid "Invalid"
 msgstr "Giá trị nhập vào không hợp lí"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:311
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:10
+msgid "Invalid Base64 key string"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:281
 msgid "Invalid VLAN ID given! Only IDs between %d and %d are allowed."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:307
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:290
 msgid "Invalid VLAN ID given! Only unique IDs are allowed"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:195
+msgid "Invalid argument"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:194
+msgid "Invalid command"
+msgstr ""
+
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:80
+msgid "Invalid hexadecimal value"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/sysauth.htm:12
 msgid "Invalid username and/or password! Please try again."
 msgstr "Tên và mật mã không đúng. Xin thử lại "
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:508
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:950
 msgid "Isolate Clients"
 msgstr ""
 
@@ -2658,15 +2760,15 @@ msgstr ""
 msgid "JavaScript required!"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:52
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1691
 msgid "Join Network"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:22
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1628
 msgid "Join Network: Wireless Scan"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:19
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1833
 msgid "Joining Network: %q"
 msgstr ""
 
@@ -2683,15 +2785,15 @@ msgstr "Kernel Log"
 msgid "Kernel Version"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:823
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1248
 msgid "Key"
 msgstr "Phím "
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:851
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:852
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:853
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:854
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:870
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1277
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1278
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1279
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1291
 msgid "Key #%d"
 msgstr ""
 
@@ -2699,33 +2801,34 @@ msgstr ""
 msgid "Kill"
 msgstr "Kill"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:10
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:21
 msgid "L2TP"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:10
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:40
 msgid "L2TP Server"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:100
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:74
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:80
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:74
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:53
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:73
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:131
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:102
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:89
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:112
 msgid "LCP echo failure threshold"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:118
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:89
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:95
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:89
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:68
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:91
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:144
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:102
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:125
 msgid "LCP echo interval"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:181
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:902
 msgid "LLC"
 msgstr ""
 
@@ -2734,11 +2837,11 @@ msgstr ""
 msgid "Label"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:213
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:204
 msgid "Language"
 msgstr "Ngôn ngữ"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:115
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:106
 msgid "Language and Style"
 msgstr ""
 
@@ -2746,51 +2849,51 @@ msgstr ""
 msgid "Latency"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:10
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:21
 msgid "Leaf"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:369
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:487
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:393
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:543
 msgid "Lease time"
 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:87
 msgid "Leasefile"
 msgstr "Leasefile"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:74
 #: modules/luci-base/luasrc/view/lease_status.htm:95
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:34
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
 msgid "Leasetime remaining"
 msgstr "Leasetime còn lại"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:9
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:20
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:27
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:50
 msgid "Leave empty to autodetect"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:21
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:45
 msgid "Leave empty to use the current WAN address"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1746
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2299
 msgid "Legend:"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:481
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:538
 msgid "Limit"
 msgstr "Giới hạn "
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:287
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:288
 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:299
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:300
 msgid "Limit listening to these interfaces, and loopback."
 msgstr ""
 
@@ -2810,17 +2913,17 @@ msgstr ""
 msgid "Line Uptime"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:101
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:88
 msgid "Link On"
 msgstr "Link On"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:185
 msgid ""
 "List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
 "requests to"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:972
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1377
 msgid ""
 "List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-"
 "Identifier,128-bit key as hex string. <br />This list is used to map R0KH-ID "
@@ -2829,7 +2932,7 @@ msgid ""
 "Association."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:981
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1381
 msgid ""
 "List of R1KHs in the same Mobility Domain. <br />Format: MAC-address,R1KH-ID "
 "as 6 octets with colons,128-bit key as hex string. <br />This list is used "
@@ -2838,31 +2941,31 @@ msgid ""
 "PMK-R1 keys."
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:21
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:82
 msgid "List of SSH key files for auth"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:206
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:207
 msgid "List of domains to allow RFC1918 responses for"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:174
 msgid "List of hosts that supply bogus NX domain results"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:298
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:299
 msgid "Listen Interfaces"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:30
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:54
 msgid "Listen Port"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:15
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:16
 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:216
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:217
 msgid "Listening port for inbound DNS queries"
 msgstr ""
 
@@ -2881,11 +2984,11 @@ msgstr ""
 msgid "Loading"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:35
-msgid "Loading SSH keys…"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1819
+msgid "Loading directory contents…"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1204
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1296
 #: modules/luci-base/luasrc/view/view.htm:4
 msgid "Loading view…"
 msgstr ""
@@ -2895,77 +2998,73 @@ msgstr ""
 msgid "Local IP address is invalid"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:25
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:86
 msgid "Local IP address to assign"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:10
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:11
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:44
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:39
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:151
 msgid "Local IPv4 address"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:20
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:54
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:45
 msgid "Local IPv6 address"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:286
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:287
 msgid "Local Service Only"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:81
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:126
 msgid "Local Startup"
 msgstr ""
 
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:25
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:121
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:112
 msgid "Local Time"
 msgstr "Giờ địa phương"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:149
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
 msgid "Local domain"
 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:147
 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:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:151
 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:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
 msgid "Local server"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:129
 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:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:128
 msgid "Localise queries"
 msgstr "Tra vấn địa phương"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:175
-msgid "Locked to channel %s used by: %s"
-msgstr ""
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:168
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:159
 msgid "Log output level"
 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:181
 msgid "Log queries"
 msgstr "Bản ghi tra vấn"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:113
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:104
 msgid "Logging"
 msgstr ""
 
@@ -2973,7 +3072,7 @@ msgstr ""
 msgid "Login"
 msgstr "Đăng nhập "
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:95
+#: modules/luci-base/luasrc/controller/admin/index.lua:103
 msgid "Logout"
 msgstr "Thoát ra"
 
@@ -2981,11 +3080,13 @@ msgstr "Thoát ra"
 msgid "Loss of Signal Seconds (LOSS)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:476
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:533
 msgid "Lowest leased address as offset from the network address."
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:40
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:75
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:35
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:86
 msgid "MAC"
@@ -2993,32 +3094,32 @@ msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:73
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:109
-#: 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:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1958
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:86
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:133
 msgid "MAC-Address"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:457
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:586
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:886
 msgid "MAC-Address Filter"
 msgstr "Lọc địa chỉ MAC"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:142
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:363
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:798
 msgid "MAC-Filter"
 msgstr "Lọc MAC"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:464
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:590
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:893
 msgid "MAC-List"
 msgstr "Danh sách MAC"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:13
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:16
 msgid "MAP / LW4over6"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:62
 msgid "MAP rule is invalid"
 msgstr ""
@@ -3036,8 +3137,8 @@ msgid "MHz"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:53
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:29
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:66
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:53
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:71
 msgid "MTU"
 msgstr ""
 
@@ -3047,16 +3148,17 @@ msgid ""
 "below:"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:55
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:69
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:26
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:38
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:38
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:108
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:52
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:96
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:83
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:57
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:70
 msgid "Manual"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1949
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2188
 msgid "Master"
 msgstr ""
 
@@ -3064,48 +3166,46 @@ msgstr ""
 msgid "Max. Attainable Data Rate (ATTNDR)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:539
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:982
 msgid "Maximum allowed Listen Interval"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:234
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
 msgid "Maximum allowed number of active DHCP leases"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:252
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:253
 msgid "Maximum allowed number of concurrent DNS queries"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:244
 msgid "Maximum allowed size of EDNS.0 UDP packets"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:63
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:77
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:57
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:112
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:104
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:93
 msgid "Maximum amount of seconds to wait for the modem to become ready"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:27
-msgid ""
-"Maximum length of the name is 15 characters including the automatic protocol/"
-"bridge prefix (br-, 6in4-, pppoe- etc.)"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:538
+msgid "Maximum number of leased addresses."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:482
-msgid "Maximum number of leased addresses."
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:761
+msgid "Maximum transmit power"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:21
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:49
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:134
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:187
 #: modules/luci-mod-status/luasrc/view/admin_status/bandwidth.htm:79
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:284
 msgid "Mbit/s"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:18
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:32
 msgid "Medium"
 msgstr ""
 
@@ -3117,42 +3217,43 @@ msgstr "Bộ nhớ"
 msgid "Memory usage (%)"
 msgstr "Memory usage (%)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1952
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2191
 msgid "Mesh"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:372
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:806
 msgid "Mesh Id"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:196
+msgid "Method not found"
+msgstr ""
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:45
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:76
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:104
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:54
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:66
 msgid "Metric"
 msgstr "Metric"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:154
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:198
 msgid "Mirror monitor port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:153
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:197
 msgid "Mirror source port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:408
-msgid "Missing protocol extension for proto %q"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:923
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1337
 msgid "Mobility Domain"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:154
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:41
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:74
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:366
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:31
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:360
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:801
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1619
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:175
 msgid "Mode"
 msgstr "Chế độ"
@@ -3161,39 +3262,38 @@ msgstr "Chế độ"
 msgid "Model"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:31
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:72
 msgid "Modem default"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:11
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:19
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:11
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:10
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:73
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:73
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:57
 msgid "Modem device"
 msgstr "Thiết bị modem"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:24
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:66
 msgid "Modem information query failed"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:62
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:76
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:56
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:112
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:104
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:93
 msgid "Modem init timeout"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1953
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:452
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:554
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:577
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2192
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:880
 msgid "Monitor"
 msgstr "Monitor"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:14
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
 msgid "More Characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:802
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1057
 msgid "More…"
 msgstr ""
 
@@ -3206,7 +3306,7 @@ msgstr ""
 msgid "Mount Point"
 msgstr "Lắp điểm"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:26
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:36
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:137
 msgid "Mount Points"
@@ -3256,46 +3356,44 @@ msgstr ""
 msgid "Move up"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:912
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
 msgid "NAS ID"
 msgstr "NAS ID"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:57
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:87
 msgid "NAT-T Mode"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:9
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 msgid "NAT64 Prefix"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:31
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:26
 msgid "NCM"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:535
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:589
 msgid "NDP-Proxy"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:43
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:72
 msgid "NT Domain"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:273
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:264
 msgid "NTP server candidates"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:837
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1092
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:27
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:502
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:65
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:553
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:658
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:49
 msgid "Name"
 msgstr "Tên"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:17
-msgid "Name of the new interface"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1808
 msgid "Name of the new network"
 msgstr ""
 
@@ -3303,9 +3401,10 @@ msgstr ""
 msgid "Navigation"
 msgstr "Sự điều hướng"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:62
+#: modules/luci-base/luasrc/controller/admin/index.lua:69
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:108
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:402
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:834
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1957
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:389
 #: modules/luci-mod-status/luasrc/view/admin_status/index/30-network.htm:8
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:73
@@ -3317,7 +3416,7 @@ msgstr "mạng lưới "
 msgid "Network Utilities"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:278
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:279
 msgid "Network boot image"
 msgstr ""
 
@@ -3330,53 +3429,59 @@ msgstr ""
 msgid "Network without interfaces."
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:661
+msgid "New interface name…"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:11
 msgid "Next »"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1507
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1754
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:108
 msgid "No"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:453
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:514
 msgid "No DHCP Server configured for this interface"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1162
+msgid "No Encryption"
+msgstr ""
+
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:89
 msgid "No NAT-T"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:198
+msgid "No data received"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1764
+msgid "No entries in this directory"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/backupfiles.lua:82
 msgid "No files found"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:550
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:191
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:180
 msgid "No information available"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:8
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:63
 msgid "No matching prefix delegation"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:157
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
 msgid "No negative cache"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:53
-msgid "No network configured on this device"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:65
-msgid "No network name specified"
-msgstr ""
-
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:147
-msgid "No networks in range"
-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
@@ -3384,7 +3489,12 @@ msgstr ""
 msgid "No password set!"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:116
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:104
+msgid "No peers defined yet"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:129
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:271
 msgid "No public keys present yet."
 msgstr ""
 
@@ -3392,19 +3502,19 @@ msgstr ""
 msgid "No rules in this chain."
 msgstr "Không có quy luật trong chuỗi này"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:150
-msgid "No scan results available yet..."
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:53
+msgid "No signal"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:7
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:756
 msgid "No zone assigned"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:111
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:35
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:48
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:133
 msgid "Noise"
 msgstr ""
 
@@ -3420,16 +3530,16 @@ msgstr ""
 msgid "Non Pre-emtive CRC errors (CRC_P)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:292
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:293
 msgid "Non-wildcard"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:129
 msgid "None"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:181
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:172
 msgid "Normal"
 msgstr ""
 
@@ -3437,25 +3547,29 @@ msgstr ""
 msgid "Not Found"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:27
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:5
-msgid "Not associated"
-msgstr ""
-
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:87
 msgid "Not connected"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:38
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:139
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:232
+msgid "Not present"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:105
 msgid "Not started on boot"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:26
-msgid "Note: interface name length"
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:201
+msgid "Not supported"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:171
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:162
 msgid "Notice"
 msgstr ""
 
@@ -3463,63 +3577,50 @@ msgstr ""
 msgid "Nslookup"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:261
 msgid "Number of cached DNS entries (max is 10000, 0 is no caching)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:203
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:194
 msgid "Number of parallel threads used for compression"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:40
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:69
 msgid "Obfuscated Group Password"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:35
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:61
 msgid "Obfuscated Password"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:22
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:34
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:40
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:105
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:97
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:49
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:80
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:54
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:67
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:93
 msgid "Obtain IPv6-Address"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:83
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:68
 msgid "Off-State Delay"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:16
-msgid ""
-"On this page you can configure the network interfaces. You can bridge "
-"several interfaces by ticking the \"bridge interfaces\" field and enter the "
-"names of several network interfaces separated by spaces. You can also use "
-"<abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
-"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
-"<samp>eth0.1</samp>)."
-msgstr ""
-"Trên trang này bạn có thể định cấu hình giao diện network. Bạn có thể bắt "
-"cầu nhiều giao diện bằng cách đánh dấu &amp;quot;bridge interfaces&amp;quot; "
-"field và nhập tên vào của nhiều giao diện network phân tách bởi những khoảng "
-"trống. Bạn có thể cũng dùng <abbr title=\"Virtual Local Area Network\">VLAN</"
-"abbr> notation <samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e."
-"g.</abbr>: <samp>eth0.1</samp>)."
-
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:95
 msgid "On-Link route"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:80
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:64
 msgid "On-State Delay"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:360
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:382
 msgid "One of hostname or mac address must be specified!"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:456
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:462
 msgid "One of the following: %s"
 msgstr ""
 
@@ -3541,34 +3642,35 @@ msgstr ""
 msgid "Open list..."
 msgstr ""
 
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:61
 #: protocols/luci-proto-openconnect/luasrc/model/network/proto_openconnect.lua:9
 msgid "OpenConnect (CISCO AnyConnect)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:757
 msgid "Operating frequency"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1753
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2306
 msgid "Option changed"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1755
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2308
 msgid "Option removed"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1140
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:55
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1535
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:66
 msgid "Optional"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:78
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:76
 msgid ""
 "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, "
 "starting with <code>0x</code>."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:144
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:215
 msgid ""
 "Optional. Allowed values: 'eui64', 'random', fixed value like '::1' or "
 "'::1:2'. When IPv6 prefix (like 'a:b:c:d::') is received from a delegating "
@@ -3576,41 +3678,41 @@ msgid ""
 "for the interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:123
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:117
 msgid ""
 "Optional. Base64-encoded preshared key. Adds in an additional layer of "
 "symmetric-key cryptography for post-quantum resistance."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:148
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:126
 msgid "Optional. Create routes for Allowed IPs for this peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:103
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:108
 msgid "Optional. Description of peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:156
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:128
 msgid ""
 "Optional. Host of peer. Names are resolved prior to bringing up the "
 "interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:67
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:71
 msgid "Optional. Maximum Transmission Unit of tunnel interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:166
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:132
 msgid "Optional. Port of peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:175
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:136
 msgid ""
 "Optional. Seconds between keep alive messages. Default is 0 (disabled). "
 "Recommended value if this device is behind a NAT is 25."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:31
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:54
 msgid "Optional. UDP port used for outgoing and incoming packets."
 msgstr ""
 
@@ -3631,7 +3733,7 @@ msgstr "Ra khỏi"
 msgid "Outbound:"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:26
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:50
 msgid "Output Interface"
 msgstr ""
 
@@ -3640,51 +3742,51 @@ msgstr ""
 msgid "Output zone"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:63
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:155
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:33
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:54
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:54
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:219
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:50
 msgid "Override MAC address"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:66
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:35
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:56
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:88
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:125
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:131
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:133
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:104
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:61
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:58
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:223
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:44
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:54
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:154
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:71
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:145
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:132
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:110
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:119
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:97
 msgid "Override MTU"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:30
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:63
 msgid "Override TOS"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:25
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:58
 msgid "Override TTL"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:954
 msgid "Override default interface name"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:41
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:167
 msgid "Override the gateway in DHCP responses"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:507
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:555
 msgid ""
 "Override the netmask sent to clients. Normally it is calculated from the "
 "subnet that is served."
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:65
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:179
 msgid "Override the table used for internal routes"
 msgstr ""
 
@@ -3692,29 +3794,33 @@ msgstr ""
 msgid "Overview"
 msgstr "Nhìn chung"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1606
+msgid "Overwrite existing file \"%s\" ?"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:11
 msgid "Owner"
 msgstr "Owner"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:42
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:56
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:17
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:28
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:34
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:14
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:18
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:43
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:98
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:45
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:44
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:63
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:82
 msgid "PAP/CHAP password"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:39
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:53
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:14
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:11
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:15
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:96
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:88
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:43
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:74
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:42
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:61
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:77
 msgid "PAP/CHAP username"
 msgstr ""
 
@@ -3722,9 +3828,9 @@ msgstr ""
 msgid "PID"
 msgstr "PID"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:36
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:50
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:26
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:95
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:87
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:68
 msgid "PIN"
 msgstr ""
 
@@ -3733,114 +3839,116 @@ msgstr ""
 msgid "PIN code rejected"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:966
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1372
 msgid "PMK R1 Push"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:43
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:13
 msgid "PPP"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:11
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:58
 msgid "PPPoA Encapsulation"
 msgstr "PPPoA Encapsulation"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:19
 msgid "PPPoATM"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:17
 msgid "PPPoE"
 msgstr ""
 
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:28
 #: protocols/luci-proto-pppossh/luasrc/model/network/proto_pppossh.lua:9
 msgid "PPPoSSH"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:15
 msgid "PPtP"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:59
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:73
 msgid "PSID offset"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:56
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:70
 msgid "PSID-bits length"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:123
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:846
 msgid "PTM/EFM (Packet Transfer Mode)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:78
-msgid "Package libiwinfo required!"
-msgstr ""
-
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:45
 msgid "Packets"
 msgstr "Gói tin"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:7
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:756
 msgid "Part of zone %q"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/sysauth.htm:29
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1111
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:35
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:42
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1514
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:46
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:104
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:58
 msgid "Password"
 msgstr "Mật mã"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:29
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:24
 msgid "Password authentication"
 msgstr "Xác thực mật mã"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1019
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1414
 msgid "Password of Private Key"
 msgstr "Mật mã của private key"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1067
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1471
 msgid "Password of inner Private Key"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:14
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:16
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:18
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:20
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:32
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:34
 msgid "Password strength"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:44
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:107
 msgid "Password2"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:37
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:244
 msgid "Paste or drag SSH key file…"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1000
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1396
 msgid "Path to CA-Certificate"
 msgstr "Đường dẫn tới CA-Certificate"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1007
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1402
 msgid "Path to Client-Certificate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1013
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1408
 msgid "Path to Private Key"
 msgstr "Đường dẫn tới private key"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1049
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1453
 msgid "Path to inner CA-Certificate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1055
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1459
 msgid "Path to inner Client-Certificate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1061
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1465
 msgid "Path to inner Private Key"
 msgstr ""
 
@@ -3858,7 +3966,7 @@ msgstr ""
 msgid "Peak:"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:28
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:89
 msgid "Peer IP address to assign"
 msgstr ""
 
@@ -3867,11 +3975,11 @@ msgstr ""
 msgid "Peer address is missing"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:90
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:89
 msgid "Peers"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:50
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:80
 msgid "Perfect Forward Secrecy"
 msgstr ""
 
@@ -3883,7 +3991,11 @@ msgstr "Tiến hành reboot"
 msgid "Perform reset"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:174
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:199
+msgid "Permission denied"
+msgstr ""
+
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:136
 msgid "Persistent Keep Alive"
 msgstr ""
 
@@ -3891,7 +4003,7 @@ msgstr ""
 msgid "Phy Rate:"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:190
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:277
 msgid "Physical Settings"
 msgstr "Cài đặt căn bản"
 
@@ -3902,6 +4014,10 @@ msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:16
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:17
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:41
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:77
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:87
@@ -3919,15 +4035,19 @@ msgstr "Nhập tên và mật mã"
 msgid "Policy"
 msgstr "Chính sách"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:22
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:20
 msgid "Port"
 msgstr "Cá»­a "
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:18
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:133
+msgid "Port %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:274
 msgid "Port status:"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:482
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:488
 msgid "Potential negation of: %s"
 msgstr ""
 
@@ -3939,11 +4059,11 @@ msgstr ""
 msgid "Pre-emtive CRC errors (CRCP_P)"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:32
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:73
 msgid "Prefer LTE"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:33
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:74
 msgid "Prefer UMTS"
 msgstr ""
 
@@ -3951,31 +4071,30 @@ msgstr ""
 msgid "Prefix Delegated"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:122
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:117
 msgid "Preshared Key"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:101
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:75
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:81
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:75
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:54
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:74
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:131
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:102
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:89
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:112
 msgid ""
 "Presume peer to be dead after given amount of LCP echo failures, use 0 to "
 "ignore failures"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:305
 msgid "Prevent listening on these interfaces."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:509
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:562
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:950
 msgid "Prevents client-to-client communication"
 msgstr "Ngăn chặn giao tiếp giữa client-và-client"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:18
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:49
 msgid "Private Key"
 msgstr ""
 
@@ -3996,39 +4115,33 @@ msgstr ""
 msgid "Prot."
 msgstr "Prot."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:72
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:349
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:675
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:84
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:216
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:87
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:390
 msgid "Protocol"
 msgstr "Protocol"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:31
-msgid "Protocol of the new interface"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:222
-msgid "Protocol support is not installed"
-msgstr ""
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:269
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:260
 msgid "Provide NTP server"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:701
 msgid "Provide new network"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:451
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:879
 msgid "Pseudo Ad-Hoc (ahdemo)"
 msgstr "Pseudo Ad-Hoc (ahdemo)"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:112
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:113
 msgid "Public Key"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:278
 msgid ""
 "Public keys allow for the passwordless SSH logins with a higher security "
 "compared to the use of plain passwords. In order to upload a new key to the "
@@ -4036,47 +4149,48 @@ msgid ""
 "code> file into the input field."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:139
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:211
 msgid "Public prefix routed to this device for distribution to clients."
 msgstr ""
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:27
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:9
 msgid "QMI Cellular"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:173
 msgid "Quality"
 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:171
 msgid ""
 "Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> "
 "servers"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:952
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1360
 msgid "R0 Key Lifetime"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:959
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1366
 msgid "R1 Key Holder"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:58
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:88
 msgid "RFC3947 NAT-T mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:381
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:814
 msgid "RSSI threshold for joining"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:256
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:597
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:778
 msgid "RTS/CTS Threshold"
 msgstr "RTS/CTS Threshold"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:41
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:76
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:87
 msgid "RX"
@@ -4086,35 +4200,39 @@ msgstr "RX"
 msgid "RX Rate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:783
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1961
+msgid "RX Rate / TX Rate"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1207
 msgid "Radius-Accounting-Port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:791
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1215
 msgid "Radius-Accounting-Secret"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:775
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1199
 msgid "Radius-Accounting-Server"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:759
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1183
 msgid "Radius-Authentication-Port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:767
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1191
 msgid "Radius-Authentication-Secret"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:751
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1175
 msgid "Radius-Authentication-Server"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:119
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:102
 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:83
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:84
 msgid ""
 "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-Server"
@@ -4128,17 +4246,11 @@ msgid ""
 "access to this device if you are connected via this interface"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2
-msgid ""
-"Really delete this wireless network? The deletion cannot be undone! You "
-"might lose access to this device if you are connected via this network."
-msgstr ""
-
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:40
 msgid "Really reset all changes?"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:237
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:354
 msgid "Really switch protocol?"
 msgstr ""
 
@@ -4162,15 +4274,15 @@ msgstr ""
 msgid "Realtime Wireless"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:931
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1343
 msgid "Reassociation Deadline"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:191
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
 msgid "Rebind protection"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:48
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:46
 #: modules/luci-mod-system/luasrc/view/admin_system/reboot.htm:9
 msgid "Reboot"
 msgstr "Reboot"
@@ -4184,21 +4296,15 @@ msgstr ""
 msgid "Reboots the operating system of your device"
 msgstr "Reboots hệ điều hành của công cụ"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:103
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:90
 msgid "Receive"
 msgstr "Receive"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:325
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:350
-msgid "Receiver Antenna"
-msgstr "Máy thu Antenna"
-
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:42
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:59
 msgid "Recommended. IP addresses of the WireGuard interface."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:28
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:300
 msgid "Reconnect this interface"
 msgstr ""
 
@@ -4206,92 +4312,134 @@ msgstr ""
 msgid "References"
 msgstr "Tham chiếu"
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:39
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:153
 msgid "Relay"
 msgstr ""
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:36
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:157
 msgid "Relay Bridge"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:17
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:154
 msgid "Relay between networks"
 msgstr ""
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:64
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:12
 msgid "Relay bridge"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:18
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:50
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:49
 msgid "Remote IPv4 address"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:8
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:40
 msgid "Remote IPv4 address or FQDN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:45
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:725
 msgid "Remove"
 msgstr "Loại bỏ"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:53
-msgid "Repeat scan"
-msgstr ""
-
-#: modules/luci-base/luasrc/view/cbi/upload.htm:11
-msgid "Replace entry"
-msgstr "thay đổi nội dung"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:46
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:51
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1806
 msgid "Replace wireless configuration"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:8
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:17
 msgid "Request IPv6-address"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:16
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:23
 msgid "Request IPv6-prefix of length"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1141
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:200
+msgid "Request timeout"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1536
 msgid "Required"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:20
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:31
 msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:19
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:49
 msgid "Required. Base64-encoded private key for this interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:113
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:113
 msgid "Required. Base64-encoded public key of peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:136
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:122
 msgid ""
 "Required. IP addresses and prefixes that this peer is allowed to use inside "
 "the tunnel. Usually the peer's tunnel IP addresses and the networks the peer "
 "routes through the tunnel."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1134
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1095
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1096
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1097
+msgid "Requires hostapd"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1101
+msgid "Requires hostapd with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1102
+msgid "Requires hostapd with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1098
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1099
+msgid "Requires hostapd with SAE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1533
 msgid ""
 "Requires the 'full' version of wpad/hostapd and support from the wifi driver "
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:141
 msgid ""
 "Requires upstream supports DNSSEC; verify unsigned domain responses really "
 "come from unsigned domains"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1268
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1109
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1119
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1120
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1121
+msgid "Requires wpa-supplicant"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1113
+msgid "Requires wpa-supplicant with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1114
+msgid "Requires wpa-supplicant with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1111
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1124
+msgid "Requires wpa-supplicant with SAE support"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1355
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:17
 #: modules/luci-base/luasrc/view/cbi/footer.htm:30
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:66
@@ -4307,17 +4455,22 @@ msgstr "Reset bộ đếm"
 msgid "Reset to defaults"
 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:68
 msgid "Resolv and Hosts Files"
 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:94
 msgid "Resolve file"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:28
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:14
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:71
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:197
+msgid "Resource not found"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:302
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:693
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:90
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:112
 msgid "Restart"
 msgstr ""
 
@@ -4325,7 +4478,7 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr "Khởi động lại Firewall"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:14
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:691
 msgid "Restart radio interface"
 msgstr ""
 
@@ -4337,26 +4490,24 @@ msgstr ""
 msgid "Restore backup"
 msgstr "Phục hồi backup"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:113
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:114
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:38
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:46
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:119
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:120
 msgid "Reveal/hide password"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1774
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2322
 msgid "Revert"
 msgstr "Revert"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1861
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2405
 msgid "Revert changes"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2013
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2554
 msgid "Revert request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1993
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2534
 msgid "Reverting configuration…"
 msgstr ""
 
@@ -4364,7 +4515,7 @@ msgstr ""
 msgid "Root"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:271
 msgid "Root directory for files served via TFTP"
 msgstr ""
 
@@ -4372,7 +4523,7 @@ msgstr ""
 msgid "Root preparation"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:147
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:126
 msgid "Route Allowed IPs"
 msgstr ""
 
@@ -4384,12 +4535,12 @@ msgstr ""
 msgid "Route type"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:523
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:577
 msgid "Router Advertisement-Service"
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:43
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:15
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:27
 msgid "Router Password"
 msgstr ""
 
@@ -4419,7 +4570,7 @@ msgstr ""
 msgid "Run filesystem check"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:651
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:669
 msgid "Runtime error"
 msgstr ""
 
@@ -4431,31 +4582,31 @@ msgstr ""
 msgid "SNR"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:5
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:18
 msgid "SSH Access"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:10
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:70
 msgid "SSH server address"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:13
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:74
 msgid "SSH server port"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:8
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:58
 msgid "SSH username"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:27
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:277
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
 msgid "SSH-Keys"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:42
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:73
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:29
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1617
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:174
 msgid "SSID"
 msgstr "SSID"
@@ -4464,17 +4615,17 @@ msgstr "SSID"
 msgid "SWAP"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1127
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1262
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1379
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1351
 #: modules/luci-base/luasrc/view/cbi/error.htm:17
 #: modules/luci-base/luasrc/view/cbi/footer.htm:26
 #: modules/luci-base/luasrc/view/cbi/header.htm:17
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:54
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:133
 msgid "Save"
 msgstr "LÆ°u"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1256
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1768
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1347
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2318
 #: modules/luci-base/luasrc/view/cbi/footer.htm:22
 msgid "Save & Apply"
 msgstr "Lưu & áp dụng "
@@ -4487,28 +4638,20 @@ msgstr ""
 msgid "Save mtdblock contents"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
-msgid "Saving keys…"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:698
 msgid "Scan"
 msgstr "Scan"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:109
-msgid "Scan request failed"
-msgstr ""
-
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:8
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:39
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:23
 msgid "Scheduled Tasks"
 msgstr "Scheduled Tasks"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1749
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2302
 msgid "Section added"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1751
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2304
 msgid "Section removed"
 msgstr ""
 
@@ -4523,61 +4666,66 @@ msgid ""
 "your device!"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:119
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:90
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:96
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:90
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:69
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:92
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1516
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1646
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1809
+msgid "Select file…"
+msgstr ""
+
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:144
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:102
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:125
 msgid ""
 "Send LCP echo requests at the given interval in seconds, only effective in "
 "conjunction with failure threshold"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:561
-msgid "Separate Clients"
-msgstr "Cô lập đối tượng"
-
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:62
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:63
 msgid "Server Settings"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:26
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:50
 msgid "Service Name"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:25
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:30
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:87
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:71
 msgid "Service Type"
 msgstr ""
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:55
+#: modules/luci-base/luasrc/controller/admin/index.lua:62
 msgid "Services"
 msgstr "Dịch vụ "
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:815
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:861
 msgid "Session expired"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:83
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:107
 msgid "Set VPN as Default Route"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:258
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:795
 msgid ""
 "Set interface properties regardless of the link carrier (If set, carrier "
 "sense events do not invoke hotplug handlers)."
 msgstr ""
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:23
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:55
 msgid "Setting PLMN failed"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:26
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:68
 msgid "Setting operation mode failed"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:454
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:517
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:527
 msgid "Setup DHCP Server"
 msgstr ""
 
@@ -4589,7 +4737,7 @@ msgstr ""
 msgid "Short GI"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:516
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:960
 msgid "Short Preamble"
 msgstr ""
 
@@ -4601,21 +4749,23 @@ msgstr ""
 msgid "Show empty chains"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:306
 msgid "Shutdown this interface"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:111
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:34
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:47
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:132
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1616
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:173
 msgid "Signal"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1960
+msgid "Signal / Noise"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:125
 msgid "Signal Attenuation (SATN)"
 msgstr ""
@@ -4628,11 +4778,11 @@ msgstr ""
 msgid "Size"
 msgstr "Dung lượng "
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:259
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:260
 msgid "Size of DNS query cache"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:191
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
 msgid "Size of the ZRam device in megabytes"
 msgstr ""
 
@@ -4649,11 +4799,7 @@ msgstr "Nhảy tới nội dung"
 msgid "Skip to navigation"
 msgstr "Chuyển đến mục định hướng"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:335
-msgid "Slot time"
-msgstr ""
-
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1640
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1846
 #: modules/luci-base/luasrc/model/network.lua:1427
 msgid "Software VLAN"
 msgstr ""
@@ -4691,61 +4837,65 @@ msgstr ""
 msgid "Specifies the directory the device is attached to"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:23
-msgid "Specifies the listening port of this <em>Dropbear</em> instance"
-msgstr ""
-
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:57
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:175
 msgid ""
 "Specifies the maximum amount of failed ARP requests until hosts are presumed "
 "to be dead"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:49
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:171
 msgid ""
 "Specifies the maximum amount of seconds after which hosts are presumed to be "
 "dead"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:761
+msgid ""
+"Specifies the maximum transmit power the wireless radio may use. Depending "
+"on regulatory requirements and wireless usage, the actual transmit power may "
+"be reduced by the driver."
+msgstr ""
+
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:63
 msgid "Specify a TOS (Type of Service)."
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:25
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:58
 msgid ""
 "Specify a TTL (Time to Live) for the encapsulating packet other than the "
 "default (64)."
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:53
 msgid ""
 "Specify an MTU (Maximum Transmission Unit) other than the default (1280 "
 "bytes)."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:60
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "Specify the secret encryption key here."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:475
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:64
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:533
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:89
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:111
 msgid "Start"
 msgstr "Bắt đầu "
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:33
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:86
 msgid "Start priority"
 msgstr "Bắt đầu ưu tiên"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1958
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2499
 msgid "Starting configuration apply…"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1626
 msgid "Starting wireless scan..."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:24
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:120
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
 msgid "Startup"
 msgstr ""
 
@@ -4757,59 +4907,62 @@ msgstr "Static IPv4 Routes"
 msgid "Static IPv6 Routes"
 msgstr "Static IPv6 Routes"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:70
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:71
 msgid "Static Leases"
 msgstr "Thống kê leases"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:118
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:73
 msgid "Static Routes"
 msgstr "Static Routes"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1194
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1384
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:172
 #: modules/luci-base/luasrc/model/network.lua:966
 msgid "Static address"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:308
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:309
 msgid ""
 "Static leases are used to assign fixed IP addresses and symbolic hostnames "
 "to DHCP clients. They are also required for non-dynamic interface "
 "configurations where only hosts with a corresponding lease are served."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:534
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:977
 msgid "Station inactivity limit"
 msgstr ""
 
 #: modules/luci-base/luasrc/controller/admin/index.lua:40
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:197
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:337
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:746
 #: modules/luci-mod-status/luasrc/view/admin_status/index.htm:128
 msgid "Status"
 msgstr "Tình trạng"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:35
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:75
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:308
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:91
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:113
 msgid "Stop"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:165
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Strict order"
 msgstr "Yêu cầu nghiêm ngặt"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:16
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:30
 msgid "Strong"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1843
 msgid "Submit"
 msgstr "Trình "
 
-#: 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:108
 msgid "Suppress logging"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:109
 msgid "Suppress logging of the routine operation of these protocols"
 msgstr ""
 
@@ -4821,42 +4974,44 @@ msgstr ""
 msgid "Swap Entry"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:23
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:5
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:135
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:21
 msgid "Switch"
 msgstr "chuyển đổi"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:129
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:168
 msgid "Switch %q"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:128
-msgid "Switch %q (%s)"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:66
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:146
 msgid ""
 "Switch %q has an unknown topology - the VLAN settings might not be accurate."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:146
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:142
 msgid "Switch Port Mask"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1640
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1846
 #: modules/luci-base/luasrc/model/network.lua:1425
 msgid "Switch VLAN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:238
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:355
 msgid "Switch protocol"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:103
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:104
 #: modules/luci-base/luasrc/view/cbi/ipaddr.htm:26
 msgid "Switch to CIDR list notation"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:77
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1547
+msgid "Symbolic link"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:71
 msgid "Sync with NTP-Server"
 msgstr ""
 
@@ -4866,7 +5021,7 @@ msgstr ""
 
 #: modules/luci-base/luasrc/controller/admin/index.lua:47
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:14
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:102
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:94
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
 #: modules/luci-mod-system/luasrc/view/admin_system/applyreboot.htm:39
 msgid "System"
@@ -4877,11 +5032,11 @@ msgstr "Hệ thống"
 msgid "System Log"
 msgstr "System Log"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:108
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:99
 msgid "System Properties"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:145
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:136
 msgid "System log buffer size"
 msgstr ""
 
@@ -4889,15 +5044,17 @@ msgstr ""
 msgid "TCP:"
 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:69
 msgid "TFTP Settings"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:269
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
 msgid "TFTP server root"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:17
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:77
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:88
 msgid "TX"
@@ -4920,7 +5077,7 @@ msgstr "Bảng"
 msgid "Target"
 msgstr "Đích"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:77
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:103
 msgid "Target network"
 msgstr ""
 
@@ -4928,40 +5085,24 @@ msgstr ""
 msgid "Terminate"
 msgstr "Terminate"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:27
-msgid ""
-"The <em>Device Configuration</em> section covers physical settings of the "
-"radio hardware such as channel, transmit power or antenna selection which "
-"are shared among all defined wireless networks (if the radio hardware is "
-"multi-SSID capable). Per network settings like encryption or operation mode "
-"are grouped in the <em>Interface Configuration</em>."
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:79
-msgid ""
-"The <em>libiwinfo-lua</em> package is not installed. You must install this "
-"component for working wireless configuration!"
-msgstr ""
-
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:66
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:77
 msgid ""
 "The HE.net endpoint update configuration changed, you must now use the plain "
 "username instead of the user ID!"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:8
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:40
 msgid ""
 "The IPv4 address or the fully-qualified domain name of the remote tunnel end."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:27
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:38
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:59
 msgid ""
 "The IPv6 prefix assigned to the provider, usually ends with <code>::</code>"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:18
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1808
 msgid ""
 "The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
 "code> and <code>_</code>"
@@ -4975,7 +5116,7 @@ msgstr ""
 msgid "The configuration file could not be loaded due to the following error:"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1849
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2396
 msgid ""
 "The device could not be reached within %d seconds after applying the pending "
 "changes, which caused the configuration to be rolled back for safety "
@@ -4995,6 +5136,12 @@ msgstr ""
 "Tập tin công cụ của bộ nhớ hoặc phân vùng (<abbr title=\"Ví dụ\">e.g.</abbr> "
 "<code>/dev/sda1</code>)"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:612
+msgid ""
+"The existing wireless configuration needs to be changed for LuCI to function "
+"properly."
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:127
 msgid ""
 "The filesystem that was used to format the memory (<abbr title=\"for example"
@@ -5015,43 +5162,49 @@ msgstr ""
 msgid "The following rules are currently active on this system."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:144
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:154
+msgid "The gateway address must not be a local IP address"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:154
 msgid "The given SSH public key has already been added."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:150
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:160
 msgid ""
 "The given SSH public key is invalid. Please supply proper public RSA or "
 "ECDSA keys."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:67
-msgid "The given network name is not unique"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:664
+msgid "The interface name is already used"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:52
-msgid ""
-"The hardware is not multi-SSID capable and the existing configuration will "
-"be replaced if you proceed."
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:670
+msgid "The interface name is too long"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:43
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:31
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:55
 msgid ""
 "The length of the IPv4 prefix in bits, the remainder is used in the IPv6 "
 "addresses."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:35
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:46
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:63
 msgid "The length of the IPv6 prefix in bits"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:12
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:44
 msgid "The local IPv4 address over which the tunnel is created (optional)."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:5
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1814
+msgid "The network name is already used"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:135
 msgid ""
 "The network ports on this device can be combined to several <abbr title="
 "\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
@@ -5061,22 +5214,21 @@ msgid ""
 "next greater network like the internet and other ports for a local network."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:77
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:395
-msgid "The selected protocol needs a device assigned"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1149
+msgid "The selected %s mode is incompatible with %s encryption"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/csrftoken.htm:11
 msgid "The submitted security token is invalid or already expired!"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:274
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:272
 msgid ""
 "The system is erasing the configuration partition now and will reboot itself "
 "when finished."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:195
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:193
 #, fuzzy
 msgid ""
 "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
@@ -5088,7 +5240,7 @@ msgstr ""
 "một vài phút cho tới khi kết nối lại. Có thể cần phải làm mới địa chỉ của "
 "máy tính để tiếp cận thiết bị một lần nữa, phụ thuộc vào cài đặt của bạn. "
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:15
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:80
 msgid "The system password has been successfully changed."
 msgstr ""
 
@@ -5100,7 +5252,7 @@ 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:403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:427
 msgid "There are no active leases"
 msgstr ""
 
@@ -5109,16 +5261,10 @@ msgstr ""
 msgid "There are no active leases."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1973
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2514
 msgid "There are no changes to apply"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:204
-msgid ""
-"There is no device assigned yet, please attach a network device in the "
-"\"Physical Settings\" tab"
-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
@@ -5128,11 +5274,19 @@ msgid ""
 "protect the web interface and enable SSH."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:19
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:49
 msgid "This IPv4 address of the relay"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1448
+msgid "This authentication type is not applicable to the selected EAP method."
+msgstr ""
+
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:54
+msgid "This does not look like a valid PEM file"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
 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 "
@@ -5146,25 +5300,25 @@ msgid ""
 "configurations are automatically preserved."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:74
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:81
 msgid ""
 "This is either the \"Update Key\" configured for the tunnel or the account "
 "password if no update key has been configured"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:82
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:127
 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 ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:27
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:54
 msgid ""
 "This is the local endpoint address assigned by the tunnel broker, it usually "
 "ends with <code>...:2/64</code>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:79
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> in the local network"
@@ -5172,20 +5326,20 @@ msgstr ""
 "Đây là <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> duy "
 "nhất trong mạng địa phương. "
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:73
 msgid "This is the plain username for logging into the account"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:34
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:57
 msgid ""
 "This is the prefix routed to you by the tunnel broker for use by clients"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:9
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:41
 msgid "This is the system crontab in which scheduled tasks can be defined."
 msgstr "Đây là system crontab mà scheduled tasks có thể bị định nghĩa."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:19
+#: 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 ""
@@ -5203,26 +5357,26 @@ msgid "This page gives an overview over currently active network connections."
 msgstr ""
 "Trang này cung cấp một tổng quan về đang hoạt động kết nối mạng hiện tại."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:726
-#: modules/luci-base/htdocs/luci-static/resources/form.js:809
+#: modules/luci-base/htdocs/luci-static/resources/form.js:936
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1064
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:172
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:32
 msgid "This section contains no values yet"
 msgstr "Phần này chưa có giá trị nào"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:114
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:105
 msgid "Time Synchronization"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:525
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:968
 msgid "Time interval for rekeying GTK"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:128
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:119
 msgid "Timezone"
 msgstr "Múi giờ "
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:825
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:871
 msgid "To login…"
 msgstr ""
 
@@ -5233,7 +5387,7 @@ msgid ""
 "reset\" (only possible with squashfs images)."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:835
 msgid "Tone"
 msgstr ""
 
@@ -5257,55 +5411,41 @@ msgstr ""
 msgid "Transfer"
 msgstr "Chuyển giao"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:595
-msgid "Transmission Rate"
-msgstr "Truyền tải rate"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:102
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:89
 msgid "Transmit"
 msgstr "Transmit"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:211
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:273
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:345
-msgid "Transmit Power"
-msgstr "Truyền tải năng lượng"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:318
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:349
-msgid "Transmitter Antenna"
-msgstr "Máy phát Antenna"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:73
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:57
 msgid "Trigger"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:98
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:84
 msgid "Trigger Mode"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:54
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:69
 msgid "Tunnel ID"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1643
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1849
 #: modules/luci-base/luasrc/model/network.lua:1430
 msgid "Tunnel Interface"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:44
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:55
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:76
 msgid "Tunnel Link"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:46
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:131
 msgid "Tx-Power"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:32
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:185
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:11
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:43
 msgid "Type"
 msgstr "Loại "
 
@@ -5313,19 +5453,20 @@ msgstr "Loại "
 msgid "UDP:"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:28
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:90
 msgid "UMTS only"
 msgstr ""
 
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:43
 #: protocols/luci-proto-3g/luasrc/model/network/proto_3g.lua:10
 msgid "UMTS/GPRS/EV-DO"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:106
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:93
 msgid "USB Device"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:122
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:110
 msgid "USB Ports"
 msgstr ""
 
@@ -5355,10 +5496,12 @@ msgstr ""
 msgid "Unable to dispatch"
 msgstr ""
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:22
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:54
 msgid "Unable to obtain client ID"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:61
 msgid "Unable to resolve AFTR host name"
 msgstr ""
@@ -5368,21 +5511,31 @@ msgstr ""
 msgid "Unable to resolve peer host name"
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:33
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:68
+msgid "Unable to save contents: %s"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:132
 msgid "Unavailable Seconds (UAS)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1196
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1386
 #: modules/luci-base/luasrc/model/network.lua:970
 msgid "Unknown"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1349
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1539
 #: modules/luci-base/luasrc/model/network.lua:1137
 msgid "Unknown error (%s)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1193
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:204
+msgid "Unknown error code"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1383
+#: modules/luci-base/htdocs/luci-static/resources/protocol/none.js:6
 #: modules/luci-base/luasrc/model/network.lua:964
 msgid "Unmanaged"
 msgstr ""
@@ -5392,22 +5545,30 @@ msgstr ""
 msgid "Unmount"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:107
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:262
 msgid "Unnamed key"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1708
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2261
 msgid "Unsaved Changes"
 msgstr "Thay đổi không lưu"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:202
+msgid "Unspecified error"
+msgstr ""
+
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:64
 msgid "Unsupported MAP type"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:27
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:69
 msgid "Unsupported modem"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:219
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:119
 msgid "Unsupported protocol type."
 msgstr ""
@@ -5427,56 +5588,70 @@ msgstr ""
 msgid "Upload archive..."
 msgstr ""
 
-#: modules/luci-base/luasrc/view/cbi/upload.htm:8
-msgid "Uploaded File"
-msgstr "Tập tin đã tải lên"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1703
+msgid "Upload file"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1678
+msgid "Upload file…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1623
+msgid "Upload request failed: %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:613
+msgid ""
+"Upon pressing \"Continue\", anonymous \"wifi-iface\" sections will be "
+"assigned with a name in the form <em>wifinet#</em> and the network will be "
+"restarted to apply the updated configuration."
+msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:14
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:74
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:85
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:26
 msgid "Uptime"
 msgstr "Uptime"
 
-#: 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:83
 msgid "Use <code>/etc/ethers</code>"
 msgstr "Dùng <code>/etc/ethers</code>"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:40
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:167
 msgid "Use DHCP gateway"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:33
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:85
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:34
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:98
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:46
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:65
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:38
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:58
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:124
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:39
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:116
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:59
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:103
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:64
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:77
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:100
 msgid "Use DNS servers advertised by peer"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:227
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:233
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:479
 msgid "Use ISO/IEC 3166 alpha2 country codes."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:31
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:100
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:70
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:35
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:51
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:86
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:56
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:97
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:77
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:75
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:92
 msgid "Use MTU on tunnel interface"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:95
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:65
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:30
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:46
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:81
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:93
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:73
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:88
 msgid "Use TTL on tunnel interface"
 msgstr ""
 
@@ -5488,68 +5663,65 @@ msgstr ""
 msgid "Use as root filesystem (/)"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:19
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:31
 msgid "Use broadcast flag"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:253
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:791
 msgid "Use builtin IPv6-management"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:40
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:109
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:92
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:45
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:105
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:53
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:72
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:45
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:65
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:40
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:182
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:127
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:42
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:119
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:62
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:67
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:80
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:103
 msgid "Use custom DNS servers"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:26
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:70
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:16
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:28
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:84
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:24
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:50
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:23
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:43
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:116
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:33
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:74
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:97
 msgid "Use default gateway"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:48
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:164
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:77
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:24
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:88
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:58
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:23
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:39
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:74
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:90
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:38
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:57
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:30
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:50
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:45
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:227
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:119
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:51
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:88
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:68
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:52
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:70
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:83
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:111
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:149
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:67
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:111
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:98
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:72
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:85
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:108
 msgid "Use gateway metric"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:64
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:179
 msgid "Use routing table"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:309
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:310
 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 "
@@ -5562,77 +5734,78 @@ msgstr ""
 msgid "Used"
 msgstr "Đã sử dụng"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:848
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1273
 msgid "Used Key Slot"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:913
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
 msgid ""
 "Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not "
 "needed with normal WPA(2)-PSK."
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:48
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:110
 msgid "User certificate (PEM encoded)"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:61
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:122
 msgid "User key (PEM encoded)"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/sysauth.htm:23
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:41
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:32
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:102
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:56
 msgid "Username"
 msgstr "Tên người dùng "
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:182
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:903
 msgid "VC-Mux"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:851
 msgid "VDSL"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:172
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:169
 msgid "VLANs on %q"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:171
-msgid "VLANs on %q (%s)"
+#: modules/luci-base/luasrc/controller/admin/index.lua:55
+msgid "VPN"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:18
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:42
 msgid "VPN Local address"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:22
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:46
 msgid "VPN Local port"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:15
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:11
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:15
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:58
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:39
 msgid "VPN Server"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:18
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:96
 msgid "VPN Server port"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:37
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:100
 msgid "VPN Server's certificate SHA1 hash"
 msgstr ""
 
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:9
 #: protocols/luci-proto-vpnc/luasrc/model/network/proto_vpnc.lua:9
 msgid "VPNC (CISCO 3000 (and others) VPN)"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:44
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:73
 msgid "Vendor"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:60
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:52
 msgid "Vendor Class to send when requesting DHCP"
 msgstr ""
 
@@ -5640,41 +5813,37 @@ msgstr ""
 msgid "Verify"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:52
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:76
 msgid "Virtual dynamic interface"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:470
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:471
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:553
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:576
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:908
 msgid "WDS"
 msgstr "WDS"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:667
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1160
 msgid "WEP Open System"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:668
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1161
 msgid "WEP Shared Key"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "WEP passphrase"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:503
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:566
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:945
 msgid "WMM Mode"
 msgstr "WMM Mode"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "WPA passphrase"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:716
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:735
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:740
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1074
 msgid ""
 "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
 "and ad-hoc mode) to be installed."
@@ -5688,7 +5857,7 @@ msgstr ""
 msgid "Waiting for command to complete..."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1940
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2481
 msgid "Waiting for configuration to get applied… %ds"
 msgstr ""
 
@@ -5696,8 +5865,8 @@ msgstr ""
 msgid "Waiting for device..."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:172
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:163
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:173
 msgid "Warning"
 msgstr ""
 
@@ -5705,11 +5874,11 @@ msgstr ""
 msgid "Warning: There are unsaved changes that will get lost on reboot!"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:20
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:34
 msgid "Weak"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:946
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1355
 msgid ""
 "When using a PSK, the PMK can be automatically generated. When enabled, the "
 "R0/R1 key options below are not applied. Disable this to use the R0 and R1 "
@@ -5717,78 +5886,85 @@ msgid ""
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:383
 msgid "Width"
 msgstr ""
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:17
 #: protocols/luci-proto-wireguard/luasrc/model/network/proto_wireguard.lua:9
 msgid "WireGuard VPN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:58
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:40
 #: modules/luci-mod-status/luasrc/controller/admin/status.lua:28
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:14
 msgid "Wireless"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1631
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1837
 #: modules/luci-base/luasrc/model/network.lua:1418
 msgid "Wireless Adapter"
 msgstr "Bộ tương hợp không dây"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1617
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2052
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1823
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2288
 #: modules/luci-base/luasrc/model/network.lua:1404
 #: modules/luci-base/luasrc/model/network.lua:1865
 msgid "Wireless Network"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:629
 msgid "Wireless Overview"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:362
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:797
 msgid "Wireless Security"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:54
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:611
+msgid "Wireless configuration migration"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:139
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:179
 msgid "Wireless is disabled"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:54
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:139
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:179
 msgid "Wireless is not associated"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:15
-msgid "Wireless is restarting..."
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:752
 msgid "Wireless network is disabled"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:752
 msgid "Wireless network is enabled"
 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:182
 msgid "Write received DNS requests to syslog"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:164
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:155
 msgid "Write system log to file"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1507
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:85
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1754
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:109
 msgid "Yes"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:26
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:943
+msgid ""
+"You appear to be currently connected to the device via the \"%h\" interface. "
+"Do you really want to shut down the interface?"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:123
 msgid ""
 "You can enable or disable installed init scripts here. Changes will applied "
 "after a device reboot.<br /><strong>Warning: If you disable essential init "
@@ -5807,38 +5983,34 @@ msgid ""
 "You must enable JavaScript in your browser or LuCI will not work properly."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:196
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:187
 msgid "ZRam Compression Algorithm"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:203
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:194
 msgid "ZRam Compression Streams"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:189
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:180
 msgid "ZRam Settings"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:191
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
 msgid "ZRam Size"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:229
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:230
 msgid "any"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:113
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:121
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:126
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:218
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:282
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:321
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:328
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:621
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:37
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:22
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:29
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:121
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:836
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:844
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:849
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1030
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:78
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:48
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:51
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:103
 msgid "auto"
 msgstr "tự động"
 
@@ -5847,11 +6019,11 @@ msgstr "tự động"
 msgid "automatic"
 msgstr "thống kê"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:45
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:78
 msgid "baseT"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:909
 msgid "bridged"
 msgstr ""
 
@@ -5867,22 +6039,21 @@ msgstr ""
 msgid "create:"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:264
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:368
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:678
 msgid "creates a bridge over specified interface(s)"
 msgstr "tạo một cầu nối trên một giao diện được chỉ định"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:277
 msgid "dB"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:34
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:35
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:46
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:47
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:48
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:131
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:132
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:133
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:277
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:279
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:331
@@ -5894,26 +6065,30 @@ msgstr ""
 msgid "dBm"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:460
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:587
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:889
 msgid "disable"
 msgstr "Vô hiệu hóa"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:119
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:524
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:530
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:536
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:18
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:578
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:584
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:590
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:25
 msgid "disabled"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:433
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:467
+msgid "driver default"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/lease_status.htm:17
 #: modules/luci-base/luasrc/view/lease_status.htm:46
-#: 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:416
 msgid "expired"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:88
 msgid ""
 "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr>-leases will be stored"
@@ -5927,25 +6102,21 @@ msgstr ""
 msgid "forward"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:80
 msgid "full-duplex"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:80
 msgid "half-duplex"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:559
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:565
 msgid "hexadecimal encoded value"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:138
-msgid "hidden"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:527
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:533
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:538
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:581
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:587
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:592
 msgid "hybrid mode"
 msgstr ""
 
@@ -5953,6 +6124,10 @@ msgstr ""
 msgid "if target is a network"
 msgstr "Nếu mục tiêu là một network"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:63
+msgid "ignore"
+msgstr ""
+
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:177
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
@@ -5987,25 +6162,26 @@ msgstr ""
 msgid "key with either 5 or 13 characters"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:94
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:95
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr "Tập tin <abbr title=\"Domain Name System\">DNS</abbr> địa phương"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:952
-msgid "minutes"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1168
+msgid "medium security"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:43
-msgid "mixed WPA/WPA2"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1360
+msgid "minutes"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:225
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:232
 msgid "no"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:54
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:72
 msgid "no link"
 msgstr ""
 
@@ -6013,7 +6189,7 @@ msgstr ""
 msgid "non-empty value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1195
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1446
 msgid "none"
 msgstr "không "
 
@@ -6023,7 +6199,9 @@ msgstr "không "
 msgid "not present"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:363
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:341
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:776
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:780
 #: 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
@@ -6038,8 +6216,8 @@ msgstr ""
 msgid "on"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
-msgid "open"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1169
+msgid "open network"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
@@ -6059,73 +6237,77 @@ msgstr ""
 msgid "positive integer value"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:34
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:56
 msgid "random"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:526
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:532
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:537
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:580
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:586
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:591
 msgid "relay mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:910
 msgid "routed"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:525
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:534
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:968
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:977
 msgid "sec"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:525
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:531
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:579
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:585
 msgid "server mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:544
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:597
 msgid "stateful-only"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:542
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:595
 msgid "stateless"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:543
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:596
 msgid "stateless + stateful"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:369
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1167
+msgid "strong security"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:346
 msgid "tagged"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:932
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1343
 msgid "time units (TUs / 1.024 ms) [1000-65535]"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:549
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:555
 msgid "unique value"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:448
 msgid "unknown"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:15
 #: modules/luci-base/luasrc/view/lease_status.htm:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:238
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:390
+#: 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:414
 msgid "unlimited"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1401
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1648
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:63
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:355
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:378
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:413
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:446
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:512
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:450
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:545
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:53
 #: modules/luci-base/luasrc/view/cbi/network_netlist.htm:38
 msgid "unspecified"
@@ -6135,7 +6317,7 @@ msgstr ""
 msgid "unspecified -or- create:"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:366
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:344
 msgid "untagged"
 msgstr ""
 
@@ -6216,8 +6398,8 @@ msgstr ""
 msgid "valid address:port"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:523
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:527
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:529
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:533
 msgid "valid date (YYYY-MM-DD)"
 msgstr ""
 
@@ -6254,7 +6436,7 @@ msgstr ""
 msgid "valid network in address/netmask notation"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:498
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:504
 msgid "valid phone digit (0-9, \"*\", \"#\", \"!\" or \".\")"
 msgstr ""
 
@@ -6267,11 +6449,11 @@ msgstr ""
 msgid "valid port value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:503
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:509
 msgid "valid time (HH:MM:SS)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:425
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:431
 msgid "value between %d and %d characters"
 msgstr ""
 
@@ -6287,14 +6469,23 @@ msgstr ""
 msgid "value smaller or equal to %f"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:430
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:425
+msgid "value with %d characters"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:436
 msgid "value with at least %d characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:435
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:441
 msgid "value with at most %d characters"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1169
+msgid "weak security"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:221
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:232
@@ -6305,6 +6496,51 @@ msgstr ""
 msgid "« Back"
 msgstr ""
 
+#~ msgid "Connection Limit"
+#~ msgstr "Giới hạn kết nối"
+
+#~ msgid "Diversity"
+#~ msgstr "Tính đa dạng"
+
+#~ msgid "Frame Bursting"
+#~ msgstr "Khung nổ"
+
+#~ msgid ""
+#~ "On this page you can configure the network interfaces. You can bridge "
+#~ "several interfaces by ticking the \"bridge interfaces\" field and enter "
+#~ "the names of several network interfaces separated by spaces. You can also "
+#~ "use <abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
+#~ "<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
+#~ "<samp>eth0.1</samp>)."
+#~ msgstr ""
+#~ "Trên trang này bạn có thể định cấu hình giao diện network. Bạn có thể bắt "
+#~ "cầu nhiều giao diện bằng cách đánh dấu &amp;quot;bridge interfaces&amp;"
+#~ "quot; field và nhập tên vào của nhiều giao diện network phân tách bởi "
+#~ "những khoảng trống. Bạn có thể cũng dùng <abbr title=\"Virtual Local Area "
+#~ "Network\">VLAN</abbr> notation <samp>INTERFACE.VLANNR</samp> (<abbr title="
+#~ "\"for example\">e.g.</abbr>: <samp>eth0.1</samp>)."
+
+#~ msgid "Receiver Antenna"
+#~ msgstr "Máy thu Antenna"
+
+#~ msgid "Replace entry"
+#~ msgstr "thay đổi nội dung"
+
+#~ msgid "Separate Clients"
+#~ msgstr "Cô lập đối tượng"
+
+#~ msgid "Transmission Rate"
+#~ msgstr "Truyền tải rate"
+
+#~ msgid "Transmit Power"
+#~ msgstr "Truyền tải năng lượng"
+
+#~ msgid "Transmitter Antenna"
+#~ msgstr "Máy phát Antenna"
+
+#~ msgid "Uploaded File"
+#~ msgstr "Tập tin đã tải lên"
+
 #~ msgid "The following changes have been reverted"
 #~ msgstr "Những thay đối sau đây đã được để trở về tình trạng cũ. "
 
diff --git a/modules/luci-base/po/zh-cn/base.po b/modules/luci-base/po/zh-cn/base.po
index b6a783a1f..0b186f2bd 100644
--- a/modules/luci-base/po/zh-cn/base.po
+++ b/modules/luci-base/po/zh-cn/base.po
@@ -13,19 +13,20 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Gtranslator 2.91.7\n"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:133
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:857
 msgid "%.1f dB"
 msgstr "%.1f dB"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:109
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:122
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 msgid "%d Bit"
 msgstr "%d Bit"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1641
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2194
 msgid "%d invalid field(s)"
 msgstr "%d 个无效字段"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:281
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:31
 msgid "%s is untagged in multiple VLANs!"
 msgstr "%s 在多个 VLAN 中均未标记！"
 
@@ -63,19 +64,19 @@ msgid "-- Additional Field --"
 msgstr "-- 更多选项 --"
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:258
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1401
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1533
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:250
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:350
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1114
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1648
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1780
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:314
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:414
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1178
 #: modules/luci-base/luasrc/view/cbi/header.htm:5
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:26
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:88
 msgid "-- Please choose --"
 msgstr "-- 请选择 --"
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:259
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:351
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1115
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:415
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1179
 #: modules/luci-base/luasrc/view/cbi/header.htm:6
 msgid "-- custom --"
 msgstr "-- 自定义 --"
@@ -98,7 +99,7 @@ msgstr "-- 根据 UUID 匹配 --"
 msgid "-- please select --"
 msgstr "-- 请选择 --"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:382
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:814
 msgid "0 = not using RSSI threshold, 1 = do not change driver default"
 msgstr "0 = 不使用 RSSI 阈值，1 = 驱动默认值"
 
@@ -110,10 +111,11 @@ msgstr "1 分钟负载："
 msgid "15 Minute Load:"
 msgstr "15 分钟负载："
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:924
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1337
 msgid "4-character hexadecimal ID"
 msgstr "4 字符的十六进制 ID"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:11
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:18
 msgid "464XLAT (CLAT)"
 msgstr "464XLAT (CLAT)"
@@ -122,47 +124,47 @@ msgstr "464XLAT (CLAT)"
 msgid "5 Minute Load:"
 msgstr "5 分钟负载："
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:960
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1366
 msgid "6-octet identifier as a hex string - no colons"
 msgstr "十六进制表示的 6 字节标识符，无冒号分隔"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:891
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1310
 msgid "802.11r Fast Transition"
 msgstr "802.11r 快速切换"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1157
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1567
 msgid "802.11w Association SA Query maximum timeout"
 msgstr "802.11w 关联 SA 查询最大超时"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1574
 msgid "802.11w Association SA Query retry timeout"
 msgstr "802.11w 关联 SA 查询重试超时"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1133
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1533
 msgid "802.11w Management Frame Protection"
 msgstr "802.11w 管理帧保护"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1156
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1567
 msgid "802.11w maximum timeout"
 msgstr "802.11w 最大超时"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1165
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1574
 msgid "802.11w retry timeout"
 msgstr "802.11w 重试超时"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:399
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:831
 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:224
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:225
 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:215
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:216
 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:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
 msgid ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
 "order of the resolvfile"
@@ -170,11 +172,11 @@ msgstr ""
 "按照“解析文件”里的顺序查询 <abbr title=\"Domain Name System\">DNS</abbr> 服务"
 "器"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:388
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:820
 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:351
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:373
 #: 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> 地址"
@@ -184,8 +186,8 @@ msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr> 地址"
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
 msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr> 网关"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:555
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:35
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:506
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr> 子网掩码"
 
@@ -200,37 +202,37 @@ 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:378
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:402
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
 msgstr ""
 "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr> 后缀（十六进制）"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:58
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:35
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:33
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> 配置"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:67
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:51
 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:328
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:329
 #: 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:372
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 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:233
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:234
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> leases"
 msgstr ""
 "最大 <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> 租约数量"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:242
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> packet size"
@@ -238,66 +240,70 @@ msgstr ""
 "最大 <abbr title=\"Extension Mechanisms for Domain Name System\">EDNS0</"
 "abbr> 数据包大小"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:251
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:252
 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
 msgstr "最大并发查询数"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:10
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:42
 msgid ""
 "<br/>Note: you need to manually restart the cron service if the crontab file "
 "was empty before editing."
 msgstr ""
 "<br/>注意：如果 crontab 文件在编辑前为空，则需要手动重新启动 cron 服务。"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:817
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1605
+msgid "A directory with the same name already exists."
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:863
 msgid "A new login is required since the authentication session expired."
 msgstr "由于身份验证会话已过期，需要重新登录。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:114
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:837
 msgid "A43C + J43 + A43"
 msgstr "A43C + J43 + A43"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:838
 msgid "A43C + J43 + A43 + V43"
 msgstr "A43C + J43 + A43 + V43"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:850
 msgid "ADSL"
 msgstr "ADSL"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:826
 msgid "ANSI T1.413"
 msgstr "ANSI T1.413"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:33
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:47
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:23
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:94
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:86
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:67
 msgid "APN"
 msgstr "APN"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:56
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:175
 msgid "ARP retry threshold"
 msgstr "ARP 重试阈值"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:122
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:845
 msgid "ATM (Asynchronous Transfer Mode)"
 msgstr "ATM（异步传输模式）"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:144
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:866
 msgid "ATM Bridges"
 msgstr "ATM 桥接"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:178
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:21
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:898
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:66
 msgid "ATM Virtual Channel Identifier (VCI)"
 msgstr "ATM 虚拟通道标识（VCI）"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:179
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:26
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:899
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:70
 msgid "ATM Virtual Path Identifier (VPI)"
 msgstr "ATM 虚拟路径标识（VPI）"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:866
 msgid ""
 "ATM bridges expose encapsulated ethernet in AAL5 connections as virtual "
 "Linux network interfaces which can be used in conjunction with DHCP or PPP "
@@ -306,8 +312,8 @@ msgstr ""
 "ATM 桥是以 AAL5 协议封装以太网的虚拟 Linux 网桥，用于协同 DHCP 或 PPP 来拨号"
 "连接到网络运营商。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:184
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:905
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:62
 msgid "ATM device number"
 msgstr "ATM 设备号码"
 
@@ -316,17 +322,17 @@ msgid "ATU-C System Vendor ID"
 msgstr "ATU-C 系统供应商 ID"
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:251
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:495
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:499
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:528
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:532
 msgid "Absent Interface"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:19
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
 msgid "Access Concentrator"
 msgstr "接入集中器"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:368
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:470
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:802
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
 msgid "Access Point"
 msgstr "接入点 AP"
 
@@ -349,7 +355,7 @@ msgid "Active Connections"
 msgstr "活动连接"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:68
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:30
 msgid "Active DHCP Leases"
 msgstr "已分配的 DHCP 租约"
 
@@ -357,55 +363,75 @@ msgstr "已分配的 DHCP 租约"
 msgid "Active DHCPv6 Leases"
 msgstr "已分配的 DHCPv6 租约"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1951
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:370
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:12
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2190
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:804
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:23
 msgid "Ad-Hoc"
 msgstr "点对点 Ad-Hoc"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:650
-#: modules/luci-base/htdocs/luci-static/resources/form.js:651
-#: modules/luci-base/htdocs/luci-static/resources/form.js:666
-#: modules/luci-base/htdocs/luci-static/resources/form.js:667
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1290
+#: modules/luci-base/htdocs/luci-static/resources/form.js:902
+#: modules/luci-base/htdocs/luci-static/resources/form.js:904
+#: modules/luci-base/htdocs/luci-static/resources/form.js:917
+#: modules/luci-base/htdocs/luci-static/resources/form.js:918
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1539
 #: modules/luci-base/luasrc/view/cbi/nsection.htm:25
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:189
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:197
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:39
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:47
 #: modules/luci-base/luasrc/view/cbi/ucisection.htm:54
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:703
 msgid "Add"
 msgstr "添加"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:60
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:870
+msgid "Add ATM Bridge"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:92
 msgid "Add IPv4 address…"
 msgstr "添加 IPv4 地址…"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:129
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:204
 msgid "Add IPv6 address…"
 msgstr "添加 IPv6 地址…"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:143
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:149
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:38
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:47
+msgid "Add LED action"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:215
+msgid "Add VLAN"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:14
+msgid "Add instance"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:153
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:159
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:250
 msgid "Add key"
 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:155
 msgid "Add local domain suffix to names served from hosts files"
 msgstr "添加本地域名后缀到 HOSTS 文件中的域名"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:705
 msgid "Add new interface..."
 msgstr "添加新接口…"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:104
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:99
+msgid "Add peer"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:105
 msgid "Additional Hosts files"
 msgstr "额外的 HOSTS 文件"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:161
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
 msgid "Additional servers file"
 msgstr "额外的 SERVERS 文件"
 
@@ -432,7 +458,7 @@ msgstr "额外的 SERVERS 文件"
 msgid "Address"
 msgstr "地址"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:12
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:151
 msgid "Address to access local relay bridge"
 msgstr "接入本地中继桥的地址"
 
@@ -441,13 +467,13 @@ msgstr "接入本地中继桥的地址"
 msgid "Administration"
 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:70
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:505
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:896
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:24
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:189
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:463
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:176
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:143
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:364
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:742
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:799
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:50
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:34
 msgid "Advanced Settings"
@@ -457,166 +483,166 @@ msgstr "高级设置"
 msgid "Aggregate Transmit Power(ACTATP)"
 msgstr "总发射功率（ACTATP）"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:175
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:166
 msgid "Alert"
 msgstr "警戒"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1628
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1834
 #: modules/luci-base/luasrc/model/network.lua:1416
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:54
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:78
 msgid "Alias Interface"
 msgstr "接口别名"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:138
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:66
 msgid "Alias of \"%s\""
 msgstr "\"%s\" 的别名"
 
-#: 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:170
 msgid "All Servers"
 msgstr "所有服务器"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:114
 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:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:113
 msgid "Allocate IP sequentially"
 msgstr "顺序分配 IP"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:24
 msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
 msgstr "允许 <abbr title=\"Secure Shell\">SSH</abbr> 密码验证"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:545
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:987
 msgid "Allow AP mode to disconnect STAs based on low ACK condition"
 msgstr "允许 AP 模式时在 low ACK 的情况下断开无线终端"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:462
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:589
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:891
 msgid "Allow all except listed"
 msgstr "仅允许列表外"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:236
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:767
 msgid "Allow legacy 802.11b rates"
 msgstr "允许传统的 802.11b 速率"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:461
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:588
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:890
 msgid "Allow listed only"
 msgstr "仅允许列表内"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:198
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:199
 msgid "Allow localhost"
 msgstr "允许本机"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:47
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:35
 msgid "Allow remote hosts to connect to local SSH forwarded ports"
 msgstr "允许远程主机连接到本地 SSH 转发端口"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:38
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:30
 msgid "Allow root logins with password"
 msgstr "允许 root 用户凭密码登录"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:39
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:30
 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:199
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:200
 msgid ""
 "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
 msgstr "允许 127.0.0.0/8 回环范围内的上行响应，例如：RBL 服务"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:135
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:122
 msgid "Allowed IPs"
 msgstr "允许的 IP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:549
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:602
 msgid "Always announce default router"
 msgstr "总是通告默认路由"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:259
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:782
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
 "option does not comply with IEEE 802.11n-2009!"
 msgstr ""
 "即使辅助信道重叠，也始终使用 40MHz 信道。使用此选项不符合 IEEE 802.11n-2009！"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:95
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:818
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:119
 msgid "Annex"
 msgstr "Annex"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:96
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:819
 msgid "Annex A + L + M (all)"
 msgstr "Annex A + L + M（全部）"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:827
 msgid "Annex A G.992.1"
 msgstr "Annex A G.992.1"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:828
 msgid "Annex A G.992.2"
 msgstr "Annex A G.992.2"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:829
 msgid "Annex A G.992.3"
 msgstr "Annex A G.992.3"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:830
 msgid "Annex A G.992.5"
 msgstr "Annex A G.992.5"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:97
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:820
 msgid "Annex B (all)"
 msgstr "Annex B（全部）"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:823
 msgid "Annex B G.992.1"
 msgstr "Annex B G.992.1"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:824
 msgid "Annex B G.992.3"
 msgstr "Annex B G.992.3"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:102
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:825
 msgid "Annex B G.992.5"
 msgstr "Annex B G.992.5"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:98
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:821
 msgid "Annex J (all)"
 msgstr "Annex J（全部）"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:831
 msgid "Annex L G.992.3 POTS 1"
 msgstr "Annex L G.992.3 POTS 1"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:99
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:822
 msgid "Annex M (all)"
 msgstr "Annex M（全部）"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:109
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:832
 msgid "Annex M G.992.3"
 msgstr "Annex M G.992.3"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:833
 msgid "Annex M G.992.5"
 msgstr "Annex M G.992.5"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:550
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:602
 msgid "Announce as default router even if no public prefix is available."
 msgstr "即使没有可用的公网前缀，也仍通告自己为默认路由。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:555
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:607
 msgid "Announced DNS domains"
 msgstr "通告的 DNS 域名"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:554
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:606
 msgid "Announced DNS servers"
 msgstr "通告的 DNS 服务器"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1093
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1496
 msgid "Anonymous Identity"
 msgstr "匿名身份"
 
@@ -628,20 +654,6 @@ msgstr "自动挂载未配置的磁盘分区"
 msgid "Anonymous Swap"
 msgstr "自动挂载未配置的 Swap 分区"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:322
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:329
-msgid "Antenna 1"
-msgstr "天线 1"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:323
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:330
-msgid "Antenna 2"
-msgstr "天线 2"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:246
-msgid "Antenna Configuration"
-msgstr "天线配置"
-
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:71
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:160
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:181
@@ -649,11 +661,11 @@ msgstr "天线配置"
 msgid "Any zone"
 msgstr "任意区域"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1981
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2522
 msgid "Apply request failed with status <code>%h</code>"
 msgstr "应用请求失败，状态 <code>%h</code>"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1867
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2409
 msgid "Apply unchecked"
 msgstr ""
 
@@ -661,8 +673,8 @@ msgstr ""
 msgid "Architecture"
 msgstr "架构"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:19
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:184
+#: 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 "将每个公共 IPv6 前缀的给定长度部分分配给此接口"
@@ -671,13 +683,13 @@ msgstr "将每个公共 IPv6 前缀的给定长度部分分配给此接口"
 msgid "Assign interfaces..."
 msgstr "分配接口…"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:124
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:24
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:189
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:31
 msgid ""
 "Assign prefix parts using this hexadecimal subprefix ID for this interface."
 msgstr "将此十六进制子 ID 前缀分配给此接口"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:148
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1967
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:22
 msgid "Associated Stations"
 msgstr "已连接站点"
@@ -686,20 +698,20 @@ msgstr "已连接站点"
 msgid "Associations"
 msgstr "关联数"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:39
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:37
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:101
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:64
 msgid "Auth Group"
 msgstr "认证组"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1027
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1421
 msgid "Authentication"
 msgstr "认证"
 
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:29
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:70
 msgid "Authentication Type"
 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:78
 msgid "Authoritative"
 msgstr "唯一授权"
 
@@ -717,17 +729,19 @@ msgstr "需要授权"
 msgid "Auto Refresh"
 msgstr "自动刷新"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:53
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:7
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:17
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:67
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:24
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:36
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:42
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:36
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:106
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:24
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:98
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:50
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:94
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:81
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:55
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:68
 msgid "Automatic"
 msgstr "自动"
 
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:7
 #: protocols/luci-proto-hnet/luasrc/model/network/proto_hnet.lua:7
 msgid "Automatic Homenet (HNCP)"
 msgstr "自动家庭网络（HNCP）"
@@ -770,21 +784,21 @@ msgstr "可用"
 msgid "Average:"
 msgstr "平均："
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:116
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:839
 msgid "B43 + B43C"
 msgstr "B43 + B43C"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:840
 msgid "B43 + B43C + V43"
 msgstr "B43 + B43C + V43"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:48
 msgid "BR / DMR / AFTR"
 msgstr "BR / DMR / AFTR"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:43
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:75
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1620
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:176
 msgid "BSSID"
 msgstr "BSSID"
@@ -798,19 +812,11 @@ msgstr "返回至概况"
 msgid "Back to configuration"
 msgstr "返回至配置"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:48
-msgid "Back to overview"
-msgstr "返回至概况"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:20
-msgid "Back to scan results"
-msgstr "返回至扫描结果"
-
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:17
 msgid "Backup"
 msgstr "备份"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:38
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:36
 msgid "Backup / Flash Firmware"
 msgstr "备份/升级"
 
@@ -823,11 +829,11 @@ msgid "Bad address specified!"
 msgstr "指定了错误的地址！"
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:158
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:288
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:368
 msgid "Band"
 msgstr "频宽"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:261
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:785
 msgid "Beacon Interval"
 msgstr "Beacon 间隔"
 
@@ -840,79 +846,85 @@ msgstr ""
 "下面是待备份的文件清单。包含了更改的配置文件、必要的基础文件和用户自定义的需"
 "备份文件。"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:293
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:294
 msgid ""
 "Bind dynamically to interfaces rather than wildcard address (recommended as "
 "linux default)"
 msgstr "动态绑定到接口而不是通配符地址（推荐为 linux 默认值）"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:16
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:48
 msgid "Bind interface"
 msgstr "绑定接口"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:16
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:48
 msgid "Bind the tunnel to this interface (optional)."
 msgstr "将隧道绑定到此接口（可选）。"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:49
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:134
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:187
 msgid "Bitrate"
 msgstr "传输速率"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:172
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
 msgid "Bogus NX Domain Override"
 msgstr "忽略虚假空域名解析"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1634
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1840
 #: modules/luci-base/luasrc/model/network.lua:1420
 msgid "Bridge"
 msgstr "桥接"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:264
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:368
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:678
 msgid "Bridge interfaces"
 msgstr "桥接接口"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:906
 msgid "Bridge unit number"
 msgstr "桥接号"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:250
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:364
 msgid "Bring up on boot"
 msgstr "开机自动运行"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:35
-msgid "Broadcom 802.11%s Wireless Controller"
-msgstr "Broadcom 802.11%s 无线控制器"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:45
-msgid "Broadcom BCM%04x 802.11 Wireless Controller"
-msgstr "Broadcom BCM%04x 802.11 无线控制器"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1697
+msgid "Browse…"
+msgstr ""
 
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:18
 msgid "Buffered"
 msgstr "已缓冲"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:75
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:134
 msgid "CA certificate; if empty it will be saved after the first connection."
 msgstr "CA 证书，如果留空，则证书将在第一次连接后被保存。"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:7
+msgid "CLAT configuration failed"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:13
 msgid "CPU usage (%)"
 msgstr "CPU 使用率（%）"
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:21
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:53
 msgid "Call failed"
 msgstr "调用失败"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1789
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:14
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:52
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:711
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:948
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1839
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:191
 #: modules/luci-mod-system/luasrc/view/admin_system/upgrade.htm:60
 msgid "Cancel"
 msgstr "取消"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:6
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:17
 msgid "Category"
 msgstr "分类"
 
@@ -930,13 +942,7 @@ msgstr "注意：将强制进行系统升级"
 msgid "Chain"
 msgstr "链"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:9
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:14
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:24
-msgid "Change login password"
-msgstr "更改登录密码"
-
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1744
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 msgid "Changes"
 msgstr "更改数"
 
@@ -944,33 +950,23 @@ msgstr "更改数"
 msgid "Changes applied."
 msgstr "更改已应用。"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2004
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2545
 msgid "Changes have been reverted."
 msgstr "更改已恢复。"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:43
 msgid "Changes the administrator password for accessing the device"
 msgstr "更改访问设备的管理员密码"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:10
-msgid "Changing password…"
-msgstr "正在更改密码…"
-
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:162
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:45
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:87
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:174
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:376
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1618
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:186
 msgid "Channel"
 msgstr "信道"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:119
-msgid ""
-"Channel %d is not available in the %s regulatory domain and has been auto-"
-"adjusted to %d."
-msgstr "信道 %d 在 %s 监管区域内不可用并已自动调整到 %d。"
-
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:229
 msgid "Check"
 msgstr "检查"
@@ -979,7 +975,7 @@ msgstr "检查"
 msgid "Check filesystems before mount"
 msgstr "在挂载前检查文件系统"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1806
 msgid "Check this option to delete the existing networks from this radio."
 msgstr "选中此选项以从无线中删除现有网络。"
 
@@ -991,8 +987,8 @@ msgstr "校验值"
 msgid "Choose mtdblock"
 msgstr "选择 mtdblock"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:358
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:443
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1829
 msgid ""
 "Choose the firewall zone you want to assign to this interface. Select "
 "<em>unspecified</em> to remove the interface from the associated zone or "
@@ -1002,17 +998,17 @@ msgstr ""
 "为此接口分配所属的防火墙区域，选择“不指定”可将该接口移出已关联的区域，或者填"
 "写“创建”栏来创建一个新的区域，并将当前接口与之建立关联。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:834
 msgid ""
 "Choose the network(s) you want to attach to this wireless interface or fill "
 "out the <em>create</em> field to define a new network."
 msgstr "选择指派到此无线接口的网络，或者填写“创建”栏来新建网络。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:614
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1023
 msgid "Cipher"
 msgstr "算法"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:61
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:91
 msgid "Cisco UDP encapsulation"
 msgstr "Cisco UDP 封装"
 
@@ -1030,28 +1026,28 @@ msgstr ""
 "单击“保存 mtdblock”以下载指定的 mtdblock 文件。（注意：此功能适用于专业人"
 "士！）"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1950
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:369
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:471
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2189
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:803
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:908
 msgid "Client"
 msgstr "客户端 Client"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:55
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:52
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:47
 msgid "Client ID to send when requesting DHCP"
 msgstr "请求 DHCP 时发送的客户端 ID"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:145
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:151
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:155
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:161
 msgid "Close"
 msgstr "关闭"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:146
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:119
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:125
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:127
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:98
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:119
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:157
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:141
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:115
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:138
 msgid ""
 "Close inactive connection after the given amount of seconds, use 0 to "
 "persist connection"
@@ -1064,12 +1060,9 @@ msgstr "关闭列表…"
 #: modules/luci-base/luasrc/view/lease_status.htm:77
 #: modules/luci-base/luasrc/view/lease_status.htm:98
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:118
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:37
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:24
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1965
 #: modules/luci-mod-network/luasrc/view/admin_network/iface_status.htm:6
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:40
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:30
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:8
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:398
 #: modules/luci-mod-status/luasrc/view/admin_status/index/30-network.htm:11
 #: modules/luci-mod-status/luasrc/view/admin_status/index/50-dsl.htm:17
@@ -1083,15 +1076,19 @@ msgstr "正在收集数据…"
 msgid "Command"
 msgstr "命令"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:193
+msgid "Command OK"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:41
+msgid "Command failed"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:64
 msgid "Comment"
 msgstr "备注"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:185
-msgid "Common Configuration"
-msgstr "一般配置"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
 msgid ""
 "Complicates key reinstallation attacks on the client side by disabling "
 "retransmission of EAPOL-Key frames that are used to install keys. This "
@@ -1102,13 +1099,14 @@ msgstr ""
 "杂度。此解决方法可能会导致互操作性问题，并降低密钥协商的可靠性，特别是在流量"
 "负载较重的环境中。"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1744
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 #: modules/luci-base/luasrc/controller/admin/uci.lua:11
 #: modules/luci-mod-system/luasrc/view/admin_system/backupfiles.htm:9
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:13
 msgid "Configuration"
 msgstr "配置"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:21
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:63
 msgid "Configuration failed"
 msgstr "配置失败"
@@ -1117,42 +1115,52 @@ msgstr "配置失败"
 msgid "Configuration files will be kept"
 msgstr "将保留配置文件"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1915
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2456
 msgid "Configuration has been applied."
 msgstr "配置已应用。"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1848
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2395
 msgid "Configuration has been rolled back!"
 msgstr "配置已回滚！"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:43
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:942
+msgid "Confirm disconnect"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:50
 msgid "Confirmation"
 msgstr "确认密码"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:32
-msgid "Connect"
-msgstr "连接"
-
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:72
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:105
 msgid "Connected"
 msgstr "已连接"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:338
-msgid "Connection Limit"
-msgstr "连接数限制"
-
 #: modules/luci-base/htdocs/luci-static/resources/network.js:7
 #: modules/luci-base/luasrc/model/network.lua:27
 msgid "Connection attempt failed"
 msgstr "尝试连接失败"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:203
+msgid "Connection lost"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/controller/admin/status.lua:32
 msgid "Connections"
 msgstr "连接"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1890
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:66
+msgid "Contents have been saved."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:618
+msgid "Continue"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2431
 msgid ""
 "Could not regain access to the device after applying the configuration "
 "changes. You might need to reconnect if you modified network related "
@@ -1161,47 +1169,37 @@ msgstr ""
 "应用配置更改后，无法重新获得对设备的访问权限。如果您更改了网络相关设置如 IP "
 "地址或无线安全证书，则可能需要重新连接。"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:135
 msgid "Country"
 msgstr "国家"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:227
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:233
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:337
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:764
 msgid "Country Code"
 msgstr "国家代码"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:36
-msgid "Cover the following interface"
-msgstr "包括以下接口"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:43
-msgid "Cover the following interfaces"
-msgstr "包括以下接口"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:357
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:86
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:443
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1829
 msgid "Create / Assign firewall-zone"
 msgstr "创建/分配防火墙区域"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:9
-msgid "Create Interface"
-msgstr "创建新接口"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:33
-msgid "Create a bridge over multiple interfaces"
-msgstr "在多个接口上创建桥接"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:735
+msgid "Create interface"
+msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:174
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:165
 msgid "Critical"
 msgstr "致命错误"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:178
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:169
 msgid "Cron Log Level"
 msgstr "Cron 日志级别"
 
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:519
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:521
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:447
+msgid "Current power"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:552
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:554
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:51
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:53
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:82
@@ -1209,7 +1207,7 @@ msgstr "Cron 日志级别"
 msgid "Custom Interface"
 msgstr "自定义接口"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:36
 msgid "Custom delegated IPv6-prefix"
 msgstr "自定义分配的 IPv6 前缀"
 
@@ -1220,52 +1218,53 @@ msgid ""
 msgstr ""
 "自定义文件（证书、脚本）会保留在系统上。若无需保留，请先执行恢复出厂设置。"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:59
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:41
 msgid ""
 "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
 "\">LED</abbr>s if possible."
 msgstr "自定义此设备的 <abbr title=\"Light Emitting Diode\">LED</abbr> 行为。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:799
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1223
 msgid "DAE-Client"
 msgstr "DAE 客户端"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:807
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1231
 msgid "DAE-Port"
 msgstr "DAE 端口"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:815
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1239
 msgid "DAE-Secret"
 msgstr "DAE 加密"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:448
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:459
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:279
 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:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:61
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:62
 msgid "DHCP and DNS"
 msgstr "DHCP/DNS"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1195
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1385
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:16
 #: modules/luci-base/luasrc/model/network.lua:968
 msgid "DHCP client"
 msgstr "DHCP 客户端"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:571
 msgid "DHCP-Options"
 msgstr "DHCP 选项"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_dhcpv6.lua:7
 msgid "DHCPv6 client"
 msgstr "DHCPv6 客户端"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:540
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:594
 msgid "DHCPv6-Mode"
 msgstr "DHCPv6 模式"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:529
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:583
 msgid "DHCPv6-Service"
 msgstr "DHCPv6 服务"
 
@@ -1282,31 +1281,31 @@ msgstr "DHCPv6 服务"
 msgid "DNS"
 msgstr "DNS"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:183
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
 msgid "DNS forwardings"
 msgstr "DNS 转发"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:30
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:37
 msgid "DNS-Label / FQDN"
 msgstr "DNS-Label / FQDN"
 
-#: 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:136
 msgid "DNSSEC"
 msgstr "DNSSEC"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:139
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
 msgid "DNSSEC check unsigned"
 msgstr "DNSSEC 检查未签名"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:73
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:99
 msgid "DPD Idle Timeout"
 msgstr "DPD 空闲超时"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:14
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:41
 msgid "DS-Lite AFTR address"
 msgstr "DS-Lite AFTR 地址"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:92
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:815
 #: modules/luci-mod-status/luasrc/view/admin_status/index/50-dsl.htm:14
 msgid "DSL"
 msgstr "DSL"
@@ -1315,11 +1314,11 @@ msgstr "DSL"
 msgid "DSL Status"
 msgstr "DSL 状态"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:125
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:848
 msgid "DSL line mode"
 msgstr "DSL 线路模式"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:519
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:963
 msgid "DTIM Interval"
 msgstr "DTIM 间隔"
 
@@ -1331,42 +1330,45 @@ msgstr "DUID"
 msgid "Data Rate"
 msgstr "数据速率"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:169
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:180
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:160
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:171
 msgid "Debug"
 msgstr "调试"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:759
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:783
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:807
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1183
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1207
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1231
 msgid "Default %d"
 msgstr "默认 %d"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:82
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:107
 msgid "Default Route"
 msgstr "默认路由"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:17
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:81
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:51
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:32
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:48
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:85
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:65
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:80
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:108
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:146
 msgid "Default gateway"
 msgstr "默认网关"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:541
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:594
 msgid "Default is stateless + stateful"
 msgstr "默认是无状态的 + 有状态的"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:70
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:54
 msgid "Default state"
 msgstr "默认状态"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:503
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:553
 msgid "Define a name for this network."
 msgstr "为网络定义名称。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:514
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:571
 msgid ""
 "Define additional DHCP options, for example "
 "\"<code>6,192.168.2.1,192.168.2.2</code>\" which advertises different DNS "
@@ -1375,35 +1377,47 @@ msgstr ""
 "设置 DHCP 的附加选项，例如设定 \"<code>6,192.168.2.1,192.168.2.2</code>\" 表"
 "示通告不同的 DNS 服务器给客户端。"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:705
-#: modules/luci-base/htdocs/luci-static/resources/form.js:958
-#: modules/luci-base/htdocs/luci-static/resources/form.js:959
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1271
+#: modules/luci-base/htdocs/luci-static/resources/form.js:966
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1210
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1216
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1524
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1758
 #: modules/luci-base/luasrc/view/cbi/nsection.htm:11
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:162
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:16
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:41
 msgid "Delete"
 msgstr "删除"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:178
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:187
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:193
 msgid "Delete key"
 msgstr "删除密钥"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:45
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1654
+msgid "Delete permission denied"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1656
+msgid "Delete request failed: %d %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:723
 msgid "Delete this network"
 msgstr "删除此网络"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:519
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:963
 msgid "Delivery Traffic Indication Message Interval"
 msgstr "发送流量指示消息间隔"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:102
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:108
 msgid "Description"
 msgstr "描述"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:224
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1754
+msgid "Deselect"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:215
 msgid "Design"
 msgstr "主题"
 
@@ -1421,10 +1435,12 @@ msgstr ""
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:177
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:43
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:13
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:38
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:73
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:33
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:52
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:85
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:86
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:72
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:154
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:253
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:86
@@ -1432,15 +1448,24 @@ msgstr ""
 msgid "Device"
 msgstr "设备"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:138
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:737
 msgid "Device Configuration"
 msgstr "设备配置"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:81
+msgid "Device is not active"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/reboot.htm:23
 msgid "Device is rebooting..."
 msgstr "设备正在重启…"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1889
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:167
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:513
+msgid "Device is restarting…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2430
 msgid "Device unreachable!"
 msgstr "无法连接到设备"
 
@@ -1448,26 +1473,26 @@ msgstr "无法连接到设备"
 msgid "Device unreachable! Still waiting for device..."
 msgstr "无法连接到设备！仍旧等待设备…"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:123
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:78
 #: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:61
 msgid "Diagnostics"
 msgstr "网络诊断"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:45
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:60
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:101
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:93
 msgid "Dial number"
 msgstr "拨号号码"
 
-#: modules/luci-base/luasrc/view/cbi/filebrowser.htm:99
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1554
 msgid "Directory"
 msgstr "目录"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:131
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:715
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:754
 msgid "Disable"
 msgstr "禁用"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:472
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:531
 msgid ""
 "Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for "
 "this interface."
@@ -1475,71 +1500,66 @@ msgstr ""
 "不在此接口提供 <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> 服务。"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:64
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:93
 msgid "Disable Encryption"
 msgstr "禁用加密"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:530
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:973
 msgid "Disable Inactivity Polling"
 msgstr "禁用不活动轮询"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:713
 msgid "Disable this network"
 msgstr "禁用此网络"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:44
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:54
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:68
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:37
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:43
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:37
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1534
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:76
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:107
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:99
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:51
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:95
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:82
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:69
 msgid "Disabled"
 msgstr "已禁用"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1139
-msgid "Disabled (default)"
-msgstr "已禁用（默认）"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:544
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:987
 msgid "Disassociate On Low Acknowledgement"
 msgstr "在低 Ack 应答时断开连接"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:193
 msgid "Discard upstream RFC1918 responses"
 msgstr "丢弃 RFC1918 上行响应数据"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:92
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:114
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:956
 msgid "Disconnect"
 msgstr "断开连接"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:22
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:64
 msgid "Disconnection attempt failed"
 msgstr "尝试断开连接失败"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1121
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1762
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1855
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:17
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1375
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1995
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2314
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2401
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1634
 msgid "Dismiss"
 msgstr "解除"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:240
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:334
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:770
 msgid "Distance Optimization"
 msgstr "距离优化"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:241
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:770
 msgid "Distance to farthest network member in meters."
 msgstr "最远网络用户的距离（米）。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:347
-msgid "Diversity"
-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:61
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
@@ -1550,35 +1570,43 @@ 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:158
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:159
 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:123
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:124
 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:118
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
 msgid "Do not forward reverse lookups for local networks"
 msgstr "不转发本地网络的反向查询"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:173
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1639
+msgid "Do you really want to delete \"%s\" ?"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:188
 msgid "Do you really want to delete the following SSH key?"
 msgstr "您真的要删除以下 SSH 密钥吗？"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1637
+msgid "Do you really want to recursively delete the directory \"%s\" ?"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:74
 msgid "Domain required"
 msgstr "忽略空域名解析"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:205
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:206
 msgid "Domain whitelist"
 msgstr "域名白名单"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:34
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:67
 msgid "Don't Fragment"
 msgstr "禁止分片"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:74
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:75
 msgid ""
 "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
 "<abbr title=\"Domain Name System\">DNS</abbr>-Name"
@@ -1597,19 +1625,19 @@ msgstr "下载备份"
 msgid "Download mtdblock"
 msgstr "下载 mtdblock"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:853
 msgid "Downstream SNR offset"
 msgstr "下游 SNR 偏移"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:914
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1169
 msgid "Drag to reorder"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:9
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:11
 msgid "Dropbear Instance"
 msgstr "Dropbear 实例"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:6
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 msgid ""
 "Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access "
 "and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
@@ -1617,40 +1645,41 @@ msgstr ""
 "Dropbear 提供 <abbr title=\"Secure Shell\">SSH</abbr> 访问和 <abbr title="
 "\"Secure Copy\">SCP</abbr> 服务"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:11
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:14
 msgid "Dual-Stack Lite (RFC6333)"
 msgstr "轻型双栈（RFC6333）"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:493
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:547
 msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 msgstr "动态 <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:60
 msgid "Dynamic tunnel"
 msgstr "动态隧道"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:494
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:547
 msgid ""
 "Dynamically allocate DHCP addresses for clients. If disabled, only clients "
 "having static leases will be served."
 msgstr ""
 "为所有客户端提供 DHCP 服务。如果禁用，将只对具有静态租约的客户提供服务。"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:67
 msgid "EA-bits length"
 msgstr "EA-位长"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:990
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1386
 msgid "EAP-Method"
 msgstr "EAP 类型"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:934
-#: modules/luci-base/htdocs/luci-static/resources/form.js:935
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1199
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1188
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1191
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1450
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:154
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:160
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:38
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:291
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:720
 msgid "Edit"
 msgstr "编辑"
 
@@ -1660,91 +1689,92 @@ msgid ""
 "reload the page."
 msgstr "编辑上方的原始配置数据来修复错误，点击“保存”按钮以重新载入此页面。"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:38
-msgid "Edit this interface"
-msgstr "编辑此接口"
-
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:718
 msgid "Edit this network"
 msgstr "编辑此网络"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:669
+msgid "Edit wireless network"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:167
 msgid "Emergency"
 msgstr "紧急"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:127
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:715
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:754
 msgid "Enable"
 msgstr "启用"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:414
 msgid ""
 "Enable <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> "
 "snooping"
 msgstr ""
 "启用 <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> 嗅探"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:271
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:412
 msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 msgstr "开启 <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:41
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:60
 msgid "Enable HE.net dynamic endpoint update"
 msgstr "启用 HE.net 动态终端更新"
 
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:51
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:89
 msgid "Enable IPv6 negotiation"
 msgstr "启用 IPv6 协商"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:23
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:35
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:41
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:35
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:37
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:49
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:80
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:54
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:67
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:93
 msgid "Enable IPv6 negotiation on the PPP link"
 msgstr "在 PPP 链路上启用 IPv6 协商"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:143
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:188
 msgid "Enable Jumbo Frame passthrough"
 msgstr "启用巨型帧透传"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:244
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:235
 msgid "Enable NTP client"
 msgstr "启用 NTP 客户端"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:69
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:96
 msgid "Enable Single DES"
 msgstr "启用单个 DES"
 
-#: 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:267
 msgid "Enable TFTP server"
 msgstr "启用 TFTP 服务器"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:134
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:180
 msgid "Enable VLAN functionality"
 msgstr "启用 VLAN"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1595
 msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
 msgstr "启用 WPS 一键加密按钮，需要 WPA(2)-PSK"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1175
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
 msgid "Enable key reinstallation (KRACK) countermeasures"
 msgstr "启用密钥重新安装（KRACK）对策"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:138
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:183
 msgid "Enable learning and aging"
 msgstr "启用智能交换学习"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:194
 msgid "Enable mirroring of incoming packets"
 msgstr "启用流入数据包镜像"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:151
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:195
 msgid "Enable mirroring of outgoing packets"
 msgstr "启用流出数据包镜像"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:34
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:67
 msgid "Enable the DF (Don't Fragment) flag of the encapsulating packets."
 msgstr "启用后报文的 DF（禁止分片）标志。"
 
@@ -1752,7 +1782,7 @@ msgstr "启用后报文的 DF（禁止分片）标志。"
 msgid "Enable this mount"
 msgstr "启用此挂载点"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:713
 msgid "Enable this network"
 msgstr "启用此网络"
 
@@ -1760,48 +1790,52 @@ msgstr "启用此网络"
 msgid "Enable this swap"
 msgstr "启用此 swap 分区"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:37
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:88
 msgid "Enable/Disable"
 msgstr "启用/禁用"
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:76
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:152
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:251
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:41
 msgid "Enabled"
 msgstr "已启用"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:277
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:414
 msgid "Enables IGMP snooping on this bridge"
 msgstr "在此桥接上启用 IGMP 窥探"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:892
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1310
 msgid ""
 "Enables fast roaming among access points that belong to the same Mobility "
 "Domain"
 msgstr "启用属于同一移动域的接入点之间的快速漫游"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:272
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:412
 msgid "Enables the Spanning Tree Protocol on this bridge"
 msgstr "在此桥接上启用生成树协议"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:120
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:180
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:59
+msgid "Encapsulation limit"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:843
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:901
 msgid "Encapsulation mode"
 msgstr "封装模式"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:76
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:603
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:129
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:992
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1621
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:177
 msgid "Encryption"
 msgstr "加密"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:155
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:128
 msgid "Endpoint Host"
 msgstr "端点主机"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:165
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:132
 msgid "Endpoint Port"
 msgstr "端点端口"
 
@@ -1813,16 +1847,21 @@ msgstr "输入自定义值"
 msgid "Enter custom values"
 msgstr "输入自定义值"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:273
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:271
 msgid "Erasing..."
 msgstr "擦除中…"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:95
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:96
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:97
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:98
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:99
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:106
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:107
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:108
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:109
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:110
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:173
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:164
 msgid "Error"
 msgstr "错误"
 
@@ -1830,24 +1869,28 @@ msgstr "错误"
 msgid "Errored seconds (ES)"
 msgstr "错误秒数（ES）"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1646
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1852
 #: modules/luci-base/luasrc/model/network.lua:1432
 msgid "Ethernet Adapter"
 msgstr "以太网适配器"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1637
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1843
 #: modules/luci-base/luasrc/model/network.lua:1422
 msgid "Ethernet Switch"
 msgstr "以太网交换机"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:303
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
 msgid "Exclude interfaces"
 msgstr "排除接口"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:153
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
 msgid "Expand hosts"
 msgstr "扩展 HOSTS 文件中的主机后缀"
 
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:195
+msgid "Expecting an hexadecimal assignment hint"
+msgstr ""
+
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:59
 msgid "Expecting: %s"
 msgstr ""
@@ -1856,60 +1899,76 @@ msgstr ""
 msgid "Expires"
 msgstr "到期时间"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:488
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:543
 msgid ""
 "Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
 msgstr "租用地址的到期时间，最短 2 分钟（<code>2m</code>）。"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:8
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:19
 msgid "External"
 msgstr "外部"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:971
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1377
 msgid "External R0 Key Holder List"
 msgstr "外部 <abbr title=\"R0 Key Holder\">R0KH</abbr> 列表"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:980
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1381
 msgid "External R1 Key Holder List"
 msgstr "外部 <abbr title=\"R1 Key Holder\">R1KH</abbr> 列表"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:150
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:141
 msgid "External system log server"
 msgstr "外部系统日志服务器地址"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:155
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:146
 msgid "External system log server port"
 msgstr "外部系统日志服务器端口"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:160
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:151
 msgid "External system log server protocol"
 msgstr "外部系统日志服务器协议"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:18
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:79
 msgid "Extra SSH command options"
 msgstr "额外的 SSH 命令选项"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:940
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1351
 msgid "FT over DS"
 msgstr "FT over DS"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:941
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1352
 msgid "FT over the Air"
 msgstr "FT over the Air"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:938
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1349
 msgid "FT protocol"
 msgstr "FT 协议"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1842
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:82
+msgid "Failed to change the system password."
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2389
 msgid "Failed to confirm apply within %ds, waiting for rollback…"
 msgstr "在 %d 秒内确认应用失败，等待回滚…"
 
-#: modules/luci-base/luasrc/view/cbi/filebrowser.htm:106
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:45
+msgid "Failed to execute \"/etc/init.d/%s %s\" action: %s"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1561
 msgid "File"
 msgstr "文件"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:279
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1514
+msgid "File not accessible"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1698
+msgid "Filename"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:280
 msgid "Filename of the boot image advertised to clients"
 msgstr "向客户端通告的启动镜像文件名"
 
@@ -1919,14 +1978,15 @@ msgstr "向客户端通告的启动镜像文件名"
 msgid "Filesystem"
 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:118
 msgid "Filter private"
 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:123
 msgid "Filter useless"
 msgstr "过滤无用包"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:23
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:65
 msgid "Finalizing failed"
 msgstr "最终确认失败"
@@ -1937,7 +1997,7 @@ msgid ""
 "with defaults based on what was detected"
 msgstr "查找当前系统上的所有分区和 swap 设备，并根据查找结果生成并替换现有配置"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:696
 msgid "Find and join network"
 msgstr "搜索并加入网络"
 
@@ -1949,11 +2009,11 @@ msgstr "完成"
 msgid "Firewall"
 msgstr "防火墙"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:77
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:76
 msgid "Firewall Mark"
 msgstr "防火墙标识"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:193
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:278
 msgid "Firewall Settings"
 msgstr "防火墙设置"
 
@@ -1961,7 +2021,7 @@ msgstr "防火墙设置"
 msgid "Firewall Status"
 msgstr "防火墙状态"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:137
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:860
 msgid "Firmware File"
 msgstr "固件文件"
 
@@ -1969,7 +2029,7 @@ msgstr "固件文件"
 msgid "Firmware Version"
 msgstr "固件版本"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:225
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:226
 msgid "Fixed source port for outbound DNS queries"
 msgstr "指定的 DNS 查询源端口"
 
@@ -1989,35 +2049,35 @@ msgstr "刷写新的固件"
 msgid "Flash operations"
 msgstr "刷新操作"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:194
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:192
 msgid "Flashing..."
 msgstr "正在刷写…"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:498
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:550
 msgid "Force"
 msgstr "强制"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:258
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:782
 msgid "Force 40MHz mode"
 msgstr "强制 40MHz 模式"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:622
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1031
 msgid "Force CCMP (AES)"
 msgstr "强制 CCMP（AES）"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:499
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:550
 msgid "Force DHCP on this network even if another server is detected."
 msgstr "即使检测到另一台服务器，也要强制使用此网络上的 DHCP。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:623
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1032
 msgid "Force TKIP"
 msgstr "强制 TKIP"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:624
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1033
 msgid "Force TKIP and CCMP (AES)"
 msgstr "强制 TKIP 和 CCMP（AES）"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:795
 msgid "Force link"
 msgstr "强制链路"
 
@@ -2025,7 +2085,7 @@ msgstr "强制链路"
 msgid "Force upgrade"
 msgstr "强制升级"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:60
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:90
 msgid "Force use of NAT-T"
 msgstr "强制使用 NAT-T"
 
@@ -2033,7 +2093,7 @@ msgstr "强制使用 NAT-T"
 msgid "Form token mismatch"
 msgstr "表单令牌不匹配"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:34
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:164
 msgid "Forward DHCP traffic"
 msgstr "转发 DHCP 数据包"
 
@@ -2041,48 +2101,41 @@ msgstr "转发 DHCP 数据包"
 msgid "Forward Error Correction Seconds (FECS)"
 msgstr "前向纠错秒数（FECS）"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:28
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:161
 msgid "Forward broadcast traffic"
 msgstr "转发广播数据包"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:375
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:809
 msgid "Forward mesh peer traffic"
 msgstr "转发 mesh 节点数据包"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:186
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:908
 msgid "Forwarding mode"
 msgstr "转发模式"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:255
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:596
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:774
 msgid "Fragmentation Threshold"
 msgstr "分片阈值"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:332
-msgid "Frame Bursting"
-msgstr "帧突发"
-
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:17
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:28
 msgid "Free"
 msgstr "空闲数"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:91
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:89
 msgid ""
-"Further information about WireGuard interfaces and peers at <a href=\"http://"
-"wireguard.com\">wireguard.com</a>."
+"Further information about WireGuard interfaces and peers at <a href='http://"
+"wireguard.com'>wireguard.com</a>."
 msgstr ""
-"有关 WireGuard 接口和 Peer 的更多信息：<a href=\"http://wireguard.com"
-"\">wireguard.com</a>。"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:45
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:130
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:186
 msgid "GHz"
 msgstr "GHz"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:29
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:36
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:91
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:77
 msgid "GPRS only"
 msgstr "仅 GPRS"
 
@@ -2091,28 +2144,28 @@ msgstr "仅 GPRS"
 msgid "Gateway"
 msgstr "网关"
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:35
+msgid "Gateway Ports"
+msgstr "网关端口"
+
 #: modules/luci-base/htdocs/luci-static/resources/network.js:9
 #: modules/luci-base/luasrc/model/network.lua:29
 msgid "Gateway address is invalid"
 msgstr "网关地址无效"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:46
-msgid "Gateway ports"
-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:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:275
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:23
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:112
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:103
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:49
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:33
 msgid "General Settings"
 msgstr "基本设置"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:188
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:462
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:175
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:141
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:361
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:504
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:895
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:741
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:796
 msgid "General Setup"
 msgstr "基本设置"
 
@@ -2120,7 +2173,7 @@ msgstr "基本设置"
 msgid "Generate Config"
 msgstr "生成配置"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:945
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1355
 msgid "Generate PMK locally"
 msgstr "本地生成 PMK"
 
@@ -2128,11 +2181,7 @@ msgstr "本地生成 PMK"
 msgid "Generate archive"
 msgstr "生成备份"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:63
-msgid "Generic 802.11%s Wireless Controller"
-msgstr "通用 802.11%s 无线控制器"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:26
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:74
 msgid "Given password confirmation did not match, password not changed!"
 msgstr "由于密码验证不匹配，密码没有更改！"
 
@@ -2140,7 +2189,7 @@ msgstr "由于密码验证不匹配，密码没有更改！"
 msgid "Global Settings"
 msgstr "全局设置"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:806
 msgid "Global network options"
 msgstr "全局网络选项"
 
@@ -2151,33 +2200,29 @@ msgstr "全局网络选项"
 msgid "Go to password configuration..."
 msgstr "跳转到密码配置页…"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:857
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1369
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1112
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1616
 #: modules/luci-base/luasrc/view/cbi/full_valueheader.htm:4
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:58
 msgid "Go to relevant configuration page"
 msgstr "跳转到相关的配置页面"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:38
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:66
 msgid "Group Password"
 msgstr "组密码"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:11
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:22
 msgid "Guest"
 msgstr "访客"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:73
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:81
 msgid "HE.net password"
 msgstr "HE.net 密码"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:60
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:73
 msgid "HE.net username"
 msgstr "HE.net 用户名"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:310
-msgid "HT mode (802.11n)"
-msgstr "HT 模式（802.11n）"
-
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:16
 msgid "Hang Up"
 msgstr "挂起"
@@ -2186,15 +2231,13 @@ msgstr "挂起"
 msgid "Header Error Code Errors (HEC)"
 msgstr "请求头错误代码错误（HEC）"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:103
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 msgid ""
 "Here you can configure the basic aspects of your device like its hostname or "
 "the timezone."
 msgstr "此处配置设备的基础信息，如主机名称或时区。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:499
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:556
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:579
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:941
 msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "隐藏 <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 
@@ -2205,14 +2248,15 @@ msgstr "隐藏空链"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:92
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1959
 msgid "Host"
 msgstr "主机"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:20
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:21
 msgid "Host entries"
-msgstr "主机目录"
+msgstr "主机/域名列表"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:48
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:171
 msgid "Host expiry timeout"
 msgstr "主机到期超时"
 
@@ -2220,45 +2264,45 @@ msgstr "主机到期超时"
 msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
 msgstr "主机 <abbr title=\"Internet Protocol Address\">IP</abbr> 或网络"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:118
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:102
 msgid "Host-Uniq tag content"
 msgstr "Host-Uniq 标签内容"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:71
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:31
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:316
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:25
+#: 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:317
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:26
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:17
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:125
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:116
 msgid "Hostname"
 msgstr "主机名"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:12
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:22
 msgid "Hostname to send when requesting DHCP"
 msgstr "请求 DHCP 时发送的主机名"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:18
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:19
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:67
 msgid "Hostnames"
-msgstr "主机名"
+msgstr "主机映射"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:13
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:24
 msgid "Hybrid"
 msgstr "混合"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:45
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:75
 msgid "IKE DH Group"
 msgstr "IKE DH 组"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:41
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:59
 msgid "IP Addresses"
 msgstr "IP 地址"
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:40
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:80
 msgid "IP Protocol"
 msgstr "IP 协议"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:29
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:30
 msgid "IP address"
 msgstr "IP 地址"
 
@@ -2277,6 +2321,11 @@ msgstr "IP 地址缺失"
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:20
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:21
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:22
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:79
+#: 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/network.js:89
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:90
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:91
@@ -2284,7 +2333,7 @@ msgstr "IP 地址缺失"
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:93
 #: 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/luasrc/model/cbi/admin_network/proto_ncm.lua:42
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:82
 msgid "IPv4"
 msgstr "IPv4"
 
@@ -2296,24 +2345,23 @@ msgstr "IPv4 防火墙"
 msgid "IPv4 Upstream"
 msgstr "IPv4 上游"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:57
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:178
 msgid "IPv4 address"
 msgstr "IPv4 地址"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:26
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:33
 msgid "IPv4 assignment length"
 msgstr "分配 IPv4 长度"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:104
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:181
 msgid "IPv4 broadcast"
 msgstr "IPv4 广播"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:100
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:180
 msgid "IPv4 gateway"
 msgstr "IPv4 网关"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:92
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:179
 msgid "IPv4 netmask"
 msgstr "IPv4 子网掩码"
 
@@ -2321,24 +2369,25 @@ msgstr "IPv4 子网掩码"
 msgid "IPv4 network in address/netmask notation"
 msgstr "地址/网络掩码表示法中的 IPv4 网络"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:25
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:52
 msgid "IPv4 prefix"
 msgstr "IPv4 地址前缀"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:42
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:30
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:55
 msgid "IPv4 prefix length"
 msgstr "IPv4 地址前缀长度"
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:43
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:83
 msgid "IPv4+IPv6"
 msgstr "IPv4+IPv6"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:72
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:34
 msgid "IPv4-Address"
 msgstr "IPv4 地址"
 
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:10
 #: protocols/luci-proto-ipip/luasrc/model/network/proto_ipip.lua:9
 msgid "IPv4-in-IPv4 (RFC2003)"
 msgstr "IPv4-in-IPv4 (RFC2003)"
@@ -2353,6 +2402,16 @@ msgstr "IPv4-in-IPv4 (RFC2003)"
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:30
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:31
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:32
+#: 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/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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:89
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:90
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:91
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:92
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:95
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:96
@@ -2365,7 +2424,7 @@ msgstr "IPv4-in-IPv4 (RFC2003)"
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:103
 #: 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/luasrc/model/cbi/admin_network/proto_ncm.lua:44
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:84
 msgid "IPv6"
 msgstr "IPv6"
 
@@ -2377,11 +2436,11 @@ msgstr "IPv6 防火墙"
 msgid "IPv6 Neighbours"
 msgstr "IPv6 网上邻居"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:464
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:506
 msgid "IPv6 Settings"
 msgstr "IPv6 设置"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:195
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:810
 msgid "IPv6 ULA-Prefix"
 msgstr "IPv6 ULA 前缀"
 
@@ -2389,21 +2448,21 @@ msgstr "IPv6 ULA 前缀"
 msgid "IPv6 Upstream"
 msgstr "IPv6 上游"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:202
 msgid "IPv6 address"
 msgstr "IPv6 地址"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:23
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:189
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:31
 msgid "IPv6 assignment hint"
 msgstr "IPv6 分配提示"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:18
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:184
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:27
 msgid "IPv6 assignment length"
 msgstr "IPv6 分配长度"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:207
 msgid "IPv6 gateway"
 msgstr "IPv6 网关"
 
@@ -2411,22 +2470,22 @@ msgstr "IPv6 网关"
 msgid "IPv6 network in address/netmask notation"
 msgstr "地址/网络掩码表示法中的 IPv6 网络"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:37
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:59
 msgid "IPv6 prefix"
 msgstr "IPv6 地址前缀"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:34
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:45
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:63
 msgid "IPv6 prefix length"
 msgstr "IPv6 地址前缀长度"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:33
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:211
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:57
 msgid "IPv6 routed prefix"
 msgstr "IPv6 路由前缀"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:143
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:215
 msgid "IPv6 suffix"
 msgstr "IPv6 后缀"
 
@@ -2436,31 +2495,35 @@ msgid "IPv6-Address"
 msgstr "IPv6 地址"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:93
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:104
 msgid "IPv6-PD"
 msgstr "IPv6-PD"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:10
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:13
 msgid "IPv6-in-IPv4 (RFC4213)"
 msgstr "IPv6-in-IPv4 (RFC4213)"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:17
 msgid "IPv6-over-IPv4 (6rd)"
 msgstr "IPv6-over-IPv4 (6rd)"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:15
 msgid "IPv6-over-IPv4 (6to4)"
 msgstr "IPv6-over-IPv4 (6to4)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1075
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1478
 msgid "Identity"
 msgstr "鉴权"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:70
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:96
 msgid "If checked, 1DES is enabled"
 msgstr "如果选中，则启用1DES。"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:65
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:93
 msgid "If checked, encryption is disabled"
 msgstr "如果选中，则禁用加密"
 
@@ -2477,36 +2540,36 @@ msgid ""
 "device node"
 msgstr "如果指定，则通过分区卷标而不是固定的设备文件来挂载设备"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:27
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:71
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:18
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:82
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:52
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:17
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:29
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:33
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:68
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:85
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:32
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:45
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:45
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:24
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:44
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:116
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:48
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:85
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:65
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:33
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:80
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:108
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:146
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:74
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:97
 msgid "If unchecked, no default route is configured"
 msgstr "留空则不配置默认路由"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:34
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:86
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:35
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:99
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:47
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:60
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:60
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:39
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:59
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:124
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:39
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:116
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:59
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:103
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:64
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:77
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:100
 msgid "If unchecked, the advertised DNS server addresses are ignored"
 msgstr "留空则忽略所通告的 DNS 服务器地址"
 
@@ -2523,15 +2586,15 @@ msgstr ""
 "swap 设备无法像 <abbr title=\"Random Access Memory\">RAM</abbr> 这样的高速率"
 "访问。"
 
-#: 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:102
 msgid "Ignore <code>/etc/hosts</code>"
 msgstr "忽略 <code>/etc/hosts</code>"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:471
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:531
 msgid "Ignore interface"
 msgstr "忽略此接口"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:90
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:91
 msgid "Ignore resolve file"
 msgstr "忽略解析文件"
 
@@ -2551,12 +2614,12 @@ msgstr ""
 "为了防止未经授权访问系统，您的请求已被阻止。点击下面的 “继续 »” 来返回上一"
 "页。"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:145
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:118
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:124
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:126
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:97
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:118
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:157
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:141
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:115
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:138
 msgid "Inactivity timeout"
 msgstr "活动超时"
 
@@ -2564,23 +2627,25 @@ msgstr "活动超时"
 msgid "Inbound:"
 msgstr "入站："
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:170
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:161
 msgid "Info"
 msgstr "信息"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:105
 msgid "Information"
 msgstr "信息"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:25
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:67
 msgid "Initialization failure"
 msgstr "初始化失败"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:34
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:87
 msgid "Initscript"
 msgstr "启动脚本"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:26
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:122
 msgid "Initscripts"
 msgstr "启动脚本"
 
@@ -2588,55 +2653,74 @@ msgstr "启动脚本"
 msgid "Install iputils-traceroute6 for IPv6 traceroute"
 msgstr "安装 iputils-traceroute6 以进行 IPv6 路由追踪"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:223
-msgid "Install package %q"
-msgstr "安装软件包 %q"
-
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:220
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:120
 msgid "Install protocol extensions..."
 msgstr "安装扩展协议…"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:416
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:423
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:683
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:687
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:26
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:284
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:342
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:47
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:134
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:14
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:16
 msgid "Interface"
 msgstr "接口"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:58
 msgid "Interface %q device auto-migrated from %q to %q."
 msgstr "接口设备 %q 从 %q 自动迁移到了 %q。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:356
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:792
 msgid "Interface Configuration"
 msgstr "接口配置"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:51
-msgid "Interface Overview"
-msgstr "接口总览"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:99
+msgid "Interface has %d pending changes"
+msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:57
+msgid "Interface is marked for deletion"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:162
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:3
 msgid "Interface is reconnecting..."
 msgstr "正在重新连接接口…"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:162
+msgid "Interface is shutting down..."
+msgstr "正在关闭接口..."
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:205
+msgid "Interface is starting..."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:208
+msgid "Interface is stopping..."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:954
 msgid "Interface name"
 msgstr "接口名称"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:34
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:224
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:131
 msgid "Interface not present or not connected yet."
 msgstr "接口不存在或未连接。"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:88
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:16
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:11
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:287
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:54
 msgid "Interfaces"
 msgstr "接口"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:9
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:20
 msgid "Internal"
 msgstr "内部"
 
@@ -2649,19 +2733,35 @@ msgstr "内部服务器错误"
 msgid "Invalid"
 msgstr "无效"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:311
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:10
+msgid "Invalid Base64 key string"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:281
 msgid "Invalid VLAN ID given! Only IDs between %d and %d are allowed."
 msgstr "无效的 VLAN ID！只有 %d 和 %d 之间的 ID 有效。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:307
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:290
 msgid "Invalid VLAN ID given! Only unique IDs are allowed"
 msgstr "无效的 VLAN ID！只允许唯一的 ID"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:195
+msgid "Invalid argument"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:194
+msgid "Invalid command"
+msgstr ""
+
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:80
+msgid "Invalid hexadecimal value"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/sysauth.htm:12
 msgid "Invalid username and/or password! Please try again."
 msgstr "无效的用户名和/或密码！请重试。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:508
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:950
 msgid "Isolate Clients"
 msgstr "隔离客户端"
 
@@ -2678,15 +2778,15 @@ msgstr "您尝试刷写的固件与本路由器不兼容，请重新验证固件
 msgid "JavaScript required!"
 msgstr "需要 JavaScript！"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:52
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1691
 msgid "Join Network"
 msgstr "加入网络"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:22
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1628
 msgid "Join Network: Wireless Scan"
 msgstr "加入网络：搜索无线"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:19
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1833
 msgid "Joining Network: %q"
 msgstr "加入网络：%q"
 
@@ -2703,15 +2803,15 @@ msgstr "内核日志"
 msgid "Kernel Version"
 msgstr "内核版本"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:823
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1248
 msgid "Key"
 msgstr "密码"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:851
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:852
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:853
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:854
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:870
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1277
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1278
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1279
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1291
 msgid "Key #%d"
 msgstr "密码 #%d"
 
@@ -2719,33 +2819,34 @@ msgstr "密码 #%d"
 msgid "Kill"
 msgstr "强制关闭"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:10
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:21
 msgid "L2TP"
 msgstr "L2TP"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:10
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:40
 msgid "L2TP Server"
 msgstr "L2TP 服务器"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:100
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:74
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:80
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:74
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:53
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:73
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:131
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:102
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:89
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:112
 msgid "LCP echo failure threshold"
 msgstr "LCP 响应故障阈值"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:118
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:89
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:95
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:89
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:68
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:91
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:144
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:102
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:125
 msgid "LCP echo interval"
 msgstr "LCP 响应间隔"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:181
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:902
 msgid "LLC"
 msgstr "LLC"
 
@@ -2754,11 +2855,11 @@ msgstr "LLC"
 msgid "Label"
 msgstr "卷标"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:213
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:204
 msgid "Language"
 msgstr "语言"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:115
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:106
 msgid "Language and Style"
 msgstr "语言和界面"
 
@@ -2766,51 +2867,51 @@ msgstr "语言和界面"
 msgid "Latency"
 msgstr "延迟"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:10
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:21
 msgid "Leaf"
 msgstr "叶节点"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:369
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:487
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:393
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:543
 msgid "Lease time"
 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:87
 msgid "Leasefile"
 msgstr "租约文件"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:74
 #: modules/luci-base/luasrc/view/lease_status.htm:95
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:34
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
 msgid "Leasetime remaining"
 msgstr "剩余租期"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:9
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:20
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:27
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:50
 msgid "Leave empty to autodetect"
 msgstr "留空则自动探测"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:21
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:45
 msgid "Leave empty to use the current WAN address"
 msgstr "留空则使用当前 WAN 地址"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1746
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2299
 msgid "Legend:"
 msgstr "图例："
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:481
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:538
 msgid "Limit"
 msgstr "客户数"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:287
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:288
 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:299
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:300
 msgid "Limit listening to these interfaces, and loopback."
 msgstr "仅监听这些接口和环回接口。"
 
@@ -2830,18 +2931,18 @@ msgstr "线路状态"
 msgid "Line Uptime"
 msgstr "线路运行时间"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:101
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:88
 msgid "Link On"
 msgstr "活动链接"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:185
 msgid ""
 "List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
 "requests to"
 msgstr ""
 "将请求转发到的 <abbr title=\"Domain Name System\">DNS</abbr> 服务器列表"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:972
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1377
 msgid ""
 "List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-"
 "Identifier,128-bit key as hex string. <br />This list is used to map R0KH-ID "
@@ -2853,7 +2954,7 @@ msgstr ""
 "进制字符串）。<br />在从初始移动域关联期间使用的 R0KH 中请求 PMK-R1 密钥时，"
 "该列表用于将 R0KH-ID（NAS 标识符）映射到目标 MAC 地址。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:981
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1381
 msgid ""
 "List of R1KHs in the same Mobility Domain. <br />Format: MAC-address,R1KH-ID "
 "as 6 octets with colons,128-bit key as hex string. <br />This list is used "
@@ -2866,31 +2967,31 @@ msgstr ""
 "表用于将 R1KH-ID 映射到目标 MAC 地址。这也是可以请求 PMK-R1 键的 MD 中授权的 "
 "R1KH 的列表。"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:21
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:82
 msgid "List of SSH key files for auth"
 msgstr "用于认证的 SSH 密钥文件列表"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:206
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:207
 msgid "List of domains to allow RFC1918 responses for"
 msgstr "允许 RFC1918 响应的域名列表"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:174
 msgid "List of hosts that supply bogus NX domain results"
 msgstr "允许虚假空域名响应的服务器列表"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:298
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:299
 msgid "Listen Interfaces"
 msgstr "监听接口"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:30
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:54
 msgid "Listen Port"
 msgstr "监听端口"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:15
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:16
 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:216
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:217
 msgid "Listening port for inbound DNS queries"
 msgstr "入站 DNS 查询端口"
 
@@ -2909,11 +3010,11 @@ msgstr "平均负载"
 msgid "Loading"
 msgstr "加载中"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:35
-msgid "Loading SSH keys…"
-msgstr "正在加载 SSH 密钥…"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1819
+msgid "Loading directory contents…"
+msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1204
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1296
 #: modules/luci-base/luasrc/view/view.htm:4
 msgid "Loading view…"
 msgstr ""
@@ -2923,77 +3024,73 @@ msgstr ""
 msgid "Local IP address is invalid"
 msgstr "本地 IP 地址无效"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:25
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:86
 msgid "Local IP address to assign"
 msgstr "要分配的本地 IP 地址"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:10
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:11
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:44
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:39
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:151
 msgid "Local IPv4 address"
 msgstr "本地 IPv4 地址"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:20
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:54
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:45
 msgid "Local IPv6 address"
 msgstr "本地 IPv6 地址"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:286
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:287
 msgid "Local Service Only"
 msgstr "仅本地服务"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:81
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:126
 msgid "Local Startup"
 msgstr "本地启动脚本"
 
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:25
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:121
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:112
 msgid "Local Time"
 msgstr "本地时间"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:149
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
 msgid "Local domain"
 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:147
 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:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:151
 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:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
 msgid "Local server"
 msgstr "本地服务器"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:129
 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:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:128
 msgid "Localise queries"
 msgstr "本地化查询"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:175
-msgid "Locked to channel %s used by: %s"
-msgstr "信道道已被锁定为 %s，因为该信道被 %s 使用"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:168
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:159
 msgid "Log output level"
 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:181
 msgid "Log queries"
 msgstr "记录查询日志"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:113
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:104
 msgid "Logging"
 msgstr "日志"
 
@@ -3001,7 +3098,7 @@ msgstr "日志"
 msgid "Login"
 msgstr "登录"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:95
+#: modules/luci-base/luasrc/controller/admin/index.lua:103
 msgid "Logout"
 msgstr "退出"
 
@@ -3009,11 +3106,13 @@ msgstr "退出"
 msgid "Loss of Signal Seconds (LOSS)"
 msgstr "信号丢失秒数（LOSS）"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:476
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:533
 msgid "Lowest leased address as offset from the network address."
 msgstr "网络地址的起始分配基址。"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:40
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:75
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:35
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:86
 msgid "MAC"
@@ -3021,32 +3120,32 @@ msgstr "MAC"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:73
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:109
-#: 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:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1958
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:86
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:133
 msgid "MAC-Address"
 msgstr "MAC 地址"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:457
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:586
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:886
 msgid "MAC-Address Filter"
 msgstr "MAC 地址过滤"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:142
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:363
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:798
 msgid "MAC-Filter"
 msgstr "MAC 过滤"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:464
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:590
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:893
 msgid "MAC-List"
 msgstr "MAC 列表"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:13
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:16
 msgid "MAP / LW4over6"
 msgstr "MAP / LW4over6"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:62
 msgid "MAP rule is invalid"
 msgstr "MAP 规则无效"
@@ -3064,8 +3163,8 @@ msgid "MHz"
 msgstr "MHz"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:53
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:29
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:66
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:53
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:71
 msgid "MTU"
 msgstr "MTU"
 
@@ -3075,16 +3174,17 @@ msgid ""
 "below:"
 msgstr "确保使用以下命令来复制根文件系统："
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:55
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:69
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:26
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:38
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:38
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:108
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:52
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:96
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:83
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:57
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:70
 msgid "Manual"
 msgstr "手动"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1949
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2188
 msgid "Master"
 msgstr ""
 
@@ -3092,50 +3192,46 @@ msgstr ""
 msgid "Max. Attainable Data Rate (ATTNDR)"
 msgstr "最大可达数据速率（ATTNDR）"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:539
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:982
 msgid "Maximum allowed Listen Interval"
 msgstr "允许的最大监听间隔"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:234
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
 msgid "Maximum allowed number of active DHCP leases"
 msgstr "允许的最大 DHCP 租用数"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:252
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:253
 msgid "Maximum allowed number of concurrent DNS queries"
 msgstr "允许的最大并发 DNS 查询数"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:244
 msgid "Maximum allowed size of EDNS.0 UDP packets"
 msgstr "允许的最大 EDNS.0 UDP 数据包大小"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:63
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:77
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:57
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:112
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:104
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:93
 msgid "Maximum amount of seconds to wait for the modem to become ready"
 msgstr "调制解调器就绪的最大等待时间（秒）"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:27
-msgid ""
-"Maximum length of the name is 15 characters including the automatic protocol/"
-"bridge prefix (br-, 6in4-, pppoe- etc.)"
-msgstr ""
-"名称的最大长度为 15 个字符，包含根据协议类型，网桥自动添加上的名字前缀（br-、"
-"6in4-、pppoe- 等）"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:482
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:538
 msgid "Maximum number of leased addresses."
 msgstr "最大地址分配数量。"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:761
+msgid "Maximum transmit power"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:21
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:49
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:134
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:187
 #: modules/luci-mod-status/luasrc/view/admin_status/bandwidth.htm:79
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:284
 msgid "Mbit/s"
 msgstr "Mbit/s"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:18
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:32
 msgid "Medium"
 msgstr "中等"
 
@@ -3147,42 +3243,43 @@ msgstr "内存"
 msgid "Memory usage (%)"
 msgstr "内存使用率（%）"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1952
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2191
 msgid "Mesh"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:372
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:806
 msgid "Mesh Id"
 msgstr "Mesh ID"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:196
+msgid "Method not found"
+msgstr ""
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:45
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:76
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:104
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:54
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:66
 msgid "Metric"
 msgstr "跃点数"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:154
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:198
 msgid "Mirror monitor port"
 msgstr "数据包镜像监听端口"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:153
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:197
 msgid "Mirror source port"
 msgstr "数据包镜像源端口"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:408
-msgid "Missing protocol extension for proto %q"
-msgstr "缺少协议 %q 的协议扩展"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:923
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1337
 msgid "Mobility Domain"
 msgstr "移动域"
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:154
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:41
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:74
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:366
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:31
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:360
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:801
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1619
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:175
 msgid "Mode"
 msgstr "模式"
@@ -3191,39 +3288,38 @@ msgstr "模式"
 msgid "Model"
 msgstr "主机型号"
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:31
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:72
 msgid "Modem default"
 msgstr "调制解调器默认"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:11
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:19
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:11
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:10
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:73
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:73
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:57
 msgid "Modem device"
 msgstr "调制解调器设备"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:24
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:66
 msgid "Modem information query failed"
 msgstr "调制解调器信息查询失败"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:62
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:76
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:56
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:112
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:104
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:93
 msgid "Modem init timeout"
 msgstr "调制解调器初始化超时"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1953
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:452
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:554
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:577
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2192
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:880
 msgid "Monitor"
 msgstr "监听"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:14
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
 msgid "More Characters"
 msgstr "需要更多字符"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:802
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1057
 msgid "More…"
 msgstr ""
 
@@ -3236,7 +3332,7 @@ msgstr "挂载项目"
 msgid "Mount Point"
 msgstr "挂载点"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:26
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:36
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:137
 msgid "Mount Points"
@@ -3284,46 +3380,44 @@ msgstr "下移"
 msgid "Move up"
 msgstr "上移"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:912
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
 msgid "NAS ID"
 msgstr "NAS ID"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:57
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:87
 msgid "NAT-T Mode"
 msgstr "NAT-T 模式"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:9
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 msgid "NAT64 Prefix"
 msgstr "NAT64 前缀"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:31
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:26
 msgid "NCM"
 msgstr "NCM"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:535
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:589
 msgid "NDP-Proxy"
 msgstr "NDP 代理"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:43
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:72
 msgid "NT Domain"
 msgstr "NT 域"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:273
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:264
 msgid "NTP server candidates"
 msgstr "候选 NTP 服务器"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:837
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1092
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:27
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:502
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:65
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:553
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:658
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:49
 msgid "Name"
 msgstr "名称"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:17
-msgid "Name of the new interface"
-msgstr "新接口的名称"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1808
 msgid "Name of the new network"
 msgstr "新网络的名称"
 
@@ -3331,9 +3425,10 @@ msgstr "新网络的名称"
 msgid "Navigation"
 msgstr "导航"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:62
+#: modules/luci-base/luasrc/controller/admin/index.lua:69
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:108
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:402
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:834
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1957
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:389
 #: modules/luci-mod-status/luasrc/view/admin_status/index/30-network.htm:8
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:73
@@ -3345,7 +3440,7 @@ msgstr "网络"
 msgid "Network Utilities"
 msgstr "网络工具"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:278
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:279
 msgid "Network boot image"
 msgstr "网络启动镜像"
 
@@ -3358,53 +3453,59 @@ msgstr "网络设备不存在"
 msgid "Network without interfaces."
 msgstr "无接口的网络。"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:661
+msgid "New interface name…"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:11
 msgid "Next »"
 msgstr "前进 »"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1507
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1754
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:108
 msgid "No"
 msgstr "无"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:453
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:514
 msgid "No DHCP Server configured for this interface"
 msgstr "本接口未配置 DHCP 服务器"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1162
+msgid "No Encryption"
+msgstr ""
+
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:89
 msgid "No NAT-T"
 msgstr "无 NAT-T"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:198
+msgid "No data received"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1764
+msgid "No entries in this directory"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/backupfiles.lua:82
 msgid "No files found"
 msgstr "未找到文件"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:550
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:191
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:180
 msgid "No information available"
 msgstr "无可用信息"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:8
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:63
 msgid "No matching prefix delegation"
 msgstr "无匹配的前缀委托"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:157
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
 msgid "No negative cache"
 msgstr "禁用无效信息缓存"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:53
-msgid "No network configured on this device"
-msgstr "本设备未配置网络"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:65
-msgid "No network name specified"
-msgstr "未指定网络名"
-
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:147
-msgid "No networks in range"
-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
@@ -3412,7 +3513,12 @@ msgstr ""
 msgid "No password set!"
 msgstr "未设置密码！"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:116
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:104
+msgid "No peers defined yet"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:129
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:271
 msgid "No public keys present yet."
 msgstr "当前还没有公钥。"
 
@@ -3420,19 +3526,19 @@ msgstr "当前还没有公钥。"
 msgid "No rules in this chain."
 msgstr "本链没有规则"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:150
-msgid "No scan results available yet..."
-msgstr "还没有可用的扫描结果…"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:53
+msgid "No signal"
+msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:7
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:756
 msgid "No zone assigned"
 msgstr "未指定区域"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:111
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:35
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:48
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:133
 msgid "Noise"
 msgstr "噪声"
 
@@ -3448,16 +3554,16 @@ msgstr "噪声："
 msgid "Non Pre-emtive CRC errors (CRC_P)"
 msgstr "非抢占 CRC 错误（CRC_P）"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:292
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:293
 msgid "Non-wildcard"
 msgstr "非全部地址"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:129
 msgid "None"
 msgstr "无"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:181
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:172
 msgid "Normal"
 msgstr "正常"
 
@@ -3465,25 +3571,29 @@ msgstr "正常"
 msgid "Not Found"
 msgstr "未找到"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:27
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:5
-msgid "Not associated"
-msgstr "未关联"
-
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:87
 msgid "Not connected"
 msgstr "未连接"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:38
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:139
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:232
+msgid "Not present"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:105
 msgid "Not started on boot"
 msgstr "开机时不启动"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:26
-msgid "Note: interface name length"
-msgstr "注意：接口名称长度"
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:201
+msgid "Not supported"
+msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:171
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:162
 msgid "Notice"
 msgstr "注意"
 
@@ -3491,61 +3601,50 @@ msgstr "注意"
 msgid "Nslookup"
 msgstr "Nslookup"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:261
 msgid "Number of cached DNS entries (max is 10000, 0 is no caching)"
 msgstr "缓存的 DNS 条目数量（最大 10000，0 表示不缓存）"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:203
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:194
 msgid "Number of parallel threads used for compression"
 msgstr "用于压缩的并行线程数"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:40
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:69
 msgid "Obfuscated Group Password"
 msgstr "混淆组密码"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:35
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:61
 msgid "Obfuscated Password"
 msgstr "混淆密码"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:22
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:34
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:40
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:105
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:97
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:49
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:80
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:54
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:67
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:93
 msgid "Obtain IPv6-Address"
 msgstr "获取 IPv6 地址"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:83
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:68
 msgid "Off-State Delay"
 msgstr "关闭时间"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:16
-msgid ""
-"On this page you can configure the network interfaces. You can bridge "
-"several interfaces by ticking the \"bridge interfaces\" field and enter the "
-"names of several network interfaces separated by spaces. You can also use "
-"<abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
-"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
-"<samp>eth0.1</samp>)."
-msgstr ""
-"在此页面，您可以配置网络接口。您可以勾选“桥接接口”，并输入由空格分隔的多个网"
-"络接口的名称来桥接多个接口。接口名称中可以使用 <abbr title=\"Virtual Local "
-"Area Network\">VLAN</abbr> 记号 <samp>INTERFACE.VLANNR</samp>（例如："
-"<samp>eth0.1</samp>）。"
-
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:95
 msgid "On-Link route"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:80
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:64
 msgid "On-State Delay"
 msgstr "通电时间"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:360
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:382
 msgid "One of hostname or mac address must be specified!"
 msgstr "请指定主机名或MAC地址！"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:456
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:462
 msgid "One of the following: %s"
 msgstr ""
 
@@ -3567,35 +3666,36 @@ msgstr "一个或多个必选项值为空！"
 msgid "Open list..."
 msgstr "打开列表…"
 
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:61
 #: protocols/luci-proto-openconnect/luasrc/model/network/proto_openconnect.lua:9
 msgid "OpenConnect (CISCO AnyConnect)"
 msgstr "OpenConnect (CISCO AnyConnect)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:757
 msgid "Operating frequency"
 msgstr "工作频率"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1753
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2306
 msgid "Option changed"
 msgstr "选项已更改"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1755
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2308
 msgid "Option removed"
 msgstr "选项已移除"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1140
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:55
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1535
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:66
 msgid "Optional"
 msgstr "可选"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:78
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:76
 msgid ""
 "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, "
 "starting with <code>0x</code>."
 msgstr ""
 "可选，传出加密数据包的 32 位标记。请输入十六进制值，以 <code>0x</code> 开头。"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:144
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:215
 msgid ""
 "Optional. Allowed values: 'eui64', 'random', fixed value like '::1' or "
 "'::1:2'. When IPv6 prefix (like 'a:b:c:d::') is received from a delegating "
@@ -3606,35 +3706,35 @@ msgstr ""
 "权服务器获取到 IPv6 前缀（如“a:b:c:d::”），使用后缀（如 “::1”）合成 IPv6 地址"
 "（“a:b:c:d::1”）分配给此接口。"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:123
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:117
 msgid ""
 "Optional. Base64-encoded preshared key. Adds in an additional layer of "
 "symmetric-key cryptography for post-quantum resistance."
 msgstr "可选，Base64 编码的预共享密钥。"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:148
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:126
 msgid "Optional. Create routes for Allowed IPs for this peer."
 msgstr "可选，为此 Peer 创建允许 IP 的路由。"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:103
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:108
 msgid "Optional. Description of peer."
 msgstr "可选，Peer 的描述。"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:156
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:128
 msgid ""
 "Optional. Host of peer. Names are resolved prior to bringing up the "
 "interface."
 msgstr "可选，Peer 的主机。"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:67
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:71
 msgid "Optional. Maximum Transmission Unit of tunnel interface."
 msgstr "可选，隧道接口的最大传输单元。"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:166
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:132
 msgid "Optional. Port of peer."
 msgstr "可选，Peer 的端口。"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:175
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:136
 msgid ""
 "Optional. Seconds between keep alive messages. Default is 0 (disabled). "
 "Recommended value if this device is behind a NAT is 25."
@@ -3642,7 +3742,7 @@ msgstr ""
 "可选，Keep-Alive 消息之间的秒数，默认为 0（禁用）。如果此设备位于 NAT 之后，"
 "建议使用的值为 25。"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:31
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:54
 msgid "Optional. UDP port used for outgoing and incoming packets."
 msgstr "可选，用于传出和传入数据包的 UDP 端口。"
 
@@ -3663,7 +3763,7 @@ msgstr "出口"
 msgid "Outbound:"
 msgstr "出站："
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:26
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:50
 msgid "Output Interface"
 msgstr "网络出口"
 
@@ -3672,51 +3772,51 @@ msgstr "网络出口"
 msgid "Output zone"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:63
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:155
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:33
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:54
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:54
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:219
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:50
 msgid "Override MAC address"
 msgstr "重设 MAC 地址"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:66
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:35
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:56
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:88
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:125
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:131
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:133
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:104
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:61
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:58
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:223
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:44
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:54
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:154
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:71
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:145
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:132
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:110
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:119
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:97
 msgid "Override MTU"
 msgstr "重设 MTU"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:30
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:63
 msgid "Override TOS"
 msgstr "重设 TOS"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:25
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:58
 msgid "Override TTL"
 msgstr "重设 TTL"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:954
 msgid "Override default interface name"
 msgstr "重设默认接口名称"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:41
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:167
 msgid "Override the gateway in DHCP responses"
 msgstr "重设 DHCP 响应网关"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:507
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:555
 msgid ""
 "Override the netmask sent to clients. Normally it is calculated from the "
 "subnet that is served."
 msgstr "重设发送到客户端的子网掩码。"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:65
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:179
 msgid "Override the table used for internal routes"
 msgstr "重设内部路由表"
 
@@ -3724,29 +3824,33 @@ msgstr "重设内部路由表"
 msgid "Overview"
 msgstr "总览"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1606
+msgid "Overwrite existing file \"%s\" ?"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:11
 msgid "Owner"
 msgstr "用户名"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:42
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:56
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:17
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:28
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:34
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:14
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:18
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:43
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:98
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:45
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:44
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:63
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:82
 msgid "PAP/CHAP password"
 msgstr "PAP/CHAP 密码"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:39
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:53
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:14
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:11
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:15
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:96
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:88
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:43
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:74
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:42
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:61
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:77
 msgid "PAP/CHAP username"
 msgstr "PAP/CHAP 用户名"
 
@@ -3754,9 +3858,9 @@ msgstr "PAP/CHAP 用户名"
 msgid "PID"
 msgstr "PID"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:36
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:50
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:26
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:95
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:87
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:68
 msgid "PIN"
 msgstr "PIN"
 
@@ -3765,114 +3869,116 @@ msgstr "PIN"
 msgid "PIN code rejected"
 msgstr "PIN 码被拒绝"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:966
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1372
 msgid "PMK R1 Push"
 msgstr "R1 推送 PMK"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:43
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:13
 msgid "PPP"
 msgstr "PPP"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:11
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:58
 msgid "PPPoA Encapsulation"
 msgstr "PPPoA 封包"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:19
 msgid "PPPoATM"
 msgstr "PPPoATM"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:17
 msgid "PPPoE"
 msgstr "PPPoE"
 
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:28
 #: protocols/luci-proto-pppossh/luasrc/model/network/proto_pppossh.lua:9
 msgid "PPPoSSH"
 msgstr "PPPoSSH"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:15
 msgid "PPtP"
 msgstr "PPtP"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:59
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:73
 msgid "PSID offset"
 msgstr "PSID 偏移"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:56
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:70
 msgid "PSID-bits length"
 msgstr "PSID-位长"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:123
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:846
 msgid "PTM/EFM (Packet Transfer Mode)"
 msgstr "PTM/EFM（分组传输模式）"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:78
-msgid "Package libiwinfo required!"
-msgstr "需要 libiwinfo 软件包！"
-
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:45
 msgid "Packets"
 msgstr "数据包"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:7
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:756
 msgid "Part of zone %q"
 msgstr "区域 %q"
 
 #: modules/luci-base/luasrc/view/sysauth.htm:29
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1111
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:35
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:42
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1514
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:46
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:104
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:58
 msgid "Password"
 msgstr "密码"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:29
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:24
 msgid "Password authentication"
 msgstr "密码验证"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1019
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1414
 msgid "Password of Private Key"
 msgstr "私有密钥"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1067
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1471
 msgid "Password of inner Private Key"
 msgstr "内部私钥的密码"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:14
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:16
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:18
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:20
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:32
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:34
 msgid "Password strength"
 msgstr "密码强度"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:44
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:107
 msgid "Password2"
 msgstr "密码 2"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:37
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:244
 msgid "Paste or drag SSH key file…"
 msgstr "粘贴或拖动 SSH 密钥文件……"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1000
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1396
 msgid "Path to CA-Certificate"
 msgstr "CA 证书路径"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1007
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1402
 msgid "Path to Client-Certificate"
 msgstr "客户端证书路径"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1013
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1408
 msgid "Path to Private Key"
 msgstr "私钥路径"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1049
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1453
 msgid "Path to inner CA-Certificate"
 msgstr "内部 CA 证书的路径"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1055
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1459
 msgid "Path to inner Client-Certificate"
 msgstr "内部客户端证书的路径"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1061
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1465
 msgid "Path to inner Private Key"
 msgstr "内部私钥的路径"
 
@@ -3890,7 +3996,7 @@ msgstr "内部私钥的路径"
 msgid "Peak:"
 msgstr "峰值："
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:28
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:89
 msgid "Peer IP address to assign"
 msgstr "要分配的 Peer IP 地址"
 
@@ -3899,11 +4005,11 @@ msgstr "要分配的 Peer IP 地址"
 msgid "Peer address is missing"
 msgstr "Peer 地址缺失"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:90
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:89
 msgid "Peers"
 msgstr "Peers"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:50
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:80
 msgid "Perfect Forward Secrecy"
 msgstr "完全正向保密"
 
@@ -3915,7 +4021,11 @@ msgstr "执行重启"
 msgid "Perform reset"
 msgstr "执行重置"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:174
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:199
+msgid "Permission denied"
+msgstr ""
+
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:136
 msgid "Persistent Keep Alive"
 msgstr "持续 Keep-Alive"
 
@@ -3923,7 +4033,7 @@ msgstr "持续 Keep-Alive"
 msgid "Phy Rate:"
 msgstr "物理速率："
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:190
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:277
 msgid "Physical Settings"
 msgstr "物理设置"
 
@@ -3934,6 +4044,10 @@ msgstr "Ping"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:16
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:17
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:41
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:77
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:87
@@ -3951,15 +4065,19 @@ msgstr "请输入用户名和密码。"
 msgid "Policy"
 msgstr "策略"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:22
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:20
 msgid "Port"
 msgstr "端口"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:18
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:133
+msgid "Port %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:274
 msgid "Port status:"
 msgstr "端口状态："
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:482
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:488
 msgid "Potential negation of: %s"
 msgstr ""
 
@@ -3971,11 +4089,11 @@ msgstr "电源管理模式"
 msgid "Pre-emtive CRC errors (CRCP_P)"
 msgstr "抢占式 CRC 错误（CRCP_P）"
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:32
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:73
 msgid "Prefer LTE"
 msgstr "首选 LTE"
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:33
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:74
 msgid "Prefer UMTS"
 msgstr "首选 UMTS"
 
@@ -3983,31 +4101,30 @@ msgstr "首选 UMTS"
 msgid "Prefix Delegated"
 msgstr "分发前缀"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:122
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:117
 msgid "Preshared Key"
 msgstr "预共享密钥"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:101
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:75
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:81
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:75
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:54
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:74
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:131
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:102
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:89
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:112
 msgid ""
 "Presume peer to be dead after given amount of LCP echo failures, use 0 to "
 "ignore failures"
 msgstr "在指定数量的 LCP 响应故障后假定链路已断开，0 为忽略故障"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:305
 msgid "Prevent listening on these interfaces."
 msgstr "不监听这些接口。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:509
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:562
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:950
 msgid "Prevents client-to-client communication"
 msgstr "禁止客户端间通信"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:18
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:49
 msgid "Private Key"
 msgstr "私钥"
 
@@ -4028,39 +4145,33 @@ msgstr "配置文件"
 msgid "Prot."
 msgstr "协议"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:72
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:349
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:675
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:84
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:216
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:87
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:390
 msgid "Protocol"
 msgstr "协议"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:31
-msgid "Protocol of the new interface"
-msgstr "新接口的协议"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:222
-msgid "Protocol support is not installed"
-msgstr "未安装协议支持"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:269
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:260
 msgid "Provide NTP server"
 msgstr "作为 NTP 服务器提供服务"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:701
 msgid "Provide new network"
 msgstr "添加新网络"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:451
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:879
 msgid "Pseudo Ad-Hoc (ahdemo)"
 msgstr "伪装 Ad-Hoc（ahdemo）"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:112
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:113
 msgid "Public Key"
 msgstr "公钥"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:278
 msgid ""
 "Public keys allow for the passwordless SSH logins with a higher security "
 "compared to the use of plain passwords. In order to upload a new key to the "
@@ -4070,48 +4181,49 @@ msgstr ""
 "与使用普通密码相比，公钥允许无密码 SSH 登录具有更高的安全性。要将新密钥上传到"
 "设备，请粘贴 OpenSSH 兼容的公钥行或将 <code>.pub</code> 文件拖到输入字段中。"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:139
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:211
 msgid "Public prefix routed to this device for distribution to clients."
 msgstr "分配到此设备的公共前缀，用以分发到客户端。"
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:27
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:9
 msgid "QMI Cellular"
 msgstr "QMI 蜂窝"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:173
 msgid "Quality"
 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:171
 msgid ""
 "Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> "
 "servers"
 msgstr ""
 "查询所有可用的上游 <abbr title=\"Domain Name System\">DNS</abbr> 服务器"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:952
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1360
 msgid "R0 Key Lifetime"
 msgstr "R0 密钥生存期"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:959
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1366
 msgid "R1 Key Holder"
 msgstr "R1 密钥持有者"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:58
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:88
 msgid "RFC3947 NAT-T mode"
 msgstr "RFC3947 NAT-T 模式"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:381
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:814
 msgid "RSSI threshold for joining"
 msgstr "RSSI 加入阈值"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:256
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:597
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:778
 msgid "RTS/CTS Threshold"
 msgstr "RTS/CTS 阈值"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:41
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:76
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:87
 msgid "RX"
@@ -4121,35 +4233,39 @@ msgstr "接收"
 msgid "RX Rate"
 msgstr "接收速率"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:783
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1961
+msgid "RX Rate / TX Rate"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1207
 msgid "Radius-Accounting-Port"
 msgstr "Radius 计费端口"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:791
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1215
 msgid "Radius-Accounting-Secret"
 msgstr "Radius 计费密钥"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:775
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1199
 msgid "Radius-Accounting-Server"
 msgstr "Radius 计费服务器"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:759
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1183
 msgid "Radius-Authentication-Port"
 msgstr "Radius 认证端口"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:767
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1191
 msgid "Radius-Authentication-Secret"
 msgstr "Radius 认证密钥"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:751
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1175
 msgid "Radius-Authentication-Server"
 msgstr "Radius 认证服务器"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:119
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:102
 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:83
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:84
 msgid ""
 "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-Server"
@@ -4164,19 +4280,11 @@ msgid ""
 msgstr ""
 "确定要删除此接口？删除操作无法撤消！若您删除此接口，可能导致无法再访问此设备"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2
-msgid ""
-"Really delete this wireless network? The deletion cannot be undone! You "
-"might lose access to this device if you are connected via this network."
-msgstr ""
-"确定要删除此无线网络？删除操作无法撤销！若您删除此无线网络，可能导致无法再访"
-"问此设备。"
-
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:40
 msgid "Really reset all changes?"
 msgstr "确定要放弃所有更改？"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:237
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:354
 msgid "Really switch protocol?"
 msgstr "确定要切换协议？"
 
@@ -4200,15 +4308,15 @@ msgstr "实时流量"
 msgid "Realtime Wireless"
 msgstr "实时无线"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:931
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1343
 msgid "Reassociation Deadline"
 msgstr "重关联截止时间"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:191
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
 msgid "Rebind protection"
 msgstr "重绑定保护"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:48
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:46
 #: modules/luci-mod-system/luasrc/view/admin_system/reboot.htm:9
 msgid "Reboot"
 msgstr "重启"
@@ -4222,21 +4330,15 @@ msgstr "正在重启…"
 msgid "Reboots the operating system of your device"
 msgstr "重启您设备上的系统"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:103
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:90
 msgid "Receive"
 msgstr "接收"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:325
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:350
-msgid "Receiver Antenna"
-msgstr "接收天线"
-
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:42
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:59
 msgid "Recommended. IP addresses of the WireGuard interface."
 msgstr "推荐，WireGuard 接口的 IP 地址。"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:28
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:300
 msgid "Reconnect this interface"
 msgstr "重连此接口"
 
@@ -4244,73 +4346,71 @@ msgstr "重连此接口"
 msgid "References"
 msgstr "引用"
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:39
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:153
 msgid "Relay"
 msgstr "中继"
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:36
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:157
 msgid "Relay Bridge"
 msgstr "中继桥"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:17
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:154
 msgid "Relay between networks"
 msgstr "网络间中继"
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:64
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:12
 msgid "Relay bridge"
 msgstr "中继桥"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:18
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:50
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:49
 msgid "Remote IPv4 address"
 msgstr "远程 IPv4 地址"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:8
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:40
 msgid "Remote IPv4 address or FQDN"
 msgstr "远程 IPv4 地址或 FQDN"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:45
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:725
 msgid "Remove"
 msgstr "移除"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:53
-msgid "Repeat scan"
-msgstr "重新扫描"
-
-#: modules/luci-base/luasrc/view/cbi/upload.htm:11
-msgid "Replace entry"
-msgstr "重置条目"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:46
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:51
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1806
 msgid "Replace wireless configuration"
 msgstr "重置无线配置"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:8
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:17
 msgid "Request IPv6-address"
 msgstr "请求 IPv6 地址"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:16
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:23
 msgid "Request IPv6-prefix of length"
 msgstr "请求指定长度的 IPv6 前缀"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1141
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:200
+msgid "Request timeout"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1536
 msgid "Required"
 msgstr "必须"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:20
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:31
 msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3"
 msgstr "某些 ISP 需要，例如：同轴线网络 DOCSIS 3"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:19
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:49
 msgid "Required. Base64-encoded private key for this interface."
 msgstr "必须，此接口的 Base64 编码私钥。"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:113
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:113
 msgid "Required. Base64-encoded public key of peer."
 msgstr "必须，Peer 的 Base64 编码公钥。"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:136
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:122
 msgid ""
 "Required. IP addresses and prefixes that this peer is allowed to use inside "
 "the tunnel. Usually the peer's tunnel IP addresses and the networks the peer "
@@ -4319,7 +4419,27 @@ msgstr ""
 "必须，允许该 Peer 在隧道中使用的 IP 地址和前缀，通常是该 Peer 的隧道 IP 地址"
 "和通过隧道的路由网络。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1134
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1095
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1096
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1097
+msgid "Requires hostapd"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1101
+msgid "Requires hostapd with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1102
+msgid "Requires hostapd with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1098
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1099
+msgid "Requires hostapd with SAE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1533
 msgid ""
 "Requires the 'full' version of wpad/hostapd and support from the wifi driver "
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
@@ -4327,13 +4447,37 @@ msgstr ""
 "需要完整版本的 wpad/hostapd，并且 WiFi 驱动支持<br />（截止 2019.01，已知支持"
 "此特性的驱动有 ath9k、ath10k、mwlwifi 和 mt76）"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:141
 msgid ""
 "Requires upstream supports DNSSEC; verify unsigned domain responses really "
 "come from unsigned domains"
 msgstr "需要上级支持 DNSSEC，验证未签名的响应确实是来自未签名的域名"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1268
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1109
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1119
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1120
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1121
+msgid "Requires wpa-supplicant"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1113
+msgid "Requires wpa-supplicant with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1114
+msgid "Requires wpa-supplicant with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1111
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1124
+msgid "Requires wpa-supplicant with SAE support"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1355
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:17
 #: modules/luci-base/luasrc/view/cbi/footer.htm:30
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:66
@@ -4349,17 +4493,22 @@ msgstr "复位计数器"
 msgid "Reset to defaults"
 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:68
 msgid "Resolv and Hosts Files"
 msgstr "HOSTS 和解析文件"
 
-#: 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:94
 msgid "Resolve file"
 msgstr "解析文件"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:28
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:14
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:71
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:197
+msgid "Resource not found"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:302
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:693
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:90
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:112
 msgid "Restart"
 msgstr "重启"
 
@@ -4367,7 +4516,7 @@ msgstr "重启"
 msgid "Restart Firewall"
 msgstr "重启防火墙"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:14
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:691
 msgid "Restart radio interface"
 msgstr "重启无线接口"
 
@@ -4379,26 +4528,24 @@ msgstr "恢复"
 msgid "Restore backup"
 msgstr "恢复配置"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:113
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:114
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:38
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:46
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:119
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:120
 msgid "Reveal/hide password"
 msgstr "显示/隐藏 密码"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1774
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2322
 msgid "Revert"
 msgstr "恢复"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1861
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2405
 msgid "Revert changes"
 msgstr "恢复更改"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2013
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2554
 msgid "Revert request failed with status <code>%h</code>"
 msgstr "恢复请求失败，状态 <code>%h</code>"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1993
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2534
 msgid "Reverting configuration…"
 msgstr "正在恢复配置…"
 
@@ -4406,7 +4553,7 @@ msgstr "正在恢复配置…"
 msgid "Root"
 msgstr "Root"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:271
 msgid "Root directory for files served via TFTP"
 msgstr "TFTP 服务器的根目录"
 
@@ -4414,7 +4561,7 @@ msgstr "TFTP 服务器的根目录"
 msgid "Root preparation"
 msgstr "根目录准备"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:147
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:126
 msgid "Route Allowed IPs"
 msgstr "路由允许的 IP"
 
@@ -4426,12 +4573,12 @@ msgstr ""
 msgid "Route type"
 msgstr "路由类型"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:523
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:577
 msgid "Router Advertisement-Service"
 msgstr "路由通告服务"
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:43
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:15
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:27
 msgid "Router Password"
 msgstr "主机密码"
 
@@ -4459,7 +4606,7 @@ msgstr "挂载设备前运行文件系统检查"
 msgid "Run filesystem check"
 msgstr "文件系统检查"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:651
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:669
 msgid "Runtime error"
 msgstr ""
 
@@ -4471,31 +4618,31 @@ msgstr "SHA256"
 msgid "SNR"
 msgstr "SNR"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:5
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:18
 msgid "SSH Access"
 msgstr "SSH 访问"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:10
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:70
 msgid "SSH server address"
 msgstr "SSH 服务器地址"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:13
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:74
 msgid "SSH server port"
 msgstr "SSH 服务器端口"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:8
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:58
 msgid "SSH username"
 msgstr "SSH 用户名"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:27
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:277
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
 msgid "SSH-Keys"
 msgstr "SSH 密钥"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:42
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:73
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:29
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1617
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:174
 msgid "SSID"
 msgstr "SSID"
@@ -4504,17 +4651,17 @@ msgstr "SSID"
 msgid "SWAP"
 msgstr "交换分区"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1127
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1262
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1379
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1351
 #: modules/luci-base/luasrc/view/cbi/error.htm:17
 #: modules/luci-base/luasrc/view/cbi/footer.htm:26
 #: modules/luci-base/luasrc/view/cbi/header.htm:17
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:54
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:133
 msgid "Save"
 msgstr "保存"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1256
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1768
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1347
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2318
 #: modules/luci-base/luasrc/view/cbi/footer.htm:22
 msgid "Save & Apply"
 msgstr "保存并应用"
@@ -4527,28 +4674,20 @@ msgstr "保存 mtdblock"
 msgid "Save mtdblock contents"
 msgstr "保存 mtdblock 内容"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
-msgid "Saving keys…"
-msgstr "正在保存密钥…"
-
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:698
 msgid "Scan"
 msgstr "扫描"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:109
-msgid "Scan request failed"
-msgstr "扫描请求失败"
-
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:8
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:39
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:23
 msgid "Scheduled Tasks"
 msgstr "计划任务"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1749
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2302
 msgid "Section added"
 msgstr "添加的节点"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1751
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2304
 msgid "Section removed"
 msgstr "移除的节点"
 
@@ -4565,47 +4704,49 @@ msgstr ""
 "即使映像文件检查失败，也“强制升级”以烧录映像。仅在您确定固件正确且适用于您的"
 "设备时使用！"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:119
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:90
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:96
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:90
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:69
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:92
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1516
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1646
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1809
+msgid "Select file…"
+msgstr ""
+
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:144
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:102
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:125
 msgid ""
 "Send LCP echo requests at the given interval in seconds, only effective in "
 "conjunction with failure threshold"
 msgstr "定时发送 LCP 响应（秒），仅在结合了故障阈值时有效"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:561
-msgid "Separate Clients"
-msgstr "隔离客户端"
-
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:62
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:63
 msgid "Server Settings"
 msgstr "服务器设置"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:26
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:50
 msgid "Service Name"
 msgstr "服务名"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:25
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:30
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:87
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:71
 msgid "Service Type"
 msgstr "服务类型"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:55
+#: modules/luci-base/luasrc/controller/admin/index.lua:62
 msgid "Services"
 msgstr "服务"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:815
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:861
 msgid "Session expired"
 msgstr "会话已过期"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:83
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:107
 msgid "Set VPN as Default Route"
 msgstr "将 VPN 设置为默认路由"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:258
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:795
 msgid ""
 "Set interface properties regardless of the link carrier (If set, carrier "
 "sense events do not invoke hotplug handlers)."
@@ -4613,15 +4754,18 @@ msgstr ""
 "不管接口的链路状态如何，总是用应用设置（如果勾选，链路状态变更将不再触发 "
 "hotplug 事件处理）。"
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:23
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:55
 msgid "Setting PLMN failed"
 msgstr "设置 PLMN 失败"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:26
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:68
 msgid "Setting operation mode failed"
 msgstr "设置操作模式失败"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:454
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:517
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:527
 msgid "Setup DHCP Server"
 msgstr "配置 DHCP 服务器"
 
@@ -4633,7 +4777,7 @@ msgstr "严重误码秒（SES）"
 msgid "Short GI"
 msgstr "Short GI"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:516
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:960
 msgid "Short Preamble"
 msgstr "Short Preamble"
 
@@ -4645,21 +4789,23 @@ msgstr "显示当前备份文件列表"
 msgid "Show empty chains"
 msgstr "显示空链"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:306
 msgid "Shutdown this interface"
 msgstr "关闭此接口"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:111
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:34
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:47
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:132
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1616
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:173
 msgid "Signal"
 msgstr "信号"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1960
+msgid "Signal / Noise"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:125
 msgid "Signal Attenuation (SATN)"
 msgstr "信号衰减（SATN）"
@@ -4672,11 +4818,11 @@ msgstr "信号："
 msgid "Size"
 msgstr "大小"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:259
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:260
 msgid "Size of DNS query cache"
 msgstr "DNS 查询缓存的大小"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:191
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
 msgid "Size of the ZRam device in megabytes"
 msgstr "ZRam 设备的大小（以兆字节为单位）"
 
@@ -4693,11 +4839,7 @@ msgstr "跳到内容"
 msgid "Skip to navigation"
 msgstr "跳转到导航"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:335
-msgid "Slot time"
-msgstr "时隙"
-
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1640
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1846
 #: modules/luci-base/luasrc/model/network.lua:1427
 msgid "Software VLAN"
 msgstr "软件 VLAN"
@@ -4737,61 +4879,65 @@ msgstr ""
 msgid "Specifies the directory the device is attached to"
 msgstr "指定设备的挂载目录"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:23
-msgid "Specifies the listening port of this <em>Dropbear</em> instance"
-msgstr "指定此 <em>Dropbear</em> 实例的监听端口"
-
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:57
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:175
 msgid ""
 "Specifies the maximum amount of failed ARP requests until hosts are presumed "
 "to be dead"
 msgstr "判定主机已下线的最少 ARP 请求失败数"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:49
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:171
 msgid ""
 "Specifies the maximum amount of seconds after which hosts are presumed to be "
 "dead"
 msgstr "判断主机已下线的超时时间（秒）"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:761
+msgid ""
+"Specifies the maximum transmit power the wireless radio may use. Depending "
+"on regulatory requirements and wireless usage, the actual transmit power may "
+"be reduced by the driver."
+msgstr ""
+
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:63
 msgid "Specify a TOS (Type of Service)."
 msgstr "指定 TOS（服务类型）。"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:25
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:58
 msgid ""
 "Specify a TTL (Time to Live) for the encapsulating packet other than the "
 "default (64)."
 msgstr "为封装数据包设置 TTL（生存时间），缺省值：64"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:53
 msgid ""
 "Specify an MTU (Maximum Transmission Unit) other than the default (1280 "
 "bytes)."
 msgstr "设置 MTU（最大传输单位），缺省值：1280 bytes"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:60
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "Specify the secret encryption key here."
 msgstr "在此指定密钥。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:475
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:64
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:533
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:89
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:111
 msgid "Start"
 msgstr "开始"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:33
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:86
 msgid "Start priority"
 msgstr "启动优先级"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1958
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2499
 msgid "Starting configuration apply…"
 msgstr "开始应用配置…"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1626
 msgid "Starting wireless scan..."
 msgstr "正在启动无线扫描…"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:24
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:120
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
 msgid "Startup"
 msgstr "启动项"
 
@@ -4803,20 +4949,21 @@ msgstr "静态 IPv4 路由"
 msgid "Static IPv6 Routes"
 msgstr "静态 IPv6 路由"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:70
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:71
 msgid "Static Leases"
 msgstr "静态地址分配"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:118
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:73
 msgid "Static Routes"
 msgstr "静态路由"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1194
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1384
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:172
 #: modules/luci-base/luasrc/model/network.lua:966
 msgid "Static address"
 msgstr "静态地址"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:308
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:309
 msgid ""
 "Static leases are used to assign fixed IP addresses and symbolic hostnames "
 "to DHCP clients. They are also required for non-dynamic interface "
@@ -4825,39 +4972,41 @@ msgstr ""
 "静态租约用于给 DHCP 客户端分配固定的 IP 地址和主机标识。只有指定的主机才能连"
 "接，并且接口须为非动态配置。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:534
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:977
 msgid "Station inactivity limit"
 msgstr "非活动站点限制"
 
 #: modules/luci-base/luasrc/controller/admin/index.lua:40
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:197
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:337
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:746
 #: modules/luci-mod-status/luasrc/view/admin_status/index.htm:128
 msgid "Status"
 msgstr "状态"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:35
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:75
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:308
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:91
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:113
 msgid "Stop"
 msgstr "关闭"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:165
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Strict order"
 msgstr "严谨查序"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:16
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:30
 msgid "Strong"
 msgstr "强"
 
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1843
 msgid "Submit"
 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:108
 msgid "Suppress logging"
 msgstr "不记录日志"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:109
 msgid "Suppress logging of the routine operation of these protocols"
 msgstr "不记录这些协议的常规操作日志。"
 
@@ -4869,42 +5018,44 @@ msgstr "Swap"
 msgid "Swap Entry"
 msgstr "Swap 节点"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:23
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:5
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:135
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:21
 msgid "Switch"
 msgstr "交换机"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:129
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:168
 msgid "Switch %q"
 msgstr "交换机 %q"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:128
-msgid "Switch %q (%s)"
-msgstr "交换机 %q（%s）"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:66
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:146
 msgid ""
 "Switch %q has an unknown topology - the VLAN settings might not be accurate."
 msgstr "交换机 %q 具有未知的拓扑结构，VLAN 设置可能不正确。"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:146
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:142
 msgid "Switch Port Mask"
 msgstr "交换机端口掩码"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1640
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1846
 #: modules/luci-base/luasrc/model/network.lua:1425
 msgid "Switch VLAN"
 msgstr "交换机 VLAN"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:238
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:355
 msgid "Switch protocol"
 msgstr "切换协议"
 
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:103
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:104
 #: modules/luci-base/luasrc/view/cbi/ipaddr.htm:26
 msgid "Switch to CIDR list notation"
 msgstr "切换到 CIDR 列表记法"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:77
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1547
+msgid "Symbolic link"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:71
 msgid "Sync with NTP-Server"
 msgstr "与 NTP 服务器同步"
 
@@ -4914,7 +5065,7 @@ msgstr "同步浏览器时间"
 
 #: modules/luci-base/luasrc/controller/admin/index.lua:47
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:14
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:102
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:94
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
 #: modules/luci-mod-system/luasrc/view/admin_system/applyreboot.htm:39
 msgid "System"
@@ -4925,11 +5076,11 @@ msgstr "系统"
 msgid "System Log"
 msgstr "系统日志"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:108
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:99
 msgid "System Properties"
 msgstr "系统属性"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:145
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:136
 msgid "System log buffer size"
 msgstr "系统日志缓冲区大小"
 
@@ -4937,15 +5088,17 @@ msgstr "系统日志缓冲区大小"
 msgid "TCP:"
 msgstr "TCP："
 
-#: 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:69
 msgid "TFTP Settings"
 msgstr "TFTP 设置"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:269
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
 msgid "TFTP server root"
 msgstr "TFTP 服务器根目录"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:17
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:77
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:88
 msgid "TX"
@@ -4968,7 +5121,7 @@ msgstr "表"
 msgid "Target"
 msgstr "对象"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:77
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:103
 msgid "Target network"
 msgstr "目标网络"
 
@@ -4976,43 +5129,24 @@ msgstr "目标网络"
 msgid "Terminate"
 msgstr "关闭"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:27
-msgid ""
-"The <em>Device Configuration</em> section covers physical settings of the "
-"radio hardware such as channel, transmit power or antenna selection which "
-"are shared among all defined wireless networks (if the radio hardware is "
-"multi-SSID capable). Per network settings like encryption or operation mode "
-"are grouped in the <em>Interface Configuration</em>."
-msgstr ""
-"“设备配置”区域可配置无线的硬件参数，比如：信道、发射功率或发射天线，如果此无"
-"线硬件支持多 SSID，则全部 SSID 共用此设备配置。“接口配置”区域则可配置接口各自"
-"参数，如工作模式、加密方式等。"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:79
-msgid ""
-"The <em>libiwinfo-lua</em> package is not installed. You must install this "
-"component for working wireless configuration!"
-msgstr "软件包 <em>libiwinfo-lua</em> 未安装，必须安装此组件以配置无线！"
-
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:66
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:77
 msgid ""
 "The HE.net endpoint update configuration changed, you must now use the plain "
 "username instead of the user ID!"
 msgstr "HE.net 客户端更新设置已经被改变，您现在必须使用用户名代替用户 ID！"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:8
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:40
 msgid ""
 "The IPv4 address or the fully-qualified domain name of the remote tunnel end."
 msgstr "远程隧道端的 IPv4 地址或完整域名。"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:27
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:38
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:59
 msgid ""
 "The IPv6 prefix assigned to the provider, usually ends with <code>::</code>"
 msgstr "运营商特定的 IPv6 前缀，通常以 <code>::</code> 为结尾"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:18
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1808
 msgid ""
 "The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
 "code> and <code>_</code>"
@@ -5028,7 +5162,7 @@ msgstr "备份存档似乎不是有效的 gzip 文件。"
 msgid "The configuration file could not be loaded due to the following error:"
 msgstr "由于以下错误，配置文件无法被加载："
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1849
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2396
 msgid ""
 "The device could not be reached within %d seconds after applying the pending "
 "changes, which caused the configuration to be rolled back for safety "
@@ -5046,6 +5180,12 @@ msgid ""
 "</abbr> <code>/dev/sda1</code>)"
 msgstr "存储器或分区的设备文件（例如：<code>/dev/sda1</code>）"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:612
+msgid ""
+"The existing wireless configuration needs to be changed for LuCI to function "
+"properly."
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:127
 msgid ""
 "The filesystem that was used to format the memory (<abbr title=\"for example"
@@ -5068,43 +5208,49 @@ msgstr ""
 msgid "The following rules are currently active on this system."
 msgstr "以下规则当前在系统中处于活动状态。"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:144
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:154
+msgid "The gateway address must not be a local IP address"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:154
 msgid "The given SSH public key has already been added."
 msgstr "已添加给定的 SSH 公钥。"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:150
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:160
 msgid ""
 "The given SSH public key is invalid. Please supply proper public RSA or "
 "ECDSA keys."
 msgstr "给定的 SSH 公钥无效。请提供适当的公共 RSA 或 ECDSA 密钥。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:67
-msgid "The given network name is not unique"
-msgstr "给定的网络名重复"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:664
+msgid "The interface name is already used"
+msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:52
-msgid ""
-"The hardware is not multi-SSID capable and the existing configuration will "
-"be replaced if you proceed."
-msgstr "本机的硬件不支持多 SSID，如果继续，现有配置将被替换。"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:670
+msgid "The interface name is too long"
+msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:43
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:31
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:55
 msgid ""
 "The length of the IPv4 prefix in bits, the remainder is used in the IPv6 "
 "addresses."
 msgstr "IPv4 前缀长度（位），其余的用在 IPv6 地址。"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:35
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:46
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:63
 msgid "The length of the IPv6 prefix in bits"
 msgstr "IPv6 前缀长度（位）"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:12
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:44
 msgid "The local IPv4 address over which the tunnel is created (optional)."
 msgstr "所创建隧道的本地 IPv4 地址（可选）。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:5
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1814
+msgid "The network name is already used"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:135
 msgid ""
 "The network ports on this device can be combined to several <abbr title="
 "\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
@@ -5118,22 +5264,21 @@ msgstr ""
 "abbr> 也常用于分割不同网段。默认通常是一条上行端口连接 ISP，其余端口为本地子"
 "网。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:77
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:395
-msgid "The selected protocol needs a device assigned"
-msgstr "所选的协议需要分配设备"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1149
+msgid "The selected %s mode is incompatible with %s encryption"
+msgstr ""
 
 #: modules/luci-base/luasrc/view/csrftoken.htm:11
 msgid "The submitted security token is invalid or already expired!"
 msgstr "提交的安全令牌无效或已过期！"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:274
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:272
 msgid ""
 "The system is erasing the configuration partition now and will reboot itself "
 "when finished."
 msgstr "系统正在擦除配置分区，完成后会自动重启。"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:195
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:193
 msgid ""
 "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
 "few minutes before you try to reconnect. It might be necessary to renew the "
@@ -5143,7 +5288,7 @@ msgstr ""
 "正在刷写系统…<br />切勿关闭电源！ DO NOT POWER OFF THE DEVICE!<br />等待数分"
 "钟后即可尝试重新连接到路由。您可能需要更改计算机的 IP 地址以重新连接。"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:15
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:80
 msgid "The system password has been successfully changed."
 msgstr "系统密码已更改成功。"
 
@@ -5153,7 +5298,7 @@ msgid ""
 "you choose the generic image format for your platform."
 msgstr "不支持所上传的映像文件格式，请选择适合当前平台的通用映像文件。"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:427
 msgid "There are no active leases"
 msgstr ""
 
@@ -5162,16 +5307,10 @@ msgstr ""
 msgid "There are no active leases."
 msgstr "没有已分配的租约。"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1973
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2514
 msgid "There are no changes to apply"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:204
-msgid ""
-"There is no device assigned yet, please attach a network device in the "
-"\"Physical Settings\" tab"
-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
@@ -5181,11 +5320,19 @@ msgid ""
 "protect the web interface and enable SSH."
 msgstr "尚未设置密码。请为 root 用户设置密码以保护主机并启用 SSH。"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:19
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:49
 msgid "This IPv4 address of the relay"
 msgstr "中继的 IPv4 地址"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1448
+msgid "This authentication type is not applicable to the selected EAP method."
+msgstr ""
+
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:54
+msgid "This does not look like a valid PEM file"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
 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 "
@@ -5201,26 +5348,26 @@ msgstr ""
 "系统升级时要保存的配置文件和目录的清单。目录 /etc/config/ 内更改过的文件以及"
 "部分其他配置会被自动保存。"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:74
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:81
 msgid ""
 "This is either the \"Update Key\" configured for the tunnel or the account "
 "password if no update key has been configured"
 msgstr "如果更新密钥没有设置的话，隧道的“更新密钥”或者账户密码必须填写。"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:82
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:127
 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 ""
 "此处为 /etc/rc.local 的内容。启动脚本插入到“exit 0”之前即可随系统启动运行。"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:27
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:54
 msgid ""
 "This is the local endpoint address assigned by the tunnel broker, it usually "
 "ends with <code>...:2/64</code>"
 msgstr "隧道代理分配的本地终端地址，通常以 <code>...:2/64</code> 结尾"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:79
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> in the local network"
@@ -5228,20 +5375,20 @@ msgstr ""
 "这是本地网络中唯一的 <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr> 服务器"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:73
 msgid "This is the plain username for logging into the account"
 msgstr "登录账户时填写的用户名"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:34
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:57
 msgid ""
 "This is the prefix routed to you by the tunnel broker for use by clients"
 msgstr "这是隧道代理分配给您的路由前缀，供客户端使用"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:9
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:41
 msgid "This is the system crontab in which scheduled tasks can be defined."
 msgstr "自定义系统 crontab 中的计划任务。"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:19
+#: 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 "这通常是隧道代理所管理的最近的 PoP 的地址"
@@ -5256,26 +5403,26 @@ msgstr "系统中正在运行的进程概况和它们的状态信息。"
 msgid "This page gives an overview over currently active network connections."
 msgstr "活跃的网络连接概况。"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:726
-#: modules/luci-base/htdocs/luci-static/resources/form.js:809
+#: modules/luci-base/htdocs/luci-static/resources/form.js:936
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1064
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:172
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:32
 msgid "This section contains no values yet"
 msgstr "尚无任何配置"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:114
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:105
 msgid "Time Synchronization"
 msgstr "时间同步"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:525
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:968
 msgid "Time interval for rekeying GTK"
 msgstr "重新加密 GTK 的时间间隔"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:128
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:119
 msgid "Timezone"
 msgstr "时区"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:825
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:871
 msgid "To login…"
 msgstr "去登录…"
 
@@ -5288,7 +5435,7 @@ msgstr ""
 "上传备份存档以恢复配置。要将固件恢复到初始状态，请单击“执行重置”（仅 "
 "squashfs 格式的固件有效）。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:835
 msgid "Tone"
 msgstr "Tone"
 
@@ -5312,55 +5459,41 @@ msgstr "流量"
 msgid "Transfer"
 msgstr "传输"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:595
-msgid "Transmission Rate"
-msgstr "传送速率"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:102
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:89
 msgid "Transmit"
 msgstr "传送"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:211
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:273
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:345
-msgid "Transmit Power"
-msgstr "无线电功率"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:318
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:349
-msgid "Transmitter Antenna"
-msgstr "传送天线"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:73
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:57
 msgid "Trigger"
 msgstr "触发器"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:98
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:84
 msgid "Trigger Mode"
 msgstr "触发模式"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:54
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:69
 msgid "Tunnel ID"
 msgstr "隧道 ID"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1643
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1849
 #: modules/luci-base/luasrc/model/network.lua:1430
 msgid "Tunnel Interface"
 msgstr "隧道接口"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:44
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:55
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:76
 msgid "Tunnel Link"
 msgstr "隧道链接"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:46
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:131
 msgid "Tx-Power"
 msgstr "传输功率"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:32
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:185
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:11
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:43
 msgid "Type"
 msgstr "类型"
 
@@ -5368,19 +5501,20 @@ msgstr "类型"
 msgid "UDP:"
 msgstr "UDP："
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:28
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:90
 msgid "UMTS only"
 msgstr "仅 UMTS（WCDMA）"
 
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:43
 #: protocols/luci-proto-3g/luasrc/model/network/proto_3g.lua:10
 msgid "UMTS/GPRS/EV-DO"
 msgstr "UMTS/GPRS/EV-DO"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:106
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:93
 msgid "USB Device"
 msgstr "USB 设备"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:122
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:110
 msgid "USB Ports"
 msgstr "USB 接口"
 
@@ -5410,10 +5544,12 @@ msgstr "无法确认上游接口"
 msgid "Unable to dispatch"
 msgstr "无法调度"
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:22
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:54
 msgid "Unable to obtain client ID"
 msgstr "无法获取客户端 ID"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:61
 msgid "Unable to resolve AFTR host name"
 msgstr "无法解析 AFTR 主机名"
@@ -5423,21 +5559,31 @@ msgstr "无法解析 AFTR 主机名"
 msgid "Unable to resolve peer host name"
 msgstr "无法解析 Pear 主机名"
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:33
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:68
+msgid "Unable to save contents: %s"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:132
 msgid "Unavailable Seconds (UAS)"
 msgstr "不可用秒数（UAS）"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1196
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1386
 #: modules/luci-base/luasrc/model/network.lua:970
 msgid "Unknown"
 msgstr "未知"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1349
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1539
 #: modules/luci-base/luasrc/model/network.lua:1137
 msgid "Unknown error (%s)"
 msgstr "未知错误（%s）"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1193
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:204
+msgid "Unknown error code"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1383
+#: modules/luci-base/htdocs/luci-static/resources/protocol/none.js:6
 #: modules/luci-base/luasrc/model/network.lua:964
 msgid "Unmanaged"
 msgstr "不配置协议"
@@ -5447,22 +5593,30 @@ msgstr "不配置协议"
 msgid "Unmount"
 msgstr "卸载分区"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:107
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:262
 msgid "Unnamed key"
 msgstr "未命名的密钥"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1708
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2261
 msgid "Unsaved Changes"
 msgstr "未保存的配置"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:202
+msgid "Unspecified error"
+msgstr ""
+
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:64
 msgid "Unsupported MAP type"
 msgstr "不支持的 MAP 类型"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:27
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:69
 msgid "Unsupported modem"
 msgstr "不支持的调制解调器"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:219
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:119
 msgid "Unsupported protocol type."
 msgstr "不支持的协议类型"
@@ -5484,56 +5638,70 @@ msgstr ""
 msgid "Upload archive..."
 msgstr "上传备份…"
 
-#: modules/luci-base/luasrc/view/cbi/upload.htm:8
-msgid "Uploaded File"
-msgstr "上传的文件"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1703
+msgid "Upload file"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1678
+msgid "Upload file…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1623
+msgid "Upload request failed: %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:613
+msgid ""
+"Upon pressing \"Continue\", anonymous \"wifi-iface\" sections will be "
+"assigned with a name in the form <em>wifinet#</em> and the network will be "
+"restarted to apply the updated configuration."
+msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:14
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:74
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:85
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:26
 msgid "Uptime"
 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:83
 msgid "Use <code>/etc/ethers</code>"
 msgstr "使用 <code>/etc/ethers</code> 配置"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:40
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:167
 msgid "Use DHCP gateway"
 msgstr "使用 DHCP 网关"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:33
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:85
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:34
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:98
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:46
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:65
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:38
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:58
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:124
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:39
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:116
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:59
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:103
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:64
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:77
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:100
 msgid "Use DNS servers advertised by peer"
-msgstr "使用对端通告的 DNS 服务器"
+msgstr "自动获取 DNS 服务器"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:227
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:233
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:479
 msgid "Use ISO/IEC 3166 alpha2 country codes."
 msgstr "参考 ISO/IEC 3166 alpha2 国家代码。"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:31
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:100
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:70
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:35
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:51
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:86
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:56
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:97
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:77
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:75
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:92
 msgid "Use MTU on tunnel interface"
 msgstr "隧道接口的 MTU"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:95
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:65
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:30
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:46
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:81
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:93
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:73
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:88
 msgid "Use TTL on tunnel interface"
 msgstr "隧道接口的 TTL"
 
@@ -5545,68 +5713,65 @@ msgstr "作为外部 overlay 使用（/overlay）"
 msgid "Use as root filesystem (/)"
 msgstr "作为根文件系统使用（/）"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:19
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:31
 msgid "Use broadcast flag"
 msgstr "使用广播标签"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:253
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:791
 msgid "Use builtin IPv6-management"
 msgstr "使用内置的 IPv6 管理"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:40
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:109
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:92
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:45
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:105
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:53
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:72
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:45
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:65
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:40
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:182
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:127
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:42
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:119
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:62
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:67
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:80
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:103
 msgid "Use custom DNS servers"
 msgstr "使用自定义的 DNS 服务器"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:26
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:70
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:16
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:28
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:84
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:24
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:50
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:23
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:43
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:116
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:33
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:74
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:97
 msgid "Use default gateway"
 msgstr "使用默认网关"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:48
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:164
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:77
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:24
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:88
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:58
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:23
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:39
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:74
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:90
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:38
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:57
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:30
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:50
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:45
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:227
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:119
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:51
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:88
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:68
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:52
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:70
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:83
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:111
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:149
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:67
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:111
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:98
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:72
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:85
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:108
 msgid "Use gateway metric"
 msgstr "使用网关跃点"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:64
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:179
 msgid "Use routing table"
 msgstr "使用路由表"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:309
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:310
 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 "
@@ -5622,11 +5787,11 @@ msgstr ""
 msgid "Used"
 msgstr "已用"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:848
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1273
 msgid "Used Key Slot"
 msgstr "启用密码组"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:913
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
 msgid ""
 "Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not "
 "needed with normal WPA(2)-PSK."
@@ -5634,67 +5799,68 @@ msgstr ""
 "用于两种不同的用途：RADIUS NAS ID 和 802.11r R0KH-ID，普通 WPA(2)-PSK 不需"
 "要。"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:48
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:110
 msgid "User certificate (PEM encoded)"
 msgstr "用户证书（PEM）"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:61
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:122
 msgid "User key (PEM encoded)"
 msgstr "用户密钥（PEM）"
 
 #: modules/luci-base/luasrc/view/sysauth.htm:23
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:41
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:32
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:102
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:56
 msgid "Username"
 msgstr "用户名"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:182
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:903
 msgid "VC-Mux"
 msgstr "VC-Mux"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:851
 msgid "VDSL"
 msgstr "VDSL"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:172
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:169
 msgid "VLANs on %q"
 msgstr "%q 上的 VLAN"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:171
-msgid "VLANs on %q (%s)"
-msgstr "%q（%s）上的 VLAN"
+#: modules/luci-base/luasrc/controller/admin/index.lua:55
+msgid "VPN"
+msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:18
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:42
 msgid "VPN Local address"
 msgstr "VPN 本地地址"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:22
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:46
 msgid "VPN Local port"
 msgstr "VPN 本地端口"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:15
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:11
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:15
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:58
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:39
 msgid "VPN Server"
 msgstr "VPN 服务器"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:18
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:96
 msgid "VPN Server port"
 msgstr "VPN 服务器端口"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:37
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:100
 msgid "VPN Server's certificate SHA1 hash"
 msgstr "VPN 服务器证书的 SHA1 哈希值"
 
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:9
 #: protocols/luci-proto-vpnc/luasrc/model/network/proto_vpnc.lua:9
 msgid "VPNC (CISCO 3000 (and others) VPN)"
 msgstr "VPNC（CISCO 3000 和其他 VPN）"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:44
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:73
 msgid "Vendor"
 msgstr "Vendor"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:60
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:52
 msgid "Vendor Class to send when requesting DHCP"
 msgstr "请求 DHCP 时发送的 Vendor Class 选项"
 
@@ -5702,41 +5868,37 @@ msgstr "请求 DHCP 时发送的 Vendor Class 选项"
 msgid "Verify"
 msgstr "验证"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:52
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:76
 msgid "Virtual dynamic interface"
 msgstr "虚拟动态接口"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:470
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:471
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:553
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:576
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:908
 msgid "WDS"
 msgstr "WDS"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:667
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1160
 msgid "WEP Open System"
 msgstr "WEP 开放式系统"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:668
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1161
 msgid "WEP Shared Key"
 msgstr "WEP 共享密钥"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "WEP passphrase"
 msgstr "WEP 密钥"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:503
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:566
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:945
 msgid "WMM Mode"
 msgstr "WMM 模式"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "WPA passphrase"
 msgstr "WPA 密钥"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:716
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:735
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:740
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1074
 msgid ""
 "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
 "and ad-hoc mode) to be installed."
@@ -5752,7 +5914,7 @@ msgstr "正在应用更改…"
 msgid "Waiting for command to complete..."
 msgstr "等待命令执行完成…"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1940
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2481
 msgid "Waiting for configuration to get applied… %ds"
 msgstr ""
 
@@ -5760,8 +5922,8 @@ msgstr ""
 msgid "Waiting for device..."
 msgstr "等待设备…"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:172
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:163
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:173
 msgid "Warning"
 msgstr "警告"
 
@@ -5769,11 +5931,11 @@ msgstr "警告"
 msgid "Warning: There are unsaved changes that will get lost on reboot!"
 msgstr "警告：一些未保存的配置将在重启后丢失！"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:20
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:34
 msgid "Weak"
 msgstr "å¼±"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:946
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1355
 msgid ""
 "When using a PSK, the PMK can be automatically generated. When enabled, the "
 "R0/R1 key options below are not applied. Disable this to use the R0 and R1 "
@@ -5783,78 +5945,85 @@ msgstr ""
 "R1 密钥则禁用此选项。"
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:383
 msgid "Width"
 msgstr "频宽"
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:17
 #: protocols/luci-proto-wireguard/luasrc/model/network/proto_wireguard.lua:9
 msgid "WireGuard VPN"
 msgstr "WireGuard VPN"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:58
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:40
 #: modules/luci-mod-status/luasrc/controller/admin/status.lua:28
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:14
 msgid "Wireless"
 msgstr "无线"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1631
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1837
 #: modules/luci-base/luasrc/model/network.lua:1418
 msgid "Wireless Adapter"
 msgstr "无线适配器"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1617
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2052
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1823
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2288
 #: modules/luci-base/luasrc/model/network.lua:1404
 #: modules/luci-base/luasrc/model/network.lua:1865
 msgid "Wireless Network"
 msgstr "无线网络"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:629
 msgid "Wireless Overview"
 msgstr "无线概况"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:362
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:797
 msgid "Wireless Security"
 msgstr "无线安全"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:54
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:611
+msgid "Wireless configuration migration"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:139
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:179
 msgid "Wireless is disabled"
 msgstr "无线未开启"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:54
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:139
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:179
 msgid "Wireless is not associated"
 msgstr "无线未关联"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:15
-msgid "Wireless is restarting..."
-msgstr "无线重启中…"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:752
 msgid "Wireless network is disabled"
 msgstr "无线网络已禁用"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:752
 msgid "Wireless network is enabled"
 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:182
 msgid "Write received DNS requests to syslog"
 msgstr "将收到的 DNS 请求写入系统日志"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:164
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:155
 msgid "Write system log to file"
 msgstr "将系统日志写入文件"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1507
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:85
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1754
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:109
 msgid "Yes"
 msgstr "是"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:26
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:943
+msgid ""
+"You appear to be currently connected to the device via the \"%h\" interface. "
+"Do you really want to shut down the interface?"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:123
 msgid ""
 "You can enable or disable installed init scripts here. Changes will applied "
 "after a device reboot.<br /><strong>Warning: If you disable essential init "
@@ -5871,38 +6040,34 @@ msgid ""
 "You must enable JavaScript in your browser or LuCI will not work properly."
 msgstr "必须开启浏览器的 JavaScript 支持，否则 LuCI 无法正常工作。"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:196
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:187
 msgid "ZRam Compression Algorithm"
 msgstr "ZRam 压缩算法"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:203
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:194
 msgid "ZRam Compression Streams"
 msgstr "ZRam 压缩流"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:189
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:180
 msgid "ZRam Settings"
 msgstr "ZRam 设置"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:191
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
 msgid "ZRam Size"
 msgstr "ZRam 大小"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:229
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:230
 msgid "any"
 msgstr "任意"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:113
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:121
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:126
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:218
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:282
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:321
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:328
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:621
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:37
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:22
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:29
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:121
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:836
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:844
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:849
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1030
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:78
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:48
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:51
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:103
 msgid "auto"
 msgstr "自动"
 
@@ -5910,11 +6075,11 @@ msgstr "自动"
 msgid "automatic"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:45
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:78
 msgid "baseT"
 msgstr "baseT"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:909
 msgid "bridged"
 msgstr "桥接的"
 
@@ -5930,22 +6095,21 @@ msgstr "创建"
 msgid "create:"
 msgstr "创建："
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:264
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:368
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:678
 msgid "creates a bridge over specified interface(s)"
 msgstr "为指定接口创建桥接"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:277
 msgid "dB"
 msgstr "dB"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:34
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:35
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:46
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:47
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:48
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:131
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:132
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:133
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:277
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:279
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:331
@@ -5957,26 +6121,30 @@ msgstr "dB"
 msgid "dBm"
 msgstr "dBm"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:460
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:587
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:889
 msgid "disable"
 msgstr "禁用"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:119
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:524
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:530
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:536
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:18
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:578
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:584
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:590
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:25
 msgid "disabled"
 msgstr "已禁用"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:433
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:467
+msgid "driver default"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/lease_status.htm:17
 #: modules/luci-base/luasrc/view/lease_status.htm:46
-#: 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:416
 msgid "expired"
 msgstr "过期时间"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:88
 msgid ""
 "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr>-leases will be stored"
@@ -5990,25 +6158,21 @@ msgstr ""
 msgid "forward"
 msgstr "转发"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:80
 msgid "full-duplex"
 msgstr "全双工"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:80
 msgid "half-duplex"
 msgstr "半双工"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:559
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:565
 msgid "hexadecimal encoded value"
 msgstr "十六进制编码值"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:138
-msgid "hidden"
-msgstr "隐藏"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:527
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:533
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:538
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:581
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:587
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:592
 msgid "hybrid mode"
 msgstr "混合模式"
 
@@ -6016,6 +6180,10 @@ msgstr "混合模式"
 msgid "if target is a network"
 msgstr "如果对象是一个网络"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:63
+msgid "ignore"
+msgstr ""
+
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:177
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
@@ -6050,25 +6218,26 @@ 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:94
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:95
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr "本地 <abbr title=\"Domain Name System\">DNS</abbr> 解析文件"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:952
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1168
+msgid "medium security"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1360
 msgid "minutes"
 msgstr "分钟"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:43
-msgid "mixed WPA/WPA2"
-msgstr "混合 WPA/WPA2"
-
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:225
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:232
 msgid "no"
 msgstr "否"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:54
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:72
 msgid "no link"
 msgstr "未连接"
 
@@ -6076,7 +6245,7 @@ msgstr "未连接"
 msgid "non-empty value"
 msgstr "非空值"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1195
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1446
 msgid "none"
 msgstr "无"
 
@@ -6086,7 +6255,9 @@ msgstr "无"
 msgid "not present"
 msgstr "不存在"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:363
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:341
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:776
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:780
 #: 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
@@ -6101,9 +6272,9 @@ msgstr "关"
 msgid "on"
 msgstr "开"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
-msgid "open"
-msgstr "开放式"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1169
+msgid "open network"
+msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
@@ -6122,73 +6293,77 @@ msgstr "正十进制值"
 msgid "positive integer value"
 msgstr "正整数值"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:34
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:56
 msgid "random"
 msgstr "随机"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:526
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:532
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:537
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:580
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:586
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:591
 msgid "relay mode"
 msgstr "中继模式"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:910
 msgid "routed"
 msgstr "已路由"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:525
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:534
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:968
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:977
 msgid "sec"
 msgstr "秒"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:525
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:531
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:579
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:585
 msgid "server mode"
 msgstr "服务器模式"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:544
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:597
 msgid "stateful-only"
 msgstr "有状态"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:542
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:595
 msgid "stateless"
 msgstr "无状态"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:543
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:596
 msgid "stateless + stateful"
 msgstr "无状态 + 有状态"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:369
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1167
+msgid "strong security"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:346
 msgid "tagged"
 msgstr "已标记"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:932
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1343
 msgid "time units (TUs / 1.024 ms) [1000-65535]"
 msgstr "时间单位（TUs / 1.024ms）[1000-65535]"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:549
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:555
 msgid "unique value"
 msgstr "唯一值"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:448
 msgid "unknown"
 msgstr "未知"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:15
 #: modules/luci-base/luasrc/view/lease_status.htm:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:238
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:390
+#: 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:414
 msgid "unlimited"
 msgstr "无限制"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1401
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1648
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:63
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:355
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:378
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:413
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:446
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:512
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:450
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:545
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:53
 #: modules/luci-base/luasrc/view/cbi/network_netlist.htm:38
 msgid "unspecified"
@@ -6198,7 +6373,7 @@ msgstr "未指定"
 msgid "unspecified -or- create:"
 msgstr "不指定或新建："
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:366
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:344
 msgid "untagged"
 msgstr "未标记"
 
@@ -6279,8 +6454,8 @@ msgstr "有效 UCI 标识符，主机名或 IP 地址"
 msgid "valid address:port"
 msgstr "有效 address:port"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:523
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:527
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:529
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:533
 msgid "valid date (YYYY-MM-DD)"
 msgstr "有效日期（YYYY-MM-DD）"
 
@@ -6317,7 +6492,7 @@ msgstr "有效整数值"
 msgid "valid network in address/netmask notation"
 msgstr "地址/网络掩码表示法中的有效网络"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:498
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:504
 msgid "valid phone digit (0-9, \"*\", \"#\", \"!\" or \".\")"
 msgstr "有效电话号码（0-9、“*”、“#”、“!”或“.”）"
 
@@ -6330,11 +6505,11 @@ msgstr "有效端口或端口范围（port1-port2）"
 msgid "valid port value"
 msgstr "有效端口值"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:503
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:509
 msgid "valid time (HH:MM:SS)"
 msgstr "有效时间（HH:MM:SS）"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:425
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:431
 msgid "value between %d and %d characters"
 msgstr "%d 和 %d 字符之间的值"
 
@@ -6350,14 +6525,23 @@ msgstr "值大于或等于 %f"
 msgid "value smaller or equal to %f"
 msgstr "值小于或等于 %f"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:430
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:425
+msgid "value with %d characters"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:436
 msgid "value with at least %d characters"
 msgstr "值至少为 %d 个字符"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:435
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:441
 msgid "value with at most %d characters"
 msgstr "值至多为 %d 个字符"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1169
+msgid "weak security"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:221
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:232
@@ -6368,6 +6552,239 @@ msgstr "是"
 msgid "« Back"
 msgstr "« 后退"
 
+#~ msgid "Change login password"
+#~ msgstr "更改登录密码"
+
+#~ msgid "Changing password…"
+#~ msgstr "正在更改密码…"
+
+#~ msgid "Disabled (default)"
+#~ msgstr "已禁用（默认）"
+
+#~ msgid "Loading SSH keys…"
+#~ msgstr "正在加载 SSH 密钥…"
+
+#~ msgid "Saving keys…"
+#~ msgstr "正在保存密钥…"
+
+#~ msgid "Specifies the listening port of this <em>Dropbear</em> instance"
+#~ msgstr "指定此 <em>Dropbear</em> 实例的监听端口"
+
+#~ msgid "Switch %q (%s)"
+#~ msgstr "交换机 %q（%s）"
+
+#~ msgid "VLANs on %q (%s)"
+#~ msgstr "%q（%s）上的 VLAN"
+
+#~ msgid "Antenna 1"
+#~ msgstr "天线 1"
+
+#~ msgid "Antenna 2"
+#~ msgstr "天线 2"
+
+#~ msgid "Antenna Configuration"
+#~ msgstr "天线配置"
+
+#~ msgid "Back to overview"
+#~ msgstr "返回至概况"
+
+#~ msgid "Back to scan results"
+#~ msgstr "返回至扫描结果"
+
+#~ msgid "Broadcom 802.11%s Wireless Controller"
+#~ msgstr "Broadcom 802.11%s 无线控制器"
+
+#~ msgid "Broadcom BCM%04x 802.11 Wireless Controller"
+#~ msgstr "Broadcom BCM%04x 802.11 无线控制器"
+
+#~ msgid ""
+#~ "Channel %d is not available in the %s regulatory domain and has been auto-"
+#~ "adjusted to %d."
+#~ msgstr "信道 %d 在 %s 监管区域内不可用并已自动调整到 %d。"
+
+#~ msgid "Common Configuration"
+#~ msgstr "一般配置"
+
+#~ msgid "Connect"
+#~ msgstr "连接"
+
+#~ msgid "Connection Limit"
+#~ msgstr "连接数限制"
+
+#~ msgid "Cover the following interface"
+#~ msgstr "包括以下接口"
+
+#~ msgid "Cover the following interfaces"
+#~ msgstr "包括以下接口"
+
+#~ msgid "Create Interface"
+#~ msgstr "创建新接口"
+
+#~ msgid "Create a bridge over multiple interfaces"
+#~ msgstr "在多个接口上创建桥接"
+
+#~ msgid "Diversity"
+#~ msgstr "差异"
+
+#~ msgid "Edit this interface"
+#~ msgstr "编辑此接口"
+
+#~ msgid "Frame Bursting"
+#~ msgstr "帧突发"
+
+#~ msgid ""
+#~ "Further information about WireGuard interfaces and peers at <a href="
+#~ "\"http://wireguard.com\">wireguard.com</a>."
+#~ msgstr ""
+#~ "有关 WireGuard 接口和 Peer 的更多信息：<a href=\"http://wireguard.com"
+#~ "\">wireguard.com</a>。"
+
+#~ msgid "Generic 802.11%s Wireless Controller"
+#~ msgstr "通用 802.11%s 无线控制器"
+
+#~ msgid "HT mode (802.11n)"
+#~ msgstr "HT 模式（802.11n）"
+
+#~ msgid "Install package %q"
+#~ msgstr "安装软件包 %q"
+
+#~ msgid "Interface Overview"
+#~ msgstr "接口总览"
+
+#~ msgid "Locked to channel %s used by: %s"
+#~ msgstr "信道道已被锁定为 %s，因为该信道被 %s 使用"
+
+#~ msgid ""
+#~ "Maximum length of the name is 15 characters including the automatic "
+#~ "protocol/bridge prefix (br-, 6in4-, pppoe- etc.)"
+#~ msgstr ""
+#~ "名称的最大长度为 15 个字符，包含根据协议类型，网桥自动添加上的名字前缀"
+#~ "（br-、6in4-、pppoe- 等）"
+
+#~ msgid "Missing protocol extension for proto %q"
+#~ msgstr "缺少协议 %q 的协议扩展"
+
+#~ msgid "Name of the new interface"
+#~ msgstr "新接口的名称"
+
+#~ msgid "No network configured on this device"
+#~ msgstr "本设备未配置网络"
+
+#~ msgid "No network name specified"
+#~ msgstr "未指定网络名"
+
+#~ msgid "No scan results available yet..."
+#~ msgstr "还没有可用的扫描结果…"
+
+#~ msgid "Not associated"
+#~ msgstr "未关联"
+
+#~ msgid "Note: interface name length"
+#~ msgstr "注意：接口名称长度"
+
+#~ msgid ""
+#~ "On this page you can configure the network interfaces. You can bridge "
+#~ "several interfaces by ticking the \"bridge interfaces\" field and enter "
+#~ "the names of several network interfaces separated by spaces. You can also "
+#~ "use <abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
+#~ "<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
+#~ "<samp>eth0.1</samp>)."
+#~ msgstr ""
+#~ "在此页面，您可以配置网络接口。您可以勾选“桥接接口”，并输入由空格分隔的多个"
+#~ "网络接口的名称来桥接多个接口。接口名称中可以使用 <abbr title=\"Virtual "
+#~ "Local Area Network\">VLAN</abbr> 记号 <samp>INTERFACE.VLANNR</samp>（例"
+#~ "如：<samp>eth0.1</samp>）。"
+
+#~ msgid "Package libiwinfo required!"
+#~ msgstr "需要 libiwinfo 软件包！"
+
+#~ msgid "Protocol of the new interface"
+#~ msgstr "新接口的协议"
+
+#~ msgid "Protocol support is not installed"
+#~ msgstr "未安装协议支持"
+
+#~ msgid ""
+#~ "Really delete this wireless network? The deletion cannot be undone! You "
+#~ "might lose access to this device if you are connected via this network."
+#~ msgstr ""
+#~ "确定要删除此无线网络？删除操作无法撤销！若您删除此无线网络，可能导致无法再"
+#~ "访问此设备。"
+
+#~ msgid "Receiver Antenna"
+#~ msgstr "接收天线"
+
+#~ msgid "Repeat scan"
+#~ msgstr "重新扫描"
+
+#~ msgid "Replace entry"
+#~ msgstr "重置条目"
+
+#~ msgid "Scan request failed"
+#~ msgstr "扫描请求失败"
+
+#~ msgid "Separate Clients"
+#~ msgstr "隔离客户端"
+
+#~ msgid "Slot time"
+#~ msgstr "时隙"
+
+#~ msgid ""
+#~ "The <em>Device Configuration</em> section covers physical settings of the "
+#~ "radio hardware such as channel, transmit power or antenna selection which "
+#~ "are shared among all defined wireless networks (if the radio hardware is "
+#~ "multi-SSID capable). Per network settings like encryption or operation "
+#~ "mode are grouped in the <em>Interface Configuration</em>."
+#~ msgstr ""
+#~ "“设备配置”区域可配置无线的硬件参数，比如：信道、发射功率或发射天线，如果此"
+#~ "无线硬件支持多 SSID，则全部 SSID 共用此设备配置。“接口配置”区域则可配置接"
+#~ "口各自参数，如工作模式、加密方式等。"
+
+#~ msgid ""
+#~ "The <em>libiwinfo-lua</em> package is not installed. You must install "
+#~ "this component for working wireless configuration!"
+#~ msgstr "软件包 <em>libiwinfo-lua</em> 未安装，必须安装此组件以配置无线！"
+
+#~ msgid "The given network name is not unique"
+#~ msgstr "给定的网络名重复"
+
+#~ msgid ""
+#~ "The hardware is not multi-SSID capable and the existing configuration "
+#~ "will be replaced if you proceed."
+#~ msgstr "本机的硬件不支持多 SSID，如果继续，现有配置将被替换。"
+
+#~ msgid "The selected protocol needs a device assigned"
+#~ msgstr "所选的协议需要分配设备"
+
+#~ msgid ""
+#~ "There is no device assigned yet, please attach a network device in the "
+#~ "\"Physical Settings\" tab"
+#~ msgstr "尚未分配设备，请在“物理设置”选项卡中选择网络设备"
+
+#~ msgid "Transmission Rate"
+#~ msgstr "传送速率"
+
+#~ msgid "Transmit Power"
+#~ msgstr "无线电功率"
+
+#~ msgid "Transmitter Antenna"
+#~ msgstr "传送天线"
+
+#~ msgid "Uploaded File"
+#~ msgstr "上传的文件"
+
+#~ msgid "Wireless is restarting..."
+#~ msgstr "无线重启中…"
+
+#~ msgid "hidden"
+#~ msgstr "隐藏"
+
+#~ msgid "mixed WPA/WPA2"
+#~ msgstr "混合 WPA/WPA2"
+
+#~ msgid "open"
+#~ msgstr "开放式"
+
 #~ msgid "Advanced"
 #~ msgstr "高级"
 
@@ -6624,9 +7041,6 @@ msgstr "« 后退"
 #~ msgid "Hermes 802.11b Wireless Controller"
 #~ msgstr "Hermes 802.11b 无线控制器"
 
-#~ msgid "Interface is shutting down..."
-#~ msgstr "正在关闭接口..."
-
 #~ msgid "Interface reconnected"
 #~ msgstr "接口已重新连接"
 
diff --git a/modules/luci-base/po/zh-tw/base.po b/modules/luci-base/po/zh-tw/base.po
index 6e899854b..12d033197 100644
--- a/modules/luci-base/po/zh-tw/base.po
+++ b/modules/luci-base/po/zh-tw/base.po
@@ -11,19 +11,20 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Pootle 2.0.6\n"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:133
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:857
 msgid "%.1f dB"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:109
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:122
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:264
 msgid "%d Bit"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1641
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2194
 msgid "%d invalid field(s)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:281
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:31
 msgid "%s is untagged in multiple VLANs!"
 msgstr ""
 
@@ -61,19 +62,19 @@ msgid "-- Additional Field --"
 msgstr "-- 更多選項 --"
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:258
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1401
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1533
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:250
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:350
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1114
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1648
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1780
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:314
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:414
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1178
 #: modules/luci-base/luasrc/view/cbi/header.htm:5
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:26
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:88
 msgid "-- Please choose --"
 msgstr "-- 請選擇 --"
 
 #: modules/luci-base/htdocs/luci-static/resources/cbi.js:259
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:351
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1115
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:415
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1179
 #: modules/luci-base/luasrc/view/cbi/header.htm:6
 msgid "-- custom --"
 msgstr "-- 自訂 --"
@@ -96,7 +97,7 @@ msgstr ""
 msgid "-- please select --"
 msgstr "-- 請選擇 --"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:382
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:814
 msgid "0 = not using RSSI threshold, 1 = do not change driver default"
 msgstr ""
 
@@ -108,10 +109,11 @@ msgstr "1分鐘負載"
 msgid "15 Minute Load:"
 msgstr "15分鐘負載"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:924
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1337
 msgid "4-character hexadecimal ID"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:11
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:18
 msgid "464XLAT (CLAT)"
 msgstr ""
@@ -120,57 +122,57 @@ msgstr ""
 msgid "5 Minute Load:"
 msgstr "5分鐘負載"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:960
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1366
 msgid "6-octet identifier as a hex string - no colons"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:891
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1310
 msgid "802.11r Fast Transition"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1157
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1567
 msgid "802.11w Association SA Query maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1574
 msgid "802.11w Association SA Query retry timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1133
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1533
 msgid "802.11w Management Frame Protection"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1156
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1567
 msgid "802.11w maximum timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1165
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1574
 msgid "802.11w retry timeout"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:399
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:831
 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:224
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:225
 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:215
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:216
 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:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:167
 msgid ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
 "order of the resolvfile"
 msgstr "將會按照指定的順序查詢<abbr title=\"Domain Name System\">DNS</abbr>"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:388
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:820
 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:351
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:373
 #: 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>-位置"
@@ -180,8 +182,8 @@ msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-位置"
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
 msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-閘道"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:555
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:35
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:506
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-遮罩"
 
@@ -196,29 +198,29 @@ 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:378
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:402
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:58
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:35
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:40
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:33
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> 設定"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:67
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:51
 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:328
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:329
 #: 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:372
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:396
 msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:233
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:234
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> leases"
@@ -226,7 +228,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:242
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> packet size"
@@ -234,65 +236,69 @@ 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:251
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:252
 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
 msgstr "<abbr title=\"maximal\">最大</abbr>同時查詢數量"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:10
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:42
 msgid ""
 "<br/>Note: you need to manually restart the cron service if the crontab file "
 "was empty before editing."
 msgstr "注意: 如果這個檔案在編輯之前是空的,您將需要重新啟動cron服務"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:817
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1605
+msgid "A directory with the same name already exists."
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:863
 msgid "A new login is required since the authentication session expired."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:114
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:837
 msgid "A43C + J43 + A43"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:838
 msgid "A43C + J43 + A43 + V43"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:850
 msgid "ADSL"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:826
 msgid "ANSI T1.413"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:33
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:47
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:23
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:94
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:86
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:67
 msgid "APN"
 msgstr "APN"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:56
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:175
 msgid "ARP retry threshold"
 msgstr "ARP重試門檻"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:122
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:845
 msgid "ATM (Asynchronous Transfer Mode)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:144
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:866
 msgid "ATM Bridges"
 msgstr "ATM橋接"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:178
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:21
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:898
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:66
 msgid "ATM Virtual Channel Identifier (VCI)"
 msgstr "ATM虛擬通道識別(VCI)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:179
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:26
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:899
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:70
 msgid "ATM Virtual Path Identifier (VPI)"
 msgstr "ATM虛擬路徑識別(VPI)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:866
 msgid ""
 "ATM bridges expose encapsulated ethernet in AAL5 connections as virtual "
 "Linux network interfaces which can be used in conjunction with DHCP or PPP "
@@ -301,8 +307,8 @@ msgstr ""
 "ATM橋接是以AAL5協定封裝乙太網路如同虛擬Linux網路界面卡，用於連接DHCP或PPP來撥"
 "號連接到網際網路。"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:184
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:905
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:62
 msgid "ATM device number"
 msgstr "ATM裝置號碼"
 
@@ -311,17 +317,17 @@ msgid "ATU-C System Vendor ID"
 msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:251
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:495
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:499
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:528
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:532
 msgid "Absent Interface"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:19
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
 msgid "Access Concentrator"
 msgstr "接入集線器"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:368
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:470
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:802
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
 msgid "Access Point"
 msgstr "存取點 (AP)"
 
@@ -344,7 +350,7 @@ msgid "Active Connections"
 msgstr "啟用連線"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:68
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:30
 msgid "Active DHCP Leases"
 msgstr "已分配的DHCP租用"
 
@@ -352,55 +358,75 @@ msgstr "已分配的DHCP租用"
 msgid "Active DHCPv6 Leases"
 msgstr "已分配的DHCPv6租用"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1951
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:370
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:12
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2190
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:804
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:23
 msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:650
-#: modules/luci-base/htdocs/luci-static/resources/form.js:651
-#: modules/luci-base/htdocs/luci-static/resources/form.js:666
-#: modules/luci-base/htdocs/luci-static/resources/form.js:667
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1290
+#: modules/luci-base/htdocs/luci-static/resources/form.js:902
+#: modules/luci-base/htdocs/luci-static/resources/form.js:904
+#: modules/luci-base/htdocs/luci-static/resources/form.js:917
+#: modules/luci-base/htdocs/luci-static/resources/form.js:918
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1539
 #: modules/luci-base/luasrc/view/cbi/nsection.htm:25
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:189
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:197
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:39
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:47
 #: modules/luci-base/luasrc/view/cbi/ucisection.htm:54
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:703
 msgid "Add"
 msgstr "增加"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:60
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:870
+msgid "Add ATM Bridge"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:92
 msgid "Add IPv4 address…"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:129
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:204
 msgid "Add IPv6 address…"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:143
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:149
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:38
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:47
+msgid "Add LED action"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:215
+msgid "Add VLAN"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:14
+msgid "Add instance"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:153
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:159
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:250
 msgid "Add key"
 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:155
 msgid "Add local domain suffix to names served from hosts files"
 msgstr "添加本地網域微碼到HOSTS檔案"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:263
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:705
 msgid "Add new interface..."
 msgstr "增加新界面"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:104
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:99
+msgid "Add peer"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:105
 msgid "Additional Hosts files"
 msgstr "額外的HOST檔案"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:161
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
 msgid "Additional servers file"
 msgstr "額外的伺服器設定檔"
 
@@ -427,7 +453,7 @@ msgstr "額外的伺服器設定檔"
 msgid "Address"
 msgstr "位置"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:12
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:151
 msgid "Address to access local relay bridge"
 msgstr "存取本地中繼橋接位置"
 
@@ -436,13 +462,13 @@ msgstr "存取本地中繼橋接位置"
 msgid "Administration"
 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:70
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:505
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:896
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:24
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:189
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:463
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:176
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:143
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:364
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:742
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:799
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:50
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:34
 msgid "Advanced Settings"
@@ -452,165 +478,165 @@ msgstr "進階設定"
 msgid "Aggregate Transmit Power(ACTATP)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:175
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:166
 msgid "Alert"
 msgstr "警示"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1628
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1834
 #: modules/luci-base/luasrc/model/network.lua:1416
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:54
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:78
 msgid "Alias Interface"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:138
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:66
 msgid "Alias of \"%s\""
 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:170
 msgid "All Servers"
 msgstr "查詢所有伺服器"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:114
 msgid ""
 "Allocate IP addresses sequentially, starting from the lowest available "
 "address"
 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:113
 msgid "Allocate IP sequentially"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:24
 msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
 msgstr "允許 <abbr title=\"Secure Shell\">SSH</abbr> 密碼驗證"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:545
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:987
 msgid "Allow AP mode to disconnect STAs based on low ACK condition"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:462
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:589
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:891
 msgid "Allow all except listed"
 msgstr "僅允許列表外"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:236
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:767
 msgid "Allow legacy 802.11b rates"
 msgstr "允許舊型 802.11b 頻率"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:461
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:588
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:890
 msgid "Allow listed only"
 msgstr "僅允許列表內"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:198
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:199
 msgid "Allow localhost"
 msgstr "允許本機"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:47
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:35
 msgid "Allow remote hosts to connect to local SSH forwarded ports"
 msgstr "允許遠端主機連接到本機SSH轉送通訊埠"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:38
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:30
 msgid "Allow root logins with password"
 msgstr "允許root登入"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:39
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:30
 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:199
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:200
 msgid ""
 "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
 msgstr "允許127.0.0.0/8範圍內的上游回應，例如：RBL服務"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:135
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:122
 msgid "Allowed IPs"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:549
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:602
 msgid "Always announce default router"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:259
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:782
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
 "option does not comply with IEEE 802.11n-2009!"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:95
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:818
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:119
 msgid "Annex"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:96
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:819
 msgid "Annex A + L + M (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:827
 msgid "Annex A G.992.1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:828
 msgid "Annex A G.992.2"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:829
 msgid "Annex A G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:830
 msgid "Annex A G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:97
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:820
 msgid "Annex B (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:823
 msgid "Annex B G.992.1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:824
 msgid "Annex B G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:102
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:825
 msgid "Annex B G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:98
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:821
 msgid "Annex J (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:831
 msgid "Annex L G.992.3 POTS 1"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:99
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:822
 msgid "Annex M (all)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:109
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:832
 msgid "Annex M G.992.3"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:833
 msgid "Annex M G.992.5"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:550
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:602
 msgid "Announce as default router even if no public prefix is available."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:555
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:607
 msgid "Announced DNS domains"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:554
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:606
 msgid "Announced DNS servers"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1093
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1496
 msgid "Anonymous Identity"
 msgstr ""
 
@@ -622,20 +648,6 @@ msgstr "自動掛載檔案系統"
 msgid "Anonymous Swap"
 msgstr "自動掛載swap分區"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:322
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:329
-msgid "Antenna 1"
-msgstr "天線 1"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:323
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:330
-msgid "Antenna 2"
-msgstr "天線 2"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:246
-msgid "Antenna Configuration"
-msgstr "天線設定"
-
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:71
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:160
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:181
@@ -643,11 +655,11 @@ msgstr "天線設定"
 msgid "Any zone"
 msgstr "任意區域"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1981
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2522
 msgid "Apply request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1867
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2409
 msgid "Apply unchecked"
 msgstr ""
 
@@ -655,8 +667,8 @@ msgstr ""
 msgid "Architecture"
 msgstr "架構"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:19
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:184
+#: 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 ""
@@ -665,13 +677,13 @@ msgstr ""
 msgid "Assign interfaces..."
 msgstr "分配界面..."
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:124
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:24
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:189
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:31
 msgid ""
 "Assign prefix parts using this hexadecimal subprefix ID for this interface."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:148
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1967
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:22
 msgid "Associated Stations"
 msgstr "已連接裝置"
@@ -680,20 +692,20 @@ msgstr "已連接裝置"
 msgid "Associations"
 msgstr "已連接裝置"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:39
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:37
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:101
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:64
 msgid "Auth Group"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1027
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1421
 msgid "Authentication"
 msgstr "認證"
 
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:29
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:70
 msgid "Authentication Type"
 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:78
 msgid "Authoritative"
 msgstr "授權"
 
@@ -711,17 +723,19 @@ msgstr "請先登入"
 msgid "Auto Refresh"
 msgstr "自動更新"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:53
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:7
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:17
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:67
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:24
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:36
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:42
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:36
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:106
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:24
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:98
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:50
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:94
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:81
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:55
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:68
 msgid "Automatic"
 msgstr ""
 
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:7
 #: protocols/luci-proto-hnet/luasrc/model/network/proto_hnet.lua:7
 msgid "Automatic Homenet (HNCP)"
 msgstr ""
@@ -764,21 +778,21 @@ msgstr "可用"
 msgid "Average:"
 msgstr "平均:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:116
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:839
 msgid "B43 + B43C"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:117
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:840
 msgid "B43 + B43C + V43"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:48
 msgid "BR / DMR / AFTR"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:43
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:75
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:106
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1620
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:176
 msgid "BSSID"
 msgstr "BSSID"
@@ -792,19 +806,11 @@ msgstr "返回至總覽"
 msgid "Back to configuration"
 msgstr "返回至設定"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:48
-msgid "Back to overview"
-msgstr "返回至總覽"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:20
-msgid "Back to scan results"
-msgstr "返回至掃描結果"
-
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:17
 msgid "Backup"
 msgstr "備份"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:38
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:36
 msgid "Backup / Flash Firmware"
 msgstr "備份/升級韌體"
 
@@ -817,11 +823,11 @@ msgid "Bad address specified!"
 msgstr "指定了錯誤的位置！"
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:158
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:288
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:368
 msgid "Band"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:261
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:785
 msgid "Beacon Interval"
 msgstr ""
 
@@ -834,79 +840,85 @@ msgstr ""
 "下面是待備份的檔案清單。包含了更改的設定檔案、必要的基本檔案和使用者自訂的備"
 "份檔案"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:293
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:294
 msgid ""
 "Bind dynamically to interfaces rather than wildcard address (recommended as "
 "linux default)"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:16
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:48
 msgid "Bind interface"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:16
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:48
 msgid "Bind the tunnel to this interface (optional)."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:49
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:134
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:187
 msgid "Bitrate"
 msgstr "傳輸速率"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:172
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
 msgid "Bogus NX Domain Override"
 msgstr "忽略NX網域解析"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1634
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1840
 #: modules/luci-base/luasrc/model/network.lua:1420
 msgid "Bridge"
 msgstr "橋接"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:264
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:368
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:678
 msgid "Bridge interfaces"
 msgstr "橋接介面"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:906
 msgid "Bridge unit number"
 msgstr "橋接單位號碼"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:250
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:364
 msgid "Bring up on boot"
 msgstr "開機自動執行"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:35
-msgid "Broadcom 802.11%s Wireless Controller"
-msgstr "Broadcom 802.11%s 無線控制器"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:45
-msgid "Broadcom BCM%04x 802.11 Wireless Controller"
-msgstr "Broadcom BCM%04x 802.11 無線控制器"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1697
+msgid "Browse…"
+msgstr ""
 
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:18
 msgid "Buffered"
 msgstr "已緩衝"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:75
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:134
 msgid "CA certificate; if empty it will be saved after the first connection."
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:7
+msgid "CLAT configuration failed"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:13
 msgid "CPU usage (%)"
 msgstr "CPU 使用率 (%)"
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:21
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:53
 msgid "Call failed"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1789
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:14
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:52
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:711
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:948
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1839
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:191
 #: modules/luci-mod-system/luasrc/view/admin_system/upgrade.htm:60
 msgid "Cancel"
 msgstr "取消"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:6
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:17
 msgid "Category"
 msgstr ""
 
@@ -924,13 +936,7 @@ msgstr ""
 msgid "Chain"
 msgstr "鏈"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:9
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:14
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:24
-msgid "Change login password"
-msgstr ""
-
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1744
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 msgid "Changes"
 msgstr "待修改"
 
@@ -938,33 +944,23 @@ msgstr "待修改"
 msgid "Changes applied."
 msgstr "修改已套用"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2004
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2545
 msgid "Changes have been reverted."
 msgstr "設定值已還原."
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:43
 msgid "Changes the administrator password for accessing the device"
 msgstr "修改管理員密碼"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:10
-msgid "Changing password…"
-msgstr ""
-
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:162
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:45
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:87
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:174
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:376
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1618
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:186
 msgid "Channel"
 msgstr "頻道"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:119
-msgid ""
-"Channel %d is not available in the %s regulatory domain and has been auto-"
-"adjusted to %d."
-msgstr ""
-
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:229
 msgid "Check"
 msgstr "檢查"
@@ -973,7 +969,7 @@ msgstr "檢查"
 msgid "Check filesystems before mount"
 msgstr "在掛載前先檢查檔案系統"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1806
 msgid "Check this option to delete the existing networks from this radio."
 msgstr ""
 
@@ -985,8 +981,8 @@ msgstr "效驗碼"
 msgid "Choose mtdblock"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:358
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:443
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1829
 msgid ""
 "Choose the firewall zone you want to assign to this interface. Select "
 "<em>unspecified</em> to remove the interface from the associated zone or "
@@ -996,7 +992,7 @@ msgstr ""
 "選擇您要指定給這介面的防火牆區. 撿選<em>unspecified</em>以便從指定區域除這個"
 "介面或者填寫<em>create</em>欄以便定義附加這個介面到一個新的區域上."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:834
 msgid ""
 "Choose the network(s) you want to attach to this wireless interface or fill "
 "out the <em>create</em> field to define a new network."
@@ -1004,11 +1000,11 @@ msgstr ""
 "選擇您要附加到無線網路介面的多個網路或者填寫<em>create</em> 以便定義一個新的"
 "網路."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:614
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1023
 msgid "Cipher"
 msgstr "加密方式"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:61
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:91
 msgid "Cisco UDP encapsulation"
 msgstr ""
 
@@ -1024,28 +1020,28 @@ msgid ""
 "FEATURE IS FOR PROFESSIONALS! )"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1950
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:369
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:471
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2189
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:803
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:908
 msgid "Client"
 msgstr "用戶端"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:55
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:52
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:47
 msgid "Client ID to send when requesting DHCP"
 msgstr "當要求DHCP時要傳送的用戶識別碼ID"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:145
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:151
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:155
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:161
 msgid "Close"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:146
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:119
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:125
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:127
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:98
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:119
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:157
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:141
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:115
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:138
 msgid ""
 "Close inactive connection after the given amount of seconds, use 0 to "
 "persist connection"
@@ -1058,12 +1054,9 @@ msgstr "關閉清單"
 #: modules/luci-base/luasrc/view/lease_status.htm:77
 #: modules/luci-base/luasrc/view/lease_status.htm:98
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:118
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:37
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:24
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1965
 #: modules/luci-mod-network/luasrc/view/admin_network/iface_status.htm:6
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:40
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:30
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:8
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:398
 #: modules/luci-mod-status/luasrc/view/admin_status/index/30-network.htm:11
 #: modules/luci-mod-status/luasrc/view/admin_status/index/50-dsl.htm:17
@@ -1077,15 +1070,19 @@ msgstr "收集資料中..."
 msgid "Command"
 msgstr "指令"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:193
+msgid "Command OK"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:41
+msgid "Command failed"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:64
 msgid "Comment"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:185
-msgid "Common Configuration"
-msgstr "一般設定"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
 msgid ""
 "Complicates key reinstallation attacks on the client side by disabling "
 "retransmission of EAPOL-Key frames that are used to install keys. This "
@@ -1093,13 +1090,14 @@ msgid ""
 "negotiation especially in environments with heavy traffic load."
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1744
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2297
 #: modules/luci-base/luasrc/controller/admin/uci.lua:11
 #: modules/luci-mod-system/luasrc/view/admin_system/backupfiles.htm:9
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:13
 msgid "Configuration"
 msgstr "設定"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:21
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:63
 msgid "Configuration failed"
 msgstr ""
@@ -1108,89 +1106,89 @@ msgstr ""
 msgid "Configuration files will be kept"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1915
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2456
 msgid "Configuration has been applied."
 msgstr "設定值已套用"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1848
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2395
 msgid "Configuration has been rolled back!"
 msgstr "設定值已復原"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:43
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:942
+msgid "Confirm disconnect"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:50
 msgid "Confirmation"
 msgstr "再確認"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:32
-msgid "Connect"
-msgstr "連線"
-
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:72
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:105
 msgid "Connected"
 msgstr "已連線"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:338
-msgid "Connection Limit"
-msgstr "連線限制"
-
 #: modules/luci-base/htdocs/luci-static/resources/network.js:7
 #: modules/luci-base/luasrc/model/network.lua:27
 msgid "Connection attempt failed"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:203
+msgid "Connection lost"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/controller/admin/status.lua:32
 msgid "Connections"
 msgstr "連線數"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1890
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:66
+msgid "Contents have been saved."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:618
+msgid "Continue"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2431
 msgid ""
 "Could not regain access to the device after applying the configuration "
 "changes. You might need to reconnect if you modified network related "
 "settings such as the IP address or wireless security credentials."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:135
 msgid "Country"
 msgstr "國別"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:227
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:233
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:337
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:764
 msgid "Country Code"
 msgstr "國別碼"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:36
-msgid "Cover the following interface"
-msgstr "覆蓋下列介面"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:43
-msgid "Cover the following interfaces"
-msgstr "覆蓋下列這些介面"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:357
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:86
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:443
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1829
 msgid "Create / Assign firewall-zone"
 msgstr "建立/指定防火牆作用區"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:9
-msgid "Create Interface"
-msgstr "建立介面"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:33
-msgid "Create a bridge over multiple interfaces"
-msgstr "在多個介面上建立橋接"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:735
+msgid "Create interface"
+msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:174
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:165
 msgid "Critical"
 msgstr "緊急"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:178
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:169
 msgid "Cron Log Level"
 msgstr "Cron日誌等級"
 
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:519
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:521
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:447
+msgid "Current power"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:552
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:554
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:51
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:53
 #: modules/luci-base/luasrc/view/cbi/network_ifacelist.htm:82
@@ -1198,7 +1196,7 @@ msgstr "Cron日誌等級"
 msgid "Custom Interface"
 msgstr "自訂介面"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:36
 msgid "Custom delegated IPv6-prefix"
 msgstr ""
 
@@ -1210,7 +1208,7 @@ msgstr ""
 "已修改的檔案(如憑證和腳本)可能會殘留在系統中.如果要避免這項問題,您可以先行重"
 "設裝置"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:59
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:41
 msgid ""
 "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
 "\">LED</abbr>s if possible."
@@ -1218,46 +1216,47 @@ msgstr ""
 "如果可以的話,自訂這個設備的 <abbr title=\"Light Emitting Diode\">LED</"
 "abbr>s ."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:799
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1223
 msgid "DAE-Client"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:807
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1231
 msgid "DAE-Port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:815
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1239
 msgid "DAE-Secret"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:448
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:459
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:279
 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:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:61
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:62
 msgid "DHCP and DNS"
 msgstr "DHCP 和 DNS"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1195
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1385
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:16
 #: modules/luci-base/luasrc/model/network.lua:968
 msgid "DHCP client"
 msgstr "DHCP用戶端"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:571
 msgid "DHCP-Options"
 msgstr "DHCP選項"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_dhcpv6.lua:7
 msgid "DHCPv6 client"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:540
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:594
 msgid "DHCPv6-Mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:529
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:583
 msgid "DHCPv6-Service"
 msgstr ""
 
@@ -1274,31 +1273,31 @@ msgstr ""
 msgid "DNS"
 msgstr "網域名稱伺服器"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:183
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
 msgid "DNS forwardings"
 msgstr "DNS封包轉發"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:30
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:37
 msgid "DNS-Label / FQDN"
 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:136
 msgid "DNSSEC"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:139
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
 msgid "DNSSEC check unsigned"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:73
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:99
 msgid "DPD Idle Timeout"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:14
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:41
 msgid "DS-Lite AFTR address"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:92
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:815
 #: modules/luci-mod-status/luasrc/view/admin_status/index/50-dsl.htm:14
 msgid "DSL"
 msgstr ""
@@ -1307,11 +1306,11 @@ msgstr ""
 msgid "DSL Status"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:125
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:848
 msgid "DSL line mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:519
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:963
 msgid "DTIM Interval"
 msgstr ""
 
@@ -1323,42 +1322,45 @@ msgstr "DHCP獨立式別碼DUID "
 msgid "Data Rate"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:169
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:180
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:160
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:171
 msgid "Debug"
 msgstr "除錯"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:759
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:783
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:807
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1183
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1207
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1231
 msgid "Default %d"
 msgstr "預設 %d"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:82
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:107
 msgid "Default Route"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:17
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:81
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:51
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:32
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:48
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:85
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:65
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:80
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:108
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:146
 msgid "Default gateway"
 msgstr "預設閘道"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:541
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:594
 msgid "Default is stateless + stateful"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:70
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:54
 msgid "Default state"
 msgstr "預設狀態"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:503
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:553
 msgid "Define a name for this network."
 msgstr "自訂這個網路名稱"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:514
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:571
 msgid ""
 "Define additional DHCP options, for example "
 "\"<code>6,192.168.2.1,192.168.2.2</code>\" which advertises different DNS "
@@ -1367,35 +1369,47 @@ msgstr ""
 "定義額外的DHCP選項,例如\"<code>6,192.168.2.1,192.168.2.2</code>\"將會通告不同"
 "的DNS伺服器到客戶端."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:705
-#: modules/luci-base/htdocs/luci-static/resources/form.js:958
-#: modules/luci-base/htdocs/luci-static/resources/form.js:959
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1271
+#: modules/luci-base/htdocs/luci-static/resources/form.js:966
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1210
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1216
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1524
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1758
 #: modules/luci-base/luasrc/view/cbi/nsection.htm:11
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:162
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:16
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:41
 msgid "Delete"
 msgstr "刪除"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:178
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:187
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:193
 msgid "Delete key"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:45
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1654
+msgid "Delete permission denied"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1656
+msgid "Delete request failed: %d %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:723
 msgid "Delete this network"
 msgstr "刪除這個網路"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:519
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:963
 msgid "Delivery Traffic Indication Message Interval"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:102
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:108
 msgid "Description"
 msgstr "描述"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:224
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1754
+msgid "Deselect"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:215
 msgid "Design"
 msgstr "設計規劃"
 
@@ -1413,10 +1427,12 @@ msgstr ""
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:177
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:43
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:13
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:38
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:73
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:33
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:52
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:85
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:86
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:72
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:154
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:253
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:86
@@ -1424,15 +1440,24 @@ msgstr ""
 msgid "Device"
 msgstr "設備"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:138
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:737
 msgid "Device Configuration"
 msgstr "設定設備"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:81
+msgid "Device is not active"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/reboot.htm:23
 msgid "Device is rebooting..."
 msgstr "設備重新啟動中..."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1889
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:167
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:513
+msgid "Device is restarting…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2430
 msgid "Device unreachable!"
 msgstr "無法連線到設備!"
 
@@ -1440,97 +1465,92 @@ msgstr "無法連線到設備!"
 msgid "Device unreachable! Still waiting for device..."
 msgstr "無法連線到設備! 正在持續等待設備回應..."
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:123
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:78
 #: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:61
 msgid "Diagnostics"
 msgstr "診斷"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:45
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:60
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:101
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:93
 msgid "Dial number"
 msgstr ""
 
-#: modules/luci-base/luasrc/view/cbi/filebrowser.htm:99
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1554
 msgid "Directory"
 msgstr "目錄"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:131
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:715
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:754
 msgid "Disable"
 msgstr "關閉"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:472
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:531
 msgid ""
 "Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for "
 "this interface."
 msgstr ""
 " 對這介面關閉 <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:64
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:93
 msgid "Disable Encryption"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:530
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:973
 msgid "Disable Inactivity Polling"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:39
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:713
 msgid "Disable this network"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:44
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:54
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:68
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:37
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:43
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:37
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1534
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:76
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:107
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:99
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:51
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:95
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:82
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:69
 msgid "Disabled"
 msgstr "關閉"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1139
-msgid "Disabled (default)"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:544
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:987
 msgid "Disassociate On Low Acknowledgement"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:193
 msgid "Discard upstream RFC1918 responses"
 msgstr "丟棄上游RFC1918 虛擬IP網路的回應"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:92
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:114
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:956
 msgid "Disconnect"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:22
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:64
 msgid "Disconnection attempt failed"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1121
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1762
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1855
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:17
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1375
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1995
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2314
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2401
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1634
 msgid "Dismiss"
 msgstr "忽略"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:240
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:334
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:770
 msgid "Distance Optimization"
 msgstr "最佳化距離"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:241
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:770
 msgid "Distance to farthest network member in meters."
 msgstr "到最遠的網路距離以米表示."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:347
-msgid "Diversity"
-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:61
 msgid ""
 "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
@@ -1541,35 +1561,43 @@ 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:158
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:159
 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:123
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:124
 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:118
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:119
 msgid "Do not forward reverse lookups for local networks"
 msgstr "對本地網域不轉發反解析鎖定"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:173
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1639
+msgid "Do you really want to delete \"%s\" ?"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:188
 msgid "Do you really want to delete the following SSH key?"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:73
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1637
+msgid "Do you really want to recursively delete the directory \"%s\" ?"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:74
 msgid "Domain required"
 msgstr "網域必要的"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:205
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:206
 msgid "Domain whitelist"
 msgstr "網域白名單"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:34
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:67
 msgid "Don't Fragment"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:74
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:75
 msgid ""
 "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
 "<abbr title=\"Domain Name System\">DNS</abbr>-Name"
@@ -1589,19 +1617,19 @@ msgstr "下載備份檔"
 msgid "Download mtdblock"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:853
 msgid "Downstream SNR offset"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:914
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1169
 msgid "Drag to reorder"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:9
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:11
 msgid "Dropbear Instance"
 msgstr "Dropbear SSH例子"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:6
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
 msgid ""
 "Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access "
 "and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
@@ -1609,39 +1637,40 @@ msgstr ""
 "Dropbear 提供 <abbr title=\"Secure Shell\">SSH</abbr> 網路shell命令存取和一個"
 "整合的 <abbr title=\"Secure Copy\">SCP</abbr> 伺服器"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:11
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:14
 msgid "Dual-Stack Lite (RFC6333)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:493
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:547
 msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 msgstr "動態 <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:60
 msgid "Dynamic tunnel"
 msgstr "動態隧道"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:494
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:547
 msgid ""
 "Dynamically allocate DHCP addresses for clients. If disabled, only clients "
 "having static leases will be served."
 msgstr "幫用戶端動態發配DHCP位址. 假如關閉的話,僅有有靜態位址的用戶端能被服務"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:67
 msgid "EA-bits length"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:990
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1386
 msgid "EAP-Method"
 msgstr "EAP協定驗證方式"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:934
-#: modules/luci-base/htdocs/luci-static/resources/form.js:935
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1199
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1188
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1191
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1450
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:154
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:160
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:38
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:291
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:720
 msgid "Edit"
 msgstr "編輯"
 
@@ -1651,90 +1680,91 @@ msgid ""
 "reload the page."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:38
-msgid "Edit this interface"
-msgstr "修改這個介面"
-
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:718
 msgid "Edit this network"
 msgstr "修改這個網路"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:176
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:669
+msgid "Edit wireless network"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:167
 msgid "Emergency"
 msgstr "緊急"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:127
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:715
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:754
 msgid "Enable"
 msgstr "啟用"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:414
 msgid ""
 "Enable <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> "
 "snooping"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:271
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:412
 msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 msgstr "啟用 <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:41
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:60
 msgid "Enable HE.net dynamic endpoint update"
 msgstr "啟用HE.net服務代管動態更新"
 
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:51
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:89
 msgid "Enable IPv6 negotiation"
 msgstr ""
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:23
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:35
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:41
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:35
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:37
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:49
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:80
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:54
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:67
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:93
 msgid "Enable IPv6 negotiation on the PPP link"
 msgstr "啟用PPP連結上的IPv6交涉"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:143
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:188
 msgid "Enable Jumbo Frame passthrough"
 msgstr "啟用超大訊框透穿"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:244
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:235
 msgid "Enable NTP client"
 msgstr "啟用NTP同步功能"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:69
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:96
 msgid "Enable Single DES"
 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:267
 msgid "Enable TFTP server"
 msgstr "啟用TFTP伺服器"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:134
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:180
 msgid "Enable VLAN functionality"
 msgstr "啟用VLAN功能"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1595
 msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
 msgstr "啟用 WPS 按鈕, 這需要 WPA(2)-PSK"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1175
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1582
 msgid "Enable key reinstallation (KRACK) countermeasures"
 msgstr "啟用金鑰重新安裝攻擊 (KRACK) 因應對策"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:138
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:183
 msgid "Enable learning and aging"
 msgstr "啟用智慧學習功能"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:194
 msgid "Enable mirroring of incoming packets"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:151
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:195
 msgid "Enable mirroring of outgoing packets"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:34
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:67
 msgid "Enable the DF (Don't Fragment) flag of the encapsulating packets."
 msgstr ""
 
@@ -1742,7 +1772,7 @@ msgstr ""
 msgid "Enable this mount"
 msgstr "啟用掛載點"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:36
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:713
 msgid "Enable this network"
 msgstr ""
 
@@ -1750,48 +1780,52 @@ msgstr ""
 msgid "Enable this swap"
 msgstr "啟用swap功能"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:37
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:88
 msgid "Enable/Disable"
 msgstr "啟用/關閉"
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:76
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:152
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:251
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:41
 msgid "Enabled"
 msgstr "啟用"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:277
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:414
 msgid "Enables IGMP snooping on this bridge"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:892
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1310
 msgid ""
 "Enables fast roaming among access points that belong to the same Mobility "
 "Domain"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:272
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:412
 msgid "Enables the Spanning Tree Protocol on this bridge"
 msgstr "在橋接器上啟用802.1d Spanning Tree協定"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:120
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:180
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:59
+msgid "Encapsulation limit"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:843
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:901
 msgid "Encapsulation mode"
 msgstr "封裝模式"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:76
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:603
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:129
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:992
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1621
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:177
 msgid "Encryption"
 msgstr "加密"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:155
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:128
 msgid "Endpoint Host"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:165
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:132
 msgid "Endpoint Port"
 msgstr ""
 
@@ -1803,16 +1837,21 @@ msgstr ""
 msgid "Enter custom values"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:273
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:271
 msgid "Erasing..."
 msgstr "刪除中..."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:95
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:96
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:97
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:98
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:99
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:106
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:107
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:108
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:109
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:110
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:173
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:164
 msgid "Error"
 msgstr "錯誤"
 
@@ -1820,24 +1859,28 @@ msgstr "錯誤"
 msgid "Errored seconds (ES)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1646
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1852
 #: modules/luci-base/luasrc/model/network.lua:1432
 msgid "Ethernet Adapter"
 msgstr "乙太網路卡"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1637
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1843
 #: modules/luci-base/luasrc/model/network.lua:1422
 msgid "Ethernet Switch"
 msgstr "乙太交換器"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:303
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
 msgid "Exclude interfaces"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:153
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:154
 msgid "Expand hosts"
 msgstr "延伸主機"
 
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:195
+msgid "Expecting an hexadecimal assignment hint"
+msgstr ""
+
 #: modules/luci-base/htdocs/luci-static/resources/validation.js:59
 msgid "Expecting: %s"
 msgstr ""
@@ -1846,61 +1889,77 @@ msgstr ""
 msgid "Expires"
 msgstr "過期"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:488
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:543
 #, fuzzy
 msgid ""
 "Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
 msgstr "釋放位址的過期週期,最少兩分鐘 (<code>2m</code>)."
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:8
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:19
 msgid "External"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:971
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1377
 msgid "External R0 Key Holder List"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:980
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1381
 msgid "External R1 Key Holder List"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:150
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:141
 msgid "External system log server"
 msgstr "外部系統日誌伺服器"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:155
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:146
 msgid "External system log server port"
 msgstr "外部系統日誌伺服器埠號"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:160
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:151
 msgid "External system log server protocol"
 msgstr "外部系統日誌伺服器通訊協定"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:18
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:79
 msgid "Extra SSH command options"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:940
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1351
 msgid "FT over DS"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:941
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1352
 msgid "FT over the Air"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:938
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1349
 msgid "FT protocol"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1842
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:82
+msgid "Failed to change the system password."
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2389
 msgid "Failed to confirm apply within %ds, waiting for rollback…"
 msgstr ""
 
-#: modules/luci-base/luasrc/view/cbi/filebrowser.htm:106
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:45
+msgid "Failed to execute \"/etc/init.d/%s %s\" action: %s"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1561
 msgid "File"
 msgstr "檔案"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:279
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1514
+msgid "File not accessible"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1698
+msgid "Filename"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:280
 msgid "Filename of the boot image advertised to clients"
 msgstr "開機影像檔通知給用戶端"
 
@@ -1910,14 +1969,15 @@ msgstr "開機影像檔通知給用戶端"
 msgid "Filesystem"
 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:118
 msgid "Filter private"
 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:123
 msgid "Filter useless"
 msgstr "無用過濾器"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:23
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:65
 msgid "Finalizing failed"
 msgstr ""
@@ -1928,7 +1988,7 @@ msgid ""
 "with defaults based on what was detected"
 msgstr "尋找所有目前已連接裝置中的檔案系統及swap分區,並覆蓋目前的設定"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:696
 msgid "Find and join network"
 msgstr "搜尋並加入網路"
 
@@ -1940,11 +2000,11 @@ msgstr "完成"
 msgid "Firewall"
 msgstr "防火牆"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:77
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:76
 msgid "Firewall Mark"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:193
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:278
 msgid "Firewall Settings"
 msgstr "防火牆設定"
 
@@ -1952,7 +2012,7 @@ msgstr "防火牆設定"
 msgid "Firewall Status"
 msgstr "防火牆狀況"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:137
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:860
 msgid "Firmware File"
 msgstr ""
 
@@ -1960,7 +2020,7 @@ msgstr ""
 msgid "Firmware Version"
 msgstr "防火牆版本"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:225
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:226
 msgid "Fixed source port for outbound DNS queries"
 msgstr "外發DNS請求的固定埠號"
 
@@ -1980,35 +2040,35 @@ msgstr "更新新版韌體映像檔"
 msgid "Flash operations"
 msgstr "執行更新"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:194
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:192
 msgid "Flashing..."
 msgstr "更新中..."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:498
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:550
 msgid "Force"
 msgstr "強制"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:258
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:782
 msgid "Force 40MHz mode"
 msgstr "強制使用 40MHz 模式"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:622
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1031
 msgid "Force CCMP (AES)"
 msgstr "強制使用CCMP (AES)加密"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:499
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:550
 msgid "Force DHCP on this network even if another server is detected."
 msgstr "在網路上即使偵測到其它伺服器也強制採用DHCP的設定"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:623
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1032
 msgid "Force TKIP"
 msgstr "強制使用TKIP加密"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:624
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1033
 msgid "Force TKIP and CCMP (AES)"
 msgstr "強制使用TKIP+CCMP (AES)加密"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:257
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:795
 msgid "Force link"
 msgstr ""
 
@@ -2016,7 +2076,7 @@ msgstr ""
 msgid "Force upgrade"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:60
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:90
 msgid "Force use of NAT-T"
 msgstr ""
 
@@ -2024,7 +2084,7 @@ msgstr ""
 msgid "Form token mismatch"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:34
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:164
 msgid "Forward DHCP traffic"
 msgstr "轉發DHCP流量"
 
@@ -2032,46 +2092,41 @@ msgstr "轉發DHCP流量"
 msgid "Forward Error Correction Seconds (FECS)"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:28
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:161
 msgid "Forward broadcast traffic"
 msgstr "轉發廣播流量"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:375
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:809
 msgid "Forward mesh peer traffic"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:186
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:908
 msgid "Forwarding mode"
 msgstr "轉發模式"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:255
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:596
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:774
 msgid "Fragmentation Threshold"
 msgstr "分片閥值"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:332
-msgid "Frame Bursting"
-msgstr "訊框爆速"
-
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:17
 #: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:28
 msgid "Free"
 msgstr "空閒"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:91
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:89
 msgid ""
-"Further information about WireGuard interfaces and peers at <a href=\"http://"
-"wireguard.com\">wireguard.com</a>."
+"Further information about WireGuard interfaces and peers at <a href='http://"
+"wireguard.com'>wireguard.com</a>."
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:45
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:130
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:186
 msgid "GHz"
 msgstr "GHz"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:29
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:36
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:91
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:77
 msgid "GPRS only"
 msgstr "僅用GPRS"
 
@@ -2080,28 +2135,28 @@ msgstr "僅用GPRS"
 msgid "Gateway"
 msgstr "閘道"
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:35
+msgid "Gateway Ports"
+msgstr "閘道埠號"
+
 #: modules/luci-base/htdocs/luci-static/resources/network.js:9
 #: modules/luci-base/luasrc/model/network.lua:29
 msgid "Gateway address is invalid"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:46
-msgid "Gateway ports"
-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:67
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:275
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:23
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:112
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:103
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:49
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:33
 msgid "General Settings"
 msgstr "一般設定"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:188
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:462
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:175
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:141
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:361
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:504
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:895
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:741
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:796
 msgid "General Setup"
 msgstr "一般設置"
 
@@ -2109,7 +2164,7 @@ msgstr "一般設置"
 msgid "Generate Config"
 msgstr "生成設定檔"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:945
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1355
 msgid "Generate PMK locally"
 msgstr ""
 
@@ -2117,11 +2172,7 @@ msgstr ""
 msgid "Generate archive"
 msgstr "製作壓縮檔"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:63
-msgid "Generic 802.11%s Wireless Controller"
-msgstr "通用 802.11%s 無線控制器"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:26
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:74
 msgid "Given password confirmation did not match, password not changed!"
 msgstr "鍵入的密碼不吻合,密碼將不變更"
 
@@ -2129,7 +2180,7 @@ msgstr "鍵入的密碼不吻合,密碼將不變更"
 msgid "Global Settings"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:194
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:806
 msgid "Global network options"
 msgstr "全域網路設定"
 
@@ -2140,33 +2191,29 @@ msgstr "全域網路設定"
 msgid "Go to password configuration..."
 msgstr "前往密碼設定頁"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:857
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1369
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1112
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1616
 #: modules/luci-base/luasrc/view/cbi/full_valueheader.htm:4
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:58
 msgid "Go to relevant configuration page"
 msgstr "到相應設定頁"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:38
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:66
 msgid "Group Password"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:11
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:22
 msgid "Guest"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:73
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:81
 msgid "HE.net password"
 msgstr " HE.net密碼"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:60
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:73
 msgid "HE.net username"
 msgstr "HE.net使用者名稱"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:310
-msgid "HT mode (802.11n)"
-msgstr ""
-
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:16
 msgid "Hang Up"
 msgstr ""
@@ -2175,15 +2222,13 @@ msgstr ""
 msgid "Header Error Code Errors (HEC)"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:103
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:95
 msgid ""
 "Here you can configure the basic aspects of your device like its hostname or "
 "the timezone."
 msgstr "在這裡設置基本設定值,如主機名稱或者時區...等"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:499
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:556
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:579
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:941
 msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "隱藏 <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 
@@ -2194,14 +2239,15 @@ msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:92
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1959
 msgid "Host"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:20
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:21
 msgid "Host entries"
 msgstr "主機項目"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:48
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:171
 msgid "Host expiry timeout"
 msgstr "過期主機"
 
@@ -2209,45 +2255,45 @@ msgstr "過期主機"
 msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
 msgstr "主機-<abbr title=\"Internet Protocol Address\">IP</abbr> 或網路"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:118
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:102
 msgid "Host-Uniq tag content"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:71
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:31
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:316
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:25
+#: 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:317
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:26
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:17
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:125
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:116
 msgid "Hostname"
 msgstr "主機名稱"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:12
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:22
 msgid "Hostname to send when requesting DHCP"
 msgstr "當請求DHCP服務時傳送的主機名稱"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:18
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:19
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:67
 msgid "Hostnames"
 msgstr "主機名稱"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:13
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:24
 msgid "Hybrid"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:45
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:75
 msgid "IKE DH Group"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:41
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:59
 msgid "IP Addresses"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:40
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:80
 msgid "IP Protocol"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:29
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:30
 msgid "IP address"
 msgstr "IP位址"
 
@@ -2266,6 +2312,11 @@ msgstr "缺少IP位址"
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:20
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:21
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:22
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:79
+#: 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/network.js:89
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:90
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:91
@@ -2273,7 +2324,7 @@ msgstr "缺少IP位址"
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:93
 #: 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/luasrc/model/cbi/admin_network/proto_ncm.lua:42
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:82
 msgid "IPv4"
 msgstr "IPv4版"
 
@@ -2285,24 +2336,23 @@ msgstr "IPv4防火牆"
 msgid "IPv4 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:57
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:178
 msgid "IPv4 address"
 msgstr "IPv4位址"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:26
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:33
 msgid "IPv4 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:104
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:181
 msgid "IPv4 broadcast"
 msgstr "IPv4廣播"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:100
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:180
 msgid "IPv4 gateway"
 msgstr "IPv4閘道"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:92
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:179
 msgid "IPv4 netmask"
 msgstr "IPv4網路遮罩"
 
@@ -2310,24 +2360,25 @@ msgstr "IPv4網路遮罩"
 msgid "IPv4 network in address/netmask notation"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:25
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:52
 msgid "IPv4 prefix"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:42
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:30
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:55
 msgid "IPv4 prefix length"
 msgstr "IPv4前綴長度"
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:43
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:83
 msgid "IPv4+IPv6"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:72
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:34
 msgid "IPv4-Address"
 msgstr "IPv4-位址"
 
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:10
 #: protocols/luci-proto-ipip/luasrc/model/network/proto_ipip.lua:9
 msgid "IPv4-in-IPv4 (RFC2003)"
 msgstr ""
@@ -2342,6 +2393,16 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:30
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:31
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:32
+#: 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/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
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:89
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:90
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:91
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:92
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:95
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:96
@@ -2354,7 +2415,7 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:103
 #: 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/luasrc/model/cbi/admin_network/proto_ncm.lua:44
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:84
 msgid "IPv6"
 msgstr "IPv6版"
 
@@ -2366,11 +2427,11 @@ msgstr "IPv6防火牆"
 msgid "IPv6 Neighbours"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:464
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:506
 msgid "IPv6 Settings"
 msgstr "IPv6 設定"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:195
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:810
 msgid "IPv6 ULA-Prefix"
 msgstr ""
 
@@ -2378,21 +2439,21 @@ msgstr ""
 msgid "IPv6 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:202
 msgid "IPv6 address"
 msgstr "IPv6位址"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:23
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:189
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:31
 msgid "IPv6 assignment hint"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:18
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:184
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:27
 msgid "IPv6 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:207
 msgid "IPv6 gateway"
 msgstr "IPv6閘道"
 
@@ -2400,22 +2461,22 @@ msgstr "IPv6閘道"
 msgid "IPv6 network in address/netmask notation"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:37
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:59
 msgid "IPv6 prefix"
 msgstr "IPv6字首"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:34
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:45
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:63
 msgid "IPv6 prefix length"
 msgstr "IPv6字首長度"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:33
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:211
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:57
 msgid "IPv6 routed prefix"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:143
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:215
 msgid "IPv6 suffix"
 msgstr ""
 
@@ -2425,31 +2486,35 @@ msgid "IPv6-Address"
 msgstr "IPv6-位址"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:93
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:104
 msgid "IPv6-PD"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:10
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:13
 msgid "IPv6-in-IPv4 (RFC4213)"
 msgstr "IPv6包覆在IPv4內(RFC4213)"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:17
 msgid "IPv6-over-IPv4 (6rd)"
 msgstr "IPv6凌駕IPv4外(第6版)"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua:15
 msgid "IPv6-over-IPv4 (6to4)"
 msgstr "IPv6凌駕IPv4外(6轉4)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1075
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1478
 msgid "Identity"
 msgstr "特性"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:70
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:96
 msgid "If checked, 1DES is enabled"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:65
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:93
 msgid "If checked, encryption is disabled"
 msgstr ""
 
@@ -2466,36 +2531,36 @@ msgid ""
 "device node"
 msgstr "假若指定的話, 掛載設備的分割標籤取代固定的設備節點"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:27
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:71
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:18
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:82
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:52
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:17
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:29
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:33
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:68
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:85
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:32
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:45
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:45
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:24
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:44
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:116
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:48
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:85
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:65
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:49
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:33
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:67
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:80
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:108
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:146
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:74
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:97
 msgid "If unchecked, no default route is configured"
 msgstr "如果沒打勾點選, 將不會設置預設路由"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:34
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:86
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:35
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:99
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:47
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:60
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:60
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:39
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:59
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:124
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:39
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:116
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:59
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:103
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:64
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:77
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:100
 msgid "If unchecked, the advertised DNS server addresses are ignored"
 msgstr "如果沒打勾點選, 公告的DNS伺服器位址將被忽視"
 
@@ -2512,15 +2577,15 @@ msgstr ""
 "緩慢的過程,作為交換裝置不能用高數據速率訪問該<abbr title=\"Random Access "
 "Memory\">RAM</縮寫>"
 
-#: 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:102
 msgid "Ignore <code>/etc/hosts</code>"
 msgstr "不使用 <code>/etc/hosts</code>"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:471
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:531
 msgid "Ignore interface"
 msgstr "被忽視的介面"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:90
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:91
 msgid "Ignore resolve file"
 msgstr "不使用解析檔"
 
@@ -2538,12 +2603,12 @@ msgid ""
 "blocked. Click \"Continue »\" below to return to the previous page."
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:145
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:118
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:124
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:126
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:97
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:118
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:157
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:141
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:115
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:138
 msgid "Inactivity timeout"
 msgstr "閒置過期"
 
@@ -2551,23 +2616,25 @@ msgstr "閒置過期"
 msgid "Inbound:"
 msgstr "輸入"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:170
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:161
 msgid "Info"
 msgstr "訊息"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:105
 msgid "Information"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:25
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:67
 msgid "Initialization failure"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:34
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:87
 msgid "Initscript"
 msgstr "初始化腳本"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:26
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:122
 msgid "Initscripts"
 msgstr "初始化腳本"
 
@@ -2575,55 +2642,74 @@ msgstr "初始化腳本"
 msgid "Install iputils-traceroute6 for IPv6 traceroute"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:223
-msgid "Install package %q"
-msgstr "安裝軟體包 %q"
-
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:220
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:120
 msgid "Install protocol extensions..."
 msgstr "安裝延伸協定中..."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:416
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:423
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:683
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:687
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:26
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:284
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:342
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:47
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:134
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:14
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:16
 msgid "Interface"
 msgstr "介面"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:58
 msgid "Interface %q device auto-migrated from %q to %q."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:356
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:792
 msgid "Interface Configuration"
 msgstr "介面設定"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:51
-msgid "Interface Overview"
-msgstr "介面預覽"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:103
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:99
+msgid "Interface has %d pending changes"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:57
+msgid "Interface is marked for deletion"
+msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:162
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:3
 msgid "Interface is reconnecting..."
 msgstr "介面重連"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:162
+msgid "Interface is shutting down..."
+msgstr "介面正在關閉中..."
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:205
+msgid "Interface is starting..."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:208
+msgid "Interface is stopping..."
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:954
 msgid "Interface name"
 msgstr "界面名稱"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:34
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:115
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:224
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:131
 msgid "Interface not present or not connected yet."
 msgstr "介面尚未出現或者還沒連上"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:88
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:16
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:11
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:287
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:54
 msgid "Interfaces"
 msgstr "介面"
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:9
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:20
 msgid "Internal"
 msgstr ""
 
@@ -2636,19 +2722,35 @@ msgstr "內部伺服器發生錯誤"
 msgid "Invalid"
 msgstr "無效"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:311
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:10
+msgid "Invalid Base64 key string"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:281
 msgid "Invalid VLAN ID given! Only IDs between %d and %d are allowed."
 msgstr "輸入的VLAN ID無效僅有介於 %d 和 %d的被允許"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:307
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:290
 msgid "Invalid VLAN ID given! Only unique IDs are allowed"
 msgstr "輸入的是不正確的VLAN ID!僅允許獨一無二的IDs"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:195
+msgid "Invalid argument"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:194
+msgid "Invalid command"
+msgstr ""
+
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:80
+msgid "Invalid hexadecimal value"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/sysauth.htm:12
 msgid "Invalid username and/or password! Please try again."
 msgstr "不正確的用戶名稱和/或者密碼!請再試一次."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:508
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:950
 msgid "Isolate Clients"
 msgstr "隔離用戶端"
 
@@ -2666,15 +2768,15 @@ msgstr "它顯示您正嘗試更新不適用於這個flash記憶體的映像檔,
 msgid "JavaScript required!"
 msgstr "需要Java腳本"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:52
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1691
 msgid "Join Network"
 msgstr "加入網路"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:22
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1628
 msgid "Join Network: Wireless Scan"
 msgstr "加入網路:無線網路掃描"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:19
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1833
 msgid "Joining Network: %q"
 msgstr ""
 
@@ -2691,15 +2793,15 @@ msgstr "核心日誌"
 msgid "Kernel Version"
 msgstr "核心版本"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:823
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1248
 msgid "Key"
 msgstr "密碼"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:851
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:852
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:853
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:854
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:870
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1276
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1277
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1278
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1279
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1291
 msgid "Key #%d"
 msgstr "鑰匙  #%d"
 
@@ -2707,33 +2809,34 @@ msgstr "鑰匙  #%d"
 msgid "Kill"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:10
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:21
 msgid "L2TP"
 msgstr "L2TP"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:10
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:40
 msgid "L2TP Server"
 msgstr "L2TP伺服器"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:100
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:74
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:80
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:74
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:53
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:73
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:131
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:102
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:89
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:112
 msgid "LCP echo failure threshold"
 msgstr "LCP協定呼叫失敗次數門檻"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:118
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:89
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:95
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:89
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:68
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:91
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:144
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:102
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:125
 msgid "LCP echo interval"
 msgstr "LCP協定呼叫間隔"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:181
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:902
 msgid "LLC"
 msgstr "LLC邏輯鏈結控制層"
 
@@ -2742,11 +2845,11 @@ msgstr "LLC邏輯鏈結控制層"
 msgid "Label"
 msgstr "標籤"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:213
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:204
 msgid "Language"
 msgstr "語言"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:115
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:106
 msgid "Language and Style"
 msgstr "語言與主題"
 
@@ -2754,51 +2857,51 @@ msgstr "語言與主題"
 msgid "Latency"
 msgstr ""
 
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:10
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:21
 msgid "Leaf"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:369
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:487
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:393
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:543
 msgid "Lease time"
 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:87
 msgid "Leasefile"
 msgstr "租賃檔案"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:74
 #: modules/luci-base/luasrc/view/lease_status.htm:95
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:34
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:36
 msgid "Leasetime remaining"
 msgstr "租賃保留時間"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:9
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:20
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:27
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:47
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:50
 msgid "Leave empty to autodetect"
 msgstr "保持空白以便自動偵測"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:21
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:45
 msgid "Leave empty to use the current WAN address"
 msgstr "保持空白以便採用現今的寬頻位址"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1746
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2299
 msgid "Legend:"
 msgstr "圖例:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:481
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:538
 msgid "Limit"
 msgstr "限制"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:287
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:288
 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:299
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:300
 msgid "Limit listening to these interfaces, and loopback."
 msgstr ""
 
@@ -2818,17 +2921,17 @@ msgstr ""
 msgid "Line Uptime"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:101
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:88
 msgid "Link On"
 msgstr "鏈接"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:184
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:185
 msgid ""
 "List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
 "requests to"
 msgstr "列出 <abbr title=\"Domain Name System\">DNS</abbr> 伺服器以便轉發請求"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:972
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1377
 msgid ""
 "List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-"
 "Identifier,128-bit key as hex string. <br />This list is used to map R0KH-ID "
@@ -2837,7 +2940,7 @@ msgid ""
 "Association."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:981
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1381
 msgid ""
 "List of R1KHs in the same Mobility Domain. <br />Format: MAC-address,R1KH-ID "
 "as 6 octets with colons,128-bit key as hex string. <br />This list is used "
@@ -2846,31 +2949,31 @@ msgid ""
 "PMK-R1 keys."
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:21
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:82
 msgid "List of SSH key files for auth"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:206
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:207
 msgid "List of domains to allow RFC1918 responses for"
 msgstr "列出允許RFC1918文件虛擬IP回應的網域"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:173
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:174
 msgid "List of hosts that supply bogus NX domain results"
 msgstr "列出供應偽裝NX網域成果的主機群"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:298
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:299
 msgid "Listen Interfaces"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:30
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:54
 msgid "Listen Port"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:15
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:16
 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:216
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:217
 msgid "Listening port for inbound DNS queries"
 msgstr "進入的DNS請求聆聽埠"
 
@@ -2889,11 +2992,11 @@ msgstr "平均掛載"
 msgid "Loading"
 msgstr "讀取中"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:35
-msgid "Loading SSH keys…"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1819
+msgid "Loading directory contents…"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1204
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1296
 #: modules/luci-base/luasrc/view/view.htm:4
 msgid "Loading view…"
 msgstr ""
@@ -2903,78 +3006,74 @@ msgstr ""
 msgid "Local IP address is invalid"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:25
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:86
 msgid "Local IP address to assign"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:12
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:10
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:11
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:44
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:39
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:39
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:151
 msgid "Local IPv4 address"
 msgstr "本地IPv4位址"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:20
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:54
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:45
 msgid "Local IPv6 address"
 msgstr "本地IPv6位址"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:286
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:287
 msgid "Local Service Only"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:81
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:126
 msgid "Local Startup"
 msgstr "本地啟動"
 
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:25
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:121
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:112
 msgid "Local Time"
 msgstr "本地時間"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:149
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:150
 msgid "Local domain"
 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:147
 #, 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:150
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:151
 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:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:146
 msgid "Local server"
 msgstr "本地伺服器"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:129
 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:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:128
 msgid "Localise queries"
 msgstr "本地化網路請求"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:175
-msgid "Locked to channel %s used by: %s"
-msgstr ""
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:168
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:159
 msgid "Log output level"
 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:181
 msgid "Log queries"
 msgstr "日誌查詢"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:113
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:104
 msgid "Logging"
 msgstr "系統日誌"
 
@@ -2982,7 +3081,7 @@ msgstr "系統日誌"
 msgid "Login"
 msgstr "登入"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:95
+#: modules/luci-base/luasrc/controller/admin/index.lua:103
 msgid "Logout"
 msgstr "登出"
 
@@ -2990,11 +3089,13 @@ msgstr "登出"
 msgid "Loss of Signal Seconds (LOSS)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:476
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:533
 msgid "Lowest leased address as offset from the network address."
 msgstr "最低的釋放位址從這網路位址的偏移計算"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:40
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:75
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:35
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:86
 msgid "MAC"
@@ -3002,32 +3103,32 @@ msgstr ""
 
 #: modules/luci-base/luasrc/view/lease_status.htm:73
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:109
-#: 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:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1958
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:53
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:86
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:133
 msgid "MAC-Address"
 msgstr "MAC-位址"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:457
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:586
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:886
 msgid "MAC-Address Filter"
 msgstr "MAC-位址過濾"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:142
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:363
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:798
 msgid "MAC-Filter"
 msgstr "MAC-過濾"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:464
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:590
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:893
 msgid "MAC-List"
 msgstr "MAC-清單"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:13
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:16
 msgid "MAP / LW4over6"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:62
 msgid "MAP rule is invalid"
 msgstr ""
@@ -3045,8 +3146,8 @@ msgid "MHz"
 msgstr "MHz"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:53
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:29
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:66
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:53
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:71
 msgid "MTU"
 msgstr "最大傳輸單位MTU"
 
@@ -3056,16 +3157,17 @@ msgid ""
 "below:"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:55
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:69
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:26
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:38
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:38
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:108
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:52
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:96
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:83
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:57
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:70
 msgid "Manual"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1949
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2188
 msgid "Master"
 msgstr ""
 
@@ -3073,48 +3175,46 @@ msgstr ""
 msgid "Max. Attainable Data Rate (ATTNDR)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:539
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:982
 msgid "Maximum allowed Listen Interval"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:234
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:235
 msgid "Maximum allowed number of active DHCP leases"
 msgstr "允許啟用DHCP釋放的最大數量"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:252
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:253
 msgid "Maximum allowed number of concurrent DNS queries"
 msgstr "允許同時齊發的DNS請求的最大數量"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:243
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:244
 msgid "Maximum allowed size of EDNS.0 UDP packets"
 msgstr "允許EDNS.0 協定的UDP封包最大數量"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:63
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:77
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:57
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:112
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:104
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:93
 msgid "Maximum amount of seconds to wait for the modem to become ready"
 msgstr "等待數據機待命的最大秒數"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:27
-msgid ""
-"Maximum length of the name is 15 characters including the automatic protocol/"
-"bridge prefix (br-, 6in4-, pppoe- etc.)"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:482
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:538
 msgid "Maximum number of leased addresses."
 msgstr "釋放出的位址群最大數量"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:761
+msgid "Maximum transmit power"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:21
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:49
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:88
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:134
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:187
 #: modules/luci-mod-status/luasrc/view/admin_status/bandwidth.htm:79
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:284
 msgid "Mbit/s"
 msgstr "Mbit/s"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:18
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:32
 msgid "Medium"
 msgstr ""
 
@@ -3126,42 +3226,43 @@ msgstr "記憶體"
 msgid "Memory usage (%)"
 msgstr "記憶體使用 (%)"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1952
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2191
 msgid "Mesh"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:372
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:806
 msgid "Mesh Id"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:196
+msgid "Method not found"
+msgstr ""
+
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:45
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:76
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:104
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:54
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:66
 msgid "Metric"
 msgstr "公測單位"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:154
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:198
 msgid "Mirror monitor port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:153
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:197
 msgid "Mirror source port"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:408
-msgid "Missing protocol extension for proto %q"
-msgstr "協定  %q 漏失的延伸協定"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:923
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1337
 msgid "Mobility Domain"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:154
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:41
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:74
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:366
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:31
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:360
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:801
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1619
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:175
 msgid "Mode"
 msgstr "模式"
@@ -3170,39 +3271,38 @@ msgstr "模式"
 msgid "Model"
 msgstr "型號"
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:31
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:72
 msgid "Modem default"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:11
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:19
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:11
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:10
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:73
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:73
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:57
 msgid "Modem device"
 msgstr "數據機設備"
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:24
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:66
 msgid "Modem information query failed"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:62
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:76
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:56
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:112
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:104
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:93
 msgid "Modem init timeout"
 msgstr "數據機初始化終結時間"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1953
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:452
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:554
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:577
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2192
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:880
 msgid "Monitor"
 msgstr "監視"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:14
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
 msgid "More Characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:802
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1057
 msgid "More…"
 msgstr ""
 
@@ -3215,7 +3315,7 @@ msgstr "掛載項目"
 msgid "Mount Point"
 msgstr "掛載點"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:28
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:26
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:36
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:137
 msgid "Mount Points"
@@ -3263,46 +3363,44 @@ msgstr "往下移"
 msgid "Move up"
 msgstr "往上移"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:912
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
 msgid "NAS ID"
 msgstr " 網路附存伺服器ID"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:57
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:87
 msgid "NAT-T Mode"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:9
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:41
 msgid "NAT64 Prefix"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:31
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:26
 msgid "NCM"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:535
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:589
 msgid "NDP-Proxy"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:43
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:72
 msgid "NT Domain"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:273
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:264
 msgid "NTP server candidates"
 msgstr "NTP伺服器備選"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:837
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1092
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:27
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:502
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:65
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:553
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:658
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:49
 msgid "Name"
 msgstr "名稱"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:17
-msgid "Name of the new interface"
-msgstr "新介面的名稱"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1808
 msgid "Name of the new network"
 msgstr "新網路的名稱"
 
@@ -3310,9 +3408,10 @@ msgstr "新網路的名稱"
 msgid "Navigation"
 msgstr "導覽"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:62
+#: modules/luci-base/luasrc/controller/admin/index.lua:69
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:108
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:402
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:834
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1957
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:389
 #: modules/luci-mod-status/luasrc/view/admin_status/index/30-network.htm:8
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:73
@@ -3324,7 +3423,7 @@ msgstr "網路"
 msgid "Network Utilities"
 msgstr "網路多項工具"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:278
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:279
 msgid "Network boot image"
 msgstr "網路開機映像檔"
 
@@ -3337,53 +3436,59 @@ msgstr ""
 msgid "Network without interfaces."
 msgstr "尚無任何介面的網路."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:661
+msgid "New interface name…"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:11
 msgid "Next »"
 msgstr "下一個 »"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1507
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:84
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1754
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:108
 msgid "No"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:453
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:514
 msgid "No DHCP Server configured for this interface"
 msgstr "在這個介面尚無DHCP伺服器"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1162
+msgid "No Encryption"
+msgstr ""
+
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:89
 msgid "No NAT-T"
 msgstr ""
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:198
+msgid "No data received"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1764
+msgid "No entries in this directory"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/backupfiles.lua:82
 msgid "No files found"
 msgstr "尚未發現任何檔案"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:550
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:191
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:180
 msgid "No information available"
 msgstr "尚無可運用資訊"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:8
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:63
 msgid "No matching prefix delegation"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:157
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:158
 msgid "No negative cache"
 msgstr "拒絕無效網域的快取"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:53
-msgid "No network configured on this device"
-msgstr "尚無網路設定在這個介面上"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:65
-msgid "No network name specified"
-msgstr "尚未指定網路名稱"
-
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:147
-msgid "No networks in range"
-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
@@ -3391,7 +3496,12 @@ msgstr ""
 msgid "No password set!"
 msgstr "尚未設定密碼!"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:116
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:104
+msgid "No peers defined yet"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:129
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:271
 msgid "No public keys present yet."
 msgstr ""
 
@@ -3399,19 +3509,19 @@ msgstr ""
 msgid "No rules in this chain."
 msgstr "尚無規則在這個鏈接上"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:150
-msgid "No scan results available yet..."
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:53
+msgid "No signal"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:7
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:756
 msgid "No zone assigned"
 msgstr "尚未指定區碼"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:111
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:35
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:48
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:133
 msgid "Noise"
 msgstr "雜訊比"
 
@@ -3427,16 +3537,16 @@ msgstr "雜訊比:"
 msgid "Non Pre-emtive CRC errors (CRC_P)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:292
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:293
 msgid "Non-wildcard"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:129
 msgid "None"
 msgstr "無"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:181
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:172
 msgid "Normal"
 msgstr "正常"
 
@@ -3444,25 +3554,29 @@ msgstr "正常"
 msgid "Not Found"
 msgstr "尚未發現"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:27
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm:5
-msgid "Not associated"
-msgstr "尚未關聯"
-
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:87
 msgid "Not connected"
 msgstr "尚未連線"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:38
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:73
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:113
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:139
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:232
+msgid "Not present"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:94
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:105
 msgid "Not started on boot"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:26
-msgid "Note: interface name length"
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:201
+msgid "Not supported"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:171
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:162
 msgid "Notice"
 msgstr "通知"
 
@@ -3470,61 +3584,50 @@ msgstr "通知"
 msgid "Nslookup"
 msgstr "DNS偵錯Nslookup"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:260
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:261
 msgid "Number of cached DNS entries (max is 10000, 0 is no caching)"
 msgstr "快取DNS項目數量(最大值為10000,輸入0代表不快取)"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:203
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:194
 msgid "Number of parallel threads used for compression"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:40
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:69
 msgid "Obfuscated Group Password"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:35
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:61
 msgid "Obfuscated Password"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:22
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:34
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:40
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:105
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:97
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:49
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:80
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:54
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:67
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:93
 msgid "Obtain IPv6-Address"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:83
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:68
 msgid "Off-State Delay"
 msgstr "熄滅狀態間隔"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:16
-msgid ""
-"On this page you can configure the network interfaces. You can bridge "
-"several interfaces by ticking the \"bridge interfaces\" field and enter the "
-"names of several network interfaces separated by spaces. You can also use "
-"<abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
-"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
-"<samp>eth0.1</samp>)."
-msgstr ""
-"在這個頁面您可以設定網路介面. 只要點下這個\"介面群橋接\"而且打入數個以空格分"
-"開網路介面的名稱就可以橋接數個介面群. 您也可以使用<abbr title=\"Virtual "
-"Local Area Network\">VLAN</abbr> 符號<samp>INTERFACE.VLANNR</samp> (<abbr "
-"title=\"for example\">例.如</abbr>: <samp>eth0.1</samp>)."
-
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:95
 msgid "On-Link route"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:80
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:64
 msgid "On-State Delay"
 msgstr "點亮狀態間隔"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:360
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:382
 msgid "One of hostname or mac address must be specified!"
 msgstr "主機名稱或mac位址任選一個被指定"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:456
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:462
 msgid "One of the following: %s"
 msgstr ""
 
@@ -3546,34 +3649,35 @@ msgstr "有一個以上的欄位缺乏任何數值!"
 msgid "Open list..."
 msgstr "開啟清單"
 
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:61
 #: protocols/luci-proto-openconnect/luasrc/model/network/proto_openconnect.lua:9
 msgid "OpenConnect (CISCO AnyConnect)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:757
 msgid "Operating frequency"
 msgstr "操作頻率"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1753
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2306
 msgid "Option changed"
 msgstr "選項已變更"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1755
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2308
 msgid "Option removed"
 msgstr "選項已移除"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1140
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:55
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1535
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:66
 msgid "Optional"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:78
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:76
 msgid ""
 "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, "
 "starting with <code>0x</code>."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:144
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:215
 msgid ""
 "Optional. Allowed values: 'eui64', 'random', fixed value like '::1' or "
 "'::1:2'. When IPv6 prefix (like 'a:b:c:d::') is received from a delegating "
@@ -3581,41 +3685,41 @@ msgid ""
 "for the interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:123
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:117
 msgid ""
 "Optional. Base64-encoded preshared key. Adds in an additional layer of "
 "symmetric-key cryptography for post-quantum resistance."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:148
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:126
 msgid "Optional. Create routes for Allowed IPs for this peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:103
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:108
 msgid "Optional. Description of peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:156
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:128
 msgid ""
 "Optional. Host of peer. Names are resolved prior to bringing up the "
 "interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:67
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:71
 msgid "Optional. Maximum Transmission Unit of tunnel interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:166
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:132
 msgid "Optional. Port of peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:175
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:136
 msgid ""
 "Optional. Seconds between keep alive messages. Default is 0 (disabled). "
 "Recommended value if this device is behind a NAT is 25."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:31
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:54
 msgid "Optional. UDP port used for outgoing and incoming packets."
 msgstr ""
 
@@ -3636,7 +3740,7 @@ msgstr "出"
 msgid "Outbound:"
 msgstr "外連:"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:26
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:50
 msgid "Output Interface"
 msgstr ""
 
@@ -3645,51 +3749,51 @@ msgstr ""
 msgid "Output zone"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:63
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:155
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:33
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:54
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:54
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:219
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:40
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:50
 msgid "Override MAC address"
 msgstr "覆蓋MAC位址"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:66
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
-#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:35
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:56
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:88
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:125
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:131
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:133
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:104
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:61
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:58
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:223
+#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:44
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:54
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:154
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:71
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:145
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:132
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:110
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:119
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:97
 msgid "Override MTU"
 msgstr "覆蓋MTU數值"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:30
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:63
 msgid "Override TOS"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:25
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:58
 msgid "Override TTL"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:513
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:954
 msgid "Override default interface name"
 msgstr ""
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:41
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:167
 msgid "Override the gateway in DHCP responses"
 msgstr "在DHCP回應中覆蓋閘道"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:507
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:555
 msgid ""
 "Override the netmask sent to clients. Normally it is calculated from the "
 "subnet that is served."
 msgstr "覆蓋傳送到客戶端的子網路遮罩. 正常來說它會計算來自於已存在的子網路."
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:65
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:179
 msgid "Override the table used for internal routes"
 msgstr "覆蓋之前內部使用的路由表"
 
@@ -3697,29 +3801,33 @@ msgstr "覆蓋之前內部使用的路由表"
 msgid "Overview"
 msgstr "預覽"
 
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1606
+msgid "Overwrite existing file \"%s\" ?"
+msgstr ""
+
 #: modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua:11
 msgid "Owner"
 msgstr "持有者"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:42
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:56
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:17
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:28
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:34
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:14
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:18
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:43
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:98
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:45
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:44
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:63
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:82
 msgid "PAP/CHAP password"
 msgstr "PAP/CHAP驗證密碼"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:39
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:53
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:14
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:25
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:11
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:15
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:96
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:88
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:43
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:74
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:42
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:61
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:77
 msgid "PAP/CHAP username"
 msgstr "PAP/CHAP驗證用戶名"
 
@@ -3727,9 +3835,9 @@ msgstr "PAP/CHAP驗證用戶名"
 msgid "PID"
 msgstr "PID碼"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:36
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:50
-#: protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua:26
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:95
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:87
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:68
 msgid "PIN"
 msgstr "PIN碼"
 
@@ -3738,114 +3846,116 @@ msgstr "PIN碼"
 msgid "PIN code rejected"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:966
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1372
 msgid "PMK R1 Push"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:43
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:13
 msgid "PPP"
 msgstr "PPP協定"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:11
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:58
 msgid "PPPoA Encapsulation"
 msgstr "PPPoA配置"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:19
 msgid "PPPoATM"
 msgstr "PPPoATM"
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:17
 msgid "PPPoE"
 msgstr "PPPoE"
 
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:28
 #: protocols/luci-proto-pppossh/luasrc/model/network/proto_pppossh.lua:9
 msgid "PPPoSSH"
 msgstr ""
 
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:28
 #: protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua:15
 msgid "PPtP"
 msgstr "PPtP點對點VPN虛擬私人隧道協定"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:59
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:73
 msgid "PSID offset"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:56
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:70
 msgid "PSID-bits length"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:123
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:846
 msgid "PTM/EFM (Packet Transfer Mode)"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:78
-msgid "Package libiwinfo required!"
-msgstr "軟體包必需有libiwinfo!"
-
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:45
 msgid "Packets"
 msgstr "封包"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:7
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:756
 msgid "Part of zone %q"
 msgstr "區域 %q 的部分 "
 
 #: modules/luci-base/luasrc/view/sysauth.htm:29
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1111
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:35
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:42
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:33
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1514
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:46
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:104
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:58
 msgid "Password"
 msgstr "密碼"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:29
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:24
 msgid "Password authentication"
 msgstr "密碼驗證"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1019
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1414
 msgid "Password of Private Key"
 msgstr "私人金鑰密碼"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1067
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1471
 msgid "Password of inner Private Key"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:14
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:16
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:18
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:20
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:32
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:34
 msgid "Password strength"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:44
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:107
 msgid "Password2"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:37
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:244
 msgid "Paste or drag SSH key file…"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1000
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1396
 msgid "Path to CA-Certificate"
 msgstr "CA-證書的路徑"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1007
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1402
 msgid "Path to Client-Certificate"
 msgstr "用戶端-證書的路徑"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1013
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1408
 msgid "Path to Private Key"
 msgstr "私人金鑰的路徑"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1049
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1453
 msgid "Path to inner CA-Certificate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1055
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1459
 msgid "Path to inner Client-Certificate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1061
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1465
 msgid "Path to inner Private Key"
 msgstr ""
 
@@ -3863,7 +3973,7 @@ msgstr ""
 msgid "Peak:"
 msgstr "峰值:"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:28
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:89
 msgid "Peer IP address to assign"
 msgstr ""
 
@@ -3872,11 +3982,11 @@ msgstr ""
 msgid "Peer address is missing"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:90
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:89
 msgid "Peers"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:50
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:80
 msgid "Perfect Forward Secrecy"
 msgstr ""
 
@@ -3888,7 +3998,11 @@ msgstr "重新開機"
 msgid "Perform reset"
 msgstr "執行重置"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:174
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:199
+msgid "Permission denied"
+msgstr ""
+
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:136
 msgid "Persistent Keep Alive"
 msgstr ""
 
@@ -3896,7 +4010,7 @@ msgstr ""
 msgid "Phy Rate:"
 msgstr "傳輸率:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:190
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:277
 msgid "Physical Settings"
 msgstr "實體設置"
 
@@ -3907,6 +4021,10 @@ msgstr "Ping"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:16
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:17
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:41
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:76
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:77
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:87
@@ -3924,15 +4042,19 @@ msgstr "請輸入您的用戶名稱和密碼"
 msgid "Policy"
 msgstr "策略"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:22
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:20
 msgid "Port"
 msgstr "埠"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:18
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:133
+msgid "Port %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:274
 msgid "Port status:"
 msgstr "埠狀態:"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:482
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:488
 msgid "Potential negation of: %s"
 msgstr ""
 
@@ -3944,11 +4066,11 @@ msgstr ""
 msgid "Pre-emtive CRC errors (CRCP_P)"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:32
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:73
 msgid "Prefer LTE"
 msgstr ""
 
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:33
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:74
 msgid "Prefer UMTS"
 msgstr ""
 
@@ -3956,31 +4078,30 @@ msgstr ""
 msgid "Prefix Delegated"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:122
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:117
 msgid "Preshared Key"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:101
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:75
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:81
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:75
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:54
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:74
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:131
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:102
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:76
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:89
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:112
 msgid ""
 "Presume peer to be dead after given amount of LCP echo failures, use 0 to "
 "ignore failures"
 msgstr "假若在給于多次的 LCP 呼叫失敗後終點將死, 使用0忽略失敗"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:304
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:305
 msgid "Prevent listening on these interfaces."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:509
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:562
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:950
 msgid "Prevents client-to-client communication"
 msgstr "防止用戶端對用戶端的通訊"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:18
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:49
 msgid "Private Key"
 msgstr ""
 
@@ -4001,39 +4122,33 @@ msgstr ""
 msgid "Prot."
 msgstr "協定."
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:72
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:349
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:675
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:84
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:216
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:54
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:87
 #: modules/luci-mod-status/luasrc/view/admin_status/connections.htm:390
 msgid "Protocol"
 msgstr "協定"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:31
-msgid "Protocol of the new interface"
-msgstr "新介面的協定家族"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:222
-msgid "Protocol support is not installed"
-msgstr "支援的協定尚未安裝"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:269
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:260
 msgid "Provide NTP server"
 msgstr "啟用NTP伺服器"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:701
 msgid "Provide new network"
 msgstr "提供新網路"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:451
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:879
 msgid "Pseudo Ad-Hoc (ahdemo)"
 msgstr "偽裝Ad-Hoc (ahdemo模式)"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:112
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:113
 msgid "Public Key"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:30
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:278
 msgid ""
 "Public keys allow for the passwordless SSH logins with a higher security "
 "compared to the use of plain passwords. In order to upload a new key to the "
@@ -4041,47 +4156,48 @@ msgid ""
 "code> file into the input field."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:139
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:211
 msgid "Public prefix routed to this device for distribution to clients."
 msgstr ""
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:27
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:9
 msgid "QMI Cellular"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:173
 msgid "Quality"
 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:171
 msgid ""
 "Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> "
 "servers"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:952
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1360
 msgid "R0 Key Lifetime"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:959
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1366
 msgid "R1 Key Holder"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:58
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:88
 msgid "RFC3947 NAT-T mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:381
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:814
 msgid "RSSI threshold for joining"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:256
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:597
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:778
 msgid "RTS/CTS Threshold"
 msgstr "RTS/CTS門檻"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:16
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:41
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:76
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:36
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:87
 msgid "RX"
@@ -4091,35 +4207,39 @@ msgstr "接收"
 msgid "RX Rate"
 msgstr "接收速率"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:783
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1961
+msgid "RX Rate / TX Rate"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1207
 msgid "Radius-Accounting-Port"
 msgstr "Radius-驗証帳號-埠"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:791
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1215
 msgid "Radius-Accounting-Secret"
 msgstr "Radius-合法帳號-密碼"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:775
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1199
 msgid "Radius-Accounting-Server"
 msgstr "Radius-合法帳號-伺服器"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:759
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1183
 msgid "Radius-Authentication-Port"
 msgstr "Radius-驗証-埠"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:767
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1191
 msgid "Radius-Authentication-Secret"
 msgstr "Radius-驗証-密碼"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:751
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1175
 msgid "Radius-Authentication-Server"
 msgstr "Radius-驗証-伺服器"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:119
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:102
 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:83
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:84
 msgid ""
 "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-Server"
@@ -4133,19 +4253,11 @@ msgid ""
 "access to this device if you are connected via this interface"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2
-msgid ""
-"Really delete this wireless network? The deletion cannot be undone! You "
-"might lose access to this device if you are connected via this network."
-msgstr ""
-"真的要刪除這個無線網路?無法復原的刪除!\n"
-"假如您是透過這個網路連線您可能會無法存取這個設備."
-
 #: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:40
 msgid "Really reset all changes?"
 msgstr "確定要回復原廠設定?"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:237
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:354
 msgid "Really switch protocol?"
 msgstr "確定要更換協定?"
 
@@ -4169,15 +4281,15 @@ msgstr "即時流量"
 msgid "Realtime Wireless"
 msgstr "即時無線網路"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:931
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1343
 msgid "Reassociation Deadline"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:191
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:192
 msgid "Rebind protection"
 msgstr "重新綁護"
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:48
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:46
 #: modules/luci-mod-system/luasrc/view/admin_system/reboot.htm:9
 msgid "Reboot"
 msgstr "重開機"
@@ -4191,21 +4303,15 @@ msgstr "重新啟動中..."
 msgid "Reboots the operating system of your device"
 msgstr "重啟您設備的作業系統"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:103
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:90
 msgid "Receive"
 msgstr "接收"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:325
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:350
-msgid "Receiver Antenna"
-msgstr "接收天線"
-
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:42
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:59
 msgid "Recommended. IP addresses of the WireGuard interface."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:28
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:32
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:300
 msgid "Reconnect this interface"
 msgstr "重新連接這個介面"
 
@@ -4213,92 +4319,134 @@ msgstr "重新連接這個介面"
 msgid "References"
 msgstr "引用"
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:39
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:153
 msgid "Relay"
 msgstr "延遲"
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:36
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:157
 msgid "Relay Bridge"
 msgstr "橋接延遲"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:17
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:154
 msgid "Relay between networks"
 msgstr "網路間的延遲"
 
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:64
 #: protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua:12
 msgid "Relay bridge"
 msgstr "橋接延遲"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:18
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:18
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:50
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:49
 msgid "Remote IPv4 address"
 msgstr "遠端IPv4位址"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:8
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:40
 msgid "Remote IPv4 address or FQDN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:45
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:725
 msgid "Remove"
 msgstr "移除"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:53
-msgid "Repeat scan"
-msgstr "再次掃描"
-
-#: modules/luci-base/luasrc/view/cbi/upload.htm:11
-msgid "Replace entry"
-msgstr "替代項目"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:46
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:51
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1806
 msgid "Replace wireless configuration"
 msgstr "替代性無線設定"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:8
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:17
 msgid "Request IPv6-address"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:16
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:23
 msgid "Request IPv6-prefix of length"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1141
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:200
+msgid "Request timeout"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1536
 msgid "Required"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:20
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:31
 msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3"
 msgstr "對特定的ISP需要,例如.DOCSIS 3 加速有線電視寬頻網路"
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:19
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:49
 msgid "Required. Base64-encoded private key for this interface."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:113
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:113
 msgid "Required. Base64-encoded public key of peer."
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:136
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:122
 msgid ""
 "Required. IP addresses and prefixes that this peer is allowed to use inside "
 "the tunnel. Usually the peer's tunnel IP addresses and the networks the peer "
 "routes through the tunnel."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:1134
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1095
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1096
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1097
+msgid "Requires hostapd"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1100
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1101
+msgid "Requires hostapd with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1102
+msgid "Requires hostapd with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1098
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1099
+msgid "Requires hostapd with SAE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1533
 msgid ""
 "Requires the 'full' version of wpad/hostapd and support from the wifi driver "
 "<br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:140
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:141
 msgid ""
 "Requires upstream supports DNSSEC; verify unsigned domain responses really "
 "come from unsigned domains"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1268
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1107
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1109
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1119
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1120
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1121
+msgid "Requires wpa-supplicant"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1113
+msgid "Requires wpa-supplicant with EAP support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1114
+msgid "Requires wpa-supplicant with OWE support"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1110
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1111
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1124
+msgid "Requires wpa-supplicant with SAE support"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1355
 #: modules/luci-base/luasrc/view/cbi/delegator.htm:17
 #: modules/luci-base/luasrc/view/cbi/footer.htm:30
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:66
@@ -4314,17 +4462,22 @@ msgstr "重置計數器"
 msgid "Reset to defaults"
 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:68
 msgid "Resolv and Hosts Files"
 msgstr "解析和Hosts檔案"
 
-#: 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:94
 msgid "Resolve file"
 msgstr "解析檔"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:28
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:14
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:71
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:197
+msgid "Resource not found"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:302
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:693
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:90
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:112
 msgid "Restart"
 msgstr "重啟"
 
@@ -4332,7 +4485,7 @@ msgstr "重啟"
 msgid "Restart Firewall"
 msgstr "重啟防火牆"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:14
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:691
 msgid "Restart radio interface"
 msgstr ""
 
@@ -4344,26 +4497,24 @@ msgstr "還原"
 msgid "Restore backup"
 msgstr "還原之前備份設定"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:113
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:114
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:38
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:46
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:119
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:120
 msgid "Reveal/hide password"
 msgstr "明示/隱藏 密碼"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1774
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2322
 msgid "Revert"
 msgstr "回溯"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1861
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2405
 msgid "Revert changes"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:2013
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2554
 msgid "Revert request failed with status <code>%h</code>"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1993
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2534
 msgid "Reverting configuration…"
 msgstr "正在還原設定值..."
 
@@ -4371,7 +4522,7 @@ msgstr "正在還原設定值..."
 msgid "Root"
 msgstr "æ ¹"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:271
 msgid "Root directory for files served via TFTP"
 msgstr "透過TFTP存取根目錄檔案"
 
@@ -4379,7 +4530,7 @@ msgstr "透過TFTP存取根目錄檔案"
 msgid "Root preparation"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:147
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:126
 msgid "Route Allowed IPs"
 msgstr ""
 
@@ -4391,12 +4542,12 @@ msgstr ""
 msgid "Route type"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:523
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:577
 msgid "Router Advertisement-Service"
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:43
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:15
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:27
 msgid "Router Password"
 msgstr "路由器密碼"
 
@@ -4424,7 +4575,7 @@ msgstr "掛載這個設備前先跑系統檢查"
 msgid "Run filesystem check"
 msgstr "執行系統檢查"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:651
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:669
 msgid "Runtime error"
 msgstr ""
 
@@ -4436,31 +4587,31 @@ msgstr ""
 msgid "SNR"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:5
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:9
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:18
 msgid "SSH Access"
 msgstr "SSH存取"
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:10
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:70
 msgid "SSH server address"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:13
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:74
 msgid "SSH server port"
 msgstr ""
 
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:8
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:58
 msgid "SSH username"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:20
-#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:27
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:277
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:19
 msgid "SSH-Keys"
 msgstr "SSH-金鑰"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:42
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:73
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:29
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:104
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:127
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1617
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:174
 msgid "SSID"
 msgstr "基地台服務設定識別碼SSID"
@@ -4469,17 +4620,17 @@ msgstr "基地台服務設定識別碼SSID"
 msgid "SWAP"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1127
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1262
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1379
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1351
 #: modules/luci-base/luasrc/view/cbi/error.htm:17
 #: modules/luci-base/luasrc/view/cbi/footer.htm:26
 #: modules/luci-base/luasrc/view/cbi/header.htm:17
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:54
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:133
 msgid "Save"
 msgstr "保存"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:1256
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1768
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:1347
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2318
 #: modules/luci-base/luasrc/view/cbi/footer.htm:22
 msgid "Save & Apply"
 msgstr "保存並啟用"
@@ -4492,28 +4643,20 @@ msgstr ""
 msgid "Save mtdblock contents"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
-msgid "Saving keys…"
-msgstr ""
-
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:15
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:698
 msgid "Scan"
 msgstr "掃描"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:109
-msgid "Scan request failed"
-msgstr ""
-
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:25
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:8
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:39
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:23
 msgid "Scheduled Tasks"
 msgstr "排程任務"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1749
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2302
 msgid "Section added"
 msgstr "新增的區段"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1751
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2304
 msgid "Section removed"
 msgstr "區段移除"
 
@@ -4528,61 +4671,66 @@ msgid ""
 "your device!"
 msgstr ""
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:119
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:90
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:96
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:90
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:69
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:92
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1516
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1646
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1809
+msgid "Select file…"
+msgstr ""
+
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:144
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:128
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:115
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:89
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:102
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:125
 msgid ""
 "Send LCP echo requests at the given interval in seconds, only effective in "
 "conjunction with failure threshold"
 msgstr "傳送LCP呼叫請求在這個給予的秒數間隔內, 僅影響關聯到失敗門檻"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:561
-msgid "Separate Clients"
-msgstr "分隔用戶端"
-
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:62
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:63
 msgid "Server Settings"
 msgstr "伺服器設定值"
 
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:26
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:50
 msgid "Service Name"
 msgstr "服務名稱"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:25
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:30
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:87
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:71
 msgid "Service Type"
 msgstr "服務型態"
 
-#: modules/luci-base/luasrc/controller/admin/index.lua:55
+#: modules/luci-base/luasrc/controller/admin/index.lua:62
 msgid "Services"
 msgstr "各服務"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:815
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:861
 msgid "Session expired"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:83
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:107
 msgid "Set VPN as Default Route"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:258
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:795
 msgid ""
 "Set interface properties regardless of the link carrier (If set, carrier "
 "sense events do not invoke hotplug handlers)."
 msgstr ""
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:23
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:55
 msgid "Setting PLMN failed"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:26
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:68
 msgid "Setting operation mode failed"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:454
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:517
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:527
 msgid "Setup DHCP Server"
 msgstr "安裝DHCP伺服器"
 
@@ -4594,7 +4742,7 @@ msgstr ""
 msgid "Short GI"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:516
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:960
 msgid "Short Preamble"
 msgstr ""
 
@@ -4606,21 +4754,23 @@ msgstr "顯示現今的備份檔清單"
 msgid "Show empty chains"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:35
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:306
 msgid "Shutdown this interface"
 msgstr "關閉這個介面"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:111
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:34
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:47
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm:28
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:132
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1616
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:173
 msgid "Signal"
 msgstr "信號"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1960
+msgid "Signal / Noise"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:125
 msgid "Signal Attenuation (SATN)"
 msgstr ""
@@ -4633,11 +4783,11 @@ msgstr "信號:"
 msgid "Size"
 msgstr "大小"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:259
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:260
 msgid "Size of DNS query cache"
 msgstr "DNS請求快取大小"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:191
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
 msgid "Size of the ZRam device in megabytes"
 msgstr ""
 
@@ -4654,11 +4804,7 @@ msgstr "跳到內容"
 msgid "Skip to navigation"
 msgstr "跳到導覽"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:335
-msgid "Slot time"
-msgstr "插槽時間"
-
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1640
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1846
 #: modules/luci-base/luasrc/model/network.lua:1427
 msgid "Software VLAN"
 msgstr ""
@@ -4698,61 +4844,65 @@ msgstr ""
 msgid "Specifies the directory the device is attached to"
 msgstr "指定這個設備被附掛到那個目錄"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua:23
-msgid "Specifies the listening port of this <em>Dropbear</em> instance"
-msgstr "指定這個 <em>Dropbear</em>的監聽埠"
-
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:57
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:175
 msgid ""
 "Specifies the maximum amount of failed ARP requests until hosts are presumed "
 "to be dead"
 msgstr "指定失敗ARP可請求的最大數量直到駭客主機死亡為止"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:49
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:171
 msgid ""
 "Specifies the maximum amount of seconds after which hosts are presumed to be "
 "dead"
 msgstr "指定可請求的最大秒數直到駭客主機死亡為止"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:761
+msgid ""
+"Specifies the maximum transmit power the wireless radio may use. Depending "
+"on regulatory requirements and wireless usage, the actual transmit power may "
+"be reduced by the driver."
+msgstr ""
+
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:63
 msgid "Specify a TOS (Type of Service)."
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:25
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:58
 msgid ""
 "Specify a TTL (Time to Live) for the encapsulating packet other than the "
 "default (64)."
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:53
 msgid ""
 "Specify an MTU (Maximum Transmission Unit) other than the default (1280 "
 "bytes)."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:60
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "Specify the secret encryption key here."
 msgstr "指定加密金鑰在此."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:475
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:64
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:533
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:89
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:111
 msgid "Start"
 msgstr "啟用"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:33
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:86
 msgid "Start priority"
 msgstr "啟用優先權順序"
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1958
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2499
 msgid "Starting configuration apply…"
 msgstr "開始套用設定值..."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:105
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1626
 msgid "Starting wireless scan..."
 msgstr "開始無線掃描..."
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:24
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:120
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:22
 msgid "Startup"
 msgstr "開機自動執行"
 
@@ -4764,20 +4914,21 @@ msgstr "靜態IPv4路由"
 msgid "Static IPv6 Routes"
 msgstr "靜態IPv6路由"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:70
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:71
 msgid "Static Leases"
 msgstr "靜態租約"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:118
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:73
 msgid "Static Routes"
 msgstr "靜態路由"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1194
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1384
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:172
 #: modules/luci-base/luasrc/model/network.lua:966
 msgid "Static address"
 msgstr "靜態位址"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:308
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:309
 msgid ""
 "Static leases are used to assign fixed IP addresses and symbolic hostnames "
 "to DHCP clients. They are also required for non-dynamic interface "
@@ -4786,39 +4937,41 @@ msgstr ""
 "靜態租約是用來指定固定的IP位址和表示的主機名稱給予DHCP用戶端. 它們也需要非動"
 "態介面設定值以便獲取相應租約的主機服務."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:534
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:977
 msgid "Station inactivity limit"
 msgstr ""
 
 #: modules/luci-base/luasrc/controller/admin/index.lua:40
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:197
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:145
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:337
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:746
 #: modules/luci-mod-status/luasrc/view/admin_status/index.htm:128
 msgid "Status"
 msgstr "狀態"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:35
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:75
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:308
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:91
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:113
 msgid "Stop"
 msgstr "停止"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:165
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:166
 msgid "Strict order"
 msgstr "嚴謹順序"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:16
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:30
 msgid "Strong"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/simpleform.htm:61
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1843
 msgid "Submit"
 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:108
 msgid "Suppress logging"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:108
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:109
 msgid "Suppress logging of the routine operation of these protocols"
 msgstr ""
 
@@ -4830,42 +4983,44 @@ msgstr ""
 msgid "Swap Entry"
 msgstr "Swap交換頁項目"
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:23
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:5
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:135
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:21
 msgid "Switch"
 msgstr "交換器"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:129
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:168
 msgid "Switch %q"
 msgstr "交換器 %q"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:128
-msgid "Switch %q (%s)"
-msgstr "交換器 %q (%s)"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:66
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:146
 msgid ""
 "Switch %q has an unknown topology - the VLAN settings might not be accurate."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:146
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:142
 msgid "Switch Port Mask"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1640
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1846
 #: modules/luci-base/luasrc/model/network.lua:1425
 msgid "Switch VLAN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:238
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:355
 msgid "Switch protocol"
 msgstr "切換協定"
 
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:103
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:104
 #: modules/luci-base/luasrc/view/cbi/ipaddr.htm:26
 msgid "Switch to CIDR list notation"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:77
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1547
+msgid "Symbolic link"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:71
 msgid "Sync with NTP-Server"
 msgstr ""
 
@@ -4875,7 +5030,7 @@ msgstr "與瀏覽器同步時間"
 
 #: modules/luci-base/luasrc/controller/admin/index.lua:47
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:14
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:102
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:94
 #: modules/luci-mod-system/luasrc/controller/admin/system.lua:10
 #: modules/luci-mod-system/luasrc/view/admin_system/applyreboot.htm:39
 msgid "System"
@@ -4886,11 +5041,11 @@ msgstr "系統"
 msgid "System Log"
 msgstr "系統日誌"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:108
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:99
 msgid "System Properties"
 msgstr "系統屬性"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:145
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:136
 msgid "System log buffer size"
 msgstr "系統日誌緩衝大小"
 
@@ -4898,15 +5053,17 @@ msgstr "系統日誌緩衝大小"
 msgid "TCP:"
 msgstr "TCP:"
 
-#: 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:69
 msgid "TFTP Settings"
 msgstr "TFTP設定"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:269
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:270
 msgid "TFTP server root"
 msgstr "TFTP 伺服器根"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:17
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:42
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:77
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:88
 msgid "TX"
@@ -4929,7 +5086,7 @@ msgstr "表格"
 msgid "Target"
 msgstr "目標"
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:77
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:103
 msgid "Target network"
 msgstr ""
 
@@ -4937,47 +5094,24 @@ msgstr ""
 msgid "Terminate"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:27
-#, fuzzy
-msgid ""
-"The <em>Device Configuration</em> section covers physical settings of the "
-"radio hardware such as channel, transmit power or antenna selection which "
-"are shared among all defined wireless networks (if the radio hardware is "
-"multi-SSID capable). Per network settings like encryption or operation mode "
-"are grouped in the <em>Interface Configuration</em>."
-msgstr ""
-"這個<em>Device Configuration</em>欄位會覆蓋無線射頻硬體的物理設定值,如通道、"
-"傳送功率或者天線分享道所有定義的無線網路(假如這個無線射頻硬體是多工-SSID能力"
-"的). 每個網路設定像加密或操作模式是被分群在<em>Interface Configuration</em>"
-"中."
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:79
-msgid ""
-"The <em>libiwinfo-lua</em> package is not installed. You must install this "
-"component for working wireless configuration!"
-msgstr ""
-"這 <em>libiwinfo-lua</em> 軟體包尚未安裝. 您必須安裝這個元件以便無線網路設定"
-"有作用."
-
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:66
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:77
 msgid ""
 "The HE.net endpoint update configuration changed, you must now use the plain "
 "username instead of the user ID!"
 msgstr ""
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:8
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:40
 msgid ""
 "The IPv4 address or the fully-qualified domain name of the remote tunnel end."
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:27
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:38
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:53
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:59
 msgid ""
 "The IPv6 prefix assigned to the provider, usually ends with <code>::</code>"
 msgstr "指定到這供應商的IPv6字首, 通常用 <code>::</code>結尾"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:18
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1808
 msgid ""
 "The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
 "code> and <code>_</code>"
@@ -4993,7 +5127,7 @@ msgstr ""
 msgid "The configuration file could not be loaded due to the following error:"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1849
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2396
 msgid ""
 "The device could not be reached within %d seconds after applying the pending "
 "changes, which caused the configuration to be rolled back for safety "
@@ -5013,6 +5147,12 @@ msgstr ""
 "記憶體的設備檔或者分割區 (<abbr title=\"for example\">e.g.</abbr> <code>/dev/"
 "sda1</code>)"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:612
+msgid ""
+"The existing wireless configuration needs to be changed for LuCI to function "
+"properly."
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:127
 msgid ""
 "The filesystem that was used to format the memory (<abbr title=\"for example"
@@ -5035,44 +5175,49 @@ msgstr ""
 msgid "The following rules are currently active on this system."
 msgstr "以下的規則現正作用在系統中."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:144
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:154
+msgid "The gateway address must not be a local IP address"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:154
 msgid "The given SSH public key has already been added."
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:150
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:160
 msgid ""
 "The given SSH public key is invalid. Please supply proper public RSA or "
 "ECDSA keys."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:67
-msgid "The given network name is not unique"
-msgstr "輸入的網路名稱非唯一"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:664
+msgid "The interface name is already used"
+msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:52
-#, fuzzy
-msgid ""
-"The hardware is not multi-SSID capable and the existing configuration will "
-"be replaced if you proceed."
-msgstr "如果您繼續的話.這硬體並非多SSID工能並且已存的設定將會被覆蓋."
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:670
+msgid "The interface name is too long"
+msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:43
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:31
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:55
 msgid ""
 "The length of the IPv4 prefix in bits, the remainder is used in the IPv6 "
 "addresses."
 msgstr "這IPv4開頭以位元計的長度, 剩餘部分將會延用在IPv6位址中."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:35
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:46
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:63
 msgid "The length of the IPv6 prefix in bits"
 msgstr "這IPv6開頭以位元計的長度"
 
-#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:12
+#: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:44
 msgid "The local IPv4 address over which the tunnel is created (optional)."
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:5
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1814
+msgid "The network name is already used"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:135
 msgid ""
 "The network ports on this device can be combined to several <abbr title="
 "\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
@@ -5086,22 +5231,21 @@ msgstr ""
 "Local Area Network\">VLAN</abbr>群經常用來分割網路區段. 預設經常會有一個上傳"
 "埠來連接到下一個大型網路類似Intenet而其它埠則用來本地區網使用."
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:77
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:395
-msgid "The selected protocol needs a device assigned"
-msgstr "選到的協定需要指定到設備上"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1149
+msgid "The selected %s mode is incompatible with %s encryption"
+msgstr ""
 
 #: modules/luci-base/luasrc/view/csrftoken.htm:11
 msgid "The submitted security token is invalid or already expired!"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:274
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:272
 msgid ""
 "The system is erasing the configuration partition now and will reboot itself "
 "when finished."
 msgstr "系統正在刪除設定分割並且當完成時將自行重開."
 
-#: modules/luci-mod-system/luasrc/controller/admin/system.lua:195
+#: modules/luci-mod-system/luasrc/controller/admin/system.lua:193
 #, fuzzy
 msgid ""
 "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
@@ -5112,7 +5256,7 @@ msgstr ""
 "系統正在刷機中.<br /> 請勿關閉設備!<br />  請等待數分鐘直到您重新連線. 可能需"
 "要更新您電腦的位址以便再次連接設備, 端看您的設定. "
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:15
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:80
 msgid "The system password has been successfully changed."
 msgstr ""
 
@@ -5123,7 +5267,7 @@ msgid ""
 msgstr ""
 "以上傳的映像檔不包含支援格式. 請確認您選擇的是針對您的平台採用的通用映像檔."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:403
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:427
 msgid "There are no active leases"
 msgstr ""
 
@@ -5132,16 +5276,10 @@ msgstr ""
 msgid "There are no active leases."
 msgstr "租賃尚未啟動."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1973
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2514
 msgid "There are no changes to apply"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:204
-msgid ""
-"There is no device assigned yet, please attach a network device in the "
-"\"Physical Settings\" tab"
-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
@@ -5151,11 +5289,19 @@ msgid ""
 "protect the web interface and enable SSH."
 msgstr "路由器尚未設密碼. 請設定root密碼以便保護web介面及啟用SSH."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:19
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:49
 msgid "This IPv4 address of the relay"
 msgstr "IPv4位址的轉驛"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:162
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1448
+msgid "This authentication type is not applicable to the selected EAP method."
+msgstr ""
+
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:54
+msgid "This does not look like a valid PEM file"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:163
 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 "
@@ -5171,13 +5317,13 @@ msgstr ""
 "這是shell通用模式清單用來在系統更新時匹配包括的檔案和目錄. 在/etc/config/ 修"
 "改檔案和特定其它設定檔將會被自動保留."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:74
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:81
 msgid ""
 "This is either the \"Update Key\" configured for the tunnel or the account "
 "password if no update key has been configured"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:82
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:127
 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."
@@ -5185,13 +5331,13 @@ msgstr ""
 "這是 /etc/rc.local 內容. 在這插入自己的指令 (在 'exit 0' 前面)以便在開機流程"
 "結尾執行它們."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:27
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:54
 msgid ""
 "This is the local endpoint address assigned by the tunnel broker, it usually "
 "ends with <code>...:2/64</code>"
 msgstr "這是由通道代理人指定的本地終端位址, 通常用 <code>...:2/64</code>結尾."
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:78
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:79
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> in the local network"
@@ -5199,20 +5345,20 @@ msgstr ""
 "在本地網路中 這是唯一的 <abbr title=\"Dynamic Host Configuration Protocol"
 "\">DHCP</abbr>"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:73
 msgid "This is the plain username for logging into the account"
 msgstr ""
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:34
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:57
 msgid ""
 "This is the prefix routed to you by the tunnel broker for use by clients"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua:9
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:41
 msgid "This is the system crontab in which scheduled tasks can be defined."
 msgstr "這是系統預設的例行性工作排程."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:19
+#: 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 "這是由通道代理人操作的近端PoP通用位址"
@@ -5227,26 +5373,26 @@ msgstr "這清單提供目前正在執行的系統的執行緒和狀態的預覽
 msgid "This page gives an overview over currently active network connections."
 msgstr "這一頁提供目前正在活動中網路連線的預覽."
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:726
-#: modules/luci-base/htdocs/luci-static/resources/form.js:809
+#: modules/luci-base/htdocs/luci-static/resources/form.js:936
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1064
 #: modules/luci-base/luasrc/view/cbi/tblsection.htm:172
 #: modules/luci-base/luasrc/view/cbi/tsection.htm:32
 msgid "This section contains no values yet"
 msgstr "這部分尚未有任何設定值."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:114
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:105
 msgid "Time Synchronization"
 msgstr "校時同步"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:525
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:968
 msgid "Time interval for rekeying GTK"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:128
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:119
 msgid "Timezone"
 msgstr "時區"
 
-#: modules/luci-base/htdocs/luci-static/resources/luci.js:825
+#: modules/luci-base/htdocs/luci-static/resources/luci.js:871
 msgid "To login…"
 msgstr ""
 
@@ -5259,7 +5405,7 @@ msgstr ""
 "要復原設定檔, 可以上傳之前製作的備份壓縮檔放這. 要重置回復出廠值,按下\"執行還"
 "原\"(可能只對squashfs影像檔有效)"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:112
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:835
 msgid "Tone"
 msgstr ""
 
@@ -5283,55 +5429,41 @@ msgstr "流量"
 msgid "Transfer"
 msgstr "傳輸"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:595
-msgid "Transmission Rate"
-msgstr "傳輸速率"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:102
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:89
 msgid "Transmit"
 msgstr "射頻"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:211
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:273
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:345
-msgid "Transmit Power"
-msgstr "射頻功率"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:318
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:349
-msgid "Transmitter Antenna"
-msgstr "射頻天線"
-
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:73
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:57
 msgid "Trigger"
 msgstr "觸發"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:98
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:84
 msgid "Trigger Mode"
 msgstr "觸發模式"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:54
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:69
 msgid "Tunnel ID"
 msgstr "通道ID"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1643
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1849
 #: modules/luci-base/luasrc/model/network.lua:1430
 msgid "Tunnel Interface"
 msgstr "通道介面"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:11
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:26
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:44
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:55
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:76
 msgid "Tunnel Link"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:46
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:131
 msgid "Tx-Power"
 msgstr "傳送-功率"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:37
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:32
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:185
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:11
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:43
 msgid "Type"
 msgstr "型態"
 
@@ -5339,19 +5471,20 @@ msgstr "型態"
 msgid "UDP:"
 msgstr "UDP:"
 
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:28
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:90
 msgid "UMTS only"
 msgstr "只用3G UMTS"
 
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:43
 #: protocols/luci-proto-3g/luasrc/model/network/proto_3g.lua:10
 msgid "UMTS/GPRS/EV-DO"
 msgstr "UMTS/GPRS/EV-DO"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:106
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:93
 msgid "USB Device"
 msgstr "USB設備"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:122
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:110
 msgid "USB Ports"
 msgstr ""
 
@@ -5381,10 +5514,12 @@ msgstr ""
 msgid "Unable to dispatch"
 msgstr "無法發送"
 
+#: protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js:22
 #: protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua:54
 msgid "Unable to obtain client ID"
 msgstr ""
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:7
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:61
 msgid "Unable to resolve AFTR host name"
 msgstr ""
@@ -5394,21 +5529,31 @@ msgstr ""
 msgid "Unable to resolve peer host name"
 msgstr ""
 
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js:33
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:68
+msgid "Unable to save contents: %s"
+msgstr ""
+
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:132
 msgid "Unavailable Seconds (UAS)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1196
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1386
 #: modules/luci-base/luasrc/model/network.lua:970
 msgid "Unknown"
 msgstr "未知"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1349
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1539
 #: modules/luci-base/luasrc/model/network.lua:1137
 msgid "Unknown error (%s)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1193
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:204
+msgid "Unknown error code"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1383
+#: modules/luci-base/htdocs/luci-static/resources/protocol/none.js:6
 #: modules/luci-base/luasrc/model/network.lua:964
 msgid "Unmanaged"
 msgstr "未託管"
@@ -5418,22 +5563,30 @@ msgstr "未託管"
 msgid "Unmount"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:107
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:262
 msgid "Unnamed key"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1708
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2261
 msgid "Unsaved Changes"
 msgstr "尚未存檔的修改"
 
+#: modules/luci-base/htdocs/luci-static/resources/rpc.js:202
+msgid "Unspecified error"
+msgstr ""
+
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:9
 #: protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua:64
 msgid "Unsupported MAP type"
 msgstr ""
 
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:27
 #: protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua:69
 msgid "Unsupported modem"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:219
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:119
 msgid "Unsupported protocol type."
 msgstr "不支援的協定型態"
@@ -5455,56 +5608,70 @@ msgstr ""
 msgid "Upload archive..."
 msgstr "上傳壓縮檔..."
 
-#: modules/luci-base/luasrc/view/cbi/upload.htm:8
-msgid "Uploaded File"
-msgstr "檔案已上傳"
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1703
+msgid "Upload file"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1678
+msgid "Upload file…"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:1623
+msgid "Upload request failed: %s"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:613
+msgid ""
+"Upon pressing \"Continue\", anonymous \"wifi-iface\" sections will be "
+"assigned with a name in the form <em>wifinet#</em> and the network will be "
+"restarted to apply the updated configuration."
+msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/iface_status.js:14
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:74
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:85
 #: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:26
 msgid "Uptime"
 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:83
 msgid "Use <code>/etc/ethers</code>"
 msgstr "採用 <code>/etc/ethers</code>"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:40
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:167
 msgid "Use DHCP gateway"
 msgstr "使用DHCP的閘道"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:33
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:85
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:34
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:98
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:46
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:65
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:59
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:38
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:58
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:37
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:124
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:39
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:116
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:59
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:103
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:90
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:64
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:77
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:100
 msgid "Use DNS servers advertised by peer"
 msgstr "使用終端發布的DNS伺服器"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:227
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:233
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:479
 msgid "Use ISO/IEC 3166 alpha2 country codes."
 msgstr "使用Use ISO/IEC 3166 alpha2 國碼."
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:31
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:100
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:70
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:35
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:51
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:86
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:56
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:97
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:77
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:61
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:75
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:92
 msgid "Use MTU on tunnel interface"
 msgstr "在通道介面上使用的MTU數值"
 
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:95
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:65
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:30
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:46
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:81
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:93
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:73
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:57
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:88
 msgid "Use TTL on tunnel interface"
 msgstr "在通道介面上使用的TTL存活時間"
 
@@ -5516,68 +5683,65 @@ msgstr ""
 msgid "Use as root filesystem (/)"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:19
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:31
 msgid "Use broadcast flag"
 msgstr "當作廣播旗標"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:253
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:791
 msgid "Use builtin IPv6-management"
 msgstr "使用內建的IPv6管理功能"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:40
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:109
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:92
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:45
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:105
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:53
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:72
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:66
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:45
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:65
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:40
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:182
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:127
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:42
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:119
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:62
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:106
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:67
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:80
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:103
 msgid "Use custom DNS servers"
 msgstr "使用自定的DNS伺服器"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:26
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:70
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:16
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:28
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:84
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:24
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:50
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:44
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:23
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:43
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:34
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:116
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:33
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:56
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:100
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:87
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:61
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:74
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:97
 msgid "Use default gateway"
 msgstr "使用預設閘道"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:48
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:164
-#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:77
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:24
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:88
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua:58
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua:23
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua:39
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua:74
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:90
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:31
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:38
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:57
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:51
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:30
-#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:50
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:45
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:227
+#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:119
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js:51
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js:88
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js:68
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js:52
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:70
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js:83
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:111
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:149
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:67
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:111
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:98
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:72
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:85
+#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:108
 msgid "Use gateway metric"
 msgstr "使用閘道公測數"
 
-#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:64
+#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:179
 msgid "Use routing table"
 msgstr "使用路由表"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:309
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:310
 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 "
@@ -5593,77 +5757,78 @@ msgstr ""
 msgid "Used"
 msgstr "已使用"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:848
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1273
 msgid "Used Key Slot"
 msgstr "已使用的關鍵插槽"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:913
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1329
 msgid ""
 "Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not "
 "needed with normal WPA(2)-PSK."
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:48
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:110
 msgid "User certificate (PEM encoded)"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:61
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:122
 msgid "User key (PEM encoded)"
 msgstr ""
 
 #: modules/luci-base/luasrc/view/sysauth.htm:23
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:41
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:32
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:102
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:56
 msgid "Username"
 msgstr "用戶名稱"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:182
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:903
 msgid "VC-Mux"
 msgstr "虛擬電路多工器VC-Mux"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:128
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:851
 msgid "VDSL"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:172
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:169
 msgid "VLANs on %q"
 msgstr "VLAN 在 %q"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:171
-msgid "VLANs on %q (%s)"
-msgstr "VLAN 在 %q (%s)"
+#: modules/luci-base/luasrc/controller/admin/index.lua:55
+msgid "VPN"
+msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:18
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:42
 msgid "VPN Local address"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:22
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:46
 msgid "VPN Local port"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:15
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:11
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:15
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:93
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:58
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:39
 msgid "VPN Server"
 msgstr "VPN伺服器"
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:18
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:96
 msgid "VPN Server port"
 msgstr ""
 
-#: protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua:37
+#: protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js:100
 msgid "VPN Server's certificate SHA1 hash"
 msgstr ""
 
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:9
 #: protocols/luci-proto-vpnc/luasrc/model/network/proto_vpnc.lua:9
 msgid "VPNC (CISCO 3000 (and others) VPN)"
 msgstr ""
 
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:44
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:73
 msgid "Vendor"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:60
+#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:52
 msgid "Vendor Class to send when requesting DHCP"
 msgstr "當請求DHCP封包時要傳送的製造商類別碼"
 
@@ -5671,41 +5836,37 @@ msgstr "當請求DHCP封包時要傳送的製造商類別碼"
 msgid "Verify"
 msgstr "確認"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:52
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:76
 msgid "Virtual dynamic interface"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:470
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:471
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:553
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:576
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:907
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:908
 msgid "WDS"
 msgstr "無線分散系統WDS"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:667
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1160
 msgid "WEP Open System"
 msgstr "WEP 開放系統"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:668
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1161
 msgid "WEP Shared Key"
 msgstr "WEP 共享金鑰"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:59
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "WEP passphrase"
 msgstr "WEP通關密碼"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:503
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:566
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:945
 msgid "WMM Mode"
 msgstr "無線多媒體機制"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1823
 msgid "WPA passphrase"
 msgstr "WPA 密碼"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:716
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:735
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:740
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1074
 msgid ""
 "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
 "and ad-hoc mode) to be installed."
@@ -5721,7 +5882,7 @@ msgstr "等待修改被啟用..."
 msgid "Waiting for command to complete..."
 msgstr "等待完整性指令..."
 
-#: modules/luci-base/htdocs/luci-static/resources/ui.js:1940
+#: modules/luci-base/htdocs/luci-static/resources/ui.js:2481
 msgid "Waiting for configuration to get applied… %ds"
 msgstr ""
 
@@ -5729,8 +5890,8 @@ msgstr ""
 msgid "Waiting for device..."
 msgstr "正在等待裝置..."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:172
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:163
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:173
 msgid "Warning"
 msgstr "警告"
 
@@ -5738,11 +5899,11 @@ msgstr "警告"
 msgid "Warning: There are unsaved changes that will get lost on reboot!"
 msgstr "警告: 目前存在未儲存的設定,這些設定將會在裝置重啟後遺失!"
 
-#: modules/luci-mod-system/luasrc/view/admin_system/password.htm:20
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:34
 msgid "Weak"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:946
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1355
 msgid ""
 "When using a PSK, the PMK can be automatically generated. When enabled, the "
 "R0/R1 key options below are not applied. Disable this to use the R0 and R1 "
@@ -5750,78 +5911,85 @@ msgid ""
 msgstr ""
 
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:166
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:383
 msgid "Width"
 msgstr ""
 
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:17
 #: protocols/luci-proto-wireguard/luasrc/model/network/proto_wireguard.lua:9
 msgid "WireGuard VPN"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/controller/admin/network.lua:58
+#: modules/luci-mod-network/luasrc/controller/admin/network.lua:40
 #: modules/luci-mod-status/luasrc/controller/admin/status.lua:28
 #: modules/luci-mod-status/luasrc/view/admin_status/index/60-wifi.htm:14
 msgid "Wireless"
 msgstr "無線網路"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1631
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1837
 #: modules/luci-base/luasrc/model/network.lua:1418
 msgid "Wireless Adapter"
 msgstr "無線網卡"
 
-#: modules/luci-base/htdocs/luci-static/resources/network.js:1617
-#: modules/luci-base/htdocs/luci-static/resources/network.js:2052
+#: modules/luci-base/htdocs/luci-static/resources/network.js:1823
+#: modules/luci-base/htdocs/luci-static/resources/network.js:2288
 #: modules/luci-base/luasrc/model/network.lua:1404
 #: modules/luci-base/luasrc/model/network.lua:1865
 msgid "Wireless Network"
 msgstr "無線網路"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua:68
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:629
 msgid "Wireless Overview"
 msgstr "無線預覽"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:362
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:797
 msgid "Wireless Security"
 msgstr "無線安全"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:54
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
-#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:30
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:611
+msgid "Wireless configuration migration"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:139
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:179
 msgid "Wireless is disabled"
 msgstr "無線被關閉"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:54
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:77
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:101
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:139
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:179
 msgid "Wireless is not associated"
 msgstr "無線網路未連結"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:15
-msgid "Wireless is restarting..."
-msgstr "無線網路重啟中..."
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:126
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:752
 msgid "Wireless network is disabled"
 msgstr "無線網路已停用"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:130
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:752
 msgid "Wireless network is enabled"
 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:182
 msgid "Write received DNS requests to syslog"
 msgstr "寫入已接收的DNS請求到系統日誌中"
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:164
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:155
 msgid "Write system log to file"
 msgstr "將系統日誌寫入檔案"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1507
-#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:85
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1754
+#: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:109
 msgid "Yes"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua:26
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:943
+msgid ""
+"You appear to be currently connected to the device via the \"%h\" interface. "
+"Do you really want to shut down the interface?"
+msgstr ""
+
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js:123
 msgid ""
 "You can enable or disable installed init scripts here. Changes will applied "
 "after a device reboot.<br /><strong>Warning: If you disable essential init "
@@ -5838,38 +6006,34 @@ msgid ""
 "You must enable JavaScript in your browser or LuCI will not work properly."
 msgstr "在瀏覽器您必須啟用JavaScript否則LuCI無法正常運作."
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:196
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:187
 msgid "ZRam Compression Algorithm"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:203
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:194
 msgid "ZRam Compression Streams"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:189
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:180
 msgid "ZRam Settings"
 msgstr ""
 
-#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:191
+#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:182
 msgid "ZRam Size"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:229
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:230
 msgid "any"
 msgstr "任意"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:113
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:121
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:126
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:218
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:282
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:321
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:328
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:621
-#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:37
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:22
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:29
-#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:121
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:836
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:844
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:849
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1030
+#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:78
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:48
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:51
+#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:103
 msgid "auto"
 msgstr "自動"
 
@@ -5877,11 +6041,11 @@ msgstr "自動"
 msgid "automatic"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:45
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:78
 msgid "baseT"
 msgstr "baseT"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:187
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:909
 msgid "bridged"
 msgstr "已橋接"
 
@@ -5897,22 +6061,21 @@ msgstr ""
 msgid "create:"
 msgstr "建立:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:264
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:368
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:678
 msgid "creates a bridge over specified interface(s)"
 msgstr "在指定的介面群上建立橋接"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:24
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:277
 msgid "dB"
 msgstr "dB"
 
 #: modules/luci-base/luasrc/view/wifi_assoclist.htm:77
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:34
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:35
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:46
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:47
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:48
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:69
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:50
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:131
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:132
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:133
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:277
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:279
 #: modules/luci-mod-status/luasrc/view/admin_status/wireless.htm:331
@@ -5924,26 +6087,30 @@ msgstr "dB"
 msgid "dBm"
 msgstr "dBm"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:460
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:587
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:889
 msgid "disable"
 msgstr "關閉"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:119
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:524
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:530
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:536
-#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:18
+#: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:185
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:578
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:584
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:590
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:25
 msgid "disabled"
 msgstr "已停用"
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:433
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:467
+msgid "driver default"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/lease_status.htm:17
 #: modules/luci-base/luasrc/view/lease_status.htm:46
-#: 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:416
 msgid "expired"
 msgstr "過期"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:87
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:88
 msgid ""
 "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr>-leases will be stored"
@@ -5957,25 +6124,21 @@ msgstr ""
 msgid "forward"
 msgstr "轉發"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:80
 msgid "full-duplex"
 msgstr "全雙工"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:47
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:80
 msgid "half-duplex"
 msgstr "半雙工"
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:559
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:565
 msgid "hexadecimal encoded value"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:138
-msgid "hidden"
-msgstr "隱藏"
-
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:527
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:533
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:538
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:581
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:587
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:592
 msgid "hybrid mode"
 msgstr ""
 
@@ -5983,6 +6146,10 @@ msgstr ""
 msgid "if target is a network"
 msgstr "假如目標是某個網路"
 
+#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:63
+msgid "ignore"
+msgstr ""
+
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:177
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
@@ -6017,25 +6184,26 @@ msgstr ""
 msgid "key with either 5 or 13 characters"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:94
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:95
 msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr "本地<abbr title=\"Domain Name System\">DNS</abbr> 檔案"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:952
-msgid "minutes"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1168
+msgid "medium security"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:43
-msgid "mixed WPA/WPA2"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1360
+msgid "minutes"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:225
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:232
 msgid "no"
 msgstr "無"
 
-#: modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm:54
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:72
 msgid "no link"
 msgstr "無連線"
 
@@ -6043,7 +6211,7 @@ msgstr "無連線"
 msgid "non-empty value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1195
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1446
 msgid "none"
 msgstr "無"
 
@@ -6053,7 +6221,9 @@ msgstr "無"
 msgid "not present"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:363
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:341
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:776
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:780
 #: 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
@@ -6068,9 +6238,9 @@ msgstr "關閉"
 msgid "on"
 msgstr "開啟"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
-msgid "open"
-msgstr "打開"
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1169
+msgid "open network"
+msgstr ""
 
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:56
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:46
@@ -6089,73 +6259,77 @@ msgstr ""
 msgid "positive integer value"
 msgstr ""
 
-#: protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua:34
+#: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:56
 msgid "random"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:526
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:532
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:537
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:580
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:586
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:591
 msgid "relay mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:188
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:910
 msgid "routed"
 msgstr "路由"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:525
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:534
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:968
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:977
 msgid "sec"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:525
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:531
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:579
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:585
 msgid "server mode"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:544
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:597
 msgid "stateful-only"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:542
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:595
 msgid "stateless"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:543
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:596
 msgid "stateless + stateful"
 msgstr ""
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:369
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1167
+msgid "strong security"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:346
 msgid "tagged"
 msgstr "標籤"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:932
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1343
 msgid "time units (TUs / 1.024 ms) [1000-65535]"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:549
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:555
 msgid "unique value"
 msgstr ""
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:46
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:448
 msgid "unknown"
 msgstr "未知"
 
 #: modules/luci-base/luasrc/view/lease_status.htm:15
 #: modules/luci-base/luasrc/view/lease_status.htm:44
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:238
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:390
+#: 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:414
 msgid "unlimited"
 msgstr "無限"
 
-#: modules/luci-base/htdocs/luci-static/resources/form.js:1401
+#: modules/luci-base/htdocs/luci-static/resources/form.js:1648
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:63
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:124
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:355
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:378
 #: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:413
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:446
-#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:512
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:450
+#: modules/luci-base/htdocs/luci-static/resources/tools/widgets.js:545
 #: modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm:53
 #: modules/luci-base/luasrc/view/cbi/network_netlist.htm:38
 msgid "unspecified"
@@ -6165,7 +6339,7 @@ msgstr "尚未指定"
 msgid "unspecified -or- create:"
 msgstr "尚未指定 - 或 -建立:"
 
-#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:366
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js:344
 msgid "untagged"
 msgstr "尚未標籤"
 
@@ -6246,8 +6420,8 @@ msgstr ""
 msgid "valid address:port"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:523
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:527
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:529
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:533
 msgid "valid date (YYYY-MM-DD)"
 msgstr ""
 
@@ -6284,7 +6458,7 @@ msgstr ""
 msgid "valid network in address/netmask notation"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:498
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:504
 msgid "valid phone digit (0-9, \"*\", \"#\", \"!\" or \".\")"
 msgstr ""
 
@@ -6297,11 +6471,11 @@ msgstr ""
 msgid "valid port value"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:503
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:509
 msgid "valid time (HH:MM:SS)"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:425
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:431
 msgid "value between %d and %d characters"
 msgstr ""
 
@@ -6317,14 +6491,23 @@ msgstr ""
 msgid "value smaller or equal to %f"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:430
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:425
+msgid "value with %d characters"
+msgstr ""
+
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:436
 msgid "value with at least %d characters"
 msgstr ""
 
-#: modules/luci-base/htdocs/luci-static/resources/validation.js:435
+#: modules/luci-base/htdocs/luci-static/resources/validation.js:441
 msgid "value with at most %d characters"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1169
+msgid "weak security"
+msgstr ""
+
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:39
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js:34
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:221
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:232
@@ -6335,6 +6518,192 @@ msgstr "是的"
 msgid "« Back"
 msgstr "« 倒退"
 
+#~ msgid "Specifies the listening port of this <em>Dropbear</em> instance"
+#~ msgstr "指定這個 <em>Dropbear</em>的監聽埠"
+
+#~ msgid "Switch %q (%s)"
+#~ msgstr "交換器 %q (%s)"
+
+#~ msgid "VLANs on %q (%s)"
+#~ msgstr "VLAN 在 %q (%s)"
+
+#~ msgid "Antenna 1"
+#~ msgstr "天線 1"
+
+#~ msgid "Antenna 2"
+#~ msgstr "天線 2"
+
+#~ msgid "Antenna Configuration"
+#~ msgstr "天線設定"
+
+#~ msgid "Back to overview"
+#~ msgstr "返回至總覽"
+
+#~ msgid "Back to scan results"
+#~ msgstr "返回至掃描結果"
+
+#~ msgid "Broadcom 802.11%s Wireless Controller"
+#~ msgstr "Broadcom 802.11%s 無線控制器"
+
+#~ msgid "Broadcom BCM%04x 802.11 Wireless Controller"
+#~ msgstr "Broadcom BCM%04x 802.11 無線控制器"
+
+#~ msgid "Common Configuration"
+#~ msgstr "一般設定"
+
+#~ msgid "Connect"
+#~ msgstr "連線"
+
+#~ msgid "Connection Limit"
+#~ msgstr "連線限制"
+
+#~ msgid "Cover the following interface"
+#~ msgstr "覆蓋下列介面"
+
+#~ msgid "Cover the following interfaces"
+#~ msgstr "覆蓋下列這些介面"
+
+#~ msgid "Create Interface"
+#~ msgstr "建立介面"
+
+#~ msgid "Create a bridge over multiple interfaces"
+#~ msgstr "在多個介面上建立橋接"
+
+#~ msgid "Diversity"
+#~ msgstr "差異"
+
+#~ msgid "Edit this interface"
+#~ msgstr "修改這個介面"
+
+#~ msgid "Frame Bursting"
+#~ msgstr "訊框爆速"
+
+#~ msgid "Generic 802.11%s Wireless Controller"
+#~ msgstr "通用 802.11%s 無線控制器"
+
+#~ msgid "Install package %q"
+#~ msgstr "安裝軟體包 %q"
+
+#~ msgid "Interface Overview"
+#~ msgstr "介面預覽"
+
+#~ msgid "Missing protocol extension for proto %q"
+#~ msgstr "協定  %q 漏失的延伸協定"
+
+#~ msgid "Name of the new interface"
+#~ msgstr "新介面的名稱"
+
+#~ msgid "No network configured on this device"
+#~ msgstr "尚無網路設定在這個介面上"
+
+#~ msgid "No network name specified"
+#~ msgstr "尚未指定網路名稱"
+
+#~ msgid "Not associated"
+#~ msgstr "尚未關聯"
+
+#~ msgid ""
+#~ "On this page you can configure the network interfaces. You can bridge "
+#~ "several interfaces by ticking the \"bridge interfaces\" field and enter "
+#~ "the names of several network interfaces separated by spaces. You can also "
+#~ "use <abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
+#~ "<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
+#~ "<samp>eth0.1</samp>)."
+#~ msgstr ""
+#~ "在這個頁面您可以設定網路介面. 只要點下這個\"介面群橋接\"而且打入數個以空格"
+#~ "分開網路介面的名稱就可以橋接數個介面群. 您也可以使用<abbr title=\"Virtual "
+#~ "Local Area Network\">VLAN</abbr> 符號<samp>INTERFACE.VLANNR</samp> (<abbr "
+#~ "title=\"for example\">例.如</abbr>: <samp>eth0.1</samp>)."
+
+#~ msgid "Package libiwinfo required!"
+#~ msgstr "軟體包必需有libiwinfo!"
+
+#~ msgid "Protocol of the new interface"
+#~ msgstr "新介面的協定家族"
+
+#~ msgid "Protocol support is not installed"
+#~ msgstr "支援的協定尚未安裝"
+
+#~ msgid ""
+#~ "Really delete this wireless network? The deletion cannot be undone! You "
+#~ "might lose access to this device if you are connected via this network."
+#~ msgstr ""
+#~ "真的要刪除這個無線網路?無法復原的刪除!\n"
+#~ "假如您是透過這個網路連線您可能會無法存取這個設備."
+
+#~ msgid "Receiver Antenna"
+#~ msgstr "接收天線"
+
+#~ msgid "Repeat scan"
+#~ msgstr "再次掃描"
+
+#~ msgid "Replace entry"
+#~ msgstr "替代項目"
+
+#~ msgid "Separate Clients"
+#~ msgstr "分隔用戶端"
+
+#~ msgid "Slot time"
+#~ msgstr "插槽時間"
+
+#, fuzzy
+#~ msgid ""
+#~ "The <em>Device Configuration</em> section covers physical settings of the "
+#~ "radio hardware such as channel, transmit power or antenna selection which "
+#~ "are shared among all defined wireless networks (if the radio hardware is "
+#~ "multi-SSID capable). Per network settings like encryption or operation "
+#~ "mode are grouped in the <em>Interface Configuration</em>."
+#~ msgstr ""
+#~ "這個<em>Device Configuration</em>欄位會覆蓋無線射頻硬體的物理設定值,如通"
+#~ "道、傳送功率或者天線分享道所有定義的無線網路(假如這個無線射頻硬體是多工-"
+#~ "SSID能力的). 每個網路設定像加密或操作模式是被分群在<em>Interface "
+#~ "Configuration</em>中."
+
+#~ msgid ""
+#~ "The <em>libiwinfo-lua</em> package is not installed. You must install "
+#~ "this component for working wireless configuration!"
+#~ msgstr ""
+#~ "這 <em>libiwinfo-lua</em> 軟體包尚未安裝. 您必須安裝這個元件以便無線網路設"
+#~ "定有作用."
+
+#~ msgid "The given network name is not unique"
+#~ msgstr "輸入的網路名稱非唯一"
+
+#, fuzzy
+#~ msgid ""
+#~ "The hardware is not multi-SSID capable and the existing configuration "
+#~ "will be replaced if you proceed."
+#~ msgstr "如果您繼續的話.這硬體並非多SSID工能並且已存的設定將會被覆蓋."
+
+#~ msgid "The selected protocol needs a device assigned"
+#~ msgstr "選到的協定需要指定到設備上"
+
+#~ msgid ""
+#~ "There is no device assigned yet, please attach a network device in the "
+#~ "\"Physical Settings\" tab"
+#~ msgstr "尚未指定設備, 請接上一個網路設備在這\"實體設置\"標籤內"
+
+#~ msgid "Transmission Rate"
+#~ msgstr "傳輸速率"
+
+#~ msgid "Transmit Power"
+#~ msgstr "射頻功率"
+
+#~ msgid "Transmitter Antenna"
+#~ msgstr "射頻天線"
+
+#~ msgid "Uploaded File"
+#~ msgstr "檔案已上傳"
+
+#~ msgid "Wireless is restarting..."
+#~ msgstr "無線網路重啟中..."
+
+#~ msgid "hidden"
+#~ msgstr "隱藏"
+
+#~ msgid "open"
+#~ msgstr "打開"
+
 #~ msgid "Advanced"
 #~ msgstr "進階"
 
@@ -6473,9 +6842,6 @@ msgstr "« 倒退"
 #~ msgid "Hermes 802.11b Wireless Controller"
 #~ msgstr "Hermes 802.11b 無線網路控制器"
 
-#~ msgid "Interface is shutting down..."
-#~ msgstr "介面正在關閉中..."
-
 #~ msgid "Interface reconnected"
 #~ msgstr "介面已重新連線"
 
diff --git a/modules/luci-base/root/usr/libexec/rpcd/luci b/modules/luci-base/root/usr/libexec/rpcd/luci
index 7644745ef..8215fb95d 100755
--- a/modules/luci-base/root/usr/libexec/rpcd/luci
+++ b/modules/luci-base/root/usr/libexec/rpcd/luci
@@ -9,7 +9,7 @@ local function readfile(path)
 end
 
 local methods = {
-	initList = {
+	getInitList = {
 		args = { name = "name" },
 		call = function(args)
 			local sys = require "luci.sys"
@@ -22,11 +22,11 @@ local methods = {
 					return { error = "No such init script" }
 				end
 			end
-			return { result = scripts }
+			return scripts
 		end
 	},
 
-	initCall = {
+	setInitAction = {
 		args = { name = "name", action = "action" },
 		call = function(args)
 			local sys = require "luci.sys"
@@ -39,7 +39,7 @@ local methods = {
 
 	getLocaltime = {
 		call = function(args)
-			return { localtime = os.time() }
+			return { result = os.time() }
 		end
 	},
 
@@ -52,11 +52,11 @@ local methods = {
 				sys.call("date -s '%04d-%02d-%02d %02d:%02d:%02d' >/dev/null" %{ date.year, date.month, date.day, date.hour, date.min, date.sec })
 				sys.call("/etc/init.d/sysfixtime restart >/dev/null")
 			end
-			return { localtime = args.localtime }
+			return { result = args.localtime }
 		end
 	},
 
-	timezone = {
+	getTimezones = {
 		call = function(args)
 			local util  = require "luci.util"
 			local zones = require "luci.sys.zoneinfo"
@@ -76,11 +76,11 @@ local methods = {
 					active = (res and res.value == zone[1]) and true or nil
 				}
 			end
-			return { result = result }
+			return result
 		end
 	},
 
-	leds = {
+	getLEDs = {
 		call = function()
 			local iter   = fs.dir("/sys/class/leds")
 			local result = { }
@@ -115,7 +115,7 @@ local methods = {
 		end
 	},
 
-	usb = {
+	getUSBDevices = {
 		call = function()
 			local fs     = require "nixio.fs"
 			local iter   = fs.glob("/sys/bus/usb/devices/[0-9]*/manufacturer")
@@ -126,7 +126,7 @@ local methods = {
 
 				local p
 				for p in iter do
-					local id = p:match("%d+-%d+")
+					local id = p:match("/([^/]+)/manufacturer$")
 
 					result.devices[#result.devices+1] = {
 						id      = id,
@@ -139,18 +139,19 @@ local methods = {
 				end
 			end
 
-			iter = fs.glob("/sys/bus/usb/devices/*/usb[0-9]*-port[0-9]*")
+			iter = fs.glob("/sys/bus/usb/devices/*/*-port[0-9]*")
 
 			if iter then
 				result.ports = {}
 
 				local p
 				for p in iter do
-					local bus, port = p:match("usb(%d+)-port(%d+)")
+					local port = p:match("([^/]+)$")
+					local link = fs.readlink(p.."/device")
 
 					result.ports[#result.ports+1] = {
-						hub  = tonumber(bus),
-						port = tonumber(port)
+						port   = port,
+						device = link and fs.basename(link)
 					}
 				end
 			end
@@ -159,20 +160,20 @@ local methods = {
 		end
 	},
 
-	ifaddrs = {
+	getIfaddrs = {
 		call = function()
 			return { result = nixio.getifaddrs() }
 		end
 	},
 
-	host_hints = {
+	getHostHints = {
 		call = function()
 			local sys = require "luci.sys"
 			return sys.net.host_hints()
 		end
 	},
 
-	duid_hints = {
+	getDUIDHints = {
 		call = function()
 			local fp = io.open('/var/hosts/odhcpd')
 			local result = { }
@@ -192,7 +193,7 @@ local methods = {
 		end
 	},
 
-	leases = {
+	getDHCPLeases = {
 		args = { family = 0 },
 		call = function(args)
 			local s = require "luci.tools.status"
@@ -210,7 +211,7 @@ local methods = {
 		end
 	},
 
-	netdevs = {
+	getNetworkDevices = {
 		call = function(args)
 			local dir = fs.dir("/sys/class/net")
 			local result = { }
@@ -273,52 +274,416 @@ local methods = {
 		end
 	},
 
-	boardjson = {
+	getWirelessDevices = {
+		call = function(args)
+			local ubus = require "ubus".connect()
+			if not ubus then
+				return { error = "Unable to establish ubus connection" }
+			end
+
+			local status = ubus:call("network.wireless", "status", {})
+			if type(status) == "table" then
+				local radioname, radiodata
+				for radioname, radiodata in pairs(status) do
+					if type(radiodata) == "table" then
+						radiodata.iwinfo = ubus:call("iwinfo", "info", { device = radioname }) or {}
+						radiodata.iwinfo.bitrate     = nil
+						radiodata.iwinfo.bssid       = nil
+						radiodata.iwinfo.encryption  = nil
+						radiodata.iwinfo.mode        = nil
+						radiodata.iwinfo.quality     = nil
+						radiodata.iwinfo.quality_max = nil
+						radiodata.iwinfo.ssid        = nil
+
+						local iwdata = nil
+
+						if type(radiodata.interfaces) == "table" then
+							local _, interfacedata
+							for _, interfacedata in ipairs(radiodata.interfaces) do
+								if type(interfacedata) == "table" and
+								   type(interfacedata.ifname) == "string"
+								then
+									local iwinfo = ubus:call("iwinfo", "info", { device = interfacedata.ifname })
+
+									iwdata = iwdata or iwinfo
+									interfacedata.iwinfo = iwinfo or {}
+								end
+							end
+						end
+
+						radiodata.iwinfo = {}
+
+						local _, k, v
+						for k, v in pairs(iwdata or ubus:call("iwinfo", "info", { device = radioname }) or {}) do
+							if k ~= "bitrate" and k ~= "bssid" and k ~= "encryption" and
+							   k ~= "mode" and k ~= "quality" and k ~= "quality_max" and
+							   k ~= "ssid"
+							then
+								if type(v) == "table" then
+									radiodata.iwinfo[k] = json.parse(json.stringify(v))
+								else
+									radiodata.iwinfo[k] = v
+								end
+							end
+						end
+					end
+				end
+			end
+
+			return status
+		end
+	},
+
+	getBoardJSON = {
 		call = function(args)
 			local jsc = require "luci.jsonc"
 			return jsc.parse(fs.readfile("/etc/board.json") or "")
 		end
 	},
 
-	offload_support = {
+	getConntrackHelpers = {
 		call = function()
-			local fs = require "nixio.fs"
-			return { offload_support = not not fs.access("/sys/module/xt_FLOWOFFLOAD/refcnt") }
+			local ok, fd = pcall(io.open, "/usr/share/fw3/helpers.conf", "r")
+			local rv = {}
+
+			if ok then
+				local entry
+
+				while true do
+					local line = fd:read("*l")
+					if not line then
+						break
+					end
+
+					if line:match("^%s*config%s") then
+						if entry then
+							rv[#rv+1] = entry
+						end
+						entry = {}
+					else
+						local opt, val = line:match("^%s*option%s+(%S+)%s+(%S.*)$")
+						if opt and val then
+							opt = opt:gsub("^'(.+)'$", "%1"):gsub('^"(.+)"$', "%1")
+							val = val:gsub("^'(.+)'$", "%1"):gsub('^"(.+)"$', "%1")
+							entry[opt] = val
+						end
+					end
+				end
+
+				if entry then
+					rv[#rv+1] = entry
+				end
+
+				fd:close()
+			end
+
+			return { result = rv }
 		end
 	},
 
-	conntrack_helpers = {
+	getFeatures = {
 		call = function()
-			local fd = io.open("/usr/share/fw3/helpers.conf", "r")
+			local fs = require "nixio.fs"
 			local rv = {}
+			local ok, fd
+
+			rv.firewall      = fs.access("/sbin/fw3")
+			rv.opkg          = fs.access("/bin/opkg")
+			rv.offloading    = fs.access("/sys/module/xt_FLOWOFFLOAD/refcnt")
+			rv.br2684ctl     = fs.access("/usr/sbin/br2684ctl")
+			rv.swconfig      = fs.access("/sbin/swconfig")
+			rv.odhcpd        = fs.access("/usr/sbin/odhcpd")
+			rv.zram          = fs.access("/sys/class/zram-control")
+			rv.sysntpd       = fs.readlink("/usr/sbin/ntpd") and true
+			rv.ipv6          = fs.access("/proc/net/ipv6_route")
+			rv.dropbear      = fs.access("/usr/sbin/dropbear")
+
+			local wifi_features = { "eap", "11n", "11ac", "11r", "11w", "acs", "sae", "owe", "suiteb192" }
+
+			if fs.access("/usr/sbin/hostapd") then
+				rv.hostapd = { cli = fs.access("/usr/sbin/hostapd_cli") }
+
+				local _, feature
+				for _, feature in ipairs(wifi_features) do
+					rv.hostapd[feature] =
+						(os.execute(string.format("/usr/sbin/hostapd -v%s >/dev/null 2>/dev/null", feature)) == 0)
+				end
+			end
 
-			local line, entry
-			while true do
-				line = fd:read("*l")
-				if not line then
-					break
+			if fs.access("/usr/sbin/wpa_supplicant") then
+				rv.wpasupplicant = { cli = fs.access("/usr/sbin/wpa_cli") }
+
+				local _, feature
+				for _, feature in ipairs(wifi_features) do
+					rv.wpasupplicant[feature] =
+						(os.execute(string.format("/usr/sbin/wpa_supplicant -v%s >/dev/null 2>/dev/null", feature)) == 0)
 				end
+			end
 
-				if line:match("^%s*config%s") then
-					if entry then
-						rv[#rv+1] = entry
+			ok, fd = pcall(io.popen, "dnsmasq --version 2>/dev/null")
+			if ok then
+				rv.dnsmasq = {}
+
+				while true do
+					local line = fd:read("*l")
+					if not line then
+						break
 					end
-					entry = {}
-				else
-					local opt, val = line:match("^%s*option%s+(%S+)%s+(%S.*)$")
-					if opt and val then
-						opt = opt:gsub("^'(.+)'$", "%1"):gsub('^"(.+)"$', "%1")
-						val = val:gsub("^'(.+)'$", "%1"):gsub('^"(.+)"$', "%1")
-						entry[opt] = val
+
+					local opts = line:match("^Compile time options: (.+)$")
+					if opts then
+						local opt
+						for opt in opts:gmatch("%S+") do
+							local no = opt:match("^no%-(%S+)$")
+							rv.dnsmasq[string.lower(no or opt)] = not no
+						end
+						break
+					end
+				end
+
+				fd:close()
+			end
+
+			ok, fd = pcall(io.popen, "ipset --help 2>/dev/null")
+			if ok then
+				rv.ipset = {}
+
+				local sets = false
+
+				while true do
+					local line = fd:read("*l")
+					if not line then
+						break
+					elseif line:match("^Supported set types:") then
+						sets = true
+					elseif sets then
+						local set, ver = line:match("^%s+(%S+)%s+(%d+)")
+						if set and not rv.ipset[set] then
+							rv.ipset[set] = tonumber(ver)
+						end
+					end
+				end
+
+				fd:close()
+			end
+
+			return rv
+		end
+	},
+
+	getSwconfigFeatures = {
+		args = { switch = "switch0" },
+		call = function(args)
+			local util = require "luci.util"
+
+			-- Parse some common switch properties from swconfig help output.
+			local swc, err = io.popen("swconfig dev %s help 2>/dev/null" % util.shellquote(args.switch))
+			if swc then
+				local is_port_attr = false
+				local is_vlan_attr = false
+				local rv = {}
+
+				while true do
+					local line = swc:read("*l")
+					if not line then break end
+
+					if line:match("^%s+%-%-vlan") then
+						is_vlan_attr = true
+
+					elseif line:match("^%s+%-%-port") then
+						is_vlan_attr = false
+						is_port_attr = true
+
+					elseif line:match("cpu @") then
+						rv.switch_title = line:match("^switch%d: %w+%((.-)%)")
+						rv.num_vlans    = tonumber(line:match("vlans: (%d+)")) or 16
+						rv.min_vid      = 1
+
+					elseif line:match(": pvid") or line:match(": tag") or line:match(": vid") then
+						if is_vlan_attr then rv.vid_option = line:match(": (%w+)") end
+
+					elseif line:match(": enable_vlan4k") then
+						rv.vlan4k_option = "enable_vlan4k"
+
+					elseif line:match(": enable_vlan") then
+						rv.vlan_option = "enable_vlan"
+
+					elseif line:match(": enable_learning") then
+						rv.learning_option = "enable_learning"
+
+					elseif line:match(": enable_mirror_rx") then
+						rv.mirror_option = "enable_mirror_rx"
+
+					elseif line:match(": max_length") then
+						rv.jumbo_option = "max_length"
 					end
 				end
+
+				swc:close()
+
+				if not next(rv) then
+					return { error = "No such switch" }
+				end
+
+				return rv
+			else
+				return { error = err }
 			end
+		end
+	},
+
+	getSwconfigPortState = {
+		args = { switch = "switch0" },
+		call = function(args)
+			local util = require "luci.util"
+
+			local swc, err = io.popen("swconfig dev %s show 2>/dev/null" % util.shellquote(args.switch))
+			if swc then
+				local ports = { }
+
+				while true do
+					local line = swc:read("*l")
+					if not line then break end
+
+					local port, up = line:match("port:(%d+) link:(%w+)")
+					if port then
+						local speed  = line:match(" speed:(%d+)")
+						local duplex = line:match(" (%w+)-duplex")
+						local txflow = line:match(" (txflow)")
+						local rxflow = line:match(" (rxflow)")
+						local auto   = line:match(" (auto)")
+
+						ports[#ports+1] = {
+							port   = tonumber(port) or 0,
+							speed  = tonumber(speed) or 0,
+							link   = (up == "up"),
+							duplex = (duplex == "full"),
+							rxflow = (not not rxflow),
+							txflow = (not not txflow),
+							auto   = (not not auto)
+						}
+					end
+				end
+
+				swc:close()
+
+				if not next(ports) then
+					return { error = "No such switch" }
+				end
 
-			if entry then
-				rv[#rv+1] = entry
+				return { result = ports }
+			else
+				return { error = err }
 			end
+		end
+	},
+
+	setPassword = {
+		args = { username = "root", password = "password" },
+		call = function(args)
+			local util = require "luci.util"
+			return {
+				result = (os.execute("(echo %s; sleep 1; echo %s) | passwd %s >/dev/null 2>&1" %{
+					luci.util.shellquote(args.password),
+					luci.util.shellquote(args.password),
+					luci.util.shellquote(args.username)
+				}) == 0)
+			}
+		end
+	},
+
+	getBlockDevices = {
+		call = function()
+			local fs = require "nixio.fs"
+
+			local block = io.popen("/sbin/block info", "r")
+			if block then
+				local rv = {}
+
+				while true do
+					local ln = block:read("*l")
+					if not ln then
+						break
+					end
+
+					local dev = ln:match("^/dev/(.-):")
+					if dev then
+						local s = tonumber((fs.readfile("/sys/class/block/" .. dev .."/size")))
+						local e = {
+							dev = "/dev/" .. dev,
+							size = s and s * 512
+						}
 
-			return { helpers = rv }
+						local key, val = { }
+						for key, val in ln:gmatch([[(%w+)="(.-)"]]) do
+							e[key:lower()] = val
+						end
+
+						rv[dev] = e
+					end
+				end
+
+				block:close()
+
+				return rv
+			else
+				return { error = "Unable to execute block utility" }
+			end
+		end
+	},
+
+	setBlockDetect = {
+		call = function()
+			return { result = (os.execute("/sbin/block detect > /etc/config/fstab") == 0) }
+		end
+	},
+
+	getMountPoints = {
+		call = function()
+			local fs = require "nixio.fs"
+
+			local fd, err = io.open("/proc/mounts", "r")
+			if fd then
+				local rv = {}
+
+				while true do
+					local ln = fd:read("*l")
+					if not ln then
+						break
+					end
+
+					local device, mount, fstype, options, freq, pass = ln:match("^(%S*) (%S*) (%S*) (%S*) (%d+) (%d+)$")
+					if device and mount then
+						device = device:gsub("\\(%d+)", function(n) return string.char(tonumber(n, 8)) end)
+						mount = mount:gsub("\\(%d+)", function(n) return string.char(tonumber(n, 8)) end)
+
+						local stat = fs.statvfs(mount)
+						if stat and stat.blocks > 0 then
+							rv[#rv+1] = {
+								device = device,
+								mount  = mount,
+								size   = stat.bsize * stat.blocks,
+								avail  = stat.bsize * stat.bavail,
+								free   = stat.bsize * stat.bfree
+							}
+						end
+					end
+				end
+
+				fd:close()
+
+				return { result = rv }
+			else
+				return { error = err }
+			end
+		end
+	},
+
+	setUmount = {
+		args = { path = "/mnt" },
+		call = function(args)
+			local util = require "luci.util"
+			return { result = (os.execute(string.format("/bin/umount %s", util.shellquote(args.path))) == 0) }
 		end
 	}
 }
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 de145ce78..af06d840d 100644
--- 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
@@ -1,4 +1,13 @@
 {
+	"unauthenticated": {
+		"description": "Allow system feature probing",
+		"read": {
+			"ubus": {
+				"luci": [ "getFeatures" ]
+			}
+		}
+	},
+
 	"uci-access": {
 		"description": "Grant uci write access to all configurations",
 		"read": {
@@ -11,20 +20,41 @@
 	"luci-access": {
 		"description": "Grant access to basic LuCI procedures",
 		"read": {
+			"file": {
+				"/": [ "list" ],
+				"/*": [ "list" ],
+				"/etc/crontabs/root": [ "read" ],
+				"/etc/dropbear/authorized_keys": [ "read" ],
+				"/etc/filesystems": [ "read" ],
+				"/etc/rc.local": [ "read" ],
+				"/proc/filesystems": [ "read" ],
+				"/proc/sys/kernel/hostname": [ "read" ]
+			},
 			"ubus": {
-				"iwinfo": [ "info" ],
-				"luci": [ "boardjson", "duid_hints", "host_hints", "ifaddrs", "initList", "getLocaltime", "leases", "leds", "netdevs", "usb" ],
+				"file": [ "list", "read", "stat" ],
+				"iwinfo": [ "assoclist", "freqlist", "txpowerlist", "countrylist" ],
+				"luci": [ "getBoardJSON", "getDUIDHints", "getHostHints", "getIfaddrs", "getInitList", "getLocaltime", "getTimezones", "getDHCPLeases", "getLEDs", "getNetworkDevices", "getUSBDevices", "getWirelessDevices", "getSwconfigFeatures", "getSwconfigPortState", "getBlockDevices", "getMountPoints" ],
 				"network.device": [ "status" ],
 				"network.interface": [ "dump" ],
-				"network.wireless": [ "status" ],
+				"network": [ "get_proto_handlers" ],
 				"uci": [ "changes", "get" ]
 			},
 			"uci": [ "*" ]
 		},
 		"write": {
+			"cgi-io": [ "upload", "/etc/luci-uploads/*" ],
+			"file": {
+				"/etc/crontabs/root": [ "write" ],
+				"/etc/dropbear/authorized_keys": [ "write" ],
+				"/etc/luci-uploads/*": [ "write" ],
+				"/etc/rc.local": [ "write" ],
+				"/sbin/block": [ "exec" ]
+			},
 			"ubus": {
-				"luci": [ "initCall", "setLocaltime", "timezone" ],
-				"uci": [ "add", "apply", "confirm", "delete", "order", "set" ]
+				"file": [ "write", "remove", "exec" ],
+				"iwinfo": [ "scan" ],
+				"luci": [ "setInitAction", "setLocaltime", "setPassword", "setBlockDetect", "setUmount" ],
+				"uci": [ "add", "apply", "confirm", "delete", "order", "set", "rename" ]
 			},
 			"uci": [ "*" ]
 		}
@@ -33,7 +63,7 @@
 		"description": "Grant access to firewall procedures",
 		"read": {
 			"ubus": {
-				"luci": [ "conntrack_helpers", "offload_support" ]
+				"luci": [ "getConntrackHelpers" ]
 			},
 			"uci": [ "firewall" ]
 		},
diff --git a/modules/luci-mod-admin-full/luasrc/controller/admin/filebrowser.lua b/modules/luci-mod-admin-full/luasrc/controller/admin/filebrowser.lua
deleted file mode 100644
index 257261513..000000000
--- a/modules/luci-mod-admin-full/luasrc/controller/admin/filebrowser.lua
+++ /dev/null
@@ -1,9 +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.
-
-module("luci.controller.admin.filebrowser", package.seeall)
-
-function index()
-	entry( {"admin", "filebrowser"}, template("cbi/filebrowser") ).leaf = true
-end
diff --git a/modules/luci-mod-network/Makefile b/modules/luci-mod-network/Makefile
index 5958765da..bf5627d64 100644
--- a/modules/luci-mod-network/Makefile
+++ b/modules/luci-mod-network/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=LuCI Network Administration
-LUCI_DEPENDS:=+luci-base +libiwinfo-lua
+LUCI_DEPENDS:=+luci-base +libiwinfo-lua +rpcd-mod-iwinfo
 
 PKG_LICENSE:=Apache-2.0
 
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 7035dc476..3acb6d1a1 100644
--- 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
@@ -7,17 +7,19 @@ var callHostHints, callDUIDHints, callDHCPLeases, CBILeaseStatus;
 
 callHostHints = rpc.declare({
 	object: 'luci',
-	method: 'host_hints'
+	method: 'getHostHints',
+	expect: { '': {} }
 });
 
 callDUIDHints = rpc.declare({
 	object: 'luci',
-	method: 'duid_hints'
+	method: 'getDUIDHints',
+	expect: { '': {} }
 });
 
 callDHCPLeases = rpc.declare({
 	object: 'luci',
-	method: 'leases',
+	method: 'getDHCPLeases',
 	params: [ 'family' ],
 	expect: { dhcp_leases: [] }
 });
@@ -57,7 +59,6 @@ return L.view.extend({
 		    m, s, o, ss, so;
 
 		m = new form.Map('dhcp', _('DHCP and DNS'), _('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'));
-		m.tabbed = true;
 
 		s = m.section(form.TypedSection, 'dnsmasq', _('Server Settings'));
 		s.anonymous = true;
@@ -344,8 +345,29 @@ return L.view.extend({
 
 			return result.length ? result.join(' ') : null;
 		};
+		so.renderWidget = function(section_id, option_index, cfgvalue) {
+			var node = form.Value.prototype.renderWidget.apply(this, [section_id, option_index, cfgvalue]),
+			    ipopt = this.section.children.filter(function(o) { return o.option == 'ip' })[0];
+
+			node.addEventListener('cbi-dropdown-change', L.bind(function(ipopt, section_id, ev) {
+				var mac = ev.detail.value.value;
+				if (mac == null || mac == '' || !hosts[mac] || !hosts[mac].ipv4)
+					return;
+
+				var ip = ipopt.formvalue(section_id);
+				if (ip != null && ip != '')
+					return;
+
+				var node = ipopt.map.findElement('id', ipopt.cbid(section_id));
+				if (node)
+					L.dom.callClassMethod(node, 'setValue', hosts[mac].ipv4);
+			}, this, ipopt, section_id));
+
+			return node;
+		};
 		Object.keys(hosts).forEach(function(mac) {
-			so.value(mac);
+			var hint = hosts[mac].name || hosts[mac].ipv4;
+			so.value(mac, hint ? '%s (%s)'.format(mac, hint) : mac);
 		});
 
 		so = ss.option(form.Value, 'ip', _('<abbr title="Internet Protocol Version 4">IPv4</abbr>-Address'));
@@ -362,8 +384,10 @@ return L.view.extend({
 			return true;
 		};
 		Object.keys(hosts).forEach(function(mac) {
-			if (hosts[mac].ipv4)
-				so.value(hosts[mac].ipv4);
+			if (hosts[mac].ipv4) {
+				var hint = hosts[mac].name;
+				so.value(hosts[mac].ipv4, hint ? '%s (%s)'.format(hosts[mac].ipv4, hint) : hosts[mac].ipv4);
+			}
 		});
 
 		so = ss.option(form.Value, 'leasetime', _('Lease time'));
diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js
index 2a49b0481..3cdea8adb 100644
--- a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js
+++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js
@@ -5,7 +5,8 @@
 return L.view.extend({
 	callHostHints: rpc.declare({
 		object: 'luci',
-		method: 'host_hints'
+		method: 'getHostHints',
+		expect: { '': {} }
 	}),
 
 	load: function() {
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
new file mode 100644
index 000000000..624718dd8
--- /dev/null
+++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js
@@ -0,0 +1,982 @@
+'use strict';
+'require uci';
+'require form';
+'require network';
+'require firewall';
+'require tools.widgets as widgets';
+
+function count_changes(section_id) {
+	var changes = L.ui.changes.changes, n = 0;
+
+	if (!L.isObject(changes))
+		return n;
+
+	if (Array.isArray(changes.network))
+		for (var i = 0; i < changes.network.length; i++)
+			n += (changes.network[i][1] == section_id);
+
+	if (Array.isArray(changes.dhcp))
+		for (var i = 0; i < changes.dhcp.length; i++)
+			n += (changes.dhcp[i][1] == section_id);
+
+	return n;
+}
+
+function render_iface(dev, alias) {
+	var type = dev ? dev.getType() : 'ethernet',
+	    up   = dev ? dev.isUp() : false;
+
+	return E('span', { class: 'cbi-tooltip-container' }, [
+		E('img', { 'class' : 'middle', 'src': L.resource('icons/%s%s.png').format(
+			alias ? 'alias' : type,
+			up ? '' : '_disabled') }),
+		E('span', { 'class': 'cbi-tooltip ifacebadge large' }, [
+			E('img', { 'src': L.resource('icons/%s%s.png').format(
+				type, up ? '' : '_disabled') }),
+			L.itemlist(E('span', { 'class': 'left' }), [
+				_('Type'),      dev ? dev.getTypeI18n() : null,
+				_('Device'),    dev ? dev.getName() : _('Not present'),
+				_('Connected'), up ? _('yes') : _('no'),
+				_('MAC'),       dev ? dev.getMAC() : null,
+				_('RX'),        dev ? '%.2mB (%d %s)'.format(dev.getRXBytes(), dev.getRXPackets(), _('Pkts.')) : null,
+				_('TX'),        dev ? '%.2mB (%d %s)'.format(dev.getTXBytes(), dev.getTXPackets(), _('Pkts.')) : null
+			])
+		])
+	]);
+}
+
+function render_status(node, ifc, with_device) {
+	var desc = null, c = [];
+
+	if (ifc.isDynamic())
+		desc = _('Virtual dynamic interface');
+	else if (ifc.isAlias())
+		desc = _('Alias Interface');
+	else if (!uci.get('network', ifc.getName()))
+		return L.itemlist(node, [
+			null, E('em', _('Interface is marked for deletion'))
+		]);
+
+	var i18n = ifc.getI18n();
+	if (i18n)
+		desc = desc ? '%s (%s)'.format(desc, i18n) : i18n;
+
+	var changecount = with_device ? 0 : count_changes(ifc.getName()),
+	    ipaddrs = changecount ? [] : ifc.getIPAddrs(),
+	    ip6addrs = changecount ? [] : ifc.getIP6Addrs(),
+	    errors = ifc.getErrors(),
+	    maindev = ifc.getL3Device() || ifc.getDevice(),
+	    macaddr = maindev ? maindev.getMAC() : null;
+
+	return L.itemlist(node, [
+		_('Protocol'), with_device ? null : (desc || '?'),
+		_('Device'),   with_device ? (maindev ? maindev.getShortName() : E('em', _('Not present'))) : null,
+		_('Uptime'),   (!changecount && ifc.isUp()) ? '%t'.format(ifc.getUptime()) : null,
+		_('MAC'),      (!changecount && !ifc.isDynamic() && !ifc.isAlias() && macaddr) ? macaddr : null,
+		_('RX'),       (!changecount && !ifc.isDynamic() && !ifc.isAlias() && maindev) ? '%.2mB (%d %s)'.format(maindev.getRXBytes(), maindev.getRXPackets(), _('Pkts.')) : null,
+		_('TX'),       (!changecount && !ifc.isDynamic() && !ifc.isAlias() && maindev) ? '%.2mB (%d %s)'.format(maindev.getTXBytes(), maindev.getTXPackets(), _('Pkts.')) : null,
+		_('IPv4'),     ipaddrs[0],
+		_('IPv4'),     ipaddrs[1],
+		_('IPv4'),     ipaddrs[2],
+		_('IPv4'),     ipaddrs[3],
+		_('IPv4'),     ipaddrs[4],
+		_('IPv6'),     ip6addrs[0],
+		_('IPv6'),     ip6addrs[1],
+		_('IPv6'),     ip6addrs[2],
+		_('IPv6'),     ip6addrs[3],
+		_('IPv6'),     ip6addrs[4],
+		_('IPv6'),     ip6addrs[5],
+		_('IPv6'),     ip6addrs[6],
+		_('IPv6'),     ip6addrs[7],
+		_('IPv6'),     ip6addrs[8],
+		_('IPv6'),     ip6addrs[9],
+		_('IPv6-PD'),  changecount ? null : ifc.getIP6Prefix(),
+		_('Information'), with_device ? null : (ifc.get('auto') != '0' ? null : _('Not started on boot')),
+		_('Error'),    errors ? errors[0] : null,
+		_('Error'),    errors ? errors[1] : null,
+		_('Error'),    errors ? errors[2] : null,
+		_('Error'),    errors ? errors[3] : null,
+		_('Error'),    errors ? errors[4] : null,
+		null, changecount ? E('a', {
+			href: '#',
+			click: L.bind(L.ui.changes.displayChanges, L.ui.changes)
+		}, _('Interface has %d pending changes').format(changecount)) : null
+	]);
+}
+
+function render_modal_status(node, ifc) {
+	var dev = ifc ? (ifc.getDevice() || ifc.getL3Device() || ifc.getL3Device()) : null;
+
+	L.dom.content(node, [
+		E('img', {
+			'src': L.resource('icons/%s%s.png').format(dev ? dev.getType() : 'ethernet', (dev && dev.isUp()) ? '' : '_disabled'),
+			'title': dev ? dev.getTypeI18n() : _('Not present')
+		}),
+		ifc ? render_status(E('span'), ifc, true) : E('em', _('Interface not present or not connected yet.'))
+	]);
+
+	return node;
+}
+
+function render_ifacebox_status(node, ifc) {
+	var dev = ifc.getL3Device() || ifc.getDevice(),
+	    subdevs = ifc.getDevices(),
+	    c = [ render_iface(dev, ifc.isAlias()) ];
+
+	if (subdevs && subdevs.length) {
+		var sifs = [ ' (' ];
+
+		for (var j = 0; j < subdevs.length; j++)
+			sifs.push(render_iface(subdevs[j]));
+
+		sifs.push(')');
+
+		c.push(E('span', {}, sifs));
+	}
+
+	c.push(E('br'));
+	c.push(E('small', {}, ifc.isAlias() ? _('Alias of "%s"').format(ifc.isAlias())
+	                                    : (dev ? dev.getName() : E('em', _('Not present')))));
+
+	L.dom.content(node, c);
+
+	return firewall.getZoneByNetwork(ifc.getName()).then(L.bind(function(zone) {
+		this.style.backgroundColor = zone ? zone.getColor() : '#EEEEEE';
+		this.title = zone ? _('Part of zone %q').format(zone.getName()) : _('No zone assigned');
+	}, node.previousElementSibling));
+}
+
+function iface_updown(up, id, ev, force) {
+	var row = document.querySelector('.cbi-section-table-row[data-sid="%s"]'.format(id)),
+	    dsc = row.querySelector('[data-name="_ifacestat"] > div'),
+	    btns = row.querySelectorAll('.cbi-section-actions .reconnect, .cbi-section-actions .down');
+
+	btns[+!up].blur();
+	btns[+!up].classList.add('spinning');
+
+	btns[0].disabled = true;
+	btns[1].disabled = true;
+
+	dsc.setAttribute(up ? 'reconnect' : 'disconnect', force ? 'force' : '');
+	L.dom.content(dsc, E('em',
+		up ? _('Interface is reconnecting...') : _('Interface is shutting down...')));
+}
+
+function get_netmask(s, use_cfgvalue) {
+	var readfn = use_cfgvalue ? 'cfgvalue' : 'formvalue',
+	    addropt = s.children.filter(function(o) { return o.option == 'ipaddr'})[0],
+	    addrvals = addropt ? L.toArray(addropt[readfn](s.section)) : [],
+	    maskopt = s.children.filter(function(o) { return o.option == 'netmask'})[0],
+	    maskval = maskopt ? maskopt[readfn](s.section) : null,
+	    firstsubnet = maskval ? addrvals[0] + '/' + maskval : addrvals.filter(function(a) { return a.indexOf('/') > 0 })[0];
+
+	if (firstsubnet == null)
+		return null;
+
+	var mask = firstsubnet.split('/')[1];
+
+	if (!isNaN(mask))
+		mask = network.prefixToMask(+mask);
+
+	return mask;
+}
+
+return L.view.extend({
+	poll_status: function(map, networks) {
+		var resolveZone = null;
+
+		for (var i = 0; i < networks.length; i++) {
+			var ifc = networks[i],
+			    row = map.querySelector('.cbi-section-table-row[data-sid="%s"]'.format(ifc.getName()));
+
+			if (row == null)
+				continue;
+
+			var dsc = row.querySelector('[data-name="_ifacestat"] > div'),
+			    box = row.querySelector('[data-name="_ifacebox"] .ifacebox-body'),
+			    btn1 = row.querySelector('.cbi-section-actions .reconnect'),
+			    btn2 = row.querySelector('.cbi-section-actions .down'),
+			    stat = document.querySelector('[id="%s-ifc-status"]'.format(ifc.getName())),
+			    resolveZone = render_ifacebox_status(box, ifc),
+			    disabled = ifc ? !ifc.isUp() : true,
+			    dynamic = ifc ? ifc.isDynamic() : false;
+
+			if (dsc.hasAttribute('reconnect')) {
+				L.dom.content(dsc, E('em', _('Interface is starting...')));
+			}
+			else if (dsc.hasAttribute('disconnect')) {
+				L.dom.content(dsc, E('em', _('Interface is stopping...')));
+			}
+			else if (ifc.getProtocol() || uci.get('network', ifc.getName()) == null) {
+				render_status(dsc, ifc, false);
+			}
+			else if (!ifc.getProtocol()) {
+				var e = map.querySelector('[id="cbi-network-%s"] .cbi-button-edit'.format(ifc.getName()));
+				if (e) e.disabled = true;
+
+				var link = L.url('admin/system/opkg') + '?query=luci-proto';
+				L.dom.content(dsc, [
+					E('em', _('Unsupported protocol type.')), E('br'),
+					E('a', { href: link }, _('Install protocol extensions...'))
+				]);
+			}
+			else {
+				L.dom.content(dsc, E('em', _('Interface not present or not connected yet.')));
+			}
+
+			if (stat) {
+				var dev = ifc.getDevice();
+				L.dom.content(stat, [
+					E('img', {
+						'src': L.resource('icons/%s%s.png').format(dev ? dev.getType() : 'ethernet', (dev && dev.isUp()) ? '' : '_disabled'),
+						'title': dev ? dev.getTypeI18n() : _('Not present')
+					}),
+					render_status(E('span'), ifc, true)
+				]);
+			}
+
+			btn1.disabled = btn1.classList.contains('spinning') || btn2.classList.contains('spinning') || dynamic;
+			btn2.disabled = btn1.classList.contains('spinning') || btn2.classList.contains('spinning') || dynamic || disabled;
+		}
+
+		return Promise.all([ resolveZone, network.flushCache() ]);
+	},
+
+	load: function() {
+		return Promise.all([
+			network.getDSLModemType(),
+			uci.changes()
+		]);
+	},
+
+	render: function(data) {
+		var dslModemType = data[0],
+		    m, s, o;
+
+		m = new form.Map('network');
+		m.tabbed = true;
+		m.chain('dhcp');
+
+		s = m.section(form.GridSection, 'interface', _('Interfaces'));
+		s.anonymous = true;
+		s.addremove = true;
+		s.addbtntitle = _('Add new interface...');
+
+		s.load = function() {
+			return Promise.all([
+				network.getNetworks(),
+				firewall.getZones()
+			]).then(L.bind(function(data) {
+				this.networks = data[0];
+				this.zones = data[1];
+			}, this));
+		};
+
+		s.tab('general', _('General Settings'));
+		s.tab('advanced', _('Advanced Settings'));
+		s.tab('physical', _('Physical Settings'));
+		s.tab('firewall', _('Firewall Settings'));
+		s.tab('dhcp', _('DHCP Server'));
+
+		s.cfgsections = function() {
+			return this.networks.map(function(n) { return n.getName() })
+				.filter(function(n) { return n != 'loopback' });
+		};
+
+		s.modaltitle = function(section_id) {
+			return _('Interfaces') + ' » ' + section_id.toUpperCase();
+		};
+
+		s.renderRowActions = function(section_id) {
+			var tdEl = this.super('renderRowActions', [ section_id, _('Edit') ]),
+			    net = this.networks.filter(function(n) { return n.getName() == section_id })[0],
+			    disabled = net ? !net.isUp() : true,
+			    dynamic = net ? net.isDynamic() : false;
+
+			L.dom.content(tdEl.lastChild, [
+				E('button', {
+					'class': 'cbi-button cbi-button-neutral reconnect',
+					'click': iface_updown.bind(this, true, section_id),
+					'title': _('Reconnect this interface'),
+					'disabled': dynamic ? 'disabled' : null
+				}, _('Restart')),
+				E('button', {
+					'class': 'cbi-button cbi-button-neutral down',
+					'click': iface_updown.bind(this, false, section_id),
+					'title': _('Shutdown this interface'),
+					'disabled': (dynamic || disabled) ? 'disabled' : null
+				}, _('Stop')),
+				tdEl.lastChild.firstChild,
+				tdEl.lastChild.lastChild
+			]);
+
+			if (!dynamic && net && !uci.get('network', net.getName())) {
+				tdEl.lastChild.childNodes[0].disabled = true;
+				tdEl.lastChild.childNodes[2].disabled = true;
+				tdEl.lastChild.childNodes[3].disabled = true;
+			}
+
+			return tdEl;
+		};
+
+		s.addModalOptions = function(s) {
+			var protoval = uci.get('network', s.section, 'proto'),
+			    protoclass = protoval ? network.getProtocol(protoval) : null,
+			    o, ifname_single, ifname_multi, proto_select, proto_switch, type, stp, igmp, ss, so;
+
+			if (!protoval)
+				return;
+
+			return network.getNetwork(s.section).then(L.bind(function(ifc) {
+				var protocols = network.getProtocols();
+
+				protocols.sort(function(a, b) {
+					return a.getProtocol() > b.getProtocol();
+				});
+
+				o = s.taboption('general', form.DummyValue, '_ifacestat_modal', _('Status'));
+				o.modalonly = true;
+				o.cfgvalue = L.bind(function(section_id) {
+					var net = this.networks.filter(function(n) { return n.getName() == section_id })[0];
+
+					return render_modal_status(E('div', {
+						'id': '%s-ifc-status'.format(section_id),
+						'class': 'ifacebadge large'
+					}), net);
+				}, this);
+				o.write = function() {};
+
+				proto_select = s.taboption('general', form.ListValue, 'proto', _('Protocol'));
+				proto_select.modalonly = true;
+
+				proto_switch = s.taboption('general', form.Button, '_switch_proto');
+				proto_switch.modalonly  = true;
+				proto_switch.title      = _('Really switch protocol?');
+				proto_switch.inputtitle = _('Switch protocol');
+				proto_switch.inputstyle = 'apply';
+				proto_switch.onclick = L.bind(function(ev) {
+					s.map.save()
+						.then(L.bind(m.load, m))
+						.then(L.bind(m.render, m))
+						.then(L.bind(this.renderMoreOptionsModal, this, s.section));
+				}, this);
+
+				o = s.taboption('general', form.Flag, 'auto', _('Bring up on boot'));
+				o.modalonly = true;
+				o.default = o.enabled;
+
+				type = s.taboption('physical', form.Flag, 'type', _('Bridge interfaces'), _('creates a bridge over specified interface(s)'));
+				type.modalonly = true;
+				type.disabled = '';
+				type.enabled = 'bridge';
+				type.write = type.remove = function(section_id, value) {
+					var protocol = network.getProtocol(proto_select.formvalue(section_id)),
+					    ifnameopt = this.section.children.filter(function(o) { return o.option == (value ? 'ifname_multi' : 'ifname_single') })[0];
+
+					if (!protocol.isVirtual() && !this.isActive(section_id))
+						return;
+
+					var old_ifnames = [],
+					    devs = ifc.getDevices() || L.toArray(ifc.getDevice());
+
+					for (var i = 0; i < devs.length; i++)
+						old_ifnames.push(devs[i].getName());
+
+					var new_ifnames = L.toArray(ifnameopt.formvalue(section_id));
+
+					if (!value)
+						new_ifnames.length = Math.max(new_ifnames.length, 1);
+
+					old_ifnames.sort();
+					new_ifnames.sort();
+
+					for (var i = 0; i < Math.max(old_ifnames.length, new_ifnames.length); i++) {
+						if (old_ifnames[i] != new_ifnames[i]) {
+							// backup_ifnames()
+							for (var j = 0; j < old_ifnames.length; j++)
+								ifc.deleteDevice(old_ifnames[j]);
+
+							for (var j = 0; j < new_ifnames.length; j++)
+								ifc.addDevice(new_ifnames[j]);
+
+							break;
+						}
+					}
+
+					if (value)
+						uci.set('network', section_id, 'type', 'bridge');
+					else
+						uci.unset('network', section_id, 'type');
+				};
+
+				stp = s.taboption('physical', form.Flag, 'stp', _('Enable <abbr title="Spanning Tree Protocol">STP</abbr>'), _('Enables the Spanning Tree Protocol on this bridge'));
+
+				igmp = s.taboption('physical', form.Flag, 'igmp_snooping', _('Enable <abbr title="Internet Group Management Protocol">IGMP</abbr> snooping'), _('Enables IGMP snooping on this bridge'));
+
+				ifname_single = s.taboption('physical', widgets.DeviceSelect, 'ifname_single', _('Interface'));
+				ifname_single.nobridges = ifc.isBridge();
+				ifname_single.noaliases = false;
+				ifname_single.optional = false;
+				ifname_single.network = ifc.getName();
+				ifname_single.write = ifname_single.remove = function() {};
+
+				ifname_multi = s.taboption('physical', widgets.DeviceSelect, 'ifname_multi', _('Interface'));
+				ifname_multi.nobridges = ifc.isBridge();
+				ifname_multi.noaliases = true;
+				ifname_multi.multiple = true;
+				ifname_multi.optional = true;
+				ifname_multi.network = ifc.getName();
+				ifname_multi.display_size = 6;
+				ifname_multi.write = ifname_multi.remove = function() {};
+
+				ifname_single.cfgvalue = ifname_multi.cfgvalue = function(section_id) {
+					var devs = ifc.getDevices() || L.toArray(ifc.getDevice()),
+					    ifnames = [];
+
+					for (var i = 0; i < devs.length; i++)
+						ifnames.push(devs[i].getName());
+
+					return ifnames;
+				};
+
+				if (L.hasSystemFeature('firewall')) {
+					o = s.taboption('firewall', widgets.ZoneSelect, '_zone', _('Create / Assign firewall-zone'), _('Choose the firewall zone you want to assign to this interface. Select <em>unspecified</em> to remove the interface from the associated zone or fill out the <em>create</em> field to define a new zone and attach the interface to it.'));
+					o.network = ifc.getName();
+					o.optional = true;
+
+					o.cfgvalue = function(section_id) {
+						return firewall.getZoneByNetwork(ifc.getName()).then(function(zone) {
+							return (zone != null ? zone.getName() : null);
+						});
+					};
+
+					o.write = o.remove = function(section_id, value) {
+						return Promise.all([
+							firewall.getZoneByNetwork(ifc.getName()),
+							(value != null) ? firewall.getZone(value) : null
+						]).then(function(data) {
+							var old_zone = data[0],
+							    new_zone = data[1];
+
+							if (old_zone == null && new_zone == null && (value == null || value == ''))
+								return;
+
+							if (old_zone != null && new_zone != null && old_zone.getName() == new_zone.getName())
+								return;
+
+							if (old_zone != null)
+								old_zone.deleteNetwork(ifc.getName());
+
+							if (new_zone != null)
+								new_zone.addNetwork(ifc.getName());
+							else if (value != null)
+								return firewall.addZone(value).then(function(new_zone) {
+									new_zone.addNetwork(ifc.getName());
+								});
+						});
+					};
+				}
+
+				for (var i = 0; i < protocols.length; i++) {
+					proto_select.value(protocols[i].getProtocol(), protocols[i].getI18n());
+
+					if (protocols[i].getProtocol() != uci.get('network', s.section, 'proto'))
+						proto_switch.depends('proto', protocols[i].getProtocol());
+
+					if (!protocols[i].isVirtual()) {
+						type.depends('proto', protocols[i].getProtocol());
+						stp.depends({ type: 'bridge', proto: protocols[i].getProtocol() });
+						igmp.depends({ type: 'bridge', proto: protocols[i].getProtocol() });
+						ifname_single.depends({ type: '', proto: protocols[i].getProtocol() });
+						ifname_multi.depends({ type: 'bridge', proto: protocols[i].getProtocol() });
+					}
+				}
+
+				if (L.hasSystemFeature('dnsmasq') || L.hasSystemFeature('odhcpd')) {
+					o = s.taboption('dhcp', form.SectionValue, '_dhcp', form.TypedSection, 'dhcp');
+					o.depends('proto', 'static');
+
+					ss = o.subsection;
+					ss.uciconfig = 'dhcp';
+					ss.addremove = false;
+					ss.anonymous = true;
+
+					ss.tab('general',  _('General Setup'));
+					ss.tab('advanced', _('Advanced Settings'));
+					ss.tab('ipv6', _('IPv6 Settings'));
+
+					ss.filter = function(section_id) {
+						return (uci.get('dhcp', section_id, 'interface') == ifc.getName());
+					};
+
+					ss.renderSectionPlaceholder = function() {
+						return E('div', { 'class': 'cbi-section-create' }, [
+							E('p', _('No DHCP Server configured for this interface') + ' &#160; '),
+							E('button', {
+								'class': 'cbi-button cbi-button-add',
+								'title': _('Setup DHCP Server'),
+								'click': L.ui.createHandlerFn(this, function(section_id, ev) {
+									this.map.save(function() {
+										uci.add('dhcp', 'dhcp', section_id);
+										uci.set('dhcp', section_id, 'interface', section_id);
+										uci.set('dhcp', section_id, 'start', 100);
+										uci.set('dhcp', section_id, 'limit', 150);
+										uci.set('dhcp', section_id, 'leasetime', '12h');
+									});
+								}, ifc.getName())
+							}, _('Setup DHCP Server'))
+						]);
+					};
+
+					ss.taboption('general', form.Flag, 'ignore', _('Ignore interface'), _('Disable <abbr title="Dynamic Host Configuration Protocol">DHCP</abbr> for this interface.'));
+
+					so = ss.taboption('general', form.Value, 'start', _('Start'), _('Lowest leased address as offset from the network address.'));
+					so.optional = true;
+					so.datatype = 'or(uinteger,ip4addr("nomask"))';
+					so.default = '100';
+
+					so = ss.taboption('general', form.Value, 'limit', _('Limit'), _('Maximum number of leased addresses.'));
+					so.optional = true;
+					so.datatype = 'uinteger';
+					so.default = '150';
+
+					so = ss.taboption('general', form.Value, 'leasetime', _('Lease time'), _('Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>).'));
+					so.optional = true;
+					so.default = '12h';
+
+					so = ss.taboption('advanced', form.Flag, 'dynamicdhcp', _('Dynamic <abbr title="Dynamic Host Configuration Protocol">DHCP</abbr>'), _('Dynamically allocate DHCP addresses for clients. If disabled, only clients having static leases will be served.'));
+					so.default = so.enabled;
+
+					ss.taboption('advanced', form.Flag, 'force', _('Force'), _('Force DHCP on this network even if another server is detected.'));
+
+					// XXX: is this actually useful?
+					//ss.taboption('advanced', form.Value, 'name', _('Name'), _('Define a name for this network.'));
+
+					so = ss.taboption('advanced', form.Value, 'netmask', _('<abbr title="Internet Protocol Version 4">IPv4</abbr>-Netmask'), _('Override the netmask sent to clients. Normally it is calculated from the subnet that is served.'));
+					so.optional = true;
+					so.datatype = 'ip4addr';
+
+					so.render = function(option_index, section_id, in_table) {
+						this.placeholder = get_netmask(s, true);
+						return form.Value.prototype.render.apply(this, [ option_index, section_id, in_table ]);
+					};
+
+					so.validate = function(section_id, value) {
+						var node = this.map.findElement('id', this.cbid(section_id));
+						if (node)
+							node.querySelector('input').setAttribute('placeholder', get_netmask(s, false));
+						return form.Value.prototype.validate.apply(this, [ section_id, value ]);
+					};
+
+					ss.taboption('advanced', form.DynamicList, 'dhcp_option', _('DHCP-Options'), _('Define additional DHCP options, for example "<code>6,192.168.2.1,192.168.2.2</code>" which advertises different DNS servers to clients.'));
+
+					for (var i = 0; i < ss.children.length; i++)
+						if (ss.children[i].option != 'ignore')
+							ss.children[i].depends('ignore', '0');
+
+					so = ss.taboption('ipv6', form.ListValue, 'ra', _('Router Advertisement-Service'));
+					so.value('', _('disabled'));
+					so.value('server', _('server mode'));
+					so.value('relay', _('relay mode'));
+					so.value('hybrid', _('hybrid mode'));
+
+					so = ss.taboption('ipv6', form.ListValue, 'dhcpv6', _('DHCPv6-Service'));
+					so.value('', _('disabled'));
+					so.value('server', _('server mode'));
+					so.value('relay', _('relay mode'));
+					so.value('hybrid', _('hybrid mode'));
+
+					so = ss.taboption('ipv6', form.ListValue, 'ndp', _('NDP-Proxy'));
+					so.value('', _('disabled'));
+					so.value('relay', _('relay mode'));
+					so.value('hybrid', _('hybrid mode'));
+
+					so = ss.taboption('ipv6', form.ListValue, 'ra_management', _('DHCPv6-Mode'), _('Default is stateless + stateful'));
+					so.value('0', _('stateless'));
+					so.value('1', _('stateless + stateful'));
+					so.value('2', _('stateful-only'));
+					so.depends('dhcpv6', 'server');
+					so.depends('dhcpv6', 'hybrid');
+					so.default = '1';
+
+					so = ss.taboption('ipv6', form.Flag, 'ra_default', _('Always announce default router'), _('Announce as default router even if no public prefix is available.'));
+					so.depends('ra', 'server');
+					so.depends('ra', 'hybrid');
+
+					ss.taboption('ipv6', form.DynamicList, 'dns', _('Announced DNS servers'));
+					ss.taboption('ipv6', form.DynamicList, 'domain', _('Announced DNS domains'));
+				}
+
+				ifc.renderFormOptions(s);
+
+				for (var i = 0; i < s.children.length; i++) {
+					o = s.children[i];
+
+					switch (o.option) {
+					case 'proto':
+					case 'delegate':
+					case 'auto':
+					case 'type':
+					case 'stp':
+					case 'igmp_snooping':
+					case 'ifname_single':
+					case 'ifname_multi':
+					case '_dhcp':
+					case '_zone':
+					case '_switch_proto':
+					case '_ifacestat_modal':
+						continue;
+
+					default:
+						if (o.deps.length)
+							for (var j = 0; j < o.deps.length; j++)
+								o.deps[j].proto = protoval;
+						else
+							o.depends('proto', protoval);
+					}
+				}
+			}, this));
+		};
+
+		s.handleAdd = function(ev) {
+			var m2 = new form.Map('network'),
+			    s2 = m2.section(form.NamedSection, '_new_'),
+			    protocols = network.getProtocols(),
+			    proto, name, bridge, ifname_single, ifname_multi;
+
+			protocols.sort(function(a, b) {
+				return a.getProtocol() > b.getProtocol();
+			});
+
+			s2.render = function() {
+				return Promise.all([
+					{},
+					this.renderUCISection('_new_')
+				]).then(this.renderContents.bind(this));
+			};
+
+			name = s2.option(form.Value, 'name', _('Name'));
+			name.rmempty = false;
+			name.datatype = 'uciname';
+			name.placeholder = _('New interface name…');
+			name.validate = function(section_id, value) {
+				if (uci.get('network', value) != null)
+					return _('The interface name is already used');
+
+				var pr = network.getProtocol(proto.formvalue(section_id), value),
+				    ifname = pr.isVirtual() ? '%s-%s'.format(pr.getProtocol(), value) : 'br-%s'.format(value);
+
+				if (value.length > 15)
+					return _('The interface name is too long');
+
+				return true;
+			};
+
+			proto = s2.option(form.ListValue, 'proto', _('Protocol'));
+			proto.validate = name.validate;
+
+			bridge = s2.option(form.Flag, 'type', _('Bridge interfaces'), _('creates a bridge over specified interface(s)'));
+			bridge.modalonly = true;
+			bridge.disabled = '';
+			bridge.enabled = 'bridge';
+
+			ifname_single = s2.option(widgets.DeviceSelect, 'ifname_single', _('Interface'));
+			ifname_single.noaliases = false;
+			ifname_single.optional = false;
+
+			ifname_multi = s2.option(widgets.DeviceSelect, 'ifname_multi', _('Interface'));
+			ifname_multi.nobridges = true;
+			ifname_multi.noaliases = true;
+			ifname_multi.multiple = true;
+			ifname_multi.optional = true;
+			ifname_multi.display_size = 6;
+
+			for (var i = 0; i < protocols.length; i++) {
+				proto.value(protocols[i].getProtocol(), protocols[i].getI18n());
+
+				if (!protocols[i].isVirtual()) {
+					bridge.depends({ proto: protocols[i].getProtocol() });
+					ifname_single.depends({ type: '', proto: protocols[i].getProtocol() });
+					ifname_multi.depends({ type: 'bridge', proto: protocols[i].getProtocol() });
+				}
+			}
+
+			m2.render().then(L.bind(function(nodes) {
+				L.ui.showModal(_('Add new interface...'), [
+					nodes,
+					E('div', { 'class': 'right' }, [
+						E('button', {
+							'class': 'btn',
+							'click': L.ui.hideModal
+						}, _('Cancel')), ' ',
+						E('button', {
+							'class': 'cbi-button cbi-button-positive important',
+							'click': L.ui.createHandlerFn(this, function(ev) {
+								var nameval = name.isValid('_new_') ? name.formvalue('_new_') : null,
+								    protoval = proto.isValid('_new_') ? proto.formvalue('_new_') : null;
+
+								if (nameval == null || protoval == null || nameval == '' || protoval == '')
+									return;
+
+								return m.save(function() {
+									var section_id = uci.add('network', 'interface', nameval);
+
+									uci.set('network', section_id, 'proto', protoval);
+
+									if (ifname_single.isActive('_new_')) {
+										uci.set('network', section_id, 'ifname', ifname_single.formvalue('_new_'));
+									}
+									else if (ifname_multi.isActive('_new_')) {
+										uci.set('network', section_id, 'type', 'bridge');
+										uci.set('network', section_id, 'ifname', L.toArray(ifname_multi.formvalue('_new_')).join(' '));
+									}
+								}).then(L.bind(m.children[0].renderMoreOptionsModal, m.children[0], nameval));
+							})
+						}, _('Create interface'))
+					])
+				], 'cbi-modal');
+
+				nodes.querySelector('[id="%s"] input[type="text"]'.format(name.cbid('_new_'))).focus();
+			}, this));
+		};
+
+		o = s.option(form.DummyValue, '_ifacebox');
+		o.modalonly = false;
+		o.textvalue = function(section_id) {
+			var net = this.section.networks.filter(function(n) { return n.getName() == section_id })[0],
+			    zone = net ? this.section.zones.filter(function(z) { return !!z.getNetworks().filter(function(n) { return n == section_id })[0] })[0] : null;
+
+			if (!net)
+				return;
+
+			var node = E('div', { 'class': 'ifacebox' }, [
+				E('div', {
+					'class': 'ifacebox-head',
+					'style': 'background-color:%s'.format(zone ? zone.getColor() : '#EEEEEE'),
+					'title': zone ? _('Part of zone %q').format(zone.getName()) : _('No zone assigned')
+				}, E('strong', net.getName().toUpperCase())),
+				E('div', {
+					'class': 'ifacebox-body',
+					'id': '%s-ifc-devices'.format(section_id),
+					'data-network': section_id
+				}, [
+					E('img', {
+						'src': L.resource('icons/ethernet_disabled.png'),
+						'style': 'width:16px; height:16px'
+					}),
+					E('br'), E('small', '?')
+				])
+			]);
+
+			render_ifacebox_status(node.childNodes[1], net);
+
+			return node;
+		};
+
+		o = s.option(form.DummyValue, '_ifacestat');
+		o.modalonly = false;
+		o.textvalue = function(section_id) {
+			var net = this.section.networks.filter(function(n) { return n.getName() == section_id })[0];
+
+			if (!net)
+				return;
+
+			var node = E('div', { 'id': '%s-ifc-description'.format(section_id) });
+
+			render_status(node, net, false);
+
+			return node;
+		};
+
+		o = s.taboption('advanced', form.Flag, 'delegate', _('Use builtin IPv6-management'));
+		o.modalonly = true;
+		o.default = o.enabled;
+
+		o = s.taboption('advanced', form.Flag, 'force_link', _('Force link'), _('Set interface properties regardless of the link carrier (If set, carrier sense events do not invoke hotplug handlers).'));
+		o.modalonly = true;
+		o.render = function(option_index, section_id, in_table) {
+			var protoopt = this.section.children.filter(function(o) { return o.option == 'proto' })[0],
+			    protoval = protoopt ? protoopt.cfgvalue(section_id) : null;
+
+			this.default = (protoval == 'static') ? this.enabled : this.disabled;
+			return this.super('render', [ option_index, section_id, in_table ]);
+		};
+
+
+		s = m.section(form.TypedSection, 'globals', _('Global network options'));
+		s.addremove = false;
+		s.anonymous = true;
+
+		o = s.option(form.Value, 'ula_prefix', _('IPv6 ULA-Prefix'));
+		o.datatype = 'cidr6';
+
+
+		if (dslModemType != null) {
+			s = m.section(form.TypedSection, 'dsl', _('DSL'));
+			s.anonymous = true;
+
+			o = s.option(form.ListValue, 'annex', _('Annex'));
+			o.value('a', _('Annex A + L + M (all)'));
+			o.value('b', _('Annex B (all)'));
+			o.value('j', _('Annex J (all)'));
+			o.value('m', _('Annex M (all)'));
+			o.value('bdmt', _('Annex B G.992.1'));
+			o.value('b2', _('Annex B G.992.3'));
+			o.value('b2p', _('Annex B G.992.5'));
+			o.value('at1', _('ANSI T1.413'));
+			o.value('admt', _('Annex A G.992.1'));
+			o.value('alite', _('Annex A G.992.2'));
+			o.value('a2', _('Annex A G.992.3'));
+			o.value('a2p', _('Annex A G.992.5'));
+			o.value('l', _('Annex L G.992.3 POTS 1'));
+			o.value('m2', _('Annex M G.992.3'));
+			o.value('m2p', _('Annex M G.992.5'));
+
+			o = s.option(form.ListValue, 'tone', _('Tone'));
+			o.value('', _('auto'));
+			o.value('a', _('A43C + J43 + A43'));
+			o.value('av', _('A43C + J43 + A43 + V43'));
+			o.value('b', _('B43 + B43C'));
+			o.value('bv', _('B43 + B43C + V43'));
+
+			if (dslModemType == 'vdsl') {
+				o = s.option(form.ListValue, 'xfer_mode', _('Encapsulation mode'));
+				o.value('', _('auto'));
+				o.value('atm', _('ATM (Asynchronous Transfer Mode)'));
+				o.value('ptm', _('PTM/EFM (Packet Transfer Mode)'));
+
+				o = s.option(form.ListValue, 'line_mode', _('DSL line mode'));
+				o.value('', _('auto'));
+				o.value('adsl', _('ADSL'));
+				o.value('vdsl', _('VDSL'));
+
+				o = s.option(form.ListValue, 'ds_snr_offset', _('Downstream SNR offset'));
+				o.default = '0';
+
+				for (var i = -100; i <= 100; i += 5)
+					o.value(i, _('%.1f dB').format(i / 10));
+			}
+
+			s.option(form.Value, 'firmware', _('Firmware File'));
+		}
+
+
+		// Show ATM bridge section if we have the capabilities
+		if (L.hasSystemFeature('br2684ctl')) {
+			s = m.section(form.TypedSection, 'atm-bridge', _('ATM Bridges'), _('ATM bridges expose encapsulated ethernet in AAL5 connections as virtual Linux network interfaces which can be used in conjunction with DHCP or PPP to dial into the provider network.'));
+
+			s.addremove = true;
+			s.anonymous = true;
+			s.addbtntitle = _('Add ATM Bridge');
+
+			s.handleAdd = function(ev) {
+				var sections = uci.sections('network', 'atm-bridge'),
+				    max_unit = -1;
+
+				for (var i = 0; i < sections.length; i++) {
+					var unit = +sections[i].unit;
+
+					if (!isNaN(unit) && unit > max_unit)
+						max_unit = unit;
+				}
+
+				return this.map.save(function() {
+					var sid = uci.add('network', 'atm-bridge');
+
+					uci.set('network', sid, 'unit', max_unit + 1);
+					uci.set('network', sid, 'atmdev', 0);
+					uci.set('network', sid, 'encaps', 'llc');
+					uci.set('network', sid, 'payload', 'bridged');
+					uci.set('network', sid, 'vci', 35);
+					uci.set('network', sid, 'vpi', 8);
+				});
+			};
+
+			s.tab('general', _('General Setup'));
+			s.tab('advanced', _('Advanced Settings'));
+
+			o = s.taboption('general', form.Value, 'vci', _('ATM Virtual Channel Identifier (VCI)'));
+			s.taboption('general', form.Value, 'vpi', _('ATM Virtual Path Identifier (VPI)'));
+
+			o = s.taboption('general', form.ListValue, 'encaps', _('Encapsulation mode'));
+			o.value('llc', _('LLC'));
+			o.value('vc', _('VC-Mux'));
+
+			s.taboption('advanced', form.Value, 'atmdev', _('ATM device number'));
+			s.taboption('advanced', form.Value, 'unit', _('Bridge unit number'));
+
+			o = s.taboption('advanced', form.ListValue, 'payload', _('Forwarding mode'));
+			o.value('bridged', _('bridged'));
+			o.value('routed', _('routed'));
+		}
+
+
+		return m.render().then(L.bind(function(m, nodes) {
+			L.Poll.add(L.bind(function() {
+				var section_ids = m.children[0].cfgsections(),
+				    tasks = [];
+
+				for (var i = 0; i < section_ids.length; i++) {
+					var row = nodes.querySelector('.cbi-section-table-row[data-sid="%s"]'.format(section_ids[i])),
+					    dsc = row.querySelector('[data-name="_ifacestat"] > div'),
+					    btn1 = row.querySelector('.cbi-section-actions .reconnect'),
+					    btn2 = row.querySelector('.cbi-section-actions .down');
+
+					if (dsc.getAttribute('reconnect') == '') {
+						dsc.setAttribute('reconnect', '1');
+						tasks.push(L.Request.post(
+							L.url('admin/network/iface_reconnect', section_ids[i]),
+							'token=' + L.env.token,
+							{ headers: { 'Content-Type': 'application/x-www-form-urlencoded' } }
+						).catch(function() {}));
+					}
+					else if (dsc.getAttribute('disconnect') == '' || dsc.getAttribute('disconnect') == 'force') {
+						var force = dsc.getAttribute('disconnect');
+						dsc.setAttribute('disconnect', '1');
+						tasks.push(L.Request.post(
+							L.url('admin/network/iface_down', section_ids[i], force),
+							'token=' + L.env.token,
+							{ headers: { 'Content-Type': 'application/x-www-form-urlencoded' } }
+						).then(L.bind(function(ifname, res) {
+							if (res.status == 409) {
+								L.ui.showModal(_('Confirm disconnect'), [
+									E('p', _('You appear to be currently connected to the device via the "%h" interface. Do you really want to shut down the interface?').format(ifname)),
+									E('div', { 'class': 'right' }, [
+										E('button', {
+											'class': 'cbi-button cbi-button-neutral',
+											'click': L.ui.hideModal
+										}, _('Cancel')),
+										' ',
+										E('button', {
+											'class': 'cbi-button cbi-button-negative important',
+											'click': function(ev) {
+												iface_updown(false, ifname, ev, true);
+												L.ui.hideModal();
+											}
+										}, _('Disconnect'))
+									])
+								]);
+							}
+						}, this, section_ids[i]), function() {}));
+					}
+					else if (dsc.getAttribute('reconnect') == '1') {
+						dsc.removeAttribute('reconnect');
+						btn1.classList.remove('spinning');
+						btn1.disabled = false;
+					}
+					else if (dsc.getAttribute('disconnect') == '1') {
+						dsc.removeAttribute('disconnect');
+						btn2.classList.remove('spinning');
+						btn2.disabled = false;
+					}
+				}
+
+				return Promise.all(tasks)
+					.then(L.bind(network.getNetworks, network))
+					.then(L.bind(this.poll_status, this, nodes));
+			}, this), 5);
+
+			return nodes;
+		}, this, m));
+	}
+});
diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js
new file mode 100644
index 000000000..b281bb180
--- /dev/null
+++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/switch.js
@@ -0,0 +1,369 @@
+'use strict';
+'require rpc';
+'require uci';
+'require form';
+'require network';
+
+function parse_portvalue(section_id) {
+	var ports = L.toArray(uci.get('network', section_id, 'ports'));
+
+	for (var i = 0; i < ports.length; i++) {
+		var m = ports[i].match(/^(\d+)([tu]?)/);
+
+		if (m && m[1] == this.option)
+			return m[2] || 'u';
+	}
+
+	return '';
+}
+
+function validate_portvalue(section_id, value) {
+	if (value != 'u')
+		return true;
+
+	var sections = this.section.cfgsections();
+
+	for (var i = 0; i < sections.length; i++) {
+		if (sections[i] == section_id)
+			continue;
+
+		if (this.formvalue(sections[i]) == 'u')
+			return _('%s is untagged in multiple VLANs!').format(this.title);
+	}
+
+	return true;
+}
+
+function update_interfaces(old_ifname, new_ifname) {
+	var interfaces = uci.sections('network', 'interface');
+
+	for (var i = 0; i < interfaces.length; i++) {
+		var old_ifnames = L.toArray(interfaces[i].ifname),
+		    new_ifnames = [],
+		    changed = false;
+
+		for (var j = 0; j < old_ifnames.length; j++) {
+			if (old_ifnames[j] == old_ifname) {
+				new_ifnames.push(new_ifname);
+				changed = true;
+			}
+			else {
+				new_ifnames.push(old_ifnames[j]);
+			}
+		}
+
+		if (changed) {
+			uci.set('network', interfaces[i]['.name'], 'ifname', new_ifnames.join(' '));
+
+			L.ui.addNotification(null, E('p', _('Interface %q device auto-migrated from %q to %q.')
+				.replace(/%q/g, '"%s"').format(interfaces[i]['.name'], old_ifname, new_ifname)));
+		}
+	}
+}
+
+function render_port_status(node, portstate) {
+	if (!node)
+		return null;
+
+	if (!portstate.link)
+		L.dom.content(node, [
+			E('img', { src: L.resource('icons/port_down.png') }),
+			E('br'),
+			_('no link')
+		]);
+	else
+		L.dom.content(node, [
+			E('img', { src: L.resource('icons/port_up.png') }),
+			E('br'),
+			'%d'.format(portstate.speed) + _('baseT'),
+			E('br'),
+			portstate.duplex ? _('full-duplex') : _('half-duplex')
+		]);
+
+	return node;
+}
+
+function update_port_status(topologies) {
+	var tasks = [];
+
+	for (var switch_name in topologies)
+		tasks.push(callSwconfigPortState(switch_name).then(L.bind(function(switch_name, ports) {
+			for (var i = 0; i < ports.length; i++) {
+				var node = document.querySelector('[data-switch="%s"][data-port="%d"]'.format(switch_name, ports[i].port));
+				render_port_status(node, ports[i]);
+			}
+		}, topologies[switch_name], switch_name)));
+
+	return Promise.all(tasks);
+}
+
+var callSwconfigFeatures = rpc.declare({
+	object: 'luci',
+	method: 'getSwconfigFeatures',
+	params: [ 'switch' ],
+	expect: { '': {} }
+});
+
+var callSwconfigPortState = rpc.declare({
+	object: 'luci',
+	method: 'getSwconfigPortState',
+	params: [ 'switch' ],
+	expect: { result: [] }
+});
+
+return L.view.extend({
+	load: function() {
+		return network.getSwitchTopologies().then(function(topologies) {
+			var tasks = [];
+
+			for (var switch_name in topologies) {
+				tasks.push(callSwconfigFeatures(switch_name).then(L.bind(function(features) {
+					this.features = features;
+				}, topologies[switch_name])));
+				tasks.push(callSwconfigPortState(switch_name).then(L.bind(function(ports) {
+					this.portstate = ports;
+				}, topologies[switch_name])));
+			}
+
+			return Promise.all(tasks).then(function() { return topologies });
+		});
+	},
+
+	render: function(topologies) {
+		var m, s, o;
+
+		m = new form.Map('network', _('Switch'), _('The network ports on this device can be combined to several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s in which computers can communicate directly with each other. <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s are often used to separate different network segments. Often there is by default one Uplink port for a connection to the next greater network like the internet and other ports for a local network.'));
+
+		var switchSections = uci.sections('network', 'switch');
+
+		for (var i = 0; i < switchSections.length; i++) {
+			var switchSection   = switchSections[i],
+			    sid             = switchSection['.name'],
+			    switch_name     = switchSection.name || sid,
+			    topology        = topologies[switch_name];
+
+			if (!topology) {
+				L.ui.addNotification(null, _('Switch %q has an unknown topology - the VLAN settings might not be accurate.').replace(/%q/, switch_name));
+
+				topology = {
+					features: {},
+					netdevs: {
+						5: 'eth0'
+					},
+					ports: [
+						{ num: 0, label: 'Port 1' },
+						{ num: 1, label: 'Port 2' },
+						{ num: 2, label: 'Port 3' },
+						{ num: 3, label: 'Port 4' },
+						{ num: 4, label: 'Port 5' },
+						{ num: 5, label: 'CPU (eth0)', device: 'eth0', need_tag: false }
+					]
+				};
+			}
+
+			var feat = topology.features,
+			    min_vid = feat.min_vid || 0,
+			    max_vid = feat.max_vid || 16,
+			    num_vlans = feat.num_vlans || 16,
+			    switch_title = _('Switch %q').replace(/%q/, '"%s"'.format(switch_name)),
+			    vlan_title = _('VLANs on %q').replace(/%q/, '"%s"'.format(switch_name));
+
+			if (feat.switch_title) {
+				switch_title += ' (%s)'.format(feat.switch_title);
+				vlan_title += ' (%s)'.format(feat.switch_title);
+			}
+
+			s = m.section(form.NamedSection, sid, 'switch', switch_title);
+			s.addremove = false;
+
+			if (feat.vlan_option)
+				s.option(form.Flag, feat.vlan_option, _('Enable VLAN functionality'));
+
+			if (feat.learning_option) {
+				o = s.option(form.Flag, feat.learning_option, _('Enable learning and aging'));
+				o.default = o.enabled;
+			}
+
+			if (feat.jumbo_option) {
+				o = s.option(form.Flag, feat.jumbo_option, _('Enable Jumbo Frame passthrough'));
+				o.enabled = '3';
+				o.rmempty = true;
+			}
+
+			if (feat.mirror_option) {
+				s.option(form.Flag, 'enable_mirror_rx', _('Enable mirroring of incoming packets'));
+				s.option(form.Flag, 'enable_mirror_tx', _('Enable mirroring of outgoing packets'));
+
+				var sp = s.option(form.ListValue, 'mirror_source_port', _('Mirror source port')),
+				    mp = s.option(form.ListValue, 'mirror_monitor_port', _('Mirror monitor port'));
+
+				sp.depends('enable_mirror_rx', '1');
+				sp.depends('enable_mirror_tx', '1');
+
+				mp.depends('enable_mirror_rx', '1');
+				mp.depends('enable_mirror_tx', '1');
+
+				for (var j = 0; j < topology.ports.length; j++) {
+					sp.value(topology.ports[j].num, topology.ports[j].label);
+					mp.value(topology.ports[j].num, topology.ports[j].label);
+				}
+			}
+
+			s = m.section(form.TableSection, 'switch_vlan', vlan_title);
+			s.anonymous = true;
+			s.addremove = true;
+			s.addbtntitle = _('Add VLAN');
+			s.topology = topology;
+			s.device = switch_name;
+
+			s.filter = function(section_id) {
+				var device = uci.get('network', section_id, 'device');
+				return (device == switch_name);
+			};
+
+			s.cfgsections = function() {
+				var sections = form.TableSection.prototype.cfgsections.apply(this);
+
+				return sections.sort(function(a, b) {
+					var vidA = feat.vid_option ? uci.get('network', a, feat.vid_option) : null,
+					    vidB = feat.vid_option ? uci.get('network', b, feat.vid_option) : null;
+
+					vidA = +(vidA != null ? vidA : uci.get('network', a, 'vlan') || 9999);
+					vidB = +(vidB != null ? vidB : uci.get('network', b, 'vlan') || 9999);
+
+					return (vidA - vidB);
+				});
+			};
+
+			s.handleAdd = function(ev) {
+				var sections = uci.sections('network', 'switch_vlan'),
+				    section_id = uci.add('network', 'switch_vlan'),
+				    max_vlan = 0,
+				    max_vid = 0;
+
+				for (var j = 0; j < sections.length; j++) {
+					if (sections[j].device != s.device)
+						continue;
+
+					var vlan = +sections[j].vlan,
+					    vid = feat.vid_option ? +sections[j][feat.vid_option] : null;
+
+					if (vlan > max_vlan)
+						max_vlan = vlan;
+
+					if (vid > max_vid)
+						max_vid = vid;
+				}
+
+				uci.set('network', section_id, 'device', s.device);
+				uci.set('network', section_id, 'vlan', max_vlan + 1);
+
+				if (feat.vid_option)
+					uci.set('network', section_id, feat.vid_option, max_vid + 1);
+
+				return this.map.save(null, true);
+			};
+
+			var port_opts = [];
+
+			o = s.option(form.Value, feat.vid_option || 'vlan', 'VLAN ID');
+			o.rmempty = false;
+			o.forcewrite = true;
+			o.vlan_used = {};
+			o.datatype = 'range(%u,%u)'.format(min_vid, feat.vid_option ? 4094 : num_vlans - 1);
+			o.description = _('Port status:');
+
+			o.validate = function(section_id, value) {
+				var v = +value,
+				    m = feat.vid_option ? 4094 : num_vlans - 1;
+
+				if (isNaN(v) || v < min_vid || v > m)
+					return _('Invalid VLAN ID given! Only IDs between %d and %d are allowed.').format(min_vid, m);
+
+				var sections = this.section.cfgsections();
+
+				for (var i = 0; i < sections.length; i++) {
+					if (sections[i] == section_id)
+						continue;
+
+					if (this.formvalue(sections[i]) == v)
+						return _('Invalid VLAN ID given! Only unique IDs are allowed');
+				}
+
+				return true;
+			};
+
+			o.write = function(section_id, value) {
+				var topology = this.section.topology,
+				    values = [];
+
+				for (var i = 0; i < port_opts.length; i++) {
+					var tagging = port_opts[i].formvalue(section_id),
+					    portspec = Array.isArray(topology.ports) ? topology.ports[i] : null;
+
+					if (tagging == 't')
+						values.push(port_opts[i].option + tagging);
+					else if (tagging == 'u')
+						values.push(port_opts[i].option);
+
+					if (portspec && portspec.device) {
+						var old_tag = port_opts[i].cfgvalue(section_id),
+						    old_vid = this.cfgvalue(section_id);
+
+						if (old_tag != tagging || old_vid != value) {
+							var old_ifname = portspec.device + (old_tag != 'u' ? '.' + old_vid : ''),
+							    new_ifname = portspec.device + (tagging != 'u' ? '.' + value : '');
+
+							if (old_ifname != new_ifname)
+								update_interfaces(old_ifname, new_ifname);
+						}
+					}
+				}
+
+				if (feat.vlan4k_option)
+					uci.set('network', sid, feat.vlan4k_option, '1');
+
+				uci.set('network', section_id, 'ports', values.join(' '));
+
+				return form.Value.prototype.write.apply(this, [section_id, value]);
+			};
+
+			o.cfgvalue = function(section_id) {
+				var value = feat.vid_option ? uci.get('network', section_id, feat.vid_option) : null;
+				return (value || uci.get('network', section_id, 'vlan'));
+			};
+
+			for (var j = 0; Array.isArray(topology.ports) && j < topology.ports.length; j++) {
+				var portspec = topology.ports[j],
+				    portstate = Array.isArray(topology.portstate) ? topology.portstate[portspec.num] : null;
+
+				o = s.option(form.ListValue, String(portspec.num), portspec.label);
+				o.value('', _('off'));
+
+				if (!portspec.need_tag)
+					o.value('u', _('untagged'));
+
+				o.value('t', _('tagged'));
+
+				o.cfgvalue = parse_portvalue;
+				o.validate = validate_portvalue;
+				o.write    = function() {};
+
+				o.description = render_port_status(E('small', {
+					'data-switch': switch_name,
+					'data-port': portspec.num
+				}), portstate);
+
+				port_opts.push(o);
+			}
+
+			port_opts.sort(function(a, b) {
+				return a.option < b.option;
+			});
+		}
+
+		L.Poll.add(L.bind(update_port_status, m, topologies));
+
+		return m.render();
+	}
+});
diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js
deleted file mode 100644
index f30e47ec7..000000000
--- a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js
+++ /dev/null
@@ -1,164 +0,0 @@
-var poll = null;
-
-function format_signal(bss) {
-	var qval = bss.quality || 0,
-	    qmax = bss.quality_max || 100,
-	    scale = 100 / qmax * qval,
-	    range = 'none';
-
-	if (!bss.bssid || bss.bssid == '00:00:00:00:00:00')
-		range = 'none';
-	else if (scale < 15)
-		range = '0';
-	else if (scale < 35)
-		range = '0-25';
-	else if (scale < 55)
-		range = '25-50';
-	else if (scale < 75)
-		range = '50-75';
-	else
-		range = '75-100';
-
-	return E('span', {
-		class: 'ifacebadge',
-		title: '%s: %d%s / %s: %d/%d'.format(_('Signal'), bss.signal, _('dB'), _('Quality'), qval, qmax)
-	}, [
-		E('img', { src: L.resource('icons/signal-%s.png').format(range) }),
-		' %d%%'.format(scale)
-	]);
-}
-
-function format_encryption(bss) {
-	var enc = bss.encryption || { }
-
-	if (enc.wep === true)
-		return 'WEP';
-	else if (enc.wpa > 0)
-		return E('abbr', {
-			title: 'Pairwise: %h / Group: %h'.format(
-				enc.pair_ciphers.join(', '),
-				enc.group_ciphers.join(', '))
-			},
-			'%h - %h'.format(
-				(enc.wpa === 3) ? _('mixed WPA/WPA2') : (enc.wpa === 2 ? 'WPA2' : 'WPA'),
-				enc.auth_suites.join(', ')));
-	else
-		return E('em', enc.enabled ? _('unknown') : _('open'));
-}
-
-function format_actions(dev, type, bss) {
-	var enc = bss.encryption || { },
-	    input = [
-			E('input', { type: 'submit', class: 'cbi-button cbi-button-action important', value: _('Join Network') }),
-			E('input', { type: 'hidden', name: 'token',    value: L.env.token }),
-			E('input', { type: 'hidden', name: 'device',   value: dev }),
-			E('input', { type: 'hidden', name: 'join',     value: bss.ssid }),
-			E('input', { type: 'hidden', name: 'mode',     value: bss.mode }),
-			E('input', { type: 'hidden', name: 'bssid',    value: bss.bssid }),
-			E('input', { type: 'hidden', name: 'channel',  value: bss.channel }),
-			E('input', { type: 'hidden', name: 'clbridge', value: type === 'wl' ? 1 : 0 }),
-			E('input', { type: 'hidden', name: 'wep',      value: enc.wep ? 1 : 0 })
-		];
-
-	if (enc.wpa) {
-		input.push(E('input', { type: 'hidden', name: 'wpa_version', value: enc.wpa }));
-
-		enc.auth_suites.forEach(function(s) {
-			input.push(E('input', { type: 'hidden', name: 'wpa_suites', value: s }));
-		});
-
-		enc.group_ciphers.forEach(function(s) {
-			input.push(E('input', { type: 'hidden', name: 'wpa_group', value: s }));
-		});
-
-		enc.pair_ciphers.forEach(function(s) {
-			input.push(E('input', { type: 'hidden', name: 'wpa_pairwise', value: s }));
-		});
-	}
-
-	return E('form', {
-		class: 'inline',
-		method: 'post',
-		action: L.url('admin/network/wireless_join')
-	}, input);
-}
-
-function fade(bss, content) {
-	if (bss.stale)
-		return E('span', { style: 'opacity:0.5' }, content);
-	else
-		return content;
-}
-
-function flush() {
-	L.stop(poll);
-	L.halt();
-
-	scan();
-}
-
-function scan() {
-	var tbl = document.querySelector('[data-wifi-scan]'),
-	    dev = tbl.getAttribute('data-wifi-scan'),
-	    type = tbl.getAttribute('data-wifi-type');
-
-	cbi_update_table(tbl, [], E('em', { class: 'spinning' }, _('Starting wireless scan...')));
-
-	L.post(L.url('admin/network/wireless_scan_trigger', dev), null, function(s) {
-		if (s.status !== 204) {
-			cbi_update_table(tbl, [], E('em', _('Scan request failed')));
-			return;
-		}
-
-		var count = 0;
-
-		poll = L.poll(3, L.url('admin/network/wireless_scan_results', dev), null, function(s, results) {
-
-			if (Array.isArray(results)) {
-				var bss = [];
-
-				results.sort(function(a, b) {
-					var diff = (b.quality - a.quality) || (a.channel - b.channel);
-
-					if (diff)
-						return diff;
-
-					if (a.ssid < b.ssid)
-						return -1;
-					else if (a.ssid > b.ssid)
-						return 1;
-
-					if (a.bssid < b.bssid)
-						return -1;
-					else if (a.bssid > b.bssid)
-						return 1;
-				}).forEach(function(res) {
-					bss.push([
-						fade(res, format_signal(res)),
-						fade(res, res.ssid ? '%h'.format(res.ssid) : E('em', {}, _('hidden'))),
-						fade(res, res.channel),
-						fade(res, res.mode),
-						fade(res, res.bssid),
-						fade(res, format_encryption(res)),
-						format_actions(dev, type, res)
-					]);
-				});
-
-				cbi_update_table(tbl, bss, E('em', {}, _('No networks in range')));
-			}
-			else {
-				cbi_update_table(tbl, [], E('em', { class: 'spinning' }, _('No scan results available yet...')));
-			}
-
-
-			if (count++ >= 3) {
-				count = 0;
-				L.post(L.url('admin/network/wireless_scan_trigger', dev, 1), null, function() {});
-			}
-		});
-
-		L.run();
-	});
-}
-
-document.addEventListener('DOMContentLoaded', scan);
diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js
deleted file mode 100644
index 108a141f8..000000000
--- a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js
+++ /dev/null
@@ -1,59 +0,0 @@
-requestAnimationFrame(function() {
-	document.querySelectorAll('[data-wifi-status]').forEach(function(container) {
-		var ifname = container.getAttribute('data-wifi-status'),
-		    small = container.querySelector('small'),
-		    info = container.querySelector('span');
-
-		L.poll(5, L.url('admin/network/wireless_status', ifname), null, function(xhr, iws) {
-			var iw = Array.isArray(iws) ? iws[0] : null;
-			if (!iw)
-				return;
-
-			var is_assoc = (iw.bssid && iw.bssid != '00:00:00:00:00:00' && iw.channel && !iw.disabled);
-			var p = iw.quality;
-			var q = iw.disabled ? -1 : p;
-
-			var icon;
-			if (q < 0)
-				icon = L.resource('icons/signal-none.png');
-			else if (q == 0)
-				icon = L.resource('icons/signal-0.png');
-			else if (q < 25)
-				icon = L.resource('icons/signal-0-25.png');
-			else if (q < 50)
-				icon = L.resource('icons/signal-25-50.png');
-			else if (q < 75)
-				icon = L.resource('icons/signal-50-75.png');
-			else
-				icon = L.resource('icons/signal-75-100.png');
-
-			L.dom.content(small, [
-				E('img', {
-					src: icon,
-					title: '%s: %d %s / %s: %d %s'.format(
-						_('Signal'), iw.signal, _('dBm'),
-						_('Noise'), iw.noise, _('dBm'))
-				}),
-				'\u00a0', E('br'), '%d%%\u00a0'.format(p)
-			]);
-
-			L.itemlist(info, [
-				_('Mode'),       iw.mode,
-				_('SSID'),       iw.ssid || '?',
-				_('BSSID'),      is_assoc ? iw.bssid : null,
-				_('Encryption'), is_assoc ? iw.encryption || _('None') : null,
-				_('Channel'),    is_assoc ? '%d (%.3f %s)'.format(iw.channel, iw.frequency || 0, _('GHz')) : null,
-				_('Tx-Power'),   is_assoc ? '%d %s'.format(iw.txpower, _('dBm')) : null,
-				_('Signal'),     is_assoc ? '%d %s'.format(iw.signal, _('dBm')) : null,
-				_('Noise'),      is_assoc ? '%d %s'.format(iw.noise, _('dBm')) : null,
-				_('Bitrate'),    is_assoc ? '%.1f %s'.format(iw.bitrate || 0, _('Mbit/s')) : null,
-				_('Country'),    is_assoc ? iw.country : null
-			], [ ' | ', E('br'), E('br'), E('br'), E('br'), E('br'), ' | ', E('br'), ' | ' ]);
-
-			if (!is_assoc)
-				L.dom.append(info, E('em', iw.disabled ? _('Wireless is disabled') : _('Wireless is not associated')));
-		});
-
-		L.run();
-	});
-});
diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js
index 57e6bbb04..9e75fe901 100644
--- a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js
+++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js
@@ -1,93 +1,1970 @@
-function wifi_delete(ev) {
-	if (!confirm(_('Really delete this wireless network? The deletion cannot be undone! You might lose access to this device if you are connected via this network.'))) {
-		ev.preventDefault();
-		return false;
+'use strict';
+'require rpc';
+'require uci';
+'require form';
+'require network';
+'require firewall';
+'require tools.widgets as widgets';
+
+function count_changes(section_id) {
+	var changes = L.ui.changes.changes, n = 0;
+
+	if (!L.isObject(changes))
+		return n;
+
+	if (Array.isArray(changes.wireless))
+		for (var i = 0; i < changes.wireless.length; i++)
+			n += (changes.wireless[i][1] == section_id);
+
+	return n;
+}
+
+function render_radio_badge(radioDev) {
+	return E('span', { 'class': 'ifacebadge' }, [
+		E('img', { 'src': L.resource('icons/wifi%s.png').format(radioDev.isUp() ? '' : '_disabled') }),
+		' ',
+		radioDev.getName()
+	]);
+}
+
+function render_signal_badge(signalPercent, signalValue, noiseValue, wrap) {
+	var icon, title;
+
+	if (signalPercent < 0)
+		icon = L.resource('icons/signal-none.png');
+	else if (signalPercent == 0)
+		icon = L.resource('icons/signal-0.png');
+	else if (signalPercent < 25)
+		icon = L.resource('icons/signal-0-25.png');
+	else if (signalPercent < 50)
+		icon = L.resource('icons/signal-25-50.png');
+	else if (signalPercent < 75)
+		icon = L.resource('icons/signal-50-75.png');
+	else
+		icon = L.resource('icons/signal-75-100.png');
+
+	if (signalValue != null && signalValue != 0) {
+		title = '%s %d %s'.format(_('Signal'), signalValue, _('dBm'));
+
+		if (noiseValue != null && noiseValue != 0)
+			title += ' / %s: %d %s'.format(_('Noise'), noiseValue, _('dBm'));
+	}
+	else {
+		title = _('No signal');
+	}
+
+	return E('div', { 'class': wrap ? 'center' : 'ifacebadge', 'title': title },
+		[ E('img', { 'src': icon }), wrap ? E('br') : ' ', '%d%%'.format(Math.max(signalPercent, 0)) ]);
+}
+
+function render_network_badge(radioNet) {
+	return render_signal_badge(radioNet.isUp() ? radioNet.getSignalPercent() : -1,  radioNet.getSignal(), radioNet.getNoise());
+}
+
+function render_radio_status(radioDev, wifiNets) {
+	var name = radioDev.getI18n().replace(/ Wireless Controller .+$/, ''),
+	    node = E('div', [ E('big', {}, E('strong', {}, name)), E('div') ]),
+	    channel, frequency, bitrate;
+
+	for (var i = 0; i < wifiNets.length; i++) {
+		channel   = channel   || wifiNets[i].getChannel();
+		frequency = frequency || wifiNets[i].getFrequency();
+		bitrate   = bitrate   || wifiNets[i].getBitRate();
+	}
+
+	if (radioDev.isUp())
+		L.itemlist(node.lastElementChild, [
+			_('Channel'), '%s (%s %s)'.format(channel || '?', frequency || '?', _('GHz')),
+			_('Bitrate'), '%s %s'.format(bitrate || '?', _('Mbit/s'))
+		], ' | ');
+	else
+		node.lastElementChild.appendChild(E('em', _('Device is not active')));
+
+	return node;
+}
+
+function render_network_status(radioNet) {
+	var mode = radioNet.getActiveMode(),
+	    bssid = radioNet.getActiveBSSID(),
+	    channel = radioNet.getChannel(),
+	    disabled = (radioNet.get('disabled') == '1' || uci.get('wireless', radioNet.getWifiDeviceName(), 'disabled') == '1'),
+	    is_assoc = (bssid && bssid != '00:00:00:00:00:00' && channel && mode != 'Unknown' && !disabled),
+	    changecount = count_changes(radioNet.getName()),
+	    status_text = null;
+
+	if (changecount)
+		status_text = E('a', {
+			href: '#',
+			click: L.bind(L.ui.changes.displayChanges, L.ui.changes)
+		}, _('Interface has %d pending changes').format(changecount));
+	else if (!is_assoc)
+		status_text = E('em', disabled ? _('Wireless is disabled') : _('Wireless is not associated'));
+
+	return L.itemlist(E('div'), [
+		_('SSID'),       radioNet.getSSID() || '?',
+		_('Mode'),       mode,
+		_('BSSID'),      (!changecount && is_assoc) ? bssid : null,
+		_('Encryption'), (!changecount && is_assoc) ? radioNet.getActiveEncryption() || _('None') : null,
+		null,            status_text
+	], [ ' | ', E('br') ]);
+}
+
+function render_modal_status(node, radioNet) {
+	var mode = radioNet.getActiveMode(),
+	    noise = radioNet.getNoise(),
+	    bssid = radioNet.getActiveBSSID(),
+	    channel = radioNet.getChannel(),
+	    disabled = (radioNet.get('disabled') == '1'),
+	    is_assoc = (bssid && bssid != '00:00:00:00:00:00' && channel && mode != 'Unknown' && !disabled);
+
+	if (node == null)
+		node = E('span', { 'class': 'ifacebadge large', 'data-network': radioNet.getName() }, [ E('small'), E('span') ]);
+
+	L.dom.content(node.firstElementChild, render_signal_badge(disabled ? -1 : radioNet.getSignalPercent(), radioNet.getSignal(), noise, true));
+
+	L.itemlist(node.lastElementChild, [
+		_('Mode'),       mode,
+		_('SSID'),       radioNet.getSSID() || '?',
+		_('BSSID'),      is_assoc ? bssid : null,
+		_('Encryption'), is_assoc ? radioNet.getActiveEncryption() || _('None') : null,
+		_('Channel'),    is_assoc ? '%d (%.3f %s)'.format(radioNet.getChannel(), radioNet.getFrequency() || 0, _('GHz')) : null,
+		_('Tx-Power'),   is_assoc ? '%d %s'.format(radioNet.getTXPower(), _('dBm')) : null,
+		_('Signal'),     is_assoc ? '%d %s'.format(radioNet.getSignal(), _('dBm')) : null,
+		_('Noise'),      (is_assoc && noise != null) ? '%d %s'.format(noise, _('dBm')) : null,
+		_('Bitrate'),    is_assoc ? '%.1f %s'.format(radioNet.getBitRate() || 0, _('Mbit/s')) : null,
+		_('Country'),    is_assoc ? radioNet.getCountryCode() : null
+	], [ ' | ', E('br'), E('br'), E('br'), E('br'), E('br'), ' | ', E('br'), ' | ' ]);
+
+	if (!is_assoc)
+		L.dom.append(node.lastElementChild, E('em', disabled ? _('Wireless is disabled') : _('Wireless is not associated')));
+
+	return node;
+}
+
+function format_wifirate(rate) {
+	var s = '%.1f Mbit/s, %dMHz'.format(rate.rate / 1000, rate.mhz);
+
+	if (rate.ht || rate.vht) {
+		if (rate.vht)      s += ', VHT-MCS %d'.format(rate.mcs);
+		if (rate.nss)      s += ', VHT-NSS %d'.format(rate.nss);
+		if (rate.ht)       s += ', MCS %s'.format(rate.mcs);
+		if (rate.short_gi) s += ', Short GI';
 	}
 
-	ev.target.previousElementSibling.value = '1';
-	return true;
+	return s;
+}
+
+function radio_restart(id, ev) {
+	var row = document.querySelector('.cbi-section-table-row[data-sid="%s"]'.format(id)),
+	    dsc = row.querySelector('[data-name="_stat"] > div'),
+	    btn = row.querySelector('.cbi-section-actions button');
+
+	btn.blur();
+	btn.classList.add('spinning');
+	btn.disabled = true;
+
+	dsc.setAttribute('restart', '');
+	L.dom.content(dsc, E('em', _('Device is restarting…')));
 }
 
-function wifi_restart(ev) {
-	L.halt();
+function network_updown(id, map, ev) {
+	var radio = uci.get('wireless', id, 'device'),
+	    disabled = (uci.get('wireless', id, 'disabled') == '1') ||
+	               (uci.get('wireless', radio, 'disabled') == '1');
 
-	findParent(ev.target, '.table').querySelectorAll('[data-disabled="false"]').forEach(function(s) {
-		L.dom.content(s, E('em', _('Wireless is restarting...')));
+	if (disabled) {
+		uci.unset('wireless', id, 'disabled');
+		uci.unset('wireless', radio, 'disabled');
+	}
+	else {
+		uci.set('wireless', id, 'disabled', '1');
+
+		var all_networks_disabled = true,
+		    wifi_ifaces = uci.sections('wireless', 'wifi-iface');
+
+		for (var i = 0; i < wifi_ifaces.length; i++) {
+			if (wifi_ifaces[i].device == radio && wifi_ifaces[i].disabled != '1') {
+				all_networks_disabled = false;
+				break;
+			}
+		}
+
+		if (all_networks_disabled)
+			uci.set('wireless', radio, 'disabled', '1');
+	}
+
+	return map.save().then(function() {
+		L.ui.changes.apply()
 	});
+}
+
+function next_free_sid(offset) {
+	var sid = 'wifinet' + offset;
+
+	while (uci.get('wireless', sid))
+		sid = 'wifinet' + (++offset);
 
-	L.post(L.url('admin/network/wireless_reconnect', ev.target.getAttribute('data-radio')), L.run);
+	return sid;
 }
 
-var networks = [ ];
+var CBIWifiFrequencyValue = form.Value.extend({
+	callFrequencyList: rpc.declare({
+		object: 'iwinfo',
+		method: 'freqlist',
+		params: [ 'device' ],
+		expect: { results: [] }
+	}),
+
+	load: function(section_id) {
+		return Promise.all([
+			network.getWifiDevice(section_id),
+			this.callFrequencyList(section_id)
+		]).then(L.bind(function(data) {
+			this.channels = {
+				'11g': L.hasSystemFeature('hostapd', 'acs') ? [ 'auto', 'auto', true ] : [],
+				'11a': L.hasSystemFeature('hostapd', 'acs') ? [ 'auto', 'auto', true ] : []
+			};
+
+			for (var i = 0; Array.isArray(data[1]) && i < data[1].length; i++)
+				this.channels[(data[1][i].mhz > 2484) ? '11a' : '11g'].push(
+					data[1][i].channel,
+					'%d (%d Mhz)'.format(data[1][i].channel, data[1][i].mhz),
+					!data[1][i].restricted
+				);
+
+			var hwmodelist = L.toArray(data[0] ? data[0].getHWModes() : null)
+				.reduce(function(o, v) { o[v] = true; return o }, {});
+
+			this.modes = [
+				'', 'Legacy', true,
+				'n', 'N', hwmodelist.n,
+				'ac', 'AC', hwmodelist.ac
+			];
+
+			var htmodelist = L.toArray(data[0] ? data[0].getHTModes() : null)
+				.reduce(function(o, v) { o[v] = true; return o }, {});
+
+			this.htmodes = {
+				'': [ '', '-', true ],
+				'n': [
+					'HT20', '20 MHz', htmodelist.HT20,
+					'HT40', '40 MHz', htmodelist.HT40
+				],
+				'ac': [
+					'VHT20', '20 MHz', htmodelist.VHT20,
+					'VHT40', '40 MHz', htmodelist.VHT40,
+					'VHT80', '80 MHz', htmodelist.VHT80,
+					'VHT160', '160 MHz', htmodelist.VHT160
+				]
+			};
+
+			this.bands = {
+				'': [
+					'11g', '2.4 GHz', this.channels['11g'].length > 3,
+					'11a', '5 GHz', this.channels['11a'].length > 3
+				],
+				'n': [
+					'11g', '2.4 GHz', this.channels['11g'].length > 3,
+					'11a', '5 GHz', this.channels['11a'].length > 3
+				],
+				'ac': [
+					'11a', '5 GHz', true
+				]
+			};
+		}, this));
+	},
+
+	setValues: function(sel, vals) {
+		if (sel.vals)
+			sel.vals.selected = sel.selectedIndex;
+
+		while (sel.options[0])
+			sel.remove(0);
+
+		for (var i = 0; vals && i < vals.length; i += 3)
+			if (vals[i+2])
+				sel.add(E('option', { value: vals[i+0] }, [ vals[i+1] ]));
+
+		if (!isNaN(vals.selected))
+			sel.selectedIndex = vals.selected;
+
+		sel.parentNode.style.display = (sel.options.length <= 1) ? 'none' : '';
+		sel.vals = vals;
+	},
+
+	toggleWifiMode: function(elem) {
+		this.toggleWifiHTMode(elem);
+		this.toggleWifiBand(elem);
+	},
+
+	toggleWifiHTMode: function(elem) {
+		var mode = elem.querySelector('.mode');
+		var bwdt = elem.querySelector('.htmode');
+
+		this.setValues(bwdt, this.htmodes[mode.value]);
+	},
+
+	toggleWifiBand: function(elem) {
+		var mode = elem.querySelector('.mode');
+		var band = elem.querySelector('.band');
+
+		this.setValues(band, this.bands[mode.value]);
+		this.toggleWifiChannel(elem);
+	},
 
-document.querySelectorAll('[data-network]').forEach(function(n) {
-	networks.push(n.getAttribute('data-network'));
+	toggleWifiChannel: function(elem) {
+		var band = elem.querySelector('.band');
+		var chan = elem.querySelector('.channel');
+
+		this.setValues(chan, this.channels[band.value]);
+	},
+
+	setInitialValues: function(section_id, elem) {
+		var mode = elem.querySelector('.mode'),
+		    band = elem.querySelector('.band'),
+		    chan = elem.querySelector('.channel'),
+		    bwdt = elem.querySelector('.htmode'),
+		    htval = uci.get('wireless', section_id, 'htmode'),
+		    hwval = uci.get('wireless', section_id, 'hwmode'),
+		    chval = uci.get('wireless', section_id, 'channel');
+
+		this.setValues(mode, this.modes);
+
+		if (/VHT20|VHT40|VHT80|VHT160/.test(htval))
+			mode.value = 'ac';
+		else if (/HT20|HT40/.test(htval))
+			mode.value = 'n';
+		else
+			mode.value = '';
+
+		this.toggleWifiMode(elem);
+
+		if (/a/.test(hwval))
+			band.value = '11a';
+		else
+			band.value = '11g';
+
+		this.toggleWifiBand(elem);
+
+		bwdt.value = htval;
+		chan.value = chval;
+
+		return elem;
+	},
+
+	renderWidget: function(section_id, option_index, cfgvalue) {
+		var elem = E('div');
+
+		L.dom.content(elem, [
+			E('label', { 'style': 'float:left; margin-right:3px' }, [
+				_('Mode'), E('br'),
+				E('select', {
+					'class': 'mode',
+					'style': 'width:auto',
+					'change': L.bind(this.toggleWifiMode, this, elem)
+				})
+			]),
+			E('label', { 'style': 'float:left; margin-right:3px' }, [
+				_('Band'), E('br'),
+				E('select', {
+					'class': 'band',
+					'style': 'width:auto',
+					'change': L.bind(this.toggleWifiBand, this, elem)
+				})
+			]),
+			E('label', { 'style': 'float:left; margin-right:3px' }, [
+				_('Channel'), E('br'),
+				E('select', {
+					'class': 'channel',
+					'style': 'width:auto'
+				})
+			]),
+			E('label', { 'style': 'float:left; margin-right:3px' }, [
+				_('Width'), E('br'),
+				E('select', {
+					'class': 'htmode',
+					'style': 'width:auto'
+				})
+			]),
+			E('br', { 'style': 'clear:left' })
+		]);
+
+		return this.setInitialValues(section_id, elem);
+	},
+
+	cfgvalue: function(section_id) {
+		return [
+		    uci.get('wireless', section_id, 'htmode'),
+		    uci.get('wireless', section_id, 'hwmode'),
+		    uci.get('wireless', section_id, 'channel')
+		];
+	},
+
+	formvalue: function(section_id) {
+		var node = this.map.findElement('data-field', this.cbid(section_id));
+
+		return [
+		    node.querySelector('.htmode').value,
+		    node.querySelector('.band').value,
+ 			node.querySelector('.channel').value
+		];
+	},
+
+	write: function(section_id, value) {
+		uci.set('wireless', section_id, 'htmode', value[0] || null);
+		uci.set('wireless', section_id, 'hwmode', value[1]);
+		uci.set('wireless', section_id, 'channel', value[2]);
+	}
 });
 
-L.poll(5, L.url('admin/network/wireless_status', networks.join(',')), null,
-	function(x, st) {
-		if (st) {
-			var rowstyle = 1;
-			var radiostate = { };
+var CBIWifiTxPowerValue = form.ListValue.extend({
+	callTxPowerList: rpc.declare({
+		object: 'iwinfo',
+		method: 'txpowerlist',
+		params: [ 'device' ],
+		expect: { results: [] }
+	}),
 
-			st.forEach(function(s) {
-				var r = radiostate[s.device.device] || (radiostate[s.device.device] = {});
+	load: function(section_id) {
+		return this.callTxPowerList(section_id).then(L.bind(function(pwrlist) {
+			this.powerval = this.wifiNetwork ? this.wifiNetwork.getTXPower() : null;
+			this.poweroff = this.wifiNetwork ? this.wifiNetwork.getTXPowerOffset() : null;
 
-				s.is_assoc = (s.bssid && s.bssid != '00:00:00:00:00:00' && s.channel && s.mode != 'Unknown' && !s.disabled);
+			this.value('', _('driver default'));
 
-				r.up        = r.up        || s.is_assoc;
-				r.channel   = r.channel   || s.channel;
-				r.bitrate   = r.bitrate   || s.bitrate;
-				r.frequency = r.frequency || s.frequency;
-			});
+			for (var i = 0; i < pwrlist.length; i++)
+				this.value(pwrlist[i].dbm, '%d dBm (%d mW)'.format(pwrlist[i].dbm, pwrlist[i].mw));
+
+			return form.ListValue.prototype.load.apply(this, [section_id]);
+		}, this));
+	},
+
+	renderWidget: function(section_id, option_index, cfgvalue) {
+		var widget = form.ListValue.prototype.renderWidget.apply(this, [section_id, option_index, cfgvalue]);
+		    widget.firstElementChild.style.width = 'auto';
 
-			for (var i = 0; i < st.length; i++) {
-				var iw = st[i],
-				    sig = document.getElementById(iw.id + '-iw-signal'),
-				    info = document.getElementById(iw.id + '-iw-status'),
-				    disabled = (info && info.getAttribute('data-disabled') === 'true');
-
-				var p = iw.quality;
-				var q = disabled ? -1 : p;
-
-				var icon;
-				if (q < 0)
-					icon = L.resource('icons/signal-none.png');
-				else if (q == 0)
-					icon = L.resource('icons/signal-0.png');
-				else if (q < 25)
-					icon = L.resource('icons/signal-0-25.png');
-				else if (q < 50)
-					icon = L.resource('icons/signal-25-50.png');
-				else if (q < 75)
-					icon = L.resource('icons/signal-50-75.png');
-				else
-					icon = L.resource('icons/signal-75-100.png');
-
-				L.dom.content(sig, E('span', {
-					class: 'ifacebadge',
-					title: '%s %d %s / %s: %d %s'.format(_('Signal'), iw.signal, _('dBm'), _('Noise'), iw.noise, _('dBm'))
-				}, [ E('img', { src: icon }), ' %d%%'.format(p) ]));
-
-				L.itemlist(info, [
-					_('SSID'),       iw.ssid || '?',
-					_('Mode'),       iw.mode,
-					_('BSSID'),      iw.is_assoc ? iw.bssid : null,
-					_('Encryption'), iw.is_assoc ? iw.encryption || _('None') : null,
-					null,            iw.is_assoc ? null : E('em', disabled ? _('Wireless is disabled') : _('Wireless is not associated'))
-				], [ ' | ', E('br') ]);
+		L.dom.append(widget, E('span', [
+			' - ', _('Current power'), ': ',
+			E('span', [ this.powerval != null ? '%d dBm'.format(this.powerval) : E('em', _('unknown')) ]),
+			this.poweroff ? ' + %d dB offset = %s dBm'.format(this.poweroff, this.powerval != null ? this.powerval + this.poweroff : '?') : ''
+		]));
+
+		return widget;
+	}
+});
+
+var CBIWifiCountryValue = form.Value.extend({
+	callCountryList: rpc.declare({
+		object: 'iwinfo',
+		method: 'countrylist',
+		params: [ 'device' ],
+		expect: { results: [] }
+	}),
+
+	load: function(section_id) {
+		return this.callCountryList(section_id).then(L.bind(function(countrylist) {
+			if (Array.isArray(countrylist) && countrylist.length > 0) {
+				this.value('', _('driver default'));
+
+				for (var i = 0; i < countrylist.length; i++)
+					this.value(countrylist[i].iso3166, '%s - %s'.format(countrylist[i].iso3166, countrylist[i].country));
 			}
 
-			for (var dev in radiostate) {
-				var img = document.getElementById(dev + '-iw-upstate');
-				if (img) img.src = L.resource('icons/wifi' + (radiostate[dev].up ? '' : '_disabled') + '.png');
+			return form.Value.prototype.load.apply(this, [section_id]);
+		}, this));
+	},
+
+	validate: function(section_id, formvalue) {
+		if (formvalue != null && formvalue != '' && !/^[A-Z0-9][A-Z0-9]$/.test(formvalue))
+			return _('Use ISO/IEC 3166 alpha2 country codes.');
+
+		return true;
+	},
 
-				var stat = document.getElementById(dev + '-iw-devinfo');
-				L.itemlist(stat, [
-					_('Channel'), '%s (%s %s)'.format(radiostate[dev].channel || '?', radiostate[dev].frequency || '?', _('GHz')),
-					_('Bitrate'), '%s %s'.format(radiostate[dev].bitrate || '?', _('Mbit/s'))
-				], ' | ');
+	renderWidget: function(section_id, option_index, cfgvalue) {
+		var typeClass = this.keylist.length ? form.ListValue : form.Value;
+		return typeClass.prototype.renderWidget.apply(this, [section_id, option_index, cfgvalue]);
+	}
+});
+
+return L.view.extend({
+	poll_status: function(map, data) {
+		var rows = map.querySelectorAll('.cbi-section-table-row[data-sid]');
+
+		for (var i = 0; i < rows.length; i++) {
+			var section_id = rows[i].getAttribute('data-sid'),
+			    radioDev = data[1].filter(function(d) { return d.getName() == section_id })[0],
+			    radioNet = data[2].filter(function(n) { return n.getName() == section_id })[0],
+			    badge = rows[i].querySelector('[data-name="_badge"] > div'),
+			    stat = rows[i].querySelector('[data-name="_stat"]'),
+			    btns = rows[i].querySelectorAll('.cbi-section-actions button'),
+			    busy = btns[0].classList.contains('spinning') || btns[1].classList.contains('spinning') || btns[2].classList.contains('spinning');
+
+			if (radioDev) {
+				L.dom.content(badge, render_radio_badge(radioDev));
+				L.dom.content(stat, render_radio_status(radioDev, data[2].filter(function(n) { return n.getWifiDeviceName() == radioDev.getName() })));
+			}
+			else {
+				L.dom.content(badge, render_network_badge(radioNet));
+				L.dom.content(stat, render_network_status(radioNet));
 			}
+
+			if (stat.hasAttribute('restart'))
+				L.dom.content(stat, E('em', _('Device is restarting…')));
+
+			btns[0].disabled = busy;
+			btns[1].disabled = busy;
+			btns[2].disabled = busy;
+		}
+
+		var table = document.querySelector('wifi_assoclist_table'),
+		    hosts = data[0],
+		    trows = [];
+
+		for (var i = 0; i < data[3].length; i++) {
+			var bss = data[3][i],
+			    name = hosts.getHostnameByMACAddr(bss.mac),
+			    ipv4 = hosts.getIPAddrByMACAddr(bss.mac),
+			    ipv6 = hosts.getIP6AddrByMACAddr(bss.mac);
+
+			trows.push([
+				E('span', { 'class': 'ifacebadge' }, [
+					E('img', {
+						'src': L.resource('icons/wifi%s.png').format(bss.network.isUp() ? '' : '_disabled'),
+						'title': bss.radio.getI18n()
+					}),
+					' %s '.format(bss.network.getShortName()),
+					E('small', '(%s)'.format(bss.network.getIfname()))
+				]),
+				bss.mac,
+				name ? '%s (%s)'.format(name, ipv4 || ipv6 || '?') : ipv4 || ipv6 || '?',
+				render_signal_badge(Math.min((bss.signal + 110) / 70 * 100, 100), bss.signal, bss.noise),
+				E('span', {}, [
+					E('span', format_wifirate(bss.rx)),
+					E('br'),
+					E('span', format_wifirate(bss.tx))
+				])
+			]);
 		}
+
+		cbi_update_table('#wifi_assoclist_table', trows, E('em', _('No information available')));
+
+		var stat = document.querySelector('.cbi-modal [data-name="_wifistat_modal"] .ifacebadge.large');
+
+		if (stat)
+			render_modal_status(stat, data[2].filter(function(n) { return n.getName() == stat.getAttribute('data-network') })[0]);
+
+		return network.flushCache();
+	},
+
+	load: function() {
+		return Promise.all([
+			uci.changes(),
+			uci.load('wireless')
+		]);
+	},
+
+	checkAnonymousSections: function() {
+		var wifiIfaces = uci.sections('wireless', 'wifi-iface');
+
+		for (var i = 0; i < wifiIfaces.length; i++)
+			if (wifiIfaces[i]['.anonymous'])
+				return true;
+
+		return false;
+	},
+
+	callUciRename: rpc.declare({
+		object: 'uci',
+		method: 'rename',
+		params: [ 'config', 'section', 'name' ]
+	}),
+
+	render: function() {
+		if (this.checkAnonymousSections())
+			return this.renderMigration();
+		else
+			return this.renderOverview();
+	},
+
+	handleMigration: function(ev) {
+		var wifiIfaces = uci.sections('wireless', 'wifi-iface'),
+		    id_offset = 0,
+		    tasks = [];
+
+		for (var i = 0; i < wifiIfaces.length; i++) {
+			if (!wifiIfaces[i]['.anonymous'])
+				continue;
+
+			var new_name = next_free_sid(id_offset);
+
+			tasks.push(this.callUciRename('wireless', wifiIfaces[i]['.name'], new_name));
+			id_offset = +new_name.substring(7) + 1;
+		}
+
+		return Promise.all(tasks)
+			.then(L.bind(L.ui.changes.init, L.ui.changes))
+			.then(L.bind(L.ui.changes.apply, L.ui.changes));
+	},
+
+	renderMigration: function() {
+		L.ui.showModal(_('Wireless configuration migration'), [
+			E('p', _('The existing wireless configuration needs to be changed for LuCI to function properly.')),
+			E('p', _('Upon pressing "Continue", anonymous "wifi-iface" sections will be assigned with a name in the form <em>wifinet#</em> and the network will be restarted to apply the updated configuration.')),
+			E('div', { 'class': 'right' },
+				E('button', {
+					'class': 'btn cbi-button-action important',
+					'click': L.ui.createHandlerFn(this, 'handleMigration')
+				}, _('Continue')))
+		]);
+	},
+
+	renderOverview: function() {
+		var m, s, o;
+
+		m = new form.Map('wireless');
+		m.chain('network');
+		m.chain('firewall');
+
+		s = m.section(form.GridSection, 'wifi-device', _('Wireless Overview'));
+		s.anonymous = true;
+		s.addremove = false;
+
+		s.load = function() {
+			return network.getWifiDevices().then(L.bind(function(radios) {
+				this.radios = radios.sort(function(a, b) {
+					return a.getName() > b.getName();
+				});
+
+				var tasks = [];
+
+				for (var i = 0; i < radios.length; i++)
+					tasks.push(radios[i].getWifiNetworks());
+
+				return Promise.all(tasks);
+			}, this)).then(L.bind(function(data) {
+				this.wifis = [];
+
+				for (var i = 0; i < data.length; i++)
+					this.wifis.push.apply(this.wifis, data[i]);
+			}, this));
+		};
+
+		s.cfgsections = function() {
+			var rv = [];
+
+			for (var i = 0; i < this.radios.length; i++) {
+				rv.push(this.radios[i].getName());
+
+				for (var j = 0; j < this.wifis.length; j++)
+					if (this.wifis[j].getWifiDeviceName() == this.radios[i].getName())
+						rv.push(this.wifis[j].getName());
+			}
+
+			return rv;
+		};
+
+		s.modaltitle = function(section_id) {
+			var radioNet = this.wifis.filter(function(w) { return w.getName() == section_id})[0];
+			return radioNet ? radioNet.getI18n() : _('Edit wireless network');
+		};
+
+		s.lookupRadioOrNetwork = function(section_id) {
+			var radioDev = this.radios.filter(function(r) { return r.getName() == section_id })[0];
+			if (radioDev)
+				return radioDev;
+
+			var radioNet = this.wifis.filter(function(w) { return w.getName() == section_id })[0];
+			if (radioNet)
+				return radioNet;
+
+			return null;
+		};
+
+		s.renderRowActions = function(section_id) {
+			var inst = this.lookupRadioOrNetwork(section_id), btns;
+
+			if (inst.getWifiNetworks) {
+				btns = [
+					E('button', {
+						'class': 'cbi-button cbi-button-neutral',
+						'title': _('Restart radio interface'),
+						'click': L.ui.createHandlerFn(this, radio_restart, section_id)
+					}, _('Restart')),
+					E('button', {
+						'class': 'cbi-button cbi-button-action important',
+						'title': _('Find and join network'),
+						'click': L.ui.createHandlerFn(this, 'handleScan', inst)
+					}, _('Scan')),
+					E('button', {
+						'class': 'cbi-button cbi-button-add',
+						'title': _('Provide new network'),
+						'click': L.ui.createHandlerFn(this, 'handleAdd', inst)
+					}, _('Add'))
+				];
+			}
+			else {
+				var isDisabled = (inst.get('disabled') == '1' ||
+					uci.get('wireless', inst.getWifiDeviceName(), 'disabled') == '1');
+
+				btns = [
+					E('button', {
+						'class': 'cbi-button cbi-button-neutral enable-disable',
+						'title': isDisabled ? _('Enable this network') : _('Disable this network'),
+						'click': L.ui.createHandlerFn(this, network_updown, section_id, this.map)
+					}, isDisabled ? _('Enable') : _('Disable')),
+					E('button', {
+						'class': 'cbi-button cbi-button-action important',
+						'title': _('Edit this network'),
+						'click': L.ui.createHandlerFn(this, 'renderMoreOptionsModal', section_id)
+					}, _('Edit')),
+					E('button', {
+						'class': 'cbi-button cbi-button-negative remove',
+						'title': _('Delete this network'),
+						'click': L.ui.createHandlerFn(this, 'handleRemove', section_id)
+					}, _('Remove'))
+				];
+			}
+
+			return E('div', { 'class': 'td middle cbi-section-actions' }, E('div', btns));
+		};
+
+		s.addModalOptions = function(s) {
+			return network.getWifiNetwork(s.section).then(function(radioNet) {
+				var hwtype = uci.get('wireless', radioNet.getWifiDeviceName(), 'type');
+				var o, ss;
+
+				o = s.option(form.SectionValue, '_device', form.NamedSection, radioNet.getWifiDeviceName(), 'wifi-device', _('Device Configuration'));
+				o.modalonly = true;
+
+				ss = o.subsection;
+				ss.tab('general', _('General Setup'));
+				ss.tab('advanced', _('Advanced Settings'));
+
+				var isDisabled = (radioNet.get('disabled') == '1');
+
+				o = ss.taboption('general', form.DummyValue, '_wifistat_modal', _('Status'));
+				o.cfgvalue = L.bind(function(radioNet) {
+					return render_modal_status(null, radioNet);
+				}, this, radioNet);
+				o.write = function() {};
+
+				o = ss.taboption('general', form.Button, '_toggle', isDisabled ? _('Wireless network is disabled') : _('Wireless network is enabled'));
+				o.inputstyle = isDisabled ? 'apply' : 'reset';
+				o.inputtitle = isDisabled ? _('Enable') : _('Disable');
+				o.onclick = L.ui.createHandlerFn(s, network_updown, s.section, s.map);
+
+				o = ss.taboption('general', CBIWifiFrequencyValue, '_freq', '<br />' + _('Operating frequency'));
+				o.ucisection = s.section;
+
+				if (hwtype == 'mac80211') {
+					o = ss.taboption('general', CBIWifiTxPowerValue, 'txpower', _('Maximum transmit power'), _('Specifies the maximum transmit power the wireless radio may use. Depending on regulatory requirements and wireless usage, the actual transmit power may be reduced by the driver.'));
+					o.wifiNetwork = radioNet;
+
+					o = ss.taboption('advanced', CBIWifiCountryValue, 'country', _('Country Code'));
+					o.wifiNetwork = radioNet;
+
+					o = ss.taboption('advanced', form.Flag, 'legacy_rates', _('Allow legacy 802.11b rates'));
+					o.default = o.enabled;
+
+					o = ss.taboption('advanced', form.Value, 'distance', _('Distance Optimization'), _('Distance to farthest network member in meters.'));
+					o.datatype = 'range(0,114750)';
+					o.placeholder = 'auto';
+
+					o = ss.taboption('advanced', form.Value, 'frag', _('Fragmentation Threshold'));
+					o.datatype = 'min(256)';
+					o.placeholder = _('off');
+
+					o = ss.taboption('advanced', form.Value, 'rts', _('RTS/CTS Threshold'));
+					o.datatype = 'uinteger';
+					o.placeholder = _('off');
+
+					o = ss.taboption('advanced', form.Flag, 'noscan', _('Force 40MHz mode'), _('Always use 40MHz channels even if the secondary channel overlaps. Using this option does not comply with IEEE 802.11n-2009!'));
+					o.rmempty = true;
+
+					o = ss.taboption('advanced', form.Value, 'beacon_int', _('Beacon Interval'));
+					o.datatype = 'range(15,65535)';
+					o.placeholder = 100;
+					o.rmempty = true;
+				}
+
+
+				o = s.option(form.SectionValue, '_device', form.NamedSection, radioNet.getName(), 'wifi-iface', _('Interface Configuration'));
+				o.modalonly = true;
+
+				ss = o.subsection;
+				ss.tab('general', _('General Setup'));
+				ss.tab('encryption', _('Wireless Security'));
+				ss.tab('macfilter', _('MAC-Filter'));
+				ss.tab('advanced', _('Advanced Settings'));
+
+				o = ss.taboption('general', form.ListValue, 'mode', _('Mode'));
+				o.value('ap', _('Access Point'));
+				o.value('sta', _('Client'));
+				o.value('adhoc', _('Ad-Hoc'));
+
+				o = ss.taboption('general', form.Value, 'mesh_id', _('Mesh Id'));
+				o.depends('mode', 'mesh');
+
+				o = ss.taboption('advanced', form.Flag, 'mesh_fwding', _('Forward mesh peer traffic'));
+				o.rmempty = false;
+				o.default = '1';
+				o.depends('mode', 'mesh');
+
+				o = ss.taboption('advanced', form.Value, 'mesh_rssi_threshold', _('RSSI threshold for joining'), _('0 = not using RSSI threshold, 1 = do not change driver default'));
+				o.rmempty = false;
+				o.default = '0';
+				o.datatype = 'range(-255,1)';
+				o.depends('mode', 'mesh');
+
+				o = ss.taboption('general', form.Value, 'ssid', _('<abbr title="Extended Service Set Identifier">ESSID</abbr>'));
+				o.datatype = 'maxlength(32)';
+				o.depends('mode', 'ap');
+				o.depends('mode', 'sta');
+				o.depends('mode', 'adhoc');
+				o.depends('mode', 'ahdemo');
+				o.depends('mode', 'monitor');
+				o.depends('mode', 'ap-wds');
+				o.depends('mode', 'sta-wds');
+				o.depends('mode', 'wds');
+
+				o = ss.taboption('general', form.Value, 'bssid', _('<abbr title="Basic Service Set Identifier">BSSID</abbr>'));
+				o.datatype = 'macaddr';
+
+				o = ss.taboption('general', widgets.NetworkSelect, 'network', _('Network'), _('Choose the network(s) you want to attach to this wireless interface or fill out the <em>create</em> field to define a new network.'));
+				o.rmempty = true;
+				o.multiple = true;
+				o.novirtual = true;
+				o.write = function(section_id, value) {
+					return network.getDevice(section_id).then(L.bind(function(dev) {
+						var old_networks = dev.getNetworks().reduce(function(o, v) { o[v.getName()] = v; return o }, {}),
+						    new_networks = {},
+						    values = L.toArray(value),
+						    tasks = [];
+
+						for (var i = 0; i < values.length; i++) {
+							new_networks[values[i]] = true;
+
+							if (old_networks[values[i]])
+								continue;
+
+							tasks.push(network.getNetwork(values[i]).then(L.bind(function(name, net) {
+								return net || network.addNetwork(name, { proto: 'none' });
+							}, this, values[i])).then(L.bind(function(dev, net) {
+								if (net) {
+									if (!net.isEmpty())
+										net.set('type', 'bridge');
+									net.addDevice(dev);
+								}
+							}, this, dev)));
+						}
+
+						for (var name in old_networks)
+							if (!new_networks[name])
+								tasks.push(network.getNetwork(name).then(L.bind(function(dev, net) {
+									if (net)
+										net.deleteDevice(dev);
+								}, this, dev)));
+
+						return Promise.all(tasks);
+					}, this));
+				};
+
+				if (hwtype == 'mac80211') {
+					var mode = ss.children[0],
+					    bssid = ss.children[5],
+					    encr;
+
+					mode.value('mesh', '802.11s');
+					mode.value('ahdemo', _('Pseudo Ad-Hoc (ahdemo)'));
+					mode.value('monitor', _('Monitor'));
+
+					bssid.depends('mode', 'adhoc');
+					bssid.depends('mode', 'sta');
+					bssid.depends('mode', 'sta-wds');
+
+					o = ss.taboption('macfilter', form.ListValue, 'macfilter', _('MAC-Address Filter'));
+					o.depends('mode', 'ap');
+					o.depends('mode', 'ap-wds');
+					o.value('', _('disable'));
+					o.value('allow', _('Allow listed only'));
+					o.value('deny', _('Allow all except listed'));
+
+					o = ss.taboption('macfilter', form.DynamicList, 'maclist', _('MAC-List'));
+					o.datatype = 'macaddr';
+					o.depends('macfilter', 'allow');
+					o.depends('macfilter', 'deny');
+					o.load = function(section_id) {
+						return network.getHostHints().then(L.bind(function(hints) {
+							hints.getMACHints().map(L.bind(function(hint) {
+								this.value(hint[0], hint[1] ? '%s (%s)'.format(hint[0], hint[1]) : hint[0]);
+							}, this));
+
+							return form.DynamicList.prototype.load.apply(this, [section_id]);
+						}, this));
+					};
+
+					mode.value('ap-wds', '%s (%s)'.format(_('Access Point'), _('WDS')));
+					mode.value('sta-wds', '%s (%s)'.format(_('Client'), _('WDS')));
+
+					mode.write = function(section_id, value) {
+						switch (value) {
+						case 'ap-wds':
+							uci.set('wireless', section_id, 'mode', 'ap');
+							uci.set('wireless', section_id, 'wds', '1');
+							break;
+
+						case 'sta-wds':
+							uci.set('wireless', section_id, 'mode', 'sta');
+							uci.set('wireless', section_id, 'wds', '1');
+							break;
+
+						default:
+							uci.set('wireless', section_id, 'mode', value);
+							uci.unset('wireless', section_id, 'wds');
+							break;
+						}
+					};
+
+					mode.cfgvalue = function(section_id) {
+						var mode = uci.get('wireless', section_id, 'mode'),
+						    wds = uci.get('wireless', section_id, 'wds');
+
+						if (mode == 'ap' && wds)
+							return 'ap-wds';
+						else if (mode == 'sta' && wds)
+							return 'sta-wds';
+
+						return mode;
+					};
+
+					o = ss.taboption('general', form.Flag, 'hidden', _('Hide <abbr title="Extended Service Set Identifier">ESSID</abbr>'));
+					o.depends('mode', 'ap');
+					o.depends('mode', 'ap-wds');
+
+					o = ss.taboption('general', form.Flag, 'wmm', _('WMM Mode'));
+					o.depends('mode', 'ap');
+					o.depends('mode', 'ap-wds');
+					o.default = o.enabled;
+
+					o = ss.taboption('advanced', form.Flag, 'isolate', _('Isolate Clients'), _('Prevents client-to-client communication'));
+					o.depends('mode', 'ap');
+					o.depends('mode', 'ap-wds');
+
+					o = ss.taboption('advanced', form.Value, 'ifname', _('Interface name'), _('Override default interface name'));
+					o.optional = true;
+					o.placeholder = radioNet.getIfname();
+					if (/^radio\d+\.network/.test(o.placeholder))
+						o.placeholder = '';
+
+					o = ss.taboption('advanced', form.Flag, 'short_preamble', _('Short Preamble'));
+					o.default = o.enabled;
+
+					o = ss.taboption('advanced', form.Value, 'dtim_period', _('DTIM Interval'), _('Delivery Traffic Indication Message Interval'));
+					o.optional = true;
+					o.placeholder = 2;
+					o.datatype = 'range(1,255)';
+
+					o = ss.taboption('advanced', form.Value, 'wpa_group_rekey', _('Time interval for rekeying GTK'), _('sec'));
+					o.optional    = true;
+					o.placeholder = 600;
+					o.datatype    = 'uinteger';
+
+					o = ss.taboption('advanced', form.Flag , 'skip_inactivity_poll', _('Disable Inactivity Polling'));
+					o.optional    = true;
+					o.datatype    = 'uinteger';
+
+					o = ss.taboption('advanced', form.Value, 'max_inactivity', _('Station inactivity limit'), _('sec'));
+					o.optional    = true;
+					o.placeholder = 300;
+					o.datatype    = 'uinteger';
+
+					o = ss.taboption('advanced', form.Value, 'max_listen_interval', _('Maximum allowed Listen Interval'));
+					o.optional    = true;
+					o.placeholder = 65535;
+					o.datatype    = 'uinteger';
+
+					o = ss.taboption('advanced', form.Flag, 'disassoc_low_ack', _('Disassociate On Low Acknowledgement'), _('Allow AP mode to disconnect STAs based on low ACK condition'));
+					o.default = o.enabled;
+				}
+
+
+				encr = o = ss.taboption('encryption', form.ListValue, 'encryption', _('Encryption'));
+				o.depends('mode', 'ap');
+				o.depends('mode', 'sta');
+				o.depends('mode', 'adhoc');
+				o.depends('mode', 'ahdemo');
+				o.depends('mode', 'ap-wds');
+				o.depends('mode', 'sta-wds');
+				o.depends('mode', 'mesh');
+
+				o.cfgvalue = function(section_id) {
+					var v = String(uci.get('wireless', section_id, 'encryption'));
+					if (v == 'wep')
+						return 'wep-open';
+					else if (v.match(/\+/))
+						return v.replace(/\+.+$/, '');
+					return v;
+				};
+
+				o.write = function(section_id, value) {
+					var e = this.section.children.filter(function(o) { return o.option == 'encryption' })[0].formvalue(section_id),
+					    co = this.section.children.filter(function(o) { return o.option == 'cipher' })[0], c = co.formvalue(section_id);
+
+					if (value == 'wpa' || value == 'wpa2')
+						uci.unset('wireless', section_id, 'key');
+
+					if (co.isActive(section_id) && e && (c == 'tkip' || c == 'ccmp' || c == 'tkip+ccmp'))
+						e += '+' + c;
+
+					uci.set('wireless', section_id, 'encryption', e);
+				};
+
+				o = ss.taboption('encryption', form.ListValue, 'cipher', _('Cipher'));
+				o.depends('encryption', 'wpa');
+				o.depends('encryption', 'wpa2');
+				o.depends('encryption', 'psk');
+				o.depends('encryption', 'psk2');
+				o.depends('encryption', 'wpa-mixed');
+				o.depends('encryption', 'psk-mixed');
+				o.value('auto', _('auto'));
+				o.value('ccmp', _('Force CCMP (AES)'));
+				o.value('tkip', _('Force TKIP'));
+				o.value('tkip+ccmp', _('Force TKIP and CCMP (AES)'));
+				o.write = ss.children.filter(function(o) { return o.option == 'encryption' })[0].write;
+
+				o.cfgvalue = function(section_id) {
+					var v = String(uci.get('wireless', section_id, 'encryption'));
+					if (v.match(/\+/)) {
+						v = v.replace(/^[^+]+\+/, '');
+						if (v == 'aes')
+							v = 'ccmp';
+						else if (v == 'tkip+aes' || v == 'aes+tkip' || v == 'ccmp+tkip')
+							v = 'tkip+ccmp';
+					}
+					return v;
+				};
+
+
+				var crypto_modes = [];
+
+				if (hwtype == 'mac80211') {
+					var has_supplicant = L.hasSystemFeature('wpasupplicant'),
+					    has_hostapd = L.hasSystemFeature('hostapd');
+
+					// Probe EAP support
+					var has_ap_eap = L.hasSystemFeature('hostapd', 'eap'),
+					    has_sta_eap = L.hasSystemFeature('wpasupplicant', 'eap');
+
+					// Probe SAE support
+					var has_ap_sae = L.hasSystemFeature('hostapd', 'sae'),
+					    has_sta_sae = L.hasSystemFeature('wpasupplicant', 'sae');
+
+					// Probe OWE support
+					var has_ap_owe = L.hasSystemFeature('hostapd', 'owe'),
+					    has_sta_owe = L.hasSystemFeature('wpasupplicant', 'owe');
+
+
+					if (has_hostapd || has_supplicant) {
+						crypto_modes.push(['psk2',      'WPA2-PSK',                    33]);
+						crypto_modes.push(['psk-mixed', 'WPA-PSK/WPA2-PSK Mixed Mode', 22]);
+						crypto_modes.push(['psk',       'WPA-PSK',                     21]);
+					}
+					else {
+						encr.description = _('WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP and ad-hoc mode) to be installed.');
+					}
+
+					if (has_ap_sae || has_sta_sae) {
+						crypto_modes.push(['sae',       'WPA3-SAE',                     31]);
+						crypto_modes.push(['sae-mixed', 'WPA2-PSK/WPA3-SAE Mixed Mode', 30]);
+					}
+
+					if (has_ap_eap || has_sta_eap) {
+						crypto_modes.push(['wpa2', 'WPA2-EAP', 32]);
+						crypto_modes.push(['wpa',  'WPA-EAP',  20]);
+					}
+
+					if (has_ap_owe || has_sta_owe) {
+						crypto_modes.push(['owe', 'OWE', 1]);
+					}
+
+					encr.crypto_support = {
+						'ap': {
+							'wep-open': true,
+							'wep-shared': true,
+							'psk': has_hostapd || _('Requires hostapd'),
+							'psk2': has_hostapd || _('Requires hostapd'),
+							'psk-mixed': has_hostapd || _('Requires hostapd'),
+							'sae': has_ap_sae || _('Requires hostapd with SAE support'),
+							'sae-mixed': has_ap_sae || _('Requires hostapd with SAE support'),
+							'wpa': has_ap_eap || _('Requires hostapd with EAP support'),
+							'wpa2': has_ap_eap || _('Requires hostapd with EAP support'),
+							'owe': has_ap_owe || _('Requires hostapd with OWE support')
+						},
+						'sta': {
+							'wep-open': true,
+							'wep-shared': true,
+							'psk': has_supplicant || _('Requires wpa-supplicant'),
+							'psk2': has_supplicant || _('Requires wpa-supplicant'),
+							'psk-mixed': has_supplicant || _('Requires wpa-supplicant'),
+							'sae': has_sta_sae || _('Requires wpa-supplicant with SAE support'),
+							'sae-mixed': has_sta_sae || _('Requires wpa-supplicant with SAE support'),
+							'wpa': has_sta_eap || _('Requires wpa-supplicant with EAP support'),
+							'wpa2': has_sta_eap || _('Requires wpa-supplicant with EAP support'),
+							'owe': has_sta_owe || _('Requires wpa-supplicant with OWE support')
+						},
+						'adhoc': {
+							'wep-open': true,
+							'wep-shared': true,
+							'psk': has_supplicant || _('Requires wpa-supplicant'),
+							'psk2': has_supplicant || _('Requires wpa-supplicant'),
+							'psk-mixed': has_supplicant || _('Requires wpa-supplicant'),
+						},
+						'mesh': {
+							'sae': has_sta_sae || _('Requires wpa-supplicant with SAE support')
+						},
+						'ahdemo': {
+							'wep-open': true,
+							'wep-shared': true
+						},
+						'wds': {
+							'wep-open': true,
+							'wep-shared': true
+						}
+					};
+
+					encr.crypto_support['ap-wds'] = encr.crypto_support['ap'];
+					encr.crypto_support['sta-wds'] = encr.crypto_support['sta'];
+
+					encr.validate = function(section_id, value) {
+						var modeopt = this.section.children.filter(function(o) { return o.option == 'mode' })[0],
+						    modeval = modeopt.formvalue(section_id),
+						    modetitle = modeopt.vallist[modeopt.keylist.indexOf(modeval)],
+						    enctitle = this.vallist[this.keylist.indexOf(value)];
+
+						if (value == 'none')
+							return true;
+
+						if (!L.isObject(this.crypto_support[modeval]) || !this.crypto_support[modeval].hasOwnProperty(value))
+							return _('The selected %s mode is incompatible with %s encryption').format(modetitle, enctitle);
+
+						return this.crypto_support[modeval][value];
+					};
+				}
+				else if (hwtype == 'broadcom') {
+					crypto_modes.push(['psk2',     'WPA2-PSK',                    33]);
+					crypto_modes.push(['psk+psk2', 'WPA-PSK/WPA2-PSK Mixed Mode', 22]);
+					crypto_modes.push(['psk',      'WPA-PSK',                     21]);
+				}
+
+				crypto_modes.push(['wep-open',   _('WEP Open System'), 11]);
+				crypto_modes.push(['wep-shared', _('WEP Shared Key'),  10]);
+				crypto_modes.push(['none',       _('No Encryption'),   0]);
+
+				crypto_modes.sort(function(a, b) { return b[2] - a[2] });
+
+				for (var i = 0; i < crypto_modes.length; i++) {
+					var security_level = (crypto_modes[i][2] >= 30) ? _('strong security')
+						: (crypto_modes[i][2] >= 20) ? _('medium security')
+							: (crypto_modes[i][2] >= 10) ? _('weak security') : _('open network');
+
+					encr.value(crypto_modes[i][0], '%s (%s)'.format(crypto_modes[i][1], security_level));
+				}
+
+
+				o = ss.taboption('encryption', form.Value, 'auth_server', _('Radius-Authentication-Server'));
+				o.depends({ mode: 'ap', encryption: 'wpa' });
+				o.depends({ mode: 'ap', encryption: 'wpa2' });
+				o.depends({ mode: 'ap-wds', encryption: 'wpa' });
+				o.depends({ mode: 'ap-wds', encryption: 'wpa2' });
+				o.rmempty = true;
+				o.datatype = 'host(0)';
+
+				o = ss.taboption('encryption', form.Value, 'auth_port', _('Radius-Authentication-Port'), _('Default %d').format(1812));
+				o.depends({ mode: 'ap', encryption: 'wpa' });
+				o.depends({ mode: 'ap', encryption: 'wpa2' });
+				o.depends({ mode: 'ap-wds', encryption: 'wpa' });
+				o.depends({ mode: 'ap-wds', encryption: 'wpa2' });
+				o.rmempty = true;
+				o.datatype = 'port';
+
+				o = ss.taboption('encryption', form.Value, 'auth_secret', _('Radius-Authentication-Secret'));
+				o.depends({ mode: 'ap', encryption: 'wpa' });
+				o.depends({ mode: 'ap', encryption: 'wpa2' });
+				o.depends({ mode: 'ap-wds', encryption: 'wpa' });
+				o.depends({ mode: 'ap-wds', encryption: 'wpa2' });
+				o.rmempty = true;
+				o.password = true;
+
+				o = ss.taboption('encryption', form.Value, 'acct_server', _('Radius-Accounting-Server'));
+				o.depends({ mode: 'ap', encryption: 'wpa' });
+				o.depends({ mode: 'ap', encryption: 'wpa2' });
+				o.depends({ mode: 'ap-wds', encryption: 'wpa' });
+				o.depends({ mode: 'ap-wds', encryption: 'wpa2' });
+				o.rmempty = true;
+				o.datatype = 'host(0)';
+
+				o = ss.taboption('encryption', form.Value, 'acct_port', _('Radius-Accounting-Port'), _('Default %d').format(1813));
+				o.depends({ mode: 'ap', encryption: 'wpa' });
+				o.depends({ mode: 'ap', encryption: 'wpa2' });
+				o.depends({ mode: 'ap-wds', encryption: 'wpa' });
+				o.depends({ mode: 'ap-wds', encryption: 'wpa2' });
+				o.rmempty = true;
+				o.datatype = 'port';
+
+				o = ss.taboption('encryption', form.Value, 'acct_secret', _('Radius-Accounting-Secret'));
+				o.depends({ mode: 'ap', encryption: 'wpa' });
+				o.depends({ mode: 'ap', encryption: 'wpa2' });
+				o.depends({ mode: 'ap-wds', encryption: 'wpa' });
+				o.depends({ mode: 'ap-wds', encryption: 'wpa2' });
+				o.rmempty = true;
+				o.password = true;
+
+				o = ss.taboption('encryption', form.Value, 'dae_client', _('DAE-Client'));
+				o.depends({ mode: 'ap', encryption: 'wpa' });
+				o.depends({ mode: 'ap', encryption: 'wpa2' });
+				o.depends({ mode: 'ap-wds', encryption: 'wpa' });
+				o.depends({ mode: 'ap-wds', encryption: 'wpa2' });
+				o.rmempty = true;
+				o.datatype = 'host(0)';
+
+				o = ss.taboption('encryption', form.Value, 'dae_port', _('DAE-Port'), _('Default %d').format(3799));
+				o.depends({ mode: 'ap', encryption: 'wpa' });
+				o.depends({ mode: 'ap', encryption: 'wpa2' });
+				o.depends({ mode: 'ap-wds', encryption: 'wpa' });
+				o.depends({ mode: 'ap-wds', encryption: 'wpa2' });
+				o.rmempty = true;
+				o.datatype = 'port';
+
+				o = ss.taboption('encryption', form.Value, 'dae_secret', _('DAE-Secret'));
+				o.depends({ mode: 'ap', encryption: 'wpa' });
+				o.depends({ mode: 'ap', encryption: 'wpa2' });
+				o.depends({ mode: 'ap-wds', encryption: 'wpa' });
+				o.depends({ mode: 'ap-wds', encryption: 'wpa2' });
+				o.rmempty = true;
+				o.password = true;
+
+
+				o = ss.taboption('encryption', form.Value, '_wpa_key', _('Key'));
+				o.depends('encryption', 'psk');
+				o.depends('encryption', 'psk2');
+				o.depends('encryption', 'psk+psk2');
+				o.depends('encryption', 'psk-mixed');
+				o.depends('encryption', 'sae');
+				o.depends('encryption', 'sae-mixed');
+				o.datatype = 'wpakey';
+				o.rmempty = true;
+				o.password = true;
+
+				o.cfgvalue = function(section_id) {
+					var key = uci.get('wireless', section_id, 'key');
+					return /^[1234]$/.test(key) ? null : key;
+				};
+
+				o.write = function(section_id, value) {
+					uci.set('wireless', section_id, 'key', value);
+					uci.unset('wireless', section_id, 'key1');
+					uci.unset('wireless', section_id, 'key2');
+					uci.unset('wireless', section_id, 'key3');
+					uci.unset('wireless', section_id, 'key4');
+				};
+
+
+				o = ss.taboption('encryption', form.ListValue, '_wep_key', _('Used Key Slot'));
+				o.depends('encryption', 'wep-open');
+				o.depends('encryption', 'wep-shared');
+				o.value('1', _('Key #%d').format(1));
+				o.value('2', _('Key #%d').format(2));
+				o.value('3', _('Key #%d').format(3));
+				o.value('4', _('Key #%d').format(4));
+
+				o.cfgvalue = function(section_id) {
+					var slot = +uci.get('wireless', section_id, 'key');
+					return (slot >= 1 && slot <= 4) ? String(slot) : '';
+				};
+
+				o.write = function(section_id, value) {
+					uci.set('wireless', section_id, 'key', value);
+				};
+
+				for (var slot = 1; slot <= 4; slot++) {
+					o = ss.taboption('encryption', form.Value, 'key%d'.format(slot), _('Key #%d').format(slot));
+					o.depends('encryption', 'wep-open');
+					o.depends('encryption', 'wep-shared');
+					o.datatype = 'wepkey';
+					o.rmempty = true;
+					o.password = true;
+
+					o.write = function(section_id, value) {
+						if (value != null && (value.length == 5 || value.length == 13))
+							value = 's:%s'.format(value);
+						uci.set('wireless', section_id, this.option, value);
+					};
+				}
+
+
+				if (hwtype == 'mac80211') {
+					// Probe 802.11r support (and EAP support as a proxy for Openwrt)
+					var has_80211r = L.hasSystemFeature('hostapd', '11r') || L.hasSystemFeature('hostapd', 'eap');
+
+					o = ss.taboption('encryption', form.Flag, 'ieee80211r', _('802.11r Fast Transition'), _('Enables fast roaming among access points that belong to the same Mobility Domain'));
+					o.depends({ mode: 'ap', encryption: 'wpa' });
+					o.depends({ mode: 'ap', encryption: 'wpa2' });
+					o.depends({ mode: 'ap-wds', encryption: 'wpa' });
+					o.depends({ mode: 'ap-wds', encryption: 'wpa2' });
+					if (has_80211r) {
+						o.depends({ mode: 'ap', encryption: 'psk' });
+						o.depends({ mode: 'ap', encryption: 'psk2' });
+						o.depends({ mode: 'ap', encryption: 'psk-mixed' });
+						o.depends({ mode: 'ap', encryption: 'sae' });
+						o.depends({ mode: 'ap', encryption: 'sae-mixed' });
+						o.depends({ mode: 'ap-wds', encryption: 'psk' });
+						o.depends({ mode: 'ap-wds', encryption: 'psk2' });
+						o.depends({ mode: 'ap-wds', encryption: 'psk-mixed' });
+						o.depends({ mode: 'ap-wds', encryption: 'sae' });
+						o.depends({ mode: 'ap-wds', encryption: 'sae-mixed' });
+					}
+					o.rmempty = true;
+
+					o = ss.taboption('encryption', form.Value, 'nasid', _('NAS ID'), _('Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not needed with normal WPA(2)-PSK.'));
+					o.depends({ mode: 'ap', encryption: 'wpa' });
+					o.depends({ mode: 'ap', encryption: 'wpa2' });
+					o.depends({ mode: 'ap-wds', encryption: 'wpa' });
+					o.depends({ mode: 'ap-wds', encryption: 'wpa2' });
+					o.depends({ ieee80211r: '1' });
+					o.rmempty = true;
+
+					o = ss.taboption('encryption', form.Value, 'mobility_domain', _('Mobility Domain'), _('4-character hexadecimal ID'));
+					o.depends({ ieee80211r: '1' });
+					o.placeholder = '4f57';
+					o.datatype = 'and(hexstring,length(4))';
+					o.rmempty = true;
+
+					o = ss.taboption('encryption', form.Value, 'reassociation_deadline', _('Reassociation Deadline'), _('time units (TUs / 1.024 ms) [1000-65535]'));
+					o.depends({ ieee80211r: '1' });
+					o.placeholder = '1000';
+					o.datatype = 'range(1000,65535)';
+					o.rmempty = true;
+
+					o = ss.taboption('encryption', form.ListValue, 'ft_over_ds', _('FT protocol'));
+					o.depends({ ieee80211r: '1' });
+					o.value('1', _('FT over DS'));
+					o.value('0', _('FT over the Air'));
+					o.rmempty = true;
+
+					o = ss.taboption('encryption', form.Flag, 'ft_psk_generate_local', _('Generate PMK locally'), _('When using a PSK, the PMK can be automatically generated. When enabled, the R0/R1 key options below are not applied. Disable this to use the R0 and R1 key options.'));
+					o.depends({ ieee80211r: '1' });
+					o.default = o.enabled;
+					o.rmempty = false;
+
+					o = ss.taboption('encryption', form.Value, 'r0_key_lifetime', _('R0 Key Lifetime'), _('minutes'));
+					o.depends({ ieee80211r: '1' });
+					o.placeholder = '10000';
+					o.datatype = 'uinteger';
+					o.rmempty = true;
+
+					o = ss.taboption('encryption', form.Value, 'r1_key_holder', _('R1 Key Holder'), _('6-octet identifier as a hex string - no colons'));
+					o.depends({ ieee80211r: '1' });
+					o.placeholder = '00004f577274';
+					o.datatype = 'and(hexstring,length(12))';
+					o.rmempty = true;
+
+					o = ss.taboption('encryption', form.Flag, 'pmk_r1_push', _('PMK R1 Push'));
+					o.depends({ ieee80211r: '1' });
+					o.placeholder = '0';
+					o.rmempty = true;
+
+					o = ss.taboption('encryption', form.DynamicList, 'r0kh', _('External R0 Key Holder List'), _('List of R0KHs in the same Mobility Domain. <br />Format: MAC-address,NAS-Identifier,128-bit key as hex string. <br />This list is used to map R0KH-ID (NAS Identifier) to a destination MAC address when requesting PMK-R1 key from the R0KH that the STA used during the Initial Mobility Domain Association.'));
+					o.depends({ ieee80211r: '1' });
+					o.rmempty = true;
+
+					o = ss.taboption('encryption', form.DynamicList, 'r1kh', _('External R1 Key Holder List'), _ ('List of R1KHs in the same Mobility Domain. <br />Format: MAC-address,R1KH-ID as 6 octets with colons,128-bit key as hex string. <br />This list is used to map R1KH-ID to a destination MAC address when sending PMK-R1 key from the R0KH. This is also the list of authorized R1KHs in the MD that can request PMK-R1 keys.'));
+					o.depends({ ieee80211r: '1' });
+					o.rmempty = true;
+					// End of 802.11r options
+
+					o = ss.taboption('encryption', form.ListValue, 'eap_type', _('EAP-Method'));
+					o.value('tls',  'TLS');
+					o.value('ttls', 'TTLS');
+					o.value('peap', 'PEAP');
+					o.value('fast', 'FAST');
+					o.depends({ mode: 'sta', encryption: 'wpa' });
+					o.depends({ mode: 'sta', encryption: 'wpa2' });
+					o.depends({ mode: 'sta-wds', encryption: 'wpa' });
+					o.depends({ mode: 'sta-wds', encryption: 'wpa2' });
+
+					o = ss.taboption('encryption', form.FileUpload, 'ca_cert', _('Path to CA-Certificate'));
+					o.depends({ mode: 'sta', encryption: 'wpa' });
+					o.depends({ mode: 'sta', encryption: 'wpa2' });
+					o.depends({ mode: 'sta-wds', encryption: 'wpa' });
+					o.depends({ mode: 'sta-wds', encryption: 'wpa2' });
+
+					o = ss.taboption('encryption', form.FileUpload, 'client_cert', _('Path to Client-Certificate'));
+					o.depends({ mode: 'sta', eap_type: 'tls', encryption: 'wpa' });
+					o.depends({ mode: 'sta', eap_type: 'tls', encryption: 'wpa2' });
+					o.depends({ mode: 'sta-wds', eap_type: 'tls', encryption: 'wpa' });
+					o.depends({ mode: 'sta-wds', eap_type: 'tls', encryption: 'wpa2' });
+
+					o = ss.taboption('encryption', form.FileUpload, 'priv_key', _('Path to Private Key'));
+					o.depends({ mode: 'sta', eap_type: 'tls', encryption: 'wpa2' });
+					o.depends({ mode: 'sta', eap_type: 'tls', encryption: 'wpa' });
+					o.depends({ mode: 'sta-wds', eap_type: 'tls', encryption: 'wpa2' });
+					o.depends({ mode: 'sta-wds', eap_type: 'tls', encryption: 'wpa' });
+
+					o = ss.taboption('encryption', form.Value, 'priv_key_pwd', _('Password of Private Key'));
+					o.depends({ mode: 'sta', eap_type: 'tls', encryption: 'wpa2' });
+					o.depends({ mode: 'sta', eap_type: 'tls', encryption: 'wpa' });
+					o.depends({ mode: 'sta-wds', eap_type: 'tls', encryption: 'wpa2' });
+					o.depends({ mode: 'sta-wds', eap_type: 'tls', encryption: 'wpa' });
+					o.password = true;
+
+					o = ss.taboption('encryption', form.ListValue, 'auth', _('Authentication'));
+					o.value('PAP', 'PAP');
+					o.value('CHAP', 'CHAP');
+					o.value('MSCHAP', 'MSCHAP');
+					o.value('MSCHAPV2', 'MSCHAPv2');
+					o.value('EAP-GTC');
+					o.value('EAP-MD5');
+					o.value('EAP-MSCHAPV2');
+					o.value('EAP-TLS');
+					o.depends({ mode: 'sta', eap_type: 'fast', encryption: 'wpa2' });
+					o.depends({ mode: 'sta', eap_type: 'fast', encryption: 'wpa' });
+					o.depends({ mode: 'sta', eap_type: 'peap', encryption: 'wpa2' });
+					o.depends({ mode: 'sta', eap_type: 'peap', encryption: 'wpa' });
+					o.depends({ mode: 'sta', eap_type: 'ttls', encryption: 'wpa2' });
+					o.depends({ mode: 'sta', eap_type: 'ttls', encryption: 'wpa' });
+					o.depends({ mode: 'sta-wds', eap_type: 'fast', encryption: 'wpa2' });
+					o.depends({ mode: 'sta-wds', eap_type: 'fast', encryption: 'wpa' });
+					o.depends({ mode: 'sta-wds', eap_type: 'peap', encryption: 'wpa2' });
+					o.depends({ mode: 'sta-wds', eap_type: 'peap', encryption: 'wpa' });
+					o.depends({ mode: 'sta-wds', eap_type: 'ttls', encryption: 'wpa2' });
+					o.depends({ mode: 'sta-wds', eap_type: 'ttls', encryption: 'wpa' });
+
+					o.validate = function(section_id, value) {
+						var eo = this.section.children.filter(function(o) { return o.option == 'eap_type' })[0],
+						    ev = eo.formvalue(section_id);
+
+						if (ev != 'ttls' && (value == 'PAP' || value == 'CHAP' || value == 'MSCHAP' || value == 'MSCHAPV2'))
+							return _('This authentication type is not applicable to the selected EAP method.');
+
+						return true;
+					};
+
+					o = ss.taboption('encryption', form.FileUpload, 'ca_cert2', _('Path to inner CA-Certificate'));
+					o.depends({ mode: 'sta', auth: 'EAP-TLS', encryption: 'wpa' });
+					o.depends({ mode: 'sta', auth: 'EAP-TLS', encryption: 'wpa2' });
+					o.depends({ mode: 'sta-wds', auth: 'EAP-TLS', encryption: 'wpa' });
+					o.depends({ mode: 'sta-wds', auth: 'EAP-TLS', encryption: 'wpa2' });
+
+					o = ss.taboption('encryption', form.FileUpload, 'client_cert2', _('Path to inner Client-Certificate'));
+					o.depends({ mode: 'sta', auth: 'EAP-TLS', encryption: 'wpa' });
+					o.depends({ mode: 'sta', auth: 'EAP-TLS', encryption: 'wpa2' });
+					o.depends({ mode: 'sta-wds', auth: 'EAP-TLS', encryption: 'wpa' });
+					o.depends({ mode: 'sta-wds', auth: 'EAP-TLS', encryption: 'wpa2' });
+
+					o = ss.taboption('encryption', form.FileUpload, 'priv_key2', _('Path to inner Private Key'));
+					o.depends({ mode: 'sta', auth: 'EAP-TLS', encryption: 'wpa' });
+					o.depends({ mode: 'sta', auth: 'EAP-TLS', encryption: 'wpa2' });
+					o.depends({ mode: 'sta-wds', auth: 'EAP-TLS', encryption: 'wpa' });
+					o.depends({ mode: 'sta-wds', auth: 'EAP-TLS', encryption: 'wpa2' });
+
+					o = ss.taboption('encryption', form.Value, 'priv_key2_pwd', _('Password of inner Private Key'));
+					o.depends({ mode: 'sta', auth: 'EAP-TLS', encryption: 'wpa' });
+					o.depends({ mode: 'sta', auth: 'EAP-TLS', encryption: 'wpa2' });
+					o.depends({ mode: 'sta-wds', auth: 'EAP-TLS', encryption: 'wpa' });
+					o.depends({ mode: 'sta-wds', auth: 'EAP-TLS', encryption: 'wpa2' });
+					o.password = true;
+
+					o = ss.taboption('encryption', form.Value, 'identity', _('Identity'));
+					o.depends({ mode: 'sta', eap_type: 'fast', encryption: 'wpa2' });
+					o.depends({ mode: 'sta', eap_type: 'fast', encryption: 'wpa' });
+					o.depends({ mode: 'sta', eap_type: 'peap', encryption: 'wpa2' });
+					o.depends({ mode: 'sta', eap_type: 'peap', encryption: 'wpa' });
+					o.depends({ mode: 'sta', eap_type: 'ttls', encryption: 'wpa2' });
+					o.depends({ mode: 'sta', eap_type: 'ttls', encryption: 'wpa' });
+					o.depends({ mode: 'sta-wds', eap_type: 'fast', encryption: 'wpa2' });
+					o.depends({ mode: 'sta-wds', eap_type: 'fast', encryption: 'wpa' });
+					o.depends({ mode: 'sta-wds', eap_type: 'peap', encryption: 'wpa2' });
+					o.depends({ mode: 'sta-wds', eap_type: 'peap', encryption: 'wpa' });
+					o.depends({ mode: 'sta-wds', eap_type: 'ttls', encryption: 'wpa2' });
+					o.depends({ mode: 'sta-wds', eap_type: 'ttls', encryption: 'wpa' });
+					o.depends({ mode: 'sta', eap_type: 'tls', encryption: 'wpa2' });
+					o.depends({ mode: 'sta', eap_type: 'tls', encryption: 'wpa' });
+					o.depends({ mode: 'sta-wds', eap_type: 'tls', encryption: 'wpa2' });
+					o.depends({ mode: 'sta-wds', eap_type: 'tls', encryption: 'wpa' });
+
+					o = ss.taboption('encryption', form.Value, 'anonymous_identity', _('Anonymous Identity'));
+					o.depends({ mode: 'sta', eap_type: 'fast', encryption: 'wpa2' });
+					o.depends({ mode: 'sta', eap_type: 'fast', encryption: 'wpa' });
+					o.depends({ mode: 'sta', eap_type: 'peap', encryption: 'wpa2' });
+					o.depends({ mode: 'sta', eap_type: 'peap', encryption: 'wpa' });
+					o.depends({ mode: 'sta', eap_type: 'ttls', encryption: 'wpa2' });
+					o.depends({ mode: 'sta', eap_type: 'ttls', encryption: 'wpa' });
+					o.depends({ mode: 'sta-wds', eap_type: 'fast', encryption: 'wpa2' });
+					o.depends({ mode: 'sta-wds', eap_type: 'fast', encryption: 'wpa' });
+					o.depends({ mode: 'sta-wds', eap_type: 'peap', encryption: 'wpa2' });
+					o.depends({ mode: 'sta-wds', eap_type: 'peap', encryption: 'wpa' });
+					o.depends({ mode: 'sta-wds', eap_type: 'ttls', encryption: 'wpa2' });
+					o.depends({ mode: 'sta-wds', eap_type: 'ttls', encryption: 'wpa' });
+					o.depends({ mode: 'sta', eap_type: 'tls', encryption: 'wpa2' });
+					o.depends({ mode: 'sta', eap_type: 'tls', encryption: 'wpa' });
+					o.depends({ mode: 'sta-wds', eap_type: 'tls', encryption: 'wpa2' });
+					o.depends({ mode: 'sta-wds', eap_type: 'tls', encryption: 'wpa' });
+
+					o = ss.taboption('encryption', form.Value, 'password', _('Password'));
+					o.depends({ mode: 'sta', eap_type: 'fast', encryption: 'wpa2' });
+					o.depends({ mode: 'sta', eap_type: 'fast', encryption: 'wpa' });
+					o.depends({ mode: 'sta', eap_type: 'peap', encryption: 'wpa2' });
+					o.depends({ mode: 'sta', eap_type: 'peap', encryption: 'wpa' });
+					o.depends({ mode: 'sta', eap_type: 'ttls', encryption: 'wpa2' });
+					o.depends({ mode: 'sta', eap_type: 'ttls', encryption: 'wpa' });
+					o.depends({ mode: 'sta-wds', eap_type: 'fast', encryption: 'wpa2' });
+					o.depends({ mode: 'sta-wds', eap_type: 'fast', encryption: 'wpa' });
+					o.depends({ mode: 'sta-wds', eap_type: 'peap', encryption: 'wpa2' });
+					o.depends({ mode: 'sta-wds', eap_type: 'peap', encryption: 'wpa' });
+					o.depends({ mode: 'sta-wds', eap_type: 'ttls', encryption: 'wpa2' });
+					o.depends({ mode: 'sta-wds', eap_type: 'ttls', encryption: 'wpa' });
+					o.password = true;
+
+
+					if (hwtype == 'mac80211') {
+						// ieee802.11w options
+						if (L.hasSystemFeature('hostapd', '11w')) {
+							o = ss.taboption('encryption', form.ListValue, 'ieee80211w', _('802.11w Management Frame Protection'), _("Requires the 'full' version of wpad/hostapd and support from the wifi driver <br />(as of Jan 2019: ath9k, ath10k, mwlwifi and mt76)"));
+							o.value('', _('Disabled'));
+							o.value('1', _('Optional'));
+							o.value('2', _('Required'));
+							o.depends({ mode: 'ap', encryption: 'wpa2' });
+							o.depends({ mode: 'ap-wds', encryption: 'wpa2' });
+							o.depends({ mode: 'ap', encryption: 'psk2' });
+							o.depends({ mode: 'ap', encryption: 'psk-mixed' });
+							o.depends({ mode: 'ap', encryption: 'sae' });
+							o.depends({ mode: 'ap', encryption: 'sae-mixed' });
+							o.depends({ mode: 'ap', encryption: 'owe' });
+							o.depends({ mode: 'ap-wds', encryption: 'psk2' });
+							o.depends({ mode: 'ap-wds', encryption: 'psk-mixed' });
+							o.depends({ mode: 'ap-wds', encryption: 'sae' });
+							o.depends({ mode: 'ap-wds', encryption: 'sae-mixed' });
+							o.depends({ mode: 'ap-wds', encryption: 'owe' });
+							o.depends({ mode: 'sta', encryption: 'wpa2' });
+							o.depends({ mode: 'sta-wds', encryption: 'wpa2' });
+							o.depends({ mode: 'sta', encryption: 'psk2' });
+							o.depends({ mode: 'sta', encryption: 'psk-mixed' });
+							o.depends({ mode: 'sta', encryption: 'sae' });
+							o.depends({ mode: 'sta', encryption: 'sae-mixed' });
+							o.depends({ mode: 'sta', encryption: 'owe' });
+							o.depends({ mode: 'sta-wds', encryption: 'psk2' });
+							o.depends({ mode: 'sta-wds', encryption: 'psk-mixed' });
+							o.depends({ mode: 'sta-wds', encryption: 'sae' });
+							o.depends({ mode: 'sta-wds', encryption: 'sae-mixed' });
+							o.depends({ mode: 'sta-wds', encryption: 'owe' });
+							o.defaults = {
+								'2': [{ encryption: 'sae' }, { encryption: 'owe' }],
+								'1': [{ encryption: 'sae-mixed'}],
+								'':  []
+							};
+
+							o = ss.taboption('encryption', form.Value, 'ieee80211w_max_timeout', _('802.11w maximum timeout'), _('802.11w Association SA Query maximum timeout'));
+							o.depends('ieee80211w', '1');
+							o.depends('ieee80211w', '2');
+							o.datatype = 'uinteger';
+							o.placeholder = '1000';
+							o.rmempty = true;
+
+							o = ss.taboption('encryption', form.Value, 'ieee80211w_retry_timeout', _('802.11w retry timeout'), _('802.11w Association SA Query retry timeout'));
+							o.depends('ieee80211w', '1');
+							o.depends('ieee80211w', '2');
+							o.datatype = 'uinteger';
+							o.placeholder = '201';
+							o.rmempty = true;
+						};
+
+						o = ss.taboption('encryption', form.Flag, 'wpa_disable_eapol_key_retries', _('Enable key reinstallation (KRACK) countermeasures'), _('Complicates key reinstallation attacks on the client side by disabling retransmission of EAPOL-Key frames that are used to install keys. This workaround might cause interoperability issues and reduced robustness of key negotiation especially in environments with heavy traffic load.'));
+						o.depends({ mode: 'ap', encryption: 'wpa2' });
+						o.depends({ mode: 'ap', encryption: 'psk2' });
+						o.depends({ mode: 'ap', encryption: 'psk-mixed' });
+						o.depends({ mode: 'ap', encryption: 'sae' });
+						o.depends({ mode: 'ap', encryption: 'sae-mixed' });
+						o.depends({ mode: 'ap-wds', encryption: 'wpa2' });
+						o.depends({ mode: 'ap-wds', encryption: 'psk2' });
+						o.depends({ mode: 'ap-wds', encryption: 'psk-mixed' });
+						o.depends({ mode: 'ap-wds', encryption: 'sae' });
+						o.depends({ mode: 'ap-wds', encryption: 'sae-mixed' });
+
+						if (L.hasSystemFeature('hostapd', 'cli') && L.hasSystemFeature('wpasupplicant')) {
+							o = ss.taboption('encryption', form.Flag, 'wps_pushbutton', _('Enable WPS pushbutton, requires WPA(2)-PSK'))
+							o.enabled = '1';
+							o.disabled = '0';
+							o.default = o.disabled;
+							o.depends('encryption', 'psk');
+							o.depends('encryption', 'psk2');
+							o.depends('encryption', 'psk-mixed');
+						}
+					}
+				}
+			});
+		};
+
+		s.handleRemove = function(section_id, ev) {
+			document.querySelector('.cbi-section-table-row[data-sid="%s"]'.format(section_id)).style.opacity = 0.5;
+			return form.TypedSection.prototype.handleRemove.apply(this, [section_id, ev]);
+		};
+
+		s.handleScan = function(radioDev, ev) {
+			var table = E('div', { 'class': 'table' }, [
+				E('div', { 'class': 'tr table-titles' }, [
+					E('div', { 'class': 'th col-2 middle center' }, _('Signal')),
+					E('div', { 'class': 'th col-4 middle left' }, _('SSID')),
+					E('div', { 'class': 'th col-2 middle center hide-xs' }, _('Channel')),
+					E('div', { 'class': 'th col-2 middle left hide-xs' }, _('Mode')),
+					E('div', { 'class': 'th col-3 middle left hide-xs' }, _('BSSID')),
+					E('div', { 'class': 'th col-3 middle left' }, _('Encryption')),
+					E('div', { 'class': 'th cbi-section-actions right' }, ' '),
+				])
+			]);
+
+			cbi_update_table(table, [], E('em', { class: 'spinning' }, _('Starting wireless scan...')));
+
+			var md = L.ui.showModal(_('Join Network: Wireless Scan'), [
+				table,
+				E('div', { 'class': 'right' },
+					E('button', {
+						'class': 'btn',
+						'click': L.bind(this.handleScanAbort, this)
+					}, _('Dismiss')))
+			]);
+
+			md.style.maxWidth = '90%';
+			md.style.maxHeight = 'none';
+
+			this.pollFn = L.bind(this.handleScanRefresh, this, radioDev, {}, table);
+
+			L.Poll.add(this.pollFn);
+			L.Poll.start();
+		};
+
+		s.handleScanRefresh = function(radioDev, scanCache, table) {
+			return radioDev.getScanList().then(L.bind(function(results) {
+				var rows = [];
+
+				for (var i = 0; i < results.length; i++)
+					scanCache[results[i].bssid] = results[i];
+
+				for (var k in scanCache)
+					if (scanCache[k].stale)
+						results.push(scanCache[k]);
+
+				results.sort(function(a, b) {
+					var diff = (b.quality - a.quality) || (a.channel - b.channel);
+
+					if (diff)
+						return diff;
+
+					if (a.ssid < b.ssid)
+						return -1;
+					else if (a.ssid > b.ssid)
+						return 1;
+
+					if (a.bssid < b.bssid)
+						return -1;
+					else if (a.bssid > b.bssid)
+						return 1;
+				});
+
+				for (var i = 0; i < results.length; i++) {
+					var res = results[i],
+					    qv = res.quality || 0,
+					    qm = res.quality_max || 0,
+					    q = (qv > 0 && qm > 0) ? Math.floor((100 / qm) * qv) : 0,
+					    s = res.stale ? 'opacity:0.5' : '';
+
+					rows.push([
+						E('span', { 'style': s }, render_signal_badge(q, res.signal, res.noise)),
+						E('span', { 'style': s }, '%h'.format(res.ssid)),
+						E('span', { 'style': s }, '%d'.format(res.channel)),
+						E('span', { 'style': s }, '%h'.format(res.mode)),
+						E('span', { 'style': s }, '%h'.format(res.bssid)),
+						E('span', { 'style': s }, '%h'.format(network.formatWifiEncryption(res.encryption))),
+						E('div', { 'class': 'right' }, E('button', {
+							'class': 'cbi-button cbi-button-action important',
+							'click': L.bind(this.handleJoin, this, radioDev, res)
+						}, _('Join Network')))
+					]);
+
+					res.stale = true;
+				}
+
+				cbi_update_table(table, rows);
+			}, this));
+		};
+
+		s.handleScanAbort = function(ev) {
+			var md = L.dom.parent(ev.target, 'div[aria-modal="true"]');
+			if (md) {
+				md.style.maxWidth = '';
+				md.style.maxHeight = '';
+			}
+
+			L.ui.hideModal();
+			L.Poll.remove(this.pollFn);
+
+			this.pollFn = null;
+		};
+
+		s.handleJoinConfirm = function(radioDev, bss, form, ev) {
+			var nameopt = L.toArray(form.lookupOption('name', '_new_'))[0],
+			    passopt = L.toArray(form.lookupOption('password', '_new_'))[0],
+			    zoneopt = L.toArray(form.lookupOption('zone', '_new_'))[0],
+			    replopt = L.toArray(form.lookupOption('replace', '_new_'))[0],
+			    nameval = (nameopt && nameopt.isValid('_new_')) ? nameopt.formvalue('_new_') : null,
+			    passval = (passopt && passopt.isValid('_new_')) ? passopt.formvalue('_new_') : null,
+			    zoneval = zoneopt ? zoneopt.formvalue('_new_') : null,
+			    enc = L.isObject(bss.encryption) ? bss.encryption : null,
+			    is_wep = (enc && Array.isArray(enc.wep)),
+			    is_psk = (enc && Array.isArray(enc.wpa) && Array.isArray(enc.authentication) && enc.authentication[0] == 'psk');
+
+			if (nameval == null || (passopt && passval == null))
+				return;
+
+			var section_id = null;
+
+			return this.map.save(function() {
+				if (replopt.formvalue('_new_') == '1') {
+					var sections = uci.sections('wireless', 'wifi-iface');
+
+					for (var i = 0; i < sections.length; i++)
+						if (sections[i].device == radioDev.getName())
+							uci.remove('wireless', sections[i]['.name']);
+				}
+
+				section_id = next_free_sid(uci.sections('wifi-iface').length);
+
+				uci.add('wireless', 'wifi-iface', section_id);
+				uci.set('wireless', section_id, 'device', radioDev.getName());
+				uci.set('wireless', section_id, 'mode', (bss.mode == 'Ad-Hoc') ? 'adhoc' : 'sta');
+				uci.set('wireless', section_id, 'network', nameval);
+
+				if (bss.ssid != null)
+					uci.set('wireless', section_id, 'ssid', bss.ssid);
+				else if (bss.bssid != null)
+					uci.set('wireless', section_id, 'bssid', bss.bssid);
+
+				if (is_psk) {
+					for (var i = enc.wpa.length - 1; i >= 0; i--) {
+						if (enc.wpa[i] == 2) {
+							uci.set('wireless', section_id, 'encryption', 'psk2');
+							break;
+						}
+						else if (enc.wpa[i] == 1) {
+							uci.set('wireless', section_id, 'encryption', 'psk');
+							break;
+						}
+					}
+
+					uci.set('wireless', section_id, 'key', passval);
+				}
+				else if (is_wep) {
+					uci.set('wireless', section_id, 'encryption', 'wep-open');
+					uci.set('wireless', section_id, 'key', '1');
+					uci.set('wireless', section_id, 'key1', passval);
+				}
+
+				var zonePromise = zoneval
+					? firewall.getZone(zoneval).then(function(zone) { return zone || firewall.addZone(zoneval) })
+					: Promise.resolve();
+
+				return zonePromise.then(function(zone) {
+					return network.addNetwork(nameval, { proto: 'dhcp' }).then(function(net) {
+						firewall.deleteNetwork(net.getName());
+
+						if (zone)
+							zone.addNetwork(net.getName());
+					});
+				});
+			}).then(L.bind(function() {
+				return this.renderMoreOptionsModal(section_id);
+			}, this));
+		};
+
+		s.handleJoin = function(radioDev, bss, ev) {
+			this.handleScanAbort(ev);
+
+			var m2 = new form.Map('wireless'),
+			    s2 = m2.section(form.NamedSection, '_new_'),
+			    enc = L.isObject(bss.encryption) ? bss.encryption : null,
+			    is_wep = (enc && Array.isArray(enc.wep)),
+			    is_psk = (enc && Array.isArray(enc.wpa) && Array.isArray(enc.authentication) && enc.authentication[0] == 'psk'),
+			    replace, passphrase, name, zone;
+
+			s2.render = function() {
+				return Promise.all([
+					{},
+					this.renderUCISection('_new_')
+				]).then(this.renderContents.bind(this));
+			};
+
+			replace = s2.option(form.Flag, 'replace', _('Replace wireless configuration'), _('Check this option to delete the existing networks from this radio.'));
+
+			name = s2.option(form.Value, 'name', _('Name of the new network'), _('The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</code> and <code>_</code>'));
+			name.datatype = 'uciname';
+			name.default = 'wwan';
+			name.rmempty = false;
+			name.validate = function(section_id, value) {
+				if (uci.get('network', value))
+					return _('The network name is already used');
+
+				return true;
+			};
+
+			for (var i = 2; uci.get('network', name.default); i++)
+				name.default = 'wwan%d'.format(i);
+
+			if (is_wep || is_psk) {
+				passphrase = s2.option(form.Value, 'password', is_wep ? _('WEP passphrase') : _('WPA passphrase'), _('Specify the secret encryption key here.'));
+				passphrase.datatype = is_wep ? 'wepkey' : 'wpakey';
+				passphrase.password = true;
+				passphrase.rmempty = false;
+			}
+
+			zone = s2.option(widgets.ZoneSelect, 'zone', _('Create / Assign firewall-zone'), _('Choose the firewall zone you want to assign to this interface. Select <em>unspecified</em> to remove the interface from the associated zone or fill out the <em>create</em> field to define a new zone and attach the interface to it.'));
+			zone.default = 'wan';
+
+			return m2.render().then(L.bind(function(nodes) {
+				L.ui.showModal(_('Joining Network: %q').replace(/%q/, '"%h"'.format(bss.ssid)), [
+					nodes,
+					E('div', { 'class': 'right' }, [
+						E('button', {
+							'class': 'btn',
+							'click': L.ui.hideModal
+						}, _('Cancel')), ' ',
+						E('button', {
+							'class': 'cbi-button cbi-button-positive important',
+							'click': L.ui.createHandlerFn(this, 'handleJoinConfirm', radioDev, bss, m2)
+						}, _('Submit'))
+					])
+				], 'cbi-modal').querySelector('[id="%s"] input[class][type]'.format((passphrase || name).cbid('_new_'))).focus();
+			}, this));
+		};
+
+		s.handleAdd = function(radioDev, ev) {
+			var section_id = next_free_sid(uci.sections('wireless', 'wifi-iface').length);
+
+			uci.unset('wireless', radioDev.getName(), 'disabled');
+
+			uci.add('wireless', 'wifi-iface', section_id);
+			uci.set('wireless', section_id, 'device', radioDev.getName());
+			uci.set('wireless', section_id, 'mode', 'ap');
+			uci.set('wireless', section_id, 'ssid', 'OpenWrt');
+			uci.set('wireless', section_id, 'encryption', 'none');
+
+			this.addedSection = section_id;
+			return this.renderMoreOptionsModal(section_id);
+		};
+
+		o = s.option(form.DummyValue, '_badge');
+		o.modalonly = false;
+		o.textvalue = function(section_id) {
+			var inst = this.section.lookupRadioOrNetwork(section_id),
+			    node = E('div', { 'class': 'center' });
+
+			if (inst.getWifiNetworks)
+				node.appendChild(render_radio_badge(inst));
+			else
+				node.appendChild(render_network_badge(inst));
+
+			return node;
+		};
+
+		o = s.option(form.DummyValue, '_stat');
+		o.modalonly = false;
+		o.textvalue = function(section_id) {
+			var inst = this.section.lookupRadioOrNetwork(section_id);
+
+			if (inst.getWifiNetworks)
+				return render_radio_status(inst, this.section.wifis.filter(function(e) {
+					return (e.getWifiDeviceName() == inst.getName());
+				}));
+			else
+				return render_network_status(inst);
+		};
+
+		return m.render().then(L.bind(function(m, nodes) {
+			L.Poll.add(L.bind(function() {
+				var section_ids = m.children[0].cfgsections(),
+				    tasks = [ network.getHostHints(), network.getWifiDevices() ];
+
+				for (var i = 0; i < section_ids.length; i++) {
+					var row = nodes.querySelector('.cbi-section-table-row[data-sid="%s"]'.format(section_ids[i])),
+					    dsc = row.querySelector('[data-name="_stat"] > div'),
+					    btns = row.querySelectorAll('.cbi-section-actions button');
+
+					if (dsc.getAttribute('restart') == '') {
+						dsc.setAttribute('restart', '1');
+						tasks.push(L.Request.post(
+							L.url('admin/network/wireless_reconnect', section_ids[i]),
+							'token=' + L.env.token,
+							{ headers: { 'Content-Type': 'application/x-www-form-urlencoded' } }
+						).catch(function() {}));
+					}
+					else if (dsc.getAttribute('restart') == '1') {
+						dsc.removeAttribute('restart');
+						btns[0].classList.remove('spinning');
+						btns[0].disabled = false;
+					}
+				}
+
+				return Promise.all(tasks)
+					.then(L.bind(function(hosts_radios) {
+						var tasks = [];
+
+						for (var i = 0; i < hosts_radios[1].length; i++)
+							tasks.push(hosts_radios[1][i].getWifiNetworks());
+
+						return Promise.all(tasks).then(function(data) {
+							hosts_radios[2] = [];
+
+							for (var i = 0; i < data.length; i++)
+								hosts_radios[2].push.apply(hosts_radios[2], data[i]);
+
+							return hosts_radios;
+						});
+					}, network))
+					.then(L.bind(function(hosts_radios_wifis) {
+						var tasks = [];
+
+						for (var i = 0; i < hosts_radios_wifis[2].length; i++)
+							tasks.push(hosts_radios_wifis[2][i].getAssocList());
+
+						return Promise.all(tasks).then(function(data) {
+							hosts_radios_wifis[3] = [];
+
+							for (var i = 0; i < data.length; i++) {
+								var wifiNetwork = hosts_radios_wifis[2][i],
+								    radioDev = hosts_radios_wifis[1].filter(function(d) { return d.getName() == wifiNetwork.getWifiDeviceName() })[0];
+
+								for (var j = 0; j < data[i].length; j++)
+									hosts_radios_wifis[3].push(Object.assign({ radio: radioDev, network: wifiNetwork }, data[i][j]));
+							}
+
+							return hosts_radios_wifis;
+						});
+					}, network))
+					.then(L.bind(this.poll_status, this, nodes));
+			}, this), 5);
+
+			var table = E('div', { 'class': 'table', 'id': 'wifi_assoclist_table' }, [
+				E('div', { 'class': 'tr table-titles' }, [
+					E('div', { 'class': 'th nowrap' }, _('Network')),
+					E('div', { 'class': 'th hide-xs' }, _('MAC-Address')),
+					E('div', { 'class': 'th nowrap' }, _('Host')),
+					E('div', { 'class': 'th nowrap' }, _('Signal / Noise')),
+					E('div', { 'class': 'th nowrap' }, _('RX Rate / TX Rate'))
+				])
+			]);
+
+			cbi_update_table(table, [], E('em', { 'class': 'spinning' }, _('Collecting data...')))
+
+			return E([ nodes, E('h3', _('Associated Stations')), table ]);
+		}, this, m));
 	}
-);
+});
diff --git a/modules/luci-mod-network/luasrc/controller/admin/network.lua b/modules/luci-mod-network/luasrc/controller/admin/network.lua
index b20607e2e..f8623be93 100644
--- a/modules/luci-mod-network/luasrc/controller/admin/network.lua
+++ b/modules/luci-mod-network/luasrc/controller/admin/network.lua
@@ -18,13 +18,7 @@ function index()
 			end)
 
 		if has_switch then
-			page  = node("admin", "network", "vlan")
-			page.target = cbi("admin_network/vlan")
-			page.title  = _("Switch")
-			page.order  = 20
-
-			page = entry({"admin", "network", "switch_status"}, call("switch_status"), nil)
-			page.leaf = true
+			entry({"admin", "network", "switch"}, view("network/switch"), _("Switch"), 20)
 		end
 
 
@@ -37,69 +31,30 @@ function index()
 			end)
 
 		if has_wifi then
-			page = entry({"admin", "network", "wireless_join"}, post("wifi_join"), nil)
-			page.leaf = true
-
-			page = entry({"admin", "network", "wireless_add"}, post("wifi_add"), nil)
-			page.leaf = true
-
 			page = entry({"admin", "network", "wireless_status"}, call("wifi_status"), nil)
 			page.leaf = true
 
 			page = entry({"admin", "network", "wireless_reconnect"}, post("wifi_reconnect"), nil)
 			page.leaf = true
 
-			page = entry({"admin", "network", "wireless_scan_trigger"}, post("wifi_scan_trigger"), nil)
+			page = entry({"admin", "network", "wireless"}, view("network/wireless"), _('Wireless'), 15)
 			page.leaf = true
-
-			page = entry({"admin", "network", "wireless_scan_results"}, call("wifi_scan_results"), nil)
-			page.leaf = true
-
-			page = entry({"admin", "network", "wireless"}, arcombine(cbi("admin_network/wifi_overview"), cbi("admin_network/wifi")), _("Wireless"), 15)
-			page.leaf = true
-			page.subindex = true
-
-			if page.inreq then
-				local wdev
-				local net = require "luci.model.network".init(uci)
-				for _, wdev in ipairs(net:get_wifidevs()) do
-					local wnet
-					for _, wnet in ipairs(wdev:get_wifinets()) do
-						entry(
-							{"admin", "network", "wireless", wnet:id()},
-							alias("admin", "network", "wireless"),
-							wdev:name() .. ": " .. wnet:shortname()
-						)
-					end
-				end
-			end
 		end
 
 
-		page = entry({"admin", "network", "iface_add"}, form("admin_network/iface_add"), nil)
-		page.leaf = true
-
 		page = entry({"admin", "network", "iface_status"}, call("iface_status"), nil)
 		page.leaf = true
 
 		page = entry({"admin", "network", "iface_reconnect"}, post("iface_reconnect"), nil)
 		page.leaf = true
 
-		page = entry({"admin", "network", "network"}, arcombine(cbi("admin_network/network"), cbi("admin_network/ifaces")), _("Interfaces"), 10)
+		page = entry({"admin", "network", "iface_down"}, post("iface_down"), nil)
+		page.leaf = true
+
+		page = entry({"admin", "network", "network"}, view("network/interfaces"), _("Interfaces"), 10)
 		page.leaf   = true
 		page.subindex = true
 
-		if page.inreq then
-			uci:foreach("network", "interface",
-				function (section)
-					local ifc = section[".name"]
-					if ifc ~= "loopback" then
-						entry({"admin", "network", "network", ifc},
-						true, ifc:upper())
-					end
-				end)
-		end
-
 
 		if nixio.fs.access("/etc/config/dhcp") then
 			page = node("admin", "network", "dhcp")
@@ -140,50 +95,6 @@ function index()
 --	end
 end
 
-function wifi_join()
-	local tpl  = require "luci.template"
-	local http = require "luci.http"
-	local dev  = http.formvalue("device")
-	local ssid = http.formvalue("join")
-
-	if dev and ssid then
-		local cancel = (http.formvalue("cancel") or http.formvalue("cbi.cancel"))
-		if not cancel then
-			local cbi = require "luci.cbi"
-			local map = luci.cbi.load("admin_network/wifi_add")[1]
-
-			if map:parse() ~= cbi.FORM_DONE then
-				tpl.render("header")
-				map:render()
-				tpl.render("footer")
-			end
-
-			return
-		end
-	end
-
-	tpl.render("admin_network/wifi_join")
-end
-
-function wifi_add()
-	local dev = luci.http.formvalue("device")
-	local ntm = require "luci.model.network".init()
-
-	dev = dev and ntm:get_wifidev(dev)
-
-	if dev then
-		local net = dev:add_wifinet({
-			mode       = "ap",
-			ssid       = "OpenWrt",
-			encryption = "none",
-			disabled   = 1
-		})
-
-		ntm:save("wireless")
-		luci.http.redirect(net:adminlink())
-	end
-end
-
 function iface_status(ifaces)
 	local netm = require "luci.model.network".init()
 	local rv   = { }
@@ -268,6 +179,62 @@ function iface_reconnect(iface)
 	luci.http.status(404, "No such interface")
 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 iface_down(iface, force)
+	local netmd = require "luci.model.network".init()
+	local peer = luci.http.getenv("REMOTE_ADDR")
+	local serv = luci.http.getenv("SERVER_ADDR")
+
+	if force ~= "force" and serv and peer then
+		local dev = addr2dev(peer, serv)
+		if dev then
+			local nets = netmd:get_networks()
+			local outnet = nil
+			local _, net, ai
+
+			for _, net in ipairs(nets) do
+				if net:contains_interface(dev) then
+					outnet = net
+					break
+				end
+			end
+
+			if outnet:name() == iface then
+				luci.http.status(409, "Is inbound interface")
+				return
+			end
+
+			local peeraddr = outnet:get("peeraddr")
+			for _, ai in ipairs(peeraddr and nixio.getaddrinfo(peeraddr) or {}) do
+				local peerdev = addr2dev(ai.address)
+				for _, net in ipairs(peerdev and nets or {}) do
+					if net:contains_interface(peerdev) and net:name() == iface then
+						luci.http.status(409, "Is inbound interface")
+						return
+					end
+				end
+			end
+		end
+	end
+
+	if netmd:get_network(iface) then
+		luci.sys.call("env -i /sbin/ifdown %s >/dev/null 2>/dev/null"
+			% luci.util.shellquote(iface))
+		luci.http.status(200, "Shut down")
+		return
+	end
+
+	luci.http.status(404, "No such interface")
+end
+
 function wifi_status(devs)
 	local s    = require "luci.tools.status"
 	local rv   = { }
@@ -289,7 +256,7 @@ function wifi_status(devs)
 end
 
 function wifi_reconnect(radio)
-	local rc = luci.sys.call("env -i /sbin/wifi up %s" % luci.util.shellquote(radio))
+	local rc = luci.sys.call("env -i /sbin/wifi up %s >/dev/null" % luci.util.shellquote(radio))
 
 	if rc == 0 then
 		luci.http.status(200, "Reconnected")
@@ -298,87 +265,6 @@ function wifi_reconnect(radio)
 	end
 end
 
-local function _wifi_get_scan_results(cache_key)
-	local results = luci.util.ubus("session", "get", {
-		ubus_rpc_session = luci.model.uci:get_session_id(),
-		keys = { cache_key }
-	})
-
-	if type(results) == "table" and
-	   type(results.values) == "table" and
-	   type(results.values[cache_key]) == "table"
-	then
-		return results.values[cache_key]
-	end
-
-	return nil
-end
-
-function wifi_scan_trigger(radio, update)
-	local iw = radio and luci.sys.wifi.getiwinfo(radio)
-
-	if not iw then
-		luci.http.status(404, "No such radio device")
-		return
-	end
-
-	luci.http.status(204, "Scan scheduled")
-
-	if nixio.fork() == 0 then
-		io.stderr:close()
-		io.stdout:close()
-
-		local _, bss
-		local data, bssids = { }, { }
-		local cache_key = "scan_%s" % radio
-
-		luci.util.ubus("session", "set", {
-			ubus_rpc_session = luci.model.uci:get_session_id(),
-			values = { [cache_key] = nil }
-		})
-
-		for _, bss in ipairs(iw.scanlist or { }) do
-			data[_] = bss
-			bssids[bss.bssid] = bss
-		end
-
-		if update then
-			local cached = _wifi_get_scan_results(cache_key)
-			if cached then
-				for _, bss in ipairs(cached) do
-					if not bssids[bss.bssid] then
-						bss.stale = true
-						data[#data + 1] = bss
-					end
-				end
-			end
-		end
-
-		luci.util.ubus("session", "set", {
-			ubus_rpc_session = luci.model.uci:get_session_id(),
-			values = { [cache_key] = data }
-		})
-	end
-end
-
-function wifi_scan_results(radio)
-	local results = radio and _wifi_get_scan_results("scan_%s" % radio)
-
-	if results then
-		luci.http.prepare_content("application/json")
-		luci.http.write_json(results)
-	else
-		luci.http.status(404, "No wireless scan results")
-	end
-end
-
-function switch_status(switches)
-	local s = require "luci.tools.status"
-
-	luci.http.prepare_content("application/json")
-	luci.http.write_json(s.switch_status(switches))
-end
-
 function diag_command(cmd, addr)
 	if addr and addr:match("^[a-zA-Z0-9%-%.:_]+$") then
 		luci.http.prepare_content("text/plain")
diff --git a/modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua b/modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua
deleted file mode 100644
index ca66e9f36..000000000
--- a/modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua
+++ /dev/null
@@ -1,101 +0,0 @@
--- Copyright 2009-2010 Jo-Philipp Wich <jow@openwrt.org>
--- Licensed to the public under the Apache License 2.0.
-
-local nw  = require "luci.model.network".init()
-local fw  = require "luci.model.firewall".init()
-local utl = require "luci.util"
-local uci = require "luci.model.uci".cursor()
-
-m = SimpleForm("network", translate("Create Interface"))
-m.redirect = luci.dispatcher.build_url("admin/network/network")
-m.reset = false
-
-function m.on_cancel()
-	luci.http.redirect(luci.dispatcher.build_url("admin/network/network"))
-end
-
-newnet = m:field(Value, "_netname", translate("Name of the new interface"),
-	translate("The allowed characters are: <code>A-Z</code>, <code>a-z</code>, " ..
-		"<code>0-9</code> and <code>_</code>"
-	))
-
-newnet:depends("_attach", "")
-newnet.default = arg[1] and "net_" .. arg[1]:gsub("[^%w_]+", "_")
-newnet.datatype = "and(uciname,maxlength(15))"
-
-advice = m:field(DummyValue, "d1", translate("Note: interface name length"),
-	 translate("Maximum length of the name is 15 characters including " ..
-		"the automatic protocol/bridge prefix (br-, 6in4-, pppoe- etc.)"
-	))
-
-newproto = m:field(ListValue, "_netproto", translate("Protocol of the new interface"))
-
-netbridge = m:field(Flag, "_bridge", translate("Create a bridge over multiple interfaces"))
-
-
-sifname = m:field(Value, "_ifname", translate("Cover the following interface"))
-
-sifname.widget = "radio"
-sifname.template  = "cbi/network_ifacelist"
-sifname.nobridges = true
-
-
-mifname = m:field(Value, "_ifnames", translate("Cover the following interfaces"))
-
-mifname.widget = "checkbox"
-mifname.template  = "cbi/network_ifacelist"
-mifname.nobridges = true
-
-
-local _, p
-for _, p in ipairs(nw:get_protocols()) do
-	if p:is_installed() then
-		newproto:value(p:proto(), p:get_i18n())
-		if not p:is_virtual()  then netbridge:depends("_netproto", p:proto()) end
-		if not p:is_floating() then
-			sifname:depends({ _bridge = "",  _netproto = p:proto()})
-			mifname:depends({ _bridge = "1", _netproto = p:proto()})
-		end
-	end
-end
-
-function newproto.validate(self, value, section)
-	local name = newnet:formvalue(section)
-	if not name or #name == 0 then
-		newnet:add_error(section, translate("No network name specified"))
-	elseif m:get(name) then
-		newnet:add_error(section, translate("The given network name is not unique"))
-	end
-
-	local proto = nw:get_protocol(value)
-	if proto and not proto:is_floating() then
-		local br = (netbridge:formvalue(section) == "1")
-		local ifn = br and mifname:formvalue(section) or sifname:formvalue(section)
-		for ifn in utl.imatch(ifn) do
-			return value
-		end
-		return nil, translate("The selected protocol needs a device assigned")
-	end
-	return value
-end
-
-function newproto.write(self, section, value)
-	local name = newnet:formvalue(section)
-	if name and #name > 0 then
-		local br = (netbridge:formvalue(section) == "1") and "bridge" or nil
-		local net = nw:add_network(name, { proto = value, type = br })
-		if net then
-			local ifn
-			for ifn in utl.imatch(
-				br and mifname:formvalue(section) or sifname:formvalue(section)
-			) do
-				net:add_interface(ifn)
-			end
-			nw:save("network")
-			nw:save("wireless")
-		end
-		luci.http.redirect(luci.dispatcher.build_url("admin/network/network", name))
-	end
-end
-
-return m
diff --git a/modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua b/modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua
deleted file mode 100644
index de7b8676e..000000000
--- a/modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua
+++ /dev/null
@@ -1,563 +0,0 @@
--- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008-2011 Jo-Philipp Wich <jow@openwrt.org>
--- Licensed to the public under the Apache License 2.0.
-
-local fs = require "nixio.fs"
-local ut = require "luci.util"
-local pt = require "luci.tools.proto"
-local nw = require "luci.model.network"
-local fw = require "luci.model.firewall"
-
-arg[1] = arg[1] or ""
-
-local has_dnsmasq  = fs.access("/etc/config/dhcp")
-local has_firewall = fs.access("/etc/config/firewall")
-
-m = Map("network", translate("Interfaces") .. " - " .. arg[1]:upper(), translate("On this page you can configure the network interfaces. You can bridge several interfaces by ticking the \"bridge interfaces\" field and enter the names of several network interfaces separated by spaces. You can also use <abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation <samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: <samp>eth0.1</samp>)."))
-m.redirect = luci.dispatcher.build_url("admin", "network", "network")
-m:chain("wireless")
-m:chain("luci")
-
-if has_firewall then
-	m:chain("firewall")
-end
-
-nw.init(m.uci)
-fw.init(m.uci)
-
-
-local net = nw:get_network(arg[1])
-
-local function set_ifstate(name, option, value)
-	local found = false
-
-	m.uci:foreach("luci", "ifstate", function (s)
-		if s.interface == name then
-			m.uci:set("luci", s[".name"], option, value)
-			found = true
-			return false
-		end
-	end)
-
-	if not found then
-		local sid = m.uci:add("luci", "ifstate")
-		m.uci:set("luci", sid, "interface", name)
-		m.uci:set("luci", sid, option, value)
-	end
-
-	m.uci:save("luci")
-end
-
-local function get_ifstate(name, option)
-	local val
-
-	m.uci:foreach("luci", "ifstate", function (s)
-		if s.interface == name then
-			val = s[option]
-			return false
-		end
-	end)
-
-	return val
-end
-
-local function backup_ifnames(is_bridge)
-	if not net:is_floating() and not get_ifstate(net:name(), "ifname") then
-		local ifcs = net:get_interfaces() or { net:get_interface() }
-		if ifcs then
-			local _, ifn
-			local ifns = { }
-			for _, ifn in ipairs(ifcs) do
-				local wif = ifn:get_wifinet()
-				ifns[#ifns+1] = wif and wif:id() or ifn:name()
-			end
-			if #ifns > 0 then
-				set_ifstate(net:name(), "ifname", table.concat(ifns, " "))
-				set_ifstate(net:name(), "bridge", tostring(net:is_bridge()))
-			end
-		end
-	end
-end
-
-
--- redirect to overview page if network does not exist anymore (e.g. after a revert)
-if not net then
-	luci.http.redirect(luci.dispatcher.build_url("admin/network/network"))
-	return
-end
-
--- protocol switch was requested, rebuild interface config and reload page
-if m:formvalue("cbid.network.%s._switch" % net:name()) then
-	-- get new protocol
-	local ptype = m:formvalue("cbid.network.%s.proto" % net:name()) or "-"
-	local proto = nw:get_protocol(ptype, net:name())
-	if proto then
-		-- backup default
-		backup_ifnames()
-
-		-- if current proto is not floating and target proto is not floating,
-		-- then attempt to retain the ifnames
-		--error(net:proto() .. " > " .. proto:proto())
-		if not net:is_floating() and not proto:is_floating() then
-			-- if old proto is a bridge and new proto not, then clip the
-			-- interface list to the first ifname only
-			if net:is_bridge() and proto:is_virtual() then
-				local _, ifn
-				local first = true
-				for _, ifn in ipairs(net:get_interfaces() or { net:get_interface() }) do
-					if first then
-						first = false
-					else
-						net:del_interface(ifn)
-					end
-				end
-				m:del(net:name(), "type")
-			end
-
-		-- if the current proto is floating, the target proto not floating,
-		-- then attempt to restore ifnames from backup
-		elseif net:is_floating() and not proto:is_floating() then
-			-- if we have backup data, then re-add all orphaned interfaces
-			-- from it and restore the bridge choice
-			local br = (get_ifstate(net:name(), "bridge") == "true")
-			local ifn
-			local ifns = { }
-			for ifn in ut.imatch(get_ifstate(net:name(), "ifname")) do
-				ifn = nw:get_interface(ifn)
-				if ifn and not ifn:get_network() then
-					proto:add_interface(ifn)
-					if not br then
-						break
-					end
-				end
-			end
-			if br then
-				m:set(net:name(), "type", "bridge")
-			end
-
-		-- in all other cases clear the ifnames
-		else
-			local _, ifc
-			for _, ifc in ipairs(net:get_interfaces() or { net:get_interface() }) do
-				net:del_interface(ifc)
-			end
-			m:del(net:name(), "type")
-		end
-
-		-- clear options
-		local k, v
-		for k, v in pairs(m:get(net:name())) do
-			if k:sub(1,1) ~= "." and
-			   k ~= "type" and
-			   k ~= "ifname"
-			then
-				m:del(net:name(), k)
-			end
-		end
-
-		-- set proto
-		m:set(net:name(), "proto", proto:proto())
-		m.uci:save("network")
-		m.uci:save("wireless")
-
-		-- reload page
-		luci.http.redirect(luci.dispatcher.build_url("admin/network/network", arg[1]))
-		return
-	end
-end
-
--- dhcp setup was requested, create section and reload page
-if m:formvalue("cbid.dhcp._enable._enable") then
-	m.uci:section("dhcp", "dhcp", arg[1], {
-		interface = arg[1],
-		start     = "100",
-		limit     = "150",
-		leasetime = "12h"
-	})
-
-	m.uci:save("dhcp")
-	luci.http.redirect(luci.dispatcher.build_url("admin/network/network", arg[1]))
-	return
-end
-
-local ifc = net:get_interface()
-
-s = m:section(NamedSection, arg[1], "interface", translate("Common Configuration"))
-s.addremove = false
-
-s:tab("general",  translate("General Setup"))
-s:tab("advanced", translate("Advanced Settings"))
-s:tab("physical", translate("Physical Settings"))
-
-if has_firewall then
-	s:tab("firewall", translate("Firewall Settings"))
-end
-
-
-st = s:taboption("general", DummyValue, "__status", translate("Status"))
-
-local function set_status()
-	-- if current network is empty, print a warning
-	if not net:is_floating() and net:is_empty() then
-		st.template = "cbi/dvalue"
-		st.network  = nil
-		st.value    = translate("There is no device assigned yet, please attach a network device in the \"Physical Settings\" tab")
-	else
-		st.template = "admin_network/iface_status"
-		st.network  = arg[1]
-		st.value    = nil
-	end
-end
-
-m.on_init = set_status
-m.on_after_save = set_status
-
-
-p = s:taboption("general", ListValue, "proto", translate("Protocol"))
-p.default = net:proto()
-
-
-if not net:is_installed() then
-	p_install = s:taboption("general", Button, "_install")
-	p_install.title      = translate("Protocol support is not installed")
-	p_install.inputtitle = translate("Install package %q" % net:opkg_package())
-	p_install.inputstyle = "apply"
-	p_install:depends("proto", net:proto())
-
-	function p_install.write()
-		return luci.http.redirect(
-			luci.dispatcher.build_url("admin/system/opkg") ..
-			"?query=%s" % net:opkg_package()
-		)
-	end
-end
-
-
-p_switch = s:taboption("general", Button, "_switch")
-p_switch.title      = translate("Really switch protocol?")
-p_switch.inputtitle = translate("Switch protocol")
-p_switch.inputstyle = "apply"
-
-local _, pr
-for _, pr in ipairs(nw:get_protocols()) do
-	p:value(pr:proto(), pr:get_i18n())
-	if pr:proto() ~= net:proto() then
-		p_switch:depends("proto", pr:proto())
-	end
-end
-
-
-auto = s:taboption("general", Flag, "auto", translate("Bring up on boot"))
-auto.default = (net:proto() == "none") and auto.disabled or auto.enabled
-
-delegate = s:taboption("advanced", Flag, "delegate", translate("Use builtin IPv6-management"))
-delegate.default = delegate.enabled
-
-force_link = s:taboption("advanced", Flag, "force_link",
-	translate("Force link"),
-	translate("Set interface properties regardless of the link carrier (If set, carrier sense events do not invoke hotplug handlers)."))
-
-force_link.default = (net:proto() == "static") and force_link.enabled or force_link.disabled
-
-
-if not net:is_virtual() then
-	br = s:taboption("physical", Flag, "type", translate("Bridge interfaces"), translate("creates a bridge over specified interface(s)"))
-	br.enabled = "bridge"
-	br.rmempty = true
-	br:depends("proto", "static")
-	br:depends("proto", "dhcp")
-	br:depends("proto", "none")
-
-	stp = s:taboption("physical", Flag, "stp", translate("Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"),
-		translate("Enables the Spanning Tree Protocol on this bridge"))
-	stp:depends("type", "bridge")
-	stp.rmempty = true
-
-	igmp = s:taboption("physical", Flag, "igmp_snooping", translate("Enable <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> snooping"),
-		translate("Enables IGMP snooping on this bridge"))
-	igmp:depends("type", "bridge")
-	igmp.rmempty = true
-end
-
-
-if not net:is_floating() then
-	ifname_single = s:taboption("physical", Value, "ifname_single", translate("Interface"))
-	ifname_single.template = "cbi/network_ifacelist"
-	ifname_single.widget = "radio"
-	ifname_single.nobridges = net:is_bridge()
-	ifname_single.noaliases = false
-	ifname_single.rmempty = false
-	ifname_single.network = arg[1]
-	ifname_single:depends("type", "")
-
-	function ifname_single.cfgvalue(self, s)
-		-- let the template figure out the related ifaces through the network model
-		return nil
-	end
-
-	function ifname_single.write(self, s, val)
-		local _, i
-		local new_ifs = { }
-		local old_ifs = { }
-
-		local alias = net:is_alias()
-
-		if alias then
-			old_ifs[1] = '@' .. alias
-		else
-			for _, i in ipairs(net:get_interfaces() or { net:get_interface() }) do
-				old_ifs[#old_ifs+1] = i:name()
-			end
-		end
-
-		for i in ut.imatch(val) do
-			new_ifs[#new_ifs+1] = i
-
-			-- if this is not a bridge, only assign first interface
-			if self.option == "ifname_single" then
-				break
-			end
-		end
-
-		table.sort(old_ifs)
-		table.sort(new_ifs)
-
-		for i = 1, math.max(#old_ifs, #new_ifs) do
-			if old_ifs[i] ~= new_ifs[i] then
-				backup_ifnames()
-				for i = 1, #old_ifs do
-					net:del_interface(old_ifs[i])
-				end
-				for i = 1, #new_ifs do
-					net:add_interface(new_ifs[i])
-				end
-				break
-			end
-		end
-	end
-end
-
-
-if not net:is_virtual() then
-	ifname_multi = s:taboption("physical", Value, "ifname_multi", translate("Interface"))
-	ifname_multi.template = "cbi/network_ifacelist"
-	ifname_multi.nobridges = net:is_bridge()
-	ifname_multi.noaliases = true
-	ifname_multi.rmempty = false
-	ifname_multi.network = arg[1]
-	ifname_multi.widget = "checkbox"
-	ifname_multi:depends("type", "bridge")
-	ifname_multi.cfgvalue = ifname_single.cfgvalue
-	ifname_multi.write = ifname_single.write
-end
-
-
-if has_firewall then
-	fwzone = s:taboption("firewall", Value, "_fwzone",
-		translate("Create / Assign firewall-zone"),
-		translate("Choose the firewall zone you want to assign to this interface. Select <em>unspecified</em> to remove the interface from the associated zone or fill out the <em>create</em> field to define a new zone and attach the interface to it."))
-
-	fwzone.template = "cbi/firewall_zonelist"
-	fwzone.network = arg[1]
-
-	function fwzone.cfgvalue(self, section)
-		self.iface = section
-		local z = fw:get_zone_by_network(section)
-		return z and z:name()
-	end
-
-	function fwzone.write(self, section, value)
-		local zone = fw:get_zone(value) or fw:add_zone(value)
-		if zone then
-			fw:del_network(section)
-			zone:add_network(section)
-		end
-	end
-
-	function fwzone.remove(self, section)
-		fw:del_network(section)
-	end
-end
-
-
-function p.write() end
-function p.remove() end
-function p.validate(self, value, section)
-	if value == net:proto() then
-		if not net:is_floating() and net:is_empty() then
-			local ifn = ((br and (br:formvalue(section) == "bridge"))
-				and ifname_multi:formvalue(section)
-			     or ifname_single:formvalue(section))
-
-			for ifn in ut.imatch(ifn) do
-				return value
-			end
-			return nil, translate("The selected protocol needs a device assigned")
-		end
-	end
-	return value
-end
-
-
-local form, ferr = loadfile(
-	ut.libpath() .. "/model/cbi/admin_network/proto_%s.lua" % net:proto()
-)
-
-if not form then
-	s:taboption("general", DummyValue, "_error",
-		translate("Missing protocol extension for proto %q" % net:proto())
-	).value = ferr
-else
-	setfenv(form, getfenv(1))(m, s, net)
-end
-
-
-local _, field
-for _, field in ipairs(s.children) do
-	if field ~= st and field ~= p and field ~= p_install and field ~= p_switch then
-		if next(field.deps) then
-			local _, dep
-			for _, dep in ipairs(field.deps) do
-				dep.proto = net:proto()
-			end
-		else
-			field:depends("proto", net:proto())
-		end
-	end
-end
-
-
---
--- Display DNS settings if dnsmasq is available
---
-
-if has_dnsmasq and net:proto() == "static" then
-	m2 = Map("dhcp", "", "")
-
-	local has_section = false
-
-	m2.uci:foreach("dhcp", "dhcp", function(s)
-		if s.interface == arg[1] then
-			has_section = true
-			return false
-		end
-	end)
-
-	if not has_section and has_dnsmasq then
-
-		s = m2:section(TypedSection, "dhcp", translate("DHCP Server"))
-		s.anonymous   = true
-		s.cfgsections = function() return { "_enable" } end
-
-		x = s:option(Button, "_enable")
-		x.title      = translate("No DHCP Server configured for this interface")
-		x.inputtitle = translate("Setup DHCP Server")
-		x.inputstyle = "apply"
-
-	elseif has_section then
-
-		s = m2:section(TypedSection, "dhcp", translate("DHCP Server"))
-		s.addremove = false
-		s.anonymous = true
-		s:tab("general",  translate("General Setup"))
-		s:tab("advanced", translate("Advanced Settings"))
-		s:tab("ipv6", translate("IPv6 Settings"))
-
-		function s.filter(self, section)
-			return m2.uci:get("dhcp", section, "interface") == arg[1]
-		end
-
-		local ignore = s:taboption("general", Flag, "ignore",
-			translate("Ignore interface"),
-			translate("Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for " ..
-				"this interface."))
-
-		local start = s:taboption("general", Value, "start", translate("Start"),
-			translate("Lowest leased address as offset from the network address."))
-		start.optional = true
-		start.datatype = "or(uinteger,ip4addr)"
-		start.default = "100"
-
-		local limit = s:taboption("general", Value, "limit", translate("Limit"),
-			translate("Maximum number of leased addresses."))
-		limit.optional = true
-		limit.datatype = "uinteger"
-		limit.default = "150"
-
-		local ltime = s:taboption("general", Value, "leasetime", translate("Lease time"),
-			translate("Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."))
-		ltime.rmempty = true
-		ltime.default = "12h"
-
-		local dd = s:taboption("advanced", Flag, "dynamicdhcp",
-			translate("Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"),
-			translate("Dynamically allocate DHCP addresses for clients. If disabled, only " ..
-				"clients having static leases will be served."))
-		dd.default = dd.enabled
-
-		s:taboption("advanced", Flag, "force", translate("Force"),
-			translate("Force DHCP on this network even if another server is detected."))
-
-		-- XXX: is this actually useful?
-		--s:taboption("advanced", Value, "name", translate("Name"),
-		--	translate("Define a name for this network."))
-
-		mask = s:taboption("advanced", Value, "netmask",
-			translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"),
-			translate("Override the netmask sent to clients. Normally it is calculated " ..
-				"from the subnet that is served."))
-
-		mask.optional = true
-		mask.datatype = "ip4addr"
-
-		s:taboption("advanced", DynamicList, "dhcp_option", translate("DHCP-Options"),
-			translate("Define additional DHCP options, for example \"<code>6,192.168.2.1," ..
-				"192.168.2.2</code>\" which advertises different DNS servers to clients."))
-
-		for i, n in ipairs(s.children) do
-			if n ~= ignore then
-				n:depends("ignore", "")
-			end
-		end
-
-		o = s:taboption("ipv6", ListValue, "ra", translate("Router Advertisement-Service"))
-		o:value("", translate("disabled"))
-		o:value("server", translate("server mode"))
-		o:value("relay", translate("relay mode"))
-		o:value("hybrid", translate("hybrid mode"))
-
-		o = s:taboption("ipv6", ListValue, "dhcpv6", translate("DHCPv6-Service"))
-		o:value("", translate("disabled"))
-		o:value("server", translate("server mode"))
-		o:value("relay", translate("relay mode"))
-		o:value("hybrid", translate("hybrid mode"))
-
-		o = s:taboption("ipv6", ListValue, "ndp", translate("NDP-Proxy"))
-		o:value("", translate("disabled"))
-		o:value("relay", translate("relay mode"))
-		o:value("hybrid", translate("hybrid mode"))
-
-		o = s:taboption("ipv6", ListValue, "ra_management", translate("DHCPv6-Mode"),
-			translate("Default is stateless + stateful"))
-		o:value("0", translate("stateless"))
-		o:value("1", translate("stateless + stateful"))
-		o:value("2", translate("stateful-only"))
-		o:depends("dhcpv6", "server")
-		o:depends("dhcpv6", "hybrid")
-		o.default = "1"
-
-		o = s:taboption("ipv6", Flag, "ra_default", translate("Always announce default router"),
-		        translate("Announce as default router even if no public prefix is available."))
-		o:depends("ra", "server")
-		o:depends("ra", "hybrid")
-
-		s:taboption("ipv6", DynamicList, "dns", translate("Announced DNS servers"))
-		s:taboption("ipv6", DynamicList, "domain", translate("Announced DNS domains"))
-
-	else
-		m2 = nil
-	end
-end
-
-
-return m, m2
diff --git a/modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua b/modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua
deleted file mode 100644
index b98086dea..000000000
--- a/modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua
+++ /dev/null
@@ -1,202 +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.
-
-local fs = require "nixio.fs"
-local tpl = require "luci.template"
-local ntm = require "luci.model.network".init()
-local fwm = require "luci.model.firewall".init()
-local json = require "luci.jsonc"
-
-m = Map("network", translate("Interfaces"))
-m:chain("wireless")
-m:chain("firewall")
-m:chain("dhcp")
-m.pageaction = false
-
-
-local _, net
-local ifaces, netlist = { }, { }
-
-for _, net in ipairs(ntm:get_networks()) do
-	if net:name() ~= "loopback" then
-		local zn = net:zonename()
-		local z = zn and fwm:get_zone(zn) or fwm:get_zone_by_network(net:name())
-
-		local w = 1
-		if net:is_alias() then
-			w = 2
-		elseif net:is_dynamic() then
-			w = 3
-		end
-
-		ifaces[#ifaces+1] = net:name()
-		netlist[#netlist+1] = {
-			net:name(), z and z:name() or "-", z, net, w
-		}
-	end
-end
-
-table.sort(netlist,
-	function(a, b)
-		if a[2] ~= b[2] then
-			return a[2] < b[2]
-		elseif a[5] ~= b[5] then
-			return a[5] < b[5]
-		else
-			return a[1] < b[1]
-		end
-	end)
-
-s = m:section(TypedSection, "interface", translate("Interface Overview"))
-s.template = "admin_network/iface_overview"
-s.netlist = netlist
-
-function s.cfgsections(self)
-	local _, net, sl = nil, nil, { }
-
-	for _, net in ipairs(netlist) do
-		sl[#sl+1] = net[1]
-	end
-
-	return sl
-end
-
-o = s:option(Value, "__disable__")
-
-function o.write(self, sid, value)
-	if value ~= "1" then
-		m:set(sid, "auto", "")
-	else
-		m:set(sid, "auto", "0")
-	end
-end
-
-o.remove = o.write
-
-o = s:option(Value, "__delete__")
-
-function o.write(self, sid, value)
-	ntm:del_network(sid)
-end
-
-
-if fs.access("/etc/init.d/dsl_control") then
-	local ok, boarddata = pcall(json.parse, fs.readfile("/etc/board.json"))
-	local modemtype = (ok == true)
-		and (type(boarddata) == "table")
-		and (type(boarddata.dsl) == "table")
-		and (type(boarddata.dsl.modem) == "table")
-		and boarddata.dsl.modem.type
-
-	dsl = m:section(TypedSection, "dsl", translate("DSL"))
-	dsl.anonymous = true
-
-	annex = dsl:option(ListValue, "annex", translate("Annex"))
-	annex:value("a", translate("Annex A + L + M (all)"))
-	annex:value("b", translate("Annex B (all)"))
-	annex:value("j", translate("Annex J (all)"))
-	annex:value("m", translate("Annex M (all)"))
-	annex:value("bdmt", translate("Annex B G.992.1"))
-	annex:value("b2", translate("Annex B G.992.3"))
-	annex:value("b2p", translate("Annex B G.992.5"))
-	annex:value("at1", translate("ANSI T1.413"))
-	annex:value("admt", translate("Annex A G.992.1"))
-	annex:value("alite", translate("Annex A G.992.2"))
-	annex:value("a2", translate("Annex A G.992.3"))
-	annex:value("a2p", translate("Annex A G.992.5"))
-	annex:value("l", translate("Annex L G.992.3 POTS 1"))
-	annex:value("m2", translate("Annex M G.992.3"))
-	annex:value("m2p", translate("Annex M G.992.5"))
-
-	tone = dsl:option(ListValue, "tone", translate("Tone"))
-	tone:value("", translate("auto"))
-	tone:value("a", translate("A43C + J43 + A43"))
-	tone:value("av", translate("A43C + J43 + A43 + V43"))
-	tone:value("b", translate("B43 + B43C"))
-	tone:value("bv", translate("B43 + B43C + V43"))
-
-	if modemtype == "vdsl" then
-		xfer_mode = dsl:option(ListValue, "xfer_mode", translate("Encapsulation mode"))
-		xfer_mode:value("", translate("auto"))
-		xfer_mode:value("atm", translate("ATM (Asynchronous Transfer Mode)"))
-		xfer_mode:value("ptm", translate("PTM/EFM (Packet Transfer Mode)"))
-
-		line_mode = dsl:option(ListValue, "line_mode", translate("DSL line mode"))
-		line_mode:value("", translate("auto"))
-		line_mode:value("adsl", translate("ADSL"))
-		line_mode:value("vdsl", translate("VDSL"))
-
-		ds_snr = dsl:option(ListValue, "ds_snr_offset", translate("Downstream SNR offset"))
-		ds_snr.default = "0"
-		for i = -100, 100, 5 do
-			ds_snr:value(i, translatef("%.1f dB", i / 10))
-		end
-	end
-
-	firmware = dsl:option(Value, "firmware", translate("Firmware File"))
-
-	m.pageaction = true
-end
-
--- Show ATM bridge section if we have the capabilities
-if fs.access("/usr/sbin/br2684ctl") then
-	atm = m:section(TypedSection, "atm-bridge", translate("ATM Bridges"),
-		translate("ATM bridges expose encapsulated ethernet in AAL5 " ..
-			"connections as virtual Linux network interfaces which can " ..
-			"be used in conjunction with DHCP or PPP to dial into the " ..
-			"provider network."))
-
-	atm.addremove = true
-	atm.anonymous = true
-
-	atm.create = function(self, section)
-		local sid = TypedSection.create(self, section)
-		local max_unit = -1
-
-		m.uci:foreach("network", "atm-bridge",
-			function(s)
-				local u = tonumber(s.unit)
-				if u ~= nil and u > max_unit then
-					max_unit = u
-				end
-			end)
-
-		m.uci:set("network", sid, "unit", max_unit + 1)
-		m.uci:set("network", sid, "atmdev", 0)
-		m.uci:set("network", sid, "encaps", "llc")
-		m.uci:set("network", sid, "payload", "bridged")
-		m.uci:set("network", sid, "vci", 35)
-		m.uci:set("network", sid, "vpi", 8)
-
-		return sid
-	end
-
-	atm:tab("general", translate("General Setup"))
-	atm:tab("advanced", translate("Advanced Settings"))
-
-	vci    = atm:taboption("general", Value, "vci", translate("ATM Virtual Channel Identifier (VCI)"))
-	vpi    = atm:taboption("general", Value, "vpi", translate("ATM Virtual Path Identifier (VPI)"))
-	encaps = atm:taboption("general", ListValue, "encaps", translate("Encapsulation mode"))
-	encaps:value("llc", translate("LLC"))
-	encaps:value("vc", translate("VC-Mux"))
-
-	atmdev  = atm:taboption("advanced", Value, "atmdev", translate("ATM device number"))
-	unit    = atm:taboption("advanced", Value, "unit", translate("Bridge unit number"))
-	payload = atm:taboption("advanced", ListValue, "payload", translate("Forwarding mode"))
-	payload:value("bridged", translate("bridged"))
-	payload:value("routed", translate("routed"))
-	m.pageaction = true
-end
-
-local network = require "luci.model.network"
-if network:has_ipv6() then
-	local s = m:section(NamedSection, "globals", "globals", translate("Global network options"))
-	local o = s:option(Value, "ula_prefix", translate("IPv6 ULA-Prefix"))
-	o.datatype = "ip6addr"
-	o.rmempty = true
-	m.pageaction = true
-end
-
-
-return m
diff --git a/modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua b/modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua
deleted file mode 100644
index edeb193ef..000000000
--- a/modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua
+++ /dev/null
@@ -1,389 +0,0 @@
--- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2010-2011 Jo-Philipp Wich <jow@openwrt.org>
--- Licensed to the public under the Apache License 2.0.
-
-m = Map("network", translate("Switch"), translate("The network ports on this device can be combined to several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s in which computers can communicate directly with each other. <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s are often used to separate different network segments. Often there is by default one Uplink port for a connection to the next greater network like the internet and other ports for a local network."))
-
-local fs = require "nixio.fs"
-local ut = require "luci.util"
-local nw = require "luci.model.network"
-local switches = { }
-
-nw.init(m.uci)
-
-local topologies = nw:get_switch_topologies() or {}
-
-local update_interfaces = function(old_ifname, new_ifname)
-	local info = { }
-
-	m.uci:foreach("network", "interface", function(section)
-		local old_ifnames = section.ifname
-		local new_ifnames = { }
-		local cur_ifname
-		local changed = false
-		for cur_ifname in luci.util.imatch(old_ifnames) do
-			if cur_ifname == old_ifname then
-				new_ifnames[#new_ifnames+1] = new_ifname
-				changed = true
-			else
-				new_ifnames[#new_ifnames+1] = cur_ifname
-			end
-		end
-		if changed then
-			m.uci:set("network", section[".name"], "ifname", table.concat(new_ifnames, " "))
-
-			info[#info+1] = translatef("Interface %q device auto-migrated from %q to %q.",
-				section[".name"], old_ifname, new_ifname)
-		end
-	end)
-
-	if #info > 0 then
-		m.message = (m.message and m.message .. "\n" or "") .. table.concat(info, "\n")
-	end
-end
-
-local vlan_already_created
-
-m.uci:foreach("network", "switch",
-	function(x)
-		local sid         = x['.name']
-		local switch_name = x.name or sid
-		local has_vlan    = nil
-		local has_learn   = nil
-		local has_vlan4k  = nil
-		local has_jumbo3  = nil
-		local has_mirror  = nil
-		local min_vid     = 0
-		local max_vid     = 16
-		local num_vlans   = 16
-
-		local switch_title
-		local enable_vlan4k = false
-
-		local topo = topologies[switch_name]
-
-		if not topo then
-			m.message = translatef("Switch %q has an unknown topology - the VLAN settings might not be accurate.", switch_name)
-			topo = {
-				ports = {
-					{ num = 0, label = "Port 1" },
-					{ num = 1, label = "Port 2" },
-					{ num = 2, label = "Port 3" },
-					{ num = 3, label = "Port 4" },
-					{ num = 4, label = "Port 5" },
-					{ num = 5, label = "CPU (eth0)", tagged = false }
-				}
-			}
-		end
-
-		-- Parse some common switch properties from swconfig help output.
-		local swc = io.popen("swconfig dev %s help 2>/dev/null" % ut.shellquote(switch_name))
-		if swc then
-
-			local is_port_attr = false
-			local is_vlan_attr = false
-
-			while true do
-				local line = swc:read("*l")
-				if not line then break end
-
-				if line:match("^%s+%-%-vlan") then
-					is_vlan_attr = true
-
-				elseif line:match("^%s+%-%-port") then
-					is_vlan_attr = false
-					is_port_attr = true
-
-				elseif line:match("cpu @") then
-					switch_title = line:match("^switch%d: %w+%((.-)%)")
-					num_vlans  = tonumber(line:match("vlans: (%d+)")) or 16
-					min_vid    = 1
-
-				elseif line:match(": pvid") or line:match(": tag") or line:match(": vid") then
-					if is_vlan_attr then has_vlan4k = line:match(": (%w+)") end
-
-				elseif line:match(": enable_vlan4k") then
-					enable_vlan4k = true
-
-				elseif line:match(": enable_vlan") then
-					has_vlan = "enable_vlan"
-
-				elseif line:match(": enable_learning") then
-					has_learn = "enable_learning"
-
-				elseif line:match(": enable_mirror_rx") then
-					has_mirror = "enable_mirror_rx"
-
-				elseif line:match(": max_length") then
-					has_jumbo3 = "max_length"
-				end
-			end
-
-			swc:close()
-		end
-
-
-		-- Switch properties
-		s = m:section(NamedSection, x['.name'], "switch",
-			switch_title and translatef("Switch %q (%s)", switch_name, switch_title)
-					      or translatef("Switch %q", switch_name))
-
-		s.addremove = false
-
-		if has_vlan then
-			s:option(Flag, has_vlan, translate("Enable VLAN functionality"))
-		end
-
-		if has_learn then
-			x = s:option(Flag, has_learn, translate("Enable learning and aging"))
-			x.default = x.enabled
-		end
-
-		if has_jumbo3 then
-			x = s:option(Flag, has_jumbo3, translate("Enable Jumbo Frame passthrough"))
-			x.enabled = "3"
-			x.rmempty = true
-		end
-
-		-- Does this switch support port mirroring?
-		if has_mirror then
-			s:option(Flag, "enable_mirror_rx", translate("Enable mirroring of incoming packets"))
-			s:option(Flag, "enable_mirror_tx", translate("Enable mirroring of outgoing packets"))
-
-			local sp = s:option(ListValue, "mirror_source_port", translate("Mirror source port"))
-			local mp = s:option(ListValue, "mirror_monitor_port", translate("Mirror monitor port"))
-
-			sp:depends("enable_mirror_tx", "1")
-			sp:depends("enable_mirror_rx", "1")
-
-			mp:depends("enable_mirror_tx", "1")
-			mp:depends("enable_mirror_rx", "1")
-
-			local _, pt
-			for _, pt in ipairs(topo.ports) do
-				sp:value(pt.num, pt.label)
-				mp:value(pt.num, pt.label)
-			end
-		end
-
-		-- VLAN table
-		s = m:section(TypedSection, "switch_vlan",
-			switch_title and translatef("VLANs on %q (%s)", switch_name, switch_title)
-						  or translatef("VLANs on %q", switch_name))
-
-		s.template = "cbi/tblsection"
-		s.addremove = true
-		s.anonymous = true
-
-		-- Filter by switch
-		s.filter = function(self, section)
-			local device = m:get(section, "device")
-			return (device and device == switch_name)
-		end
-
-		-- Override cfgsections callback to enforce row ordering by vlan id.
-		s.cfgsections = function(self)
-			local osections = TypedSection.cfgsections(self)
-			local sections = { }
-			local section
-
-			for _, section in luci.util.spairs(
-				osections,
-				function(a, b)
-					return (tonumber(m:get(osections[a], has_vlan4k or "vlan")) or 9999)
-						<  (tonumber(m:get(osections[b], has_vlan4k or "vlan")) or 9999)
-				end
-			) do
-				sections[#sections+1] = section
-			end
-
-			return sections
-		end
-
-		-- When creating a new vlan, preset it with the highest found vid + 1.
-		s.create = function(self, section, origin)
-			-- VLAN has already been created for another switch
-			if vlan_already_created then
-				return
-
-			-- VLAN add button was pressed in an empty VLAN section so only
-			-- accept the create event if our switch is without existing VLANs
-			elseif origin == "" then
-				local is_empty_switch = true
-
-				m.uci:foreach("network", "switch_vlan",
-					function(s)
-						if s.device == switch_name then
-							is_empty_switch = false
-							return false
-						end
-					end)
-
-				if not is_empty_switch then
-					return
-				end
-
-			-- VLAN was created for another switch
-			elseif m:get(origin, "device") ~= switch_name then
-				return
-			end
-
-			local sid = TypedSection.create(self, section)
-
-			local max_nr = 0
-			local max_id = 0
-
-			m.uci:foreach("network", "switch_vlan",
-				function(s)
-					if s.device == switch_name then
-						local nr = tonumber(s.vlan)
-						local id = has_vlan4k and tonumber(s[has_vlan4k])
-						if nr ~= nil and nr > max_nr then max_nr = nr end
-						if id ~= nil and id > max_id then max_id = id end
-					end
-				end)
-
-			m:set(sid, "device", switch_name)
-			m:set(sid, "vlan", max_nr + 1)
-
-			if has_vlan4k then
-				m:set(sid, has_vlan4k, max_id + 1)
-			end
-
-			vlan_already_created = true
-
-			return sid
-		end
-
-
-		local port_opts = { }
-		local untagged  = { }
-
-		-- Parse current tagging state from the "ports" option.
-		local portvalue = function(self, section)
-			local pt
-			for pt in (m:get(section, "ports") or ""):gmatch("%w+") do
-				local pc, tu = pt:match("^(%d+)([tu]*)")
-				if pc == self.option then return (#tu > 0) and tu or "u" end
-			end
-			return ""
-		end
-
-		-- Validate port tagging. Ensure that a port is only untagged once,
-		-- bail out if not.
-		local portvalidate = function(self, value, section)
-			-- ensure that the ports appears untagged only once
-			if value == "u" then
-				if not untagged[self.option] then
-					untagged[self.option] = true
-				else
-					return nil,
-						translatef("%s is untagged in multiple VLANs!", self.title)
-				end
-			end
-			return value
-		end
-
-
-		local vid = s:option(Value, has_vlan4k or "vlan", "VLAN ID")
-		local mx_vid = has_vlan4k and 4094 or (num_vlans - 1)
-
-		vid.rmempty = false
-		vid.forcewrite = true
-		vid.vlan_used = { }
-		vid.datatype = "and(uinteger,range("..min_vid..","..mx_vid.."))"
-
-		-- Validate user provided VLAN ID, make sure its within the bounds
-		-- allowed by the switch.
-		vid.validate = function(self, value, section)
-			local v = tonumber(value)
-			local m = has_vlan4k and 4094 or (num_vlans - 1)
-			if v ~= nil and v >= min_vid and v <= m then
-				if not self.vlan_used[v] then
-					self.vlan_used[v] = true
-					return value
-				else
-					return nil,
-						translatef("Invalid VLAN ID given! Only unique IDs are allowed")
-				end
-			else
-				return nil,
-					translatef("Invalid VLAN ID given! Only IDs between %d and %d are allowed.", min_vid, m)
-			end
-		end
-
-		-- When writing the "vid" or "vlan" option, serialize the port states
-		-- as well and write them as "ports" option to uci.
-		vid.write = function(self, section, new_vid)
-			local o
-			local p = { }
-			for _, o in ipairs(port_opts) do
-				local new_tag = o:formvalue(section)
-				if new_tag == "t" then
-					p[#p+1] = o.option .. new_tag
-				elseif new_tag == "u" then
-					p[#p+1] = o.option
-				end
-
-				if o.info and o.info.device then
-					local old_tag = o:cfgvalue(section)
-					local old_vid = self:cfgvalue(section)
-					if old_tag ~= new_tag or old_vid ~= new_vid then
-						local old_ifname = (old_tag == "u") and o.info.device
-							or "%s.%s" %{ o.info.device, old_vid }
-
-						local new_ifname = (new_tag == "u") and o.info.device
-							or "%s.%s" %{ o.info.device, new_vid }
-
-						if old_ifname ~= new_ifname then
-							update_interfaces(old_ifname, new_ifname)
-						end
-					end
-				end
-			end
-
-			if enable_vlan4k then
-				m:set(sid, "enable_vlan4k", "1")
-			end
-
-			m:set(section, "ports", table.concat(p, " "))
-			return Value.write(self, section, new_vid)
-		end
-
-		-- Fallback to "vlan" option if "vid" option is supported but unset.
-		vid.cfgvalue = function(self, section)
-			return m:get(section, has_vlan4k or "vlan")
-				or m:get(section, "vlan")
-		end
-
-		local _, pt
-		for _, pt in ipairs(topo.ports) do
-			local po = s:option(ListValue, tostring(pt.num), pt.label)
-
-			po:value("",  translate("off"))
-
-			if not pt.tagged then
-				po:value("u", translate("untagged"))
-			end
-
-			po:value("t", translate("tagged"))
-
-			po.cfgvalue = portvalue
-			po.validate = portvalidate
-			po.write    = function() end
-			po.info     = pt
-
-			port_opts[#port_opts+1] = po
-		end
-
-		table.sort(port_opts, function(a, b) return a.option < b.option end)
-		switches[#switches+1] = switch_name
-	end
-)
-
--- Switch status template
-s = m:section(SimpleSection)
-s.template = "admin_network/switch_status"
-s.switches = switches
-
-return m
diff --git a/modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua b/modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua
deleted file mode 100644
index 2e6c026bb..000000000
--- a/modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua
+++ /dev/null
@@ -1,1216 +0,0 @@
--- Copyright 2008 Steven Barth <steven@midlink.org>
--- Licensed to the public under the Apache License 2.0.
-
-local wa = require "luci.tools.webadmin"
-local nw = require "luci.model.network"
-local ut = require "luci.util"
-local nt = require "luci.sys".net
-local fs = require "nixio.fs"
-
-local acct_port, acct_secret, acct_server, anonymous_identity, ant1, ant2,
-	auth, auth_port, auth_secret, auth_server, bssid, cacert, cacert2,
-	cc, ch, cipher, clientcert, clientcert2, ea, eaptype, en, encr,
-	ft_protocol, ft_psk_generate_local, hidden, htmode, identity,
-	ieee80211r, ieee80211w, ifname, isolate, key_retries,
-	legacyrates, max_timeout, meshfwd, meshid, ml, mobility_domain, mode,
-	mp, nasid, network, password, pmk_r1_push, privkey, privkey2, privkeypwd,
-	privkeypwd2, r0_key_lifetime, r0kh, r1_key_holder, r1kh,
-	reassociation_deadline, retry_timeout, ssid, st, tp, wepkey, wepslot,
-	wmm, wpakey, wps, disassoc_low_ack, short_preamble, beacon_int, dtim_period,
-	wparekey, inactivitypool, maxinactivity, listeninterval,
-	dae_client, dae_port, dae_port
-
-
-arg[1] = arg[1] or ""
-
-m = Map("wireless", "",
-	translate("The <em>Device Configuration</em> section covers physical settings of the radio " ..
-		"hardware such as channel, transmit power or antenna selection which are shared among all " ..
-		"defined wireless networks (if the radio hardware is multi-SSID capable). Per network settings " ..
-		"like encryption or operation mode are grouped in the <em>Interface Configuration</em>."))
-
-m:chain("network")
-m:chain("firewall")
-m.redirect = luci.dispatcher.build_url("admin/network/wireless")
-
-nw.init(m.uci)
-
-local wnet = nw:get_wifinet(arg[1])
-local wdev = wnet and wnet:get_device()
-
--- redirect to overview page if network does not exist anymore (e.g. after a revert)
-if not wnet or not wdev then
-	luci.http.redirect(luci.dispatcher.build_url("admin/network/wireless"))
-	return
-end
-
-local function txpower_list(iw)
-	local list = iw.txpwrlist or { }
-	local off  = tonumber(iw.txpower_offset) or 0
-	local new  = { }
-	local prev = -1
-	local _, val
-	for _, val in ipairs(list) do
-		local dbm = val.dbm + off
-		local mw  = math.floor(10 ^ (dbm / 10))
-		if mw ~= prev then
-			prev = mw
-			new[#new+1] = {
-				display_dbm = dbm,
-				display_mw  = mw,
-				driver_dbm  = val.dbm,
-				driver_mw   = val.mw
-			}
-		end
-	end
-	return new
-end
-
-local function txpower_current(pwr, list)
-	pwr = tonumber(pwr)
-	if pwr ~= nil then
-		local _, item
-		for _, item in ipairs(list) do
-			if item.driver_dbm >= pwr then
-				return item.driver_dbm
-			end
-		end
-	end
-	return pwr or ""
-end
-
-local iw = luci.sys.wifi.getiwinfo(arg[1])
-local hw_modes      = iw.hwmodelist or { }
-local tx_power_list = txpower_list(iw)
-local tx_power_cur  = txpower_current(wdev:get("txpower"), tx_power_list)
-
--- wireless toggle was requested, commit and reload page
-function m.parse(map)
-	local new_cc = m:formvalue("cbid.wireless.%s.country" % wdev:name())
-	local old_cc = m:get(wdev:name(), "country")
-
-	if m:formvalue("cbid.wireless.%s.__toggle" % wdev:name()) then
-		if wdev:get("disabled") == "1" or wnet:get("disabled") == "1" then
-			wnet:set("disabled", nil)
-		else
-			wnet:set("disabled", "1")
-		end
-		wdev:set("disabled", nil)
-		m.apply_needed = true
-		m.redirect = nil
-	end
-
-	Map.parse(map)
-
-	if m:get(wdev:name(), "type") == "mac80211" and new_cc and new_cc ~= old_cc then
-		luci.sys.call("iw reg set %s" % ut.shellquote(new_cc))
-
-		local old_ch = tonumber(m:formvalue("cbid.wireless.%s._mode_freq.channel" % wdev:name()) or "")
-		if old_ch then
-			local _, c, new_ch
-			for _, c in ipairs(iw.freqlist) do
-				if c.channel > old_ch or (old_ch <= 14 and c.channel > 14) then
-					break
-				end
-				new_ch = c.channel
-			end
-			if new_ch ~= old_ch then
-				wdev:set("channel", new_ch)
-				m.message = translatef("Channel %d is not available in the %s regulatory domain and has been auto-adjusted to %d.",
-					old_ch, new_cc, new_ch)
-			end
-		end
-	end
-
-	if wdev:get("disabled") == "1" or wnet:get("disabled") == "1" then
-		en.title      = translate("Wireless network is disabled")
-		en.inputtitle = translate("Enable")
-		en.inputstyle = "apply"
-	else
-		en.title      = translate("Wireless network is enabled")
-		en.inputtitle = translate("Disable")
-		en.inputstyle = "reset"
-	end
-end
-
-m.title = luci.util.pcdata(wnet:get_i18n())
-
-s = m:section(NamedSection, wdev:name(), "wifi-device", translate("Device Configuration"))
-s.addremove = false
-
-s:tab("general", translate("General Setup"))
-s:tab("macfilter", translate("MAC-Filter"))
-s:tab("advanced", translate("Advanced Settings"))
-
-st = s:taboption("general", DummyValue, "__status", translate("Status"))
-st.template = "admin_network/wifi_status"
-st.ifname   = arg[1]
-
-en = s:taboption("general", Button, "__toggle")
-
-local hwtype = wdev:get("type")
-
--- NanoFoo
-local nsantenna = wdev:get("antenna")
-
--- Check whether there are client interfaces on the same radio,
--- if yes, lock the channel choice as these stations will dicatate the freq
-local found_sta = nil
-local _, net
-if wnet:mode() ~= "sta" then
-	for _, net in ipairs(wdev:get_wifinets()) do
-		if net:mode() == "sta" and net:get("disabled") ~= "1" then
-			if not found_sta then
-				found_sta = {}
-				found_sta.channel = net:channel()
-				found_sta.names = {}
-			end
-			found_sta.names[#found_sta.names+1] = net:shortname()
-		end
-	end
-end
-
-if found_sta then
-	ch = s:taboption("general", DummyValue, "choice", translate("Channel"))
-	ch.value = translatef("Locked to channel %s used by: %s",
-		found_sta.channel or "(auto)", table.concat(found_sta.names, ", "))
-else
-	ch = s:taboption("general", Value, "_mode_freq", '<br />'..translate("Operating frequency"))
-	ch.iwinfo = iw
-	ch.hostapd_acs = (os.execute("hostapd -vacs >/dev/null 2>/dev/null") == 0)
-	ch.template = "cbi/wireless_modefreq"
-
-	function ch.cfgvalue(self, section)
-		return {
-			m:get(section, "hwmode") or "",
-			m:get(section, "channel") or "auto",
-			m:get(section, "htmode") or ""
-		}
-	end
-
-	function ch.formvalue(self, section)
-		return {
-			m:formvalue(self:cbid(section) .. ".band") or (hw_modes.g and "11g" or "11a"),
-			m:formvalue(self:cbid(section) .. ".channel") or "auto",
-			m:formvalue(self:cbid(section) .. ".htmode") or ""
-		}
-	end
-
-	function ch.write(self, section, value)
-		m:set(section, "hwmode", value[1])
-		m:set(section, "channel", value[2])
-		m:set(section, "htmode", value[3])
-	end
-end
-
-------------------- MAC80211 Device ------------------
-
-if hwtype == "mac80211" then
-	if #tx_power_list > 0 then
-		tp = s:taboption("general", ListValue,
-			"txpower", translate("Transmit Power"), "dBm")
-		tp.rmempty = true
-		tp.default = tx_power_cur
-		function tp.cfgvalue(...)
-			return txpower_current(Value.cfgvalue(...), tx_power_list)
-		end
-
-		tp:value("", translate("auto"))
-		for _, p in ipairs(tx_power_list) do
-			tp:value(p.driver_dbm, "%i dBm (%i mW)"
-				%{ p.display_dbm, p.display_mw })
-		end
-	end
-
-	local cl = iw and iw.countrylist
-	if cl and #cl > 0 then
-		cc = s:taboption("advanced", ListValue, "country", translate("Country Code"), translate("Use ISO/IEC 3166 alpha2 country codes."))
-		cc.default = tostring(iw and iw.country or "00")
-		for _, c in ipairs(cl) do
-			cc:value(c.alpha2, "%s - %s" %{ c.alpha2, c.name })
-		end
-	else
-		s:taboption("advanced", Value, "country", translate("Country Code"), translate("Use ISO/IEC 3166 alpha2 country codes."))
-	end
-
-	legacyrates = s:taboption("advanced", Flag, "legacy_rates", translate("Allow legacy 802.11b rates"))
-	legacyrates.rmempty = false
-	legacyrates.default = "1"
-
-	s:taboption("advanced", Value, "distance", translate("Distance Optimization"),
-		translate("Distance to farthest network member in meters."))
-
-	-- external antenna profiles
-	local eal = iw and iw.extant
-	if eal and #eal > 0 then
-		ea = s:taboption("advanced", ListValue, "extant", translate("Antenna Configuration"))
-		for _, eap in ipairs(eal) do
-			ea:value(eap.id, "%s (%s)" %{ eap.name, eap.description })
-			if eap.selected then
-				ea.default = eap.id
-			end
-		end
-	end
-
-	s:taboption("advanced", Value, "frag", translate("Fragmentation Threshold"))
-	s:taboption("advanced", Value, "rts", translate("RTS/CTS Threshold"))
-	
-	s:taboption("advanced", Flag, "noscan", translate("Force 40MHz mode"),
-		translate("Always use 40MHz channels even if the secondary channel overlaps. Using this option does not comply with IEEE 802.11n-2009!")).optional = true
-
-	beacon_int = s:taboption("advanced", Value, "beacon_int", translate("Beacon Interval"))
-	beacon_int.optional = true
-	beacon_int.placeholder = 100
-	beacon_int.datatype = "range(15,65535)"
-end
-
-
-------------------- Broadcom Device ------------------
-
-if hwtype == "broadcom" then
-	tp = s:taboption("general",
-		(#tx_power_list > 0) and ListValue or Value,
-		"txpower", translate("Transmit Power"), "dBm")
-
-	tp.rmempty = true
-	tp.default = tx_power_cur
-
-	function tp.cfgvalue(...)
-		return txpower_current(Value.cfgvalue(...), tx_power_list)
-	end
-
-	tp:value("", translate("auto"))
-	for _, p in ipairs(tx_power_list) do
-		tp:value(p.driver_dbm, "%i dBm (%i mW)"
-			%{ p.display_dbm, p.display_mw })
-	end
-
-	mode = s:taboption("advanced", ListValue, "hwmode", translate("Band"))
-	if hw_modes.b then
-		mode:value("11b", "2.4GHz (802.11b)")
-		if hw_modes.g then
-			mode:value("11bg", "2.4GHz (802.11b+g)")
-		end
-	end
-	if hw_modes.g then
-		mode:value("11g", "2.4GHz (802.11g)")
-		mode:value("11gst", "2.4GHz (802.11g + Turbo)")
-		mode:value("11lrs", "2.4GHz (802.11g Limited Rate Support)")
-	end
-	if hw_modes.a then mode:value("11a", "5GHz (802.11a)") end
-	if hw_modes.n then
-		if hw_modes.g then
-			mode:value("11ng", "2.4GHz (802.11g+n)")
-			mode:value("11n", "2.4GHz (802.11n)")
-		end
-		if hw_modes.a then
-			mode:value("11na", "5GHz (802.11a+n)")
-			mode:value("11n", "5GHz (802.11n)")
-		end
-		htmode = s:taboption("advanced", ListValue, "htmode", translate("HT mode (802.11n)"))
-		htmode:depends("hwmode", "11ng")
-		htmode:depends("hwmode", "11na")
-		htmode:depends("hwmode", "11n")
-		htmode:value("HT20", "20MHz")
-		htmode:value("HT40", "40MHz")
-	end
-
-	ant1 = s:taboption("advanced", ListValue, "txantenna", translate("Transmitter Antenna"))
-	ant1.widget = "radio"
-	ant1:depends("diversity", "")
-	ant1:value("3", translate("auto"))
-	ant1:value("0", translate("Antenna 1"))
-	ant1:value("1", translate("Antenna 2"))
-
-	ant2 = s:taboption("advanced", ListValue, "rxantenna", translate("Receiver Antenna"))
-	ant2.widget = "radio"
-	ant2:depends("diversity", "")
-	ant2:value("3", translate("auto"))
-	ant2:value("0", translate("Antenna 1"))
-	ant2:value("1", translate("Antenna 2"))
-
-	s:taboption("advanced", Flag, "frameburst", translate("Frame Bursting"))
-
-	s:taboption("advanced", Value, "distance", translate("Distance Optimization"))
-	--s:option(Value, "slottime", translate("Slot time"))
-
-	s:taboption("advanced", Value, "country", translate("Country Code"))
-	s:taboption("advanced", Value, "maxassoc", translate("Connection Limit"))
-end
-
-
---------------------- HostAP Device ---------------------
-
-if hwtype == "prism2" then
-	s:taboption("advanced", Value, "txpower", translate("Transmit Power"), "att units").rmempty = true
-
-	s:taboption("advanced", Flag, "diversity", translate("Diversity")).rmempty = false
-
-	s:taboption("advanced", Value, "txantenna", translate("Transmitter Antenna"))
-	s:taboption("advanced", Value, "rxantenna", translate("Receiver Antenna"))
-end
-
-
------------------------ Interface -----------------------
-
-s = m:section(NamedSection, wnet.sid, "wifi-iface", translate("Interface Configuration"))
-s.addremove = false
-s.anonymous = true
-s.defaults.device = wdev:name()
-
-s:tab("general", translate("General Setup"))
-s:tab("encryption", translate("Wireless Security"))
-s:tab("macfilter", translate("MAC-Filter"))
-s:tab("advanced", translate("Advanced Settings"))
-
-mode = s:taboption("general", ListValue, "mode", translate("Mode"))
-mode.override_values = true
-mode:value("ap", translate("Access Point"))
-mode:value("sta", translate("Client"))
-mode:value("adhoc", translate("Ad-Hoc"))
-
-meshid = s:taboption("general", Value, "mesh_id", translate("Mesh Id"))
-meshid:depends({mode="mesh"})
-
-meshfwd = s:taboption("advanced", Flag, "mesh_fwding", translate("Forward mesh peer traffic"))
-meshfwd.rmempty = false
-meshfwd.default = "1"
-meshfwd:depends({mode="mesh"})
-
-mesh_rssi_th = s:taboption("advanced", Value, "mesh_rssi_threshold",
-       translate("RSSI threshold for joining"),
-       translate("0 = not using RSSI threshold, 1 = do not change driver default"))
-mesh_rssi_th.rmempty = false
-mesh_rssi_th.default = "0"
-mesh_rssi_th.datatype = "range(-255,1)"
-mesh_rssi_th:depends({mode="mesh"})
-
-ssid = s:taboption("general", Value, "ssid", translate("<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"))
-ssid.datatype = "maxlength(32)"
-ssid:depends({mode="ap"})
-ssid:depends({mode="sta"})
-ssid:depends({mode="adhoc"})
-ssid:depends({mode="ahdemo"})
-ssid:depends({mode="monitor"})
-ssid:depends({mode="ap-wds"})
-ssid:depends({mode="sta-wds"})
-ssid:depends({mode="wds"})
-
-bssid = s:taboption("general", Value, "bssid", translate("<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"))
-bssid.datatype = "macaddr"
-
-network = s:taboption("general", Value, "network", translate("Network"),
-	translate("Choose the network(s) you want to attach to this wireless interface or " ..
-		"fill out the <em>create</em> field to define a new network."))
-
-network.rmempty = true
-network.template = "cbi/network_netlist"
-network.widget = "checkbox"
-network.novirtual = true
-
-function network.write(self, section, value)
-	local i = nw:get_interface(section)
-	if i then
-		local _, net, old, new = nil, nil, {}, {}
-
-		for _, net in ipairs(i:get_networks()) do
-			old[net:name()] = true
-		end
-
-		for net in ut.imatch(value) do
-			new[net] = true
-			if not old[net] then
-				local n = nw:get_network(net) or nw:add_network(net, { proto = "none" })
-				if n then
-					if not n:is_empty() then
-						n:set("type", "bridge")
-					end
-					n:add_interface(i)
-				end
-			end
-		end
-
-		for net, _ in pairs(old) do
-			if not new[net] then
-				local n = nw:get_network(net)
-				if n then
-					n:del_interface(i)
-				end
-			end
-		end
-	end
-end
-
--------------------- MAC80211 Interface ----------------------
-
-if hwtype == "mac80211" then
-	if fs.access("/usr/sbin/iw") then
-		mode:value("mesh", "802.11s")
-	end
-
-	mode:value("ahdemo", translate("Pseudo Ad-Hoc (ahdemo)"))
-	mode:value("monitor", translate("Monitor"))
-	bssid:depends({mode="adhoc"})
-	bssid:depends({mode="sta"})
-	bssid:depends({mode="sta-wds"})
-
-	mp = s:taboption("macfilter", ListValue, "macfilter", translate("MAC-Address Filter"))
-	mp:depends({mode="ap"})
-	mp:depends({mode="ap-wds"})
-	mp:value("", translate("disable"))
-	mp:value("allow", translate("Allow listed only"))
-	mp:value("deny", translate("Allow all except listed"))
-
-	ml = s:taboption("macfilter", DynamicList, "maclist", translate("MAC-List"))
-	ml.datatype = "macaddr"
-	ml:depends({macfilter="allow"})
-	ml:depends({macfilter="deny"})
-	nt.mac_hints(function(mac, name) ml:value(mac, "%s (%s)" %{ mac, name }) end)
-
-	mode:value("ap-wds", "%s (%s)" % {translate("Access Point"), translate("WDS")})
-	mode:value("sta-wds", "%s (%s)" % {translate("Client"), translate("WDS")})
-
-	function mode.write(self, section, value)
-		if value == "ap-wds" then
-			ListValue.write(self, section, "ap")
-			m.uci:set("wireless", section, "wds", 1)
-		elseif value == "sta-wds" then
-			ListValue.write(self, section, "sta")
-			m.uci:set("wireless", section, "wds", 1)
-		else
-			ListValue.write(self, section, value)
-			m.uci:delete("wireless", section, "wds")
-		end
-	end
-
-	function mode.cfgvalue(self, section)
-		local mode = ListValue.cfgvalue(self, section)
-		local wds  = m.uci:get("wireless", section, "wds") == "1"
-
-		if mode == "ap" and wds then
-			return "ap-wds"
-		elseif mode == "sta" and wds then
-			return "sta-wds"
-		else
-			return mode
-		end
-	end
-
-	hidden = s:taboption("general", Flag, "hidden", translate("Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"))
-	hidden:depends({mode="ap"})
-	hidden:depends({mode="ap-wds"})
-
-	wmm = s:taboption("general", Flag, "wmm", translate("WMM Mode"))
-	wmm:depends({mode="ap"})
-	wmm:depends({mode="ap-wds"})
-	wmm.default = wmm.enabled
-
-	isolate = s:taboption("advanced", Flag, "isolate", translate("Isolate Clients"),
-	 translate("Prevents client-to-client communication"))
-	isolate:depends({mode="ap"})
-	isolate:depends({mode="ap-wds"})
-
-	ifname = s:taboption("advanced", Value, "ifname", translate("Interface name"), translate("Override default interface name"))
-	ifname.optional = true
-
-	short_preamble = s:taboption("advanced", Flag, "short_preamble", translate("Short Preamble"))
-	short_preamble.default = short_preamble.enabled
-
-	dtim_period = s:taboption("advanced", Value, "dtim_period", translate("DTIM Interval"), translate("Delivery Traffic Indication Message Interval"))
-	dtim_period.optional = true
-	dtim_period.placeholder = 2
-	dtim_period.datatype = "range(1,255)"
-	
-	
-	wparekey = s:taboption("advanced", Value, "wpa_group_rekey", translate("Time interval for rekeying GTK"), translate("sec"))
-	wparekey.optional    = true
-	wparekey.placeholder = 600
-	wparekey.datatype    = "uinteger"
-	
-	inactivitypool = s:taboption("advanced", Flag , "skip_inactivity_poll", translate("Disable Inactivity Polling"))
-	inactivitypool.optional    = true
-	inactivitypool.datatype    = "uinteger"
-	
-	maxinactivity = s:taboption("advanced", Value, "max_inactivity", translate("Station inactivity limit"), translate("sec"))
-	maxinactivity.optional    = true
-	maxinactivity.placeholder = 300
-	maxinactivity.datatype    = "uinteger"
-	
-	listeninterval = s:taboption("advanced", Value, "max_listen_interval", translate("Maximum allowed Listen Interval"))
-	listeninterval.optional    = true
-	listeninterval.placeholder = 65535
-	listeninterval.datatype    = "uinteger"
-
-	disassoc_low_ack = s:taboption("advanced", Flag, "disassoc_low_ack", translate("Disassociate On Low Acknowledgement"),
-		translate("Allow AP mode to disconnect STAs based on low ACK condition"))
-	disassoc_low_ack.default = disassoc_low_ack.enabled
-end
-
-
--------------------- Broadcom Interface ----------------------
-
-if hwtype == "broadcom" then
-	mode:value("wds", translate("WDS"))
-	mode:value("monitor", translate("Monitor"))
-
-	hidden = s:taboption("general", Flag, "hidden", translate("Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"))
-	hidden:depends({mode="ap"})
-	hidden:depends({mode="adhoc"})
-	hidden:depends({mode="wds"})
-
-	isolate = s:taboption("advanced", Flag, "isolate", translate("Separate Clients"),
-	 translate("Prevents client-to-client communication"))
-	isolate:depends({mode="ap"})
-
-	s:taboption("advanced", Flag, "doth", "802.11h")
-	s:taboption("advanced", Flag, "wmm", translate("WMM Mode"))
-
-	bssid:depends({mode="wds"})
-	bssid:depends({mode="adhoc"})
-end
-
-
------------------------ HostAP Interface ---------------------
-
-if hwtype == "prism2" then
-	mode:value("wds", translate("WDS"))
-	mode:value("monitor", translate("Monitor"))
-
-	hidden = s:taboption("general", Flag, "hidden", translate("Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"))
-	hidden:depends({mode="ap"})
-	hidden:depends({mode="adhoc"})
-	hidden:depends({mode="wds"})
-
-	bssid:depends({mode="sta"})
-
-	mp = s:taboption("macfilter", ListValue, "macpolicy", translate("MAC-Address Filter"))
-	mp:value("", translate("disable"))
-	mp:value("allow", translate("Allow listed only"))
-	mp:value("deny", translate("Allow all except listed"))
-	ml = s:taboption("macfilter", DynamicList, "maclist", translate("MAC-List"))
-	ml:depends({macpolicy="allow"})
-	ml:depends({macpolicy="deny"})
-	nt.mac_hints(function(mac, name) ml:value(mac, "%s (%s)" %{ mac, name }) end)
-
-	s:taboption("advanced", Value, "rate", translate("Transmission Rate"))
-	s:taboption("advanced", Value, "frag", translate("Fragmentation Threshold"))
-	s:taboption("advanced", Value, "rts", translate("RTS/CTS Threshold"))
-end
-
-
-------------------- WiFI-Encryption -------------------
-
-encr = s:taboption("encryption", ListValue, "encryption", translate("Encryption"))
-encr.override_values = true
-encr.override_depends = true
-encr:depends({mode="ap"})
-encr:depends({mode="sta"})
-encr:depends({mode="adhoc"})
-encr:depends({mode="ahdemo"})
-encr:depends({mode="ap-wds"})
-encr:depends({mode="sta-wds"})
-encr:depends({mode="mesh"})
-
-cipher = s:taboption("encryption", ListValue, "cipher", translate("Cipher"))
-cipher:depends({encryption="wpa"})
-cipher:depends({encryption="wpa2"})
-cipher:depends({encryption="psk"})
-cipher:depends({encryption="psk2"})
-cipher:depends({encryption="wpa-mixed"})
-cipher:depends({encryption="psk-mixed"})
-cipher:value("auto", translate("auto"))
-cipher:value("ccmp", translate("Force CCMP (AES)"))
-cipher:value("tkip", translate("Force TKIP"))
-cipher:value("tkip+ccmp", translate("Force TKIP and CCMP (AES)"))
-
-function encr.cfgvalue(self, section)
-	local v = tostring(ListValue.cfgvalue(self, section))
-	if v == "wep" then
-		return "wep-open"
-	elseif v and v:match("%+") then
-		return (v:gsub("%+.+$", ""))
-	end
-	return v
-end
-
-function encr.write(self, section, value)
-	local e = tostring(encr:formvalue(section))
-	local c = tostring(cipher:formvalue(section))
-	if value == "wpa" or value == "wpa2"  then
-		self.map.uci:delete("wireless", section, "key")
-	end
-	if e and (c == "tkip" or c == "ccmp" or c == "tkip+ccmp") then
-		e = e .. "+" .. c
-	end
-	self.map:set(section, "encryption", e)
-end
-
-function cipher.cfgvalue(self, section)
-	local v = tostring(ListValue.cfgvalue(encr, section))
-	if v and v:match("%+") then
-		v = v:gsub("^[^%+]+%+", "")
-		if v == "aes" then v = "ccmp"
-		elseif v == "tkip+aes" then v = "tkip+ccmp"
-		elseif v == "aes+tkip" then v = "tkip+ccmp"
-		elseif v == "ccmp+tkip" then v = "tkip+ccmp"
-		end
-	end
-	return v
-end
-
-function cipher.write(self, section)
-	return encr:write(section)
-end
-
-
-encr:value("none", "No Encryption")
-encr:value("wep-open",   translate("WEP Open System"), {mode="ap"}, {mode="sta"}, {mode="ap-wds"}, {mode="sta-wds"}, {mode="adhoc"}, {mode="ahdemo"}, {mode="wds"})
-encr:value("wep-shared", translate("WEP Shared Key"),  {mode="ap"}, {mode="sta"}, {mode="ap-wds"}, {mode="sta-wds"}, {mode="adhoc"}, {mode="ahdemo"}, {mode="wds"})
-
-if hwtype == "mac80211" or hwtype == "prism2" then
-	local supplicant = fs.access("/usr/sbin/wpa_supplicant")
-	local hostapd = fs.access("/usr/sbin/hostapd")
-
-	-- Probe EAP support
-	local has_ap_eap  = (os.execute("hostapd -veap >/dev/null 2>/dev/null") == 0)
-	local has_sta_eap = (os.execute("wpa_supplicant -veap >/dev/null 2>/dev/null") == 0)
-
-	-- Probe SAE support
-	local has_ap_sae  = (os.execute("hostapd -vsae >/dev/null 2>/dev/null") == 0)
-	local has_sta_sae = (os.execute("wpa_supplicant -vsae >/dev/null 2>/dev/null") == 0)
-
-	-- Probe OWE support
-	local has_ap_owe  = (os.execute("hostapd -vowe >/dev/null 2>/dev/null") == 0)
-	local has_sta_owe = (os.execute("wpa_supplicant -vowe >/dev/null 2>/dev/null") == 0)
-
-	if hostapd and supplicant then
-		encr:value("psk", "WPA-PSK", {mode="ap"}, {mode="sta"}, {mode="ap-wds"}, {mode="sta-wds"}, {mode="adhoc"})
-		encr:value("psk2", "WPA2-PSK", {mode="ap"}, {mode="sta"}, {mode="ap-wds"}, {mode="sta-wds"}, {mode="adhoc"})
-		encr:value("psk-mixed", "WPA-PSK/WPA2-PSK Mixed Mode", {mode="ap"}, {mode="sta"}, {mode="ap-wds"}, {mode="sta-wds"}, {mode="adhoc"})
-		if has_ap_sae and has_sta_sae then
-			encr:value("sae", "WPA3-SAE", {mode="ap"}, {mode="sta"}, {mode="ap-wds"}, {mode="sta-wds"}, {mode="adhoc"}, {mode="mesh"})
-			encr:value("sae-mixed", "WPA2-PSK/WPA3-SAE Mixed Mode", {mode="ap"}, {mode="sta"}, {mode="ap-wds"}, {mode="sta-wds"}, {mode="adhoc"})
-		end
-		if has_ap_eap and has_sta_eap then
-			encr:value("wpa", "WPA-EAP", {mode="ap"}, {mode="sta"}, {mode="ap-wds"}, {mode="sta-wds"})
-			encr:value("wpa2", "WPA2-EAP", {mode="ap"}, {mode="sta"}, {mode="ap-wds"}, {mode="sta-wds"})
-		end
-		if has_ap_owe and has_sta_owe then
-			encr:value("owe", "OWE", {mode="ap"}, {mode="sta"}, {mode="ap-wds"}, {mode="sta-wds"}, {mode="adhoc"})
-		end
-	elseif hostapd and not supplicant then
-		encr:value("psk", "WPA-PSK", {mode="ap"}, {mode="ap-wds"})
-		encr:value("psk2", "WPA2-PSK", {mode="ap"}, {mode="ap-wds"})
-		encr:value("psk-mixed", "WPA-PSK/WPA2-PSK Mixed Mode", {mode="ap"}, {mode="ap-wds"})
-		if has_ap_sae then
-			encr:value("sae", "WPA3-SAE", {mode="ap"}, {mode="ap-wds"})
-			encr:value("sae-mixed", "WPA2-PSK/WPA3-SAE Mixed Mode", {mode="ap"}, {mode="ap-wds"})
-		end
-		if has_ap_eap then
-			encr:value("wpa", "WPA-EAP", {mode="ap"}, {mode="ap-wds"})
-			encr:value("wpa2", "WPA2-EAP", {mode="ap"}, {mode="ap-wds"})
-		end
-		if has_ap_owe then
-			encr:value("owe", "OWE", {mode="ap"}, {mode="ap-wds"})
-		end
-		encr.description = translate(
-			"WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP " ..
-			"and ad-hoc mode) to be installed."
-		)
-	elseif not hostapd and supplicant then
-		encr:value("psk", "WPA-PSK", {mode="sta"}, {mode="sta-wds"}, {mode="adhoc"})
-		encr:value("psk2", "WPA2-PSK", {mode="sta"}, {mode="sta-wds"}, {mode="adhoc"})
-		encr:value("psk-mixed", "WPA-PSK/WPA2-PSK Mixed Mode", {mode="sta"}, {mode="sta-wds"}, {mode="adhoc"})
-		if has_sta_sae then
-			encr:value("sae", "WPA3-SAE", {mode="sta"}, {mode="sta-wds"}, {mode="mesh"})
-			encr:value("sae-mixed", "WPA2-PSK/WPA3-SAE Mixed Mode", {mode="sta"}, {mode="sta-wds"})
-		end
-		if has_sta_eap then
-			encr:value("wpa", "WPA-EAP", {mode="sta"}, {mode="sta-wds"})
-			encr:value("wpa2", "WPA2-EAP", {mode="sta"}, {mode="sta-wds"})
-		end
-		if has_sta_owe then
-			encr:value("owe", "OWE", {mode="sta"}, {mode="sta-wds"})
-		end
-		encr.description = translate(
-			"WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP " ..
-			"and ad-hoc mode) to be installed."
-		)
-	else
-		encr.description = translate(
-			"WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP " ..
-			"and ad-hoc mode) to be installed."
-		)
-	end
-elseif hwtype == "broadcom" then
-	encr:value("psk", "WPA-PSK")
-	encr:value("psk2", "WPA2-PSK")
-	encr:value("psk+psk2", "WPA-PSK/WPA2-PSK Mixed Mode")
-end
-
-auth_server = s:taboption("encryption", Value, "auth_server", translate("Radius-Authentication-Server"))
-auth_server:depends({mode="ap", encryption="wpa"})
-auth_server:depends({mode="ap", encryption="wpa2"})
-auth_server:depends({mode="ap-wds", encryption="wpa"})
-auth_server:depends({mode="ap-wds", encryption="wpa2"})
-auth_server.rmempty = true
-auth_server.datatype = "host(0)"
-
-auth_port = s:taboption("encryption", Value, "auth_port", translate("Radius-Authentication-Port"), translatef("Default %d", 1812))
-auth_port:depends({mode="ap", encryption="wpa"})
-auth_port:depends({mode="ap", encryption="wpa2"})
-auth_port:depends({mode="ap-wds", encryption="wpa"})
-auth_port:depends({mode="ap-wds", encryption="wpa2"})
-auth_port.rmempty = true
-auth_port.datatype = "port"
-
-auth_secret = s:taboption("encryption", Value, "auth_secret", translate("Radius-Authentication-Secret"))
-auth_secret:depends({mode="ap", encryption="wpa"})
-auth_secret:depends({mode="ap", encryption="wpa2"})
-auth_secret:depends({mode="ap-wds", encryption="wpa"})
-auth_secret:depends({mode="ap-wds", encryption="wpa2"})
-auth_secret.rmempty = true
-auth_secret.password = true
-
-acct_server = s:taboption("encryption", Value, "acct_server", translate("Radius-Accounting-Server"))
-acct_server:depends({mode="ap", encryption="wpa"})
-acct_server:depends({mode="ap", encryption="wpa2"})
-acct_server:depends({mode="ap-wds", encryption="wpa"})
-acct_server:depends({mode="ap-wds", encryption="wpa2"})
-acct_server.rmempty = true
-acct_server.datatype = "host(0)"
-
-acct_port = s:taboption("encryption", Value, "acct_port", translate("Radius-Accounting-Port"), translatef("Default %d", 1813))
-acct_port:depends({mode="ap", encryption="wpa"})
-acct_port:depends({mode="ap", encryption="wpa2"})
-acct_port:depends({mode="ap-wds", encryption="wpa"})
-acct_port:depends({mode="ap-wds", encryption="wpa2"})
-acct_port.rmempty = true
-acct_port.datatype = "port"
-
-acct_secret = s:taboption("encryption", Value, "acct_secret", translate("Radius-Accounting-Secret"))
-acct_secret:depends({mode="ap", encryption="wpa"})
-acct_secret:depends({mode="ap", encryption="wpa2"})
-acct_secret:depends({mode="ap-wds", encryption="wpa"})
-acct_secret:depends({mode="ap-wds", encryption="wpa2"})
-acct_secret.rmempty = true
-acct_secret.password = true
-
-dae_client = s:taboption("encryption", Value, "dae_client", translate("DAE-Client"))
-dae_client:depends({mode="ap", encryption="wpa"})
-dae_client:depends({mode="ap", encryption="wpa2"})
-dae_client:depends({mode="ap-wds", encryption="wpa"})
-dae_client:depends({mode="ap-wds", encryption="wpa2"})
-dae_client.rmempty = true
-dae_client.datatype = "host(0)"
-
-dae_port = s:taboption("encryption", Value, "dae_port", translate("DAE-Port"), translatef("Default %d", 3799))
-dae_port:depends({mode="ap", encryption="wpa"})
-dae_port:depends({mode="ap", encryption="wpa2"})
-dae_port:depends({mode="ap-wds", encryption="wpa"})
-dae_port:depends({mode="ap-wds", encryption="wpa2"})
-dae_port.rmempty = true
-dae_port.datatype = "port"
-
-dae_secret = s:taboption("encryption", Value, "dae_secret", translate("DAE-Secret"))
-dae_secret:depends({mode="ap", encryption="wpa"})
-dae_secret:depends({mode="ap", encryption="wpa2"})
-dae_secret:depends({mode="ap-wds", encryption="wpa"})
-dae_secret:depends({mode="ap-wds", encryption="wpa2"})
-dae_secret.rmempty = true
-dae_secret.password = true
-
-wpakey = s:taboption("encryption", Value, "_wpa_key", translate("Key"))
-wpakey:depends("encryption", "psk")
-wpakey:depends("encryption", "psk2")
-wpakey:depends("encryption", "psk+psk2")
-wpakey:depends("encryption", "psk-mixed")
-wpakey:depends("encryption", "sae")
-wpakey:depends("encryption", "sae-mixed")
-wpakey.datatype = "wpakey"
-wpakey.rmempty = true
-wpakey.password = true
-
-wpakey.cfgvalue = function(self, section, value)
-	local key = m.uci:get("wireless", section, "key")
-	if key == "1" or key == "2" or key == "3" or key == "4" then
-		return nil
-	end
-	return key
-end
-
-wpakey.write = function(self, section, value)
-	self.map.uci:set("wireless", section, "key", value)
-	self.map.uci:delete("wireless", section, "key1")
-end
-
-
-wepslot = s:taboption("encryption", ListValue, "_wep_key", translate("Used Key Slot"))
-wepslot:depends("encryption", "wep-open")
-wepslot:depends("encryption", "wep-shared")
-wepslot:value("1", translatef("Key #%d", 1))
-wepslot:value("2", translatef("Key #%d", 2))
-wepslot:value("3", translatef("Key #%d", 3))
-wepslot:value("4", translatef("Key #%d", 4))
-
-wepslot.cfgvalue = function(self, section)
-	local slot = tonumber(m.uci:get("wireless", section, "key"))
-	if not slot or slot < 1 or slot > 4 then
-		return 1
-	end
-	return slot
-end
-
-wepslot.write = function(self, section, value)
-	self.map.uci:set("wireless", section, "key", value)
-end
-
-local slot
-for slot=1,4 do
-	wepkey = s:taboption("encryption", Value, "key" .. slot, translatef("Key #%d", slot))
-	wepkey:depends("encryption", "wep-open")
-	wepkey:depends("encryption", "wep-shared")
-	wepkey.datatype = "wepkey"
-	wepkey.rmempty = true
-	wepkey.password = true
-
-	function wepkey.write(self, section, value)
-		if value and (#value == 5 or #value == 13) then
-			value = "s:" .. value
-		end
-		return Value.write(self, section, value)
-	end
-end
-
-if hwtype == "mac80211" or hwtype == "prism2" then
-
-	-- Probe 802.11r support (and EAP support as a proxy for Openwrt)
-	local has_80211r = (os.execute("hostapd -v11r 2>/dev/null || hostapd -veap 2>/dev/null") == 0)
-
-	ieee80211r = s:taboption("encryption", Flag, "ieee80211r",
-		translate("802.11r Fast Transition"),
-		translate("Enables fast roaming among access points that belong " ..
-			"to the same Mobility Domain"))
-	ieee80211r:depends({mode="ap", encryption="wpa"})
-	ieee80211r:depends({mode="ap", encryption="wpa2"})
-	ieee80211r:depends({mode="ap-wds", encryption="wpa"})
-	ieee80211r:depends({mode="ap-wds", encryption="wpa2"})
-	if has_80211r then
-		ieee80211r:depends({mode="ap", encryption="psk"})
-		ieee80211r:depends({mode="ap", encryption="psk2"})
-		ieee80211r:depends({mode="ap", encryption="psk-mixed"})
-		ieee80211r:depends({mode="ap", encryption="sae"})
-		ieee80211r:depends({mode="ap", encryption="sae-mixed"})
-		ieee80211r:depends({mode="ap-wds", encryption="psk"})
-		ieee80211r:depends({mode="ap-wds", encryption="psk2"})
-		ieee80211r:depends({mode="ap-wds", encryption="psk-mixed"})
-		ieee80211r:depends({mode="ap-wds", encryption="sae"})
-		ieee80211r:depends({mode="ap-wds", encryption="sae-mixed"})
-	end
-	ieee80211r.rmempty = true
-
-	nasid = s:taboption("encryption", Value, "nasid", translate("NAS ID"),
-		translate("Used for two different purposes: RADIUS NAS ID and " ..
-			"802.11r R0KH-ID. Not needed with normal WPA(2)-PSK."))
-	nasid:depends({mode="ap", encryption="wpa"})
-	nasid:depends({mode="ap", encryption="wpa2"})
-	nasid:depends({mode="ap-wds", encryption="wpa"})
-	nasid:depends({mode="ap-wds", encryption="wpa2"})
-	nasid:depends({ieee80211r="1"})
-	nasid.rmempty = true
-
-	mobility_domain = s:taboption("encryption", Value, "mobility_domain",
-			translate("Mobility Domain"),
-			translate("4-character hexadecimal ID"))
-	mobility_domain:depends({ieee80211r="1"})
-	mobility_domain.placeholder = "4f57"
-	mobility_domain.datatype = "and(hexstring,rangelength(4,4))"
-	mobility_domain.rmempty = true
-
-	reassociation_deadline = s:taboption("encryption", Value, "reassociation_deadline",
-		translate("Reassociation Deadline"),
-		translate("time units (TUs / 1.024 ms) [1000-65535]"))
-	reassociation_deadline:depends({ieee80211r="1"})
-	reassociation_deadline.placeholder = "1000"
-	reassociation_deadline.datatype = "range(1000,65535)"
-	reassociation_deadline.rmempty = true
-
-	ft_protocol = s:taboption("encryption", ListValue, "ft_over_ds", translate("FT protocol"))
-	ft_protocol:depends({ieee80211r="1"})
-	ft_protocol:value("1", translatef("FT over DS"))
-	ft_protocol:value("0", translatef("FT over the Air"))
-	ft_protocol.rmempty = true
-
-	ft_psk_generate_local = s:taboption("encryption", Flag, "ft_psk_generate_local",
-		translate("Generate PMK locally"),
-		translate("When using a PSK, the PMK can be automatically generated. When enabled, the R0/R1 key options below are not applied. Disable this to use the R0 and R1 key options."))
-	ft_psk_generate_local:depends({ieee80211r="1"})
-	ft_psk_generate_local.default = ft_psk_generate_local.enabled
-	ft_psk_generate_local.rmempty = false
-
-	r0_key_lifetime = s:taboption("encryption", Value, "r0_key_lifetime",
-			translate("R0 Key Lifetime"), translate("minutes"))
-	r0_key_lifetime:depends({ieee80211r="1"})
-	r0_key_lifetime.placeholder = "10000"
-	r0_key_lifetime.datatype = "uinteger"
-	r0_key_lifetime.rmempty = true
-
-	r1_key_holder = s:taboption("encryption", Value, "r1_key_holder",
-			translate("R1 Key Holder"),
-			translate("6-octet identifier as a hex string - no colons"))
-	r1_key_holder:depends({ieee80211r="1"})
-	r1_key_holder.placeholder = "00004f577274"
-	r1_key_holder.datatype = "and(hexstring,rangelength(12,12))"
-	r1_key_holder.rmempty = true
-
-	pmk_r1_push = s:taboption("encryption", Flag, "pmk_r1_push", translate("PMK R1 Push"))
-	pmk_r1_push:depends({ieee80211r="1"})
-	pmk_r1_push.placeholder = "0"
-	pmk_r1_push.rmempty = true
-
-	r0kh = s:taboption("encryption", DynamicList, "r0kh", translate("External R0 Key Holder List"),
-		translate("List of R0KHs in the same Mobility Domain. " ..
-			"<br />Format: MAC-address,NAS-Identifier,128-bit key as hex string. " ..
-			"<br />This list is used to map R0KH-ID (NAS Identifier) to a destination " ..
-			"MAC address when requesting PMK-R1 key from the R0KH that the STA " ..
-			"used during the Initial Mobility Domain Association."))
-	r0kh:depends({ieee80211r="1"})
-	r0kh.rmempty = true
-
-	r1kh = s:taboption("encryption", DynamicList, "r1kh", translate("External R1 Key Holder List"),
-		translate ("List of R1KHs in the same Mobility Domain. "..
-			"<br />Format: MAC-address,R1KH-ID as 6 octets with colons,128-bit key as hex string. "..
-			"<br />This list is used to map R1KH-ID to a destination MAC address " ..
-			"when sending PMK-R1 key from the R0KH. This is also the " ..
-			"list of authorized R1KHs in the MD that can request PMK-R1 keys."))
-	r1kh:depends({ieee80211r="1"})
-	r1kh.rmempty = true
-	-- End of 802.11r options
-
-	eaptype = s:taboption("encryption", ListValue, "eap_type", translate("EAP-Method"))
-	eaptype:value("tls",  "TLS")
-	eaptype:value("ttls", "TTLS")
-	eaptype:value("peap", "PEAP")
-	eaptype:value("fast", "FAST")
-	eaptype:depends({mode="sta", encryption="wpa"})
-	eaptype:depends({mode="sta", encryption="wpa2"})
-	eaptype:depends({mode="sta-wds", encryption="wpa"})
-	eaptype:depends({mode="sta-wds", encryption="wpa2"})
-
-	cacert = s:taboption("encryption", FileUpload, "ca_cert", translate("Path to CA-Certificate"))
-	cacert:depends({mode="sta", encryption="wpa"})
-	cacert:depends({mode="sta", encryption="wpa2"})
-	cacert:depends({mode="sta-wds", encryption="wpa"})
-	cacert:depends({mode="sta-wds", encryption="wpa2"})
-	cacert.rmempty = true
-
-	clientcert = s:taboption("encryption", FileUpload, "client_cert", translate("Path to Client-Certificate"))
-	clientcert:depends({mode="sta", eap_type="tls", encryption="wpa"})
-	clientcert:depends({mode="sta", eap_type="tls", encryption="wpa2"})
-	clientcert:depends({mode="sta-wds", eap_type="tls", encryption="wpa"})
-	clientcert:depends({mode="sta-wds", eap_type="tls", encryption="wpa2"})
-
-	privkey = s:taboption("encryption", FileUpload, "priv_key", translate("Path to Private Key"))
-	privkey:depends({mode="sta", eap_type="tls", encryption="wpa2"})
-	privkey:depends({mode="sta", eap_type="tls", encryption="wpa"})
-	privkey:depends({mode="sta-wds", eap_type="tls", encryption="wpa2"})
-	privkey:depends({mode="sta-wds", eap_type="tls", encryption="wpa"})
-
-	privkeypwd = s:taboption("encryption", Value, "priv_key_pwd", translate("Password of Private Key"))
-	privkeypwd:depends({mode="sta", eap_type="tls", encryption="wpa2"})
-	privkeypwd:depends({mode="sta", eap_type="tls", encryption="wpa"})
-	privkeypwd:depends({mode="sta-wds", eap_type="tls", encryption="wpa2"})
-	privkeypwd:depends({mode="sta-wds", eap_type="tls", encryption="wpa"})
-	privkeypwd.rmempty = true
-	privkeypwd.password = true
-
-	auth = s:taboption("encryption", ListValue, "auth", translate("Authentication"))
-	auth:value("PAP", "PAP", {eap_type="ttls"})
-	auth:value("CHAP", "CHAP", {eap_type="ttls"})
-	auth:value("MSCHAP", "MSCHAP", {eap_type="ttls"})
-	auth:value("MSCHAPV2", "MSCHAPv2", {eap_type="ttls"})
-	auth:value("EAP-GTC")
-	auth:value("EAP-MD5")
-	auth:value("EAP-MSCHAPV2")
-	auth:value("EAP-TLS")
-	auth:depends({mode="sta", eap_type="fast", encryption="wpa2"})
-	auth:depends({mode="sta", eap_type="fast", encryption="wpa"})
-	auth:depends({mode="sta", eap_type="peap", encryption="wpa2"})
-	auth:depends({mode="sta", eap_type="peap", encryption="wpa"})
-	auth:depends({mode="sta", eap_type="ttls", encryption="wpa2"})
-	auth:depends({mode="sta", eap_type="ttls", encryption="wpa"})
-	auth:depends({mode="sta-wds", eap_type="fast", encryption="wpa2"})
-	auth:depends({mode="sta-wds", eap_type="fast", encryption="wpa"})
-	auth:depends({mode="sta-wds", eap_type="peap", encryption="wpa2"})
-	auth:depends({mode="sta-wds", eap_type="peap", encryption="wpa"})
-	auth:depends({mode="sta-wds", eap_type="ttls", encryption="wpa2"})
-	auth:depends({mode="sta-wds", eap_type="ttls", encryption="wpa"})
-
-	cacert2 = s:taboption("encryption", FileUpload, "ca_cert2", translate("Path to inner CA-Certificate"))
-	cacert2:depends({mode="sta", auth="EAP-TLS", encryption="wpa"})
-	cacert2:depends({mode="sta", auth="EAP-TLS", encryption="wpa2"})
-	cacert2:depends({mode="sta-wds", auth="EAP-TLS", encryption="wpa"})
-	cacert2:depends({mode="sta-wds", auth="EAP-TLS", encryption="wpa2"})
-
-	clientcert2 = s:taboption("encryption", FileUpload, "client_cert2", translate("Path to inner Client-Certificate"))
-	clientcert2:depends({mode="sta", auth="EAP-TLS", encryption="wpa"})
-	clientcert2:depends({mode="sta", auth="EAP-TLS", encryption="wpa2"})
-	clientcert2:depends({mode="sta-wds", auth="EAP-TLS", encryption="wpa"})
-	clientcert2:depends({mode="sta-wds", auth="EAP-TLS", encryption="wpa2"})
-
-	privkey2 = s:taboption("encryption", FileUpload, "priv_key2", translate("Path to inner Private Key"))
-	privkey2:depends({mode="sta", auth="EAP-TLS", encryption="wpa"})
-	privkey2:depends({mode="sta", auth="EAP-TLS", encryption="wpa2"})
-	privkey2:depends({mode="sta-wds", auth="EAP-TLS", encryption="wpa"})
-	privkey2:depends({mode="sta-wds", auth="EAP-TLS", encryption="wpa2"})
-
-	privkeypwd2 = s:taboption("encryption", Value, "priv_key2_pwd", translate("Password of inner Private Key"))
-	privkeypwd2:depends({mode="sta", auth="EAP-TLS", encryption="wpa"})
-	privkeypwd2:depends({mode="sta", auth="EAP-TLS", encryption="wpa2"})
-	privkeypwd2:depends({mode="sta-wds", auth="EAP-TLS", encryption="wpa"})
-	privkeypwd2:depends({mode="sta-wds", auth="EAP-TLS", encryption="wpa2"})
-	privkeypwd2.rmempty = true
-	privkeypwd2.password = true
-
-	identity = s:taboption("encryption", Value, "identity", translate("Identity"))
-	identity:depends({mode="sta", eap_type="fast", encryption="wpa2"})
-	identity:depends({mode="sta", eap_type="fast", encryption="wpa"})
-	identity:depends({mode="sta", eap_type="peap", encryption="wpa2"})
-	identity:depends({mode="sta", eap_type="peap", encryption="wpa"})
-	identity:depends({mode="sta", eap_type="ttls", encryption="wpa2"})
-	identity:depends({mode="sta", eap_type="ttls", encryption="wpa"})
-	identity:depends({mode="sta-wds", eap_type="fast", encryption="wpa2"})
-	identity:depends({mode="sta-wds", eap_type="fast", encryption="wpa"})
-	identity:depends({mode="sta-wds", eap_type="peap", encryption="wpa2"})
-	identity:depends({mode="sta-wds", eap_type="peap", encryption="wpa"})
-	identity:depends({mode="sta-wds", eap_type="ttls", encryption="wpa2"})
-	identity:depends({mode="sta-wds", eap_type="ttls", encryption="wpa"})
-	identity:depends({mode="sta", eap_type="tls", encryption="wpa2"})
-	identity:depends({mode="sta", eap_type="tls", encryption="wpa"})
-	identity:depends({mode="sta-wds", eap_type="tls", encryption="wpa2"})
-	identity:depends({mode="sta-wds", eap_type="tls", encryption="wpa"})
-
-	anonymous_identity = s:taboption("encryption", Value, "anonymous_identity", translate("Anonymous Identity"))
-	anonymous_identity:depends({mode="sta", eap_type="fast", encryption="wpa2"})
-	anonymous_identity:depends({mode="sta", eap_type="fast", encryption="wpa"})
-	anonymous_identity:depends({mode="sta", eap_type="peap", encryption="wpa2"})
-	anonymous_identity:depends({mode="sta", eap_type="peap", encryption="wpa"})
-	anonymous_identity:depends({mode="sta", eap_type="ttls", encryption="wpa2"})
-	anonymous_identity:depends({mode="sta", eap_type="ttls", encryption="wpa"})
-	anonymous_identity:depends({mode="sta-wds", eap_type="fast", encryption="wpa2"})
-	anonymous_identity:depends({mode="sta-wds", eap_type="fast", encryption="wpa"})
-	anonymous_identity:depends({mode="sta-wds", eap_type="peap", encryption="wpa2"})
-	anonymous_identity:depends({mode="sta-wds", eap_type="peap", encryption="wpa"})
-	anonymous_identity:depends({mode="sta-wds", eap_type="ttls", encryption="wpa2"})
-	anonymous_identity:depends({mode="sta-wds", eap_type="ttls", encryption="wpa"})
-	anonymous_identity:depends({mode="sta", eap_type="tls", encryption="wpa2"})
-	anonymous_identity:depends({mode="sta", eap_type="tls", encryption="wpa"})
-	anonymous_identity:depends({mode="sta-wds", eap_type="tls", encryption="wpa2"})
-	anonymous_identity:depends({mode="sta-wds", eap_type="tls", encryption="wpa"})
-
-	password = s:taboption("encryption", Value, "password", translate("Password"))
-	password:depends({mode="sta", eap_type="fast", encryption="wpa2"})
-	password:depends({mode="sta", eap_type="fast", encryption="wpa"})
-	password:depends({mode="sta", eap_type="peap", encryption="wpa2"})
-	password:depends({mode="sta", eap_type="peap", encryption="wpa"})
-	password:depends({mode="sta", eap_type="ttls", encryption="wpa2"})
-	password:depends({mode="sta", eap_type="ttls", encryption="wpa"})
-	password:depends({mode="sta-wds", eap_type="fast", encryption="wpa2"})
-	password:depends({mode="sta-wds", eap_type="fast", encryption="wpa"})
-	password:depends({mode="sta-wds", eap_type="peap", encryption="wpa2"})
-	password:depends({mode="sta-wds", eap_type="peap", encryption="wpa"})
-	password:depends({mode="sta-wds", eap_type="ttls", encryption="wpa2"})
-	password:depends({mode="sta-wds", eap_type="ttls", encryption="wpa"})
-	password.rmempty = true
-	password.password = true
-end
-
--- ieee802.11w options
-if hwtype == "mac80211" then
-	local has_80211w = (os.execute("hostapd -v11w 2>/dev/null || hostapd -veap 2>/dev/null") == 0)
-	if has_80211w then
-		ieee80211w = s:taboption("encryption", ListValue, "ieee80211w",
-			translate("802.11w Management Frame Protection"),
-			translate("Requires the 'full' version of wpad/hostapd " ..
-				"and support from the wifi driver <br />(as of Jan 2019: " ..
-				"ath9k, ath10k, mwlwifi and mt76)"))
-		ieee80211w.default = ""
-		ieee80211w.rmempty = true
-		ieee80211w:value("", translate("Disabled (default)"))
-		ieee80211w:value("1", translate("Optional"))
-		ieee80211w:value("2", translate("Required"))
-		ieee80211w:depends({mode="ap", encryption="wpa2"})
-		ieee80211w:depends({mode="ap-wds", encryption="wpa2"})
-		ieee80211w:depends({mode="ap", encryption="psk2"})
-		ieee80211w:depends({mode="ap", encryption="psk-mixed"})
-		ieee80211w:depends({mode="ap", encryption="sae"})
-		ieee80211w:depends({mode="ap", encryption="sae-mixed"})
-		ieee80211w:depends({mode="ap", encryption="owe"})
-		ieee80211w:depends({mode="ap-wds", encryption="psk2"})
-		ieee80211w:depends({mode="ap-wds", encryption="psk-mixed"})
-		ieee80211w:depends({mode="ap-wds", encryption="sae"})
-		ieee80211w:depends({mode="ap-wds", encryption="sae-mixed"})
-		ieee80211w:depends({mode="ap-wds", encryption="owe"})
-		ieee80211w:depends({mode="sta", encryption="wpa2"})
-		ieee80211w:depends({mode="sta-wds", encryption="wpa2"})
-		ieee80211w:depends({mode="sta", encryption="psk2"})
-		ieee80211w:depends({mode="sta", encryption="psk-mixed"})
-		ieee80211w:depends({mode="sta", encryption="sae"})
-		ieee80211w:depends({mode="sta", encryption="sae-mixed"})
-		ieee80211w:depends({mode="sta", encryption="owe"})
-		ieee80211w:depends({mode="sta-wds", encryption="psk2"})
-		ieee80211w:depends({mode="sta-wds", encryption="psk-mixed"})
-		ieee80211w:depends({mode="sta-wds", encryption="sae"})
-		ieee80211w:depends({mode="sta-wds", encryption="sae-mixed"})
-		ieee80211w:depends({mode="sta-wds", encryption="owe"})
-
-		max_timeout = s:taboption("encryption", Value, "ieee80211w_max_timeout",
-				translate("802.11w maximum timeout"),
-				translate("802.11w Association SA Query maximum timeout"))
-		max_timeout:depends({ieee80211w="1"})
-		max_timeout:depends({ieee80211w="2"})
-		max_timeout.datatype = "uinteger"
-		max_timeout.placeholder = "1000"
-		max_timeout.rmempty = true
-
-		retry_timeout = s:taboption("encryption", Value, "ieee80211w_retry_timeout",
-				translate("802.11w retry timeout"),
-				translate("802.11w Association SA Query retry timeout"))
-		retry_timeout:depends({ieee80211w="1"})
-		retry_timeout:depends({ieee80211w="2"})
-		retry_timeout.datatype = "uinteger"
-		retry_timeout.placeholder = "201"
-		retry_timeout.rmempty = true
-	end
-
-	key_retries = s:taboption("encryption", Flag, "wpa_disable_eapol_key_retries",
-		translate("Enable key reinstallation (KRACK) countermeasures"),
-		translate("Complicates key reinstallation attacks on the client side by disabling retransmission of EAPOL-Key frames that are used to install keys. This workaround might cause interoperability issues and reduced robustness of key negotiation especially in environments with heavy traffic load."))
-
-	key_retries:depends({mode="ap", encryption="wpa2"})
-	key_retries:depends({mode="ap", encryption="psk2"})
-	key_retries:depends({mode="ap", encryption="psk-mixed"})
-	key_retries:depends({mode="ap", encryption="sae"})
-	key_retries:depends({mode="ap", encryption="sae-mixed"})
-	key_retries:depends({mode="ap-wds", encryption="wpa2"})
-	key_retries:depends({mode="ap-wds", encryption="psk2"})
-	key_retries:depends({mode="ap-wds", encryption="psk-mixed"})
-	key_retries:depends({mode="ap-wds", encryption="sae"})
-	key_retries:depends({mode="ap-wds", encryption="sae-mixed"})
-end
-
-if hwtype == "mac80211" or hwtype == "prism2" then
-	local wpasupplicant = fs.access("/usr/sbin/wpa_supplicant")
-	local hostcli = fs.access("/usr/sbin/hostapd_cli")
-	if hostcli and wpasupplicant then
-		wps = s:taboption("encryption", Flag, "wps_pushbutton", translate("Enable WPS pushbutton, requires WPA(2)-PSK"))
-		wps.enabled = "1"
-		wps.disabled = "0"
-		wps.rmempty = false
-		wps:depends("encryption", "psk")
-		wps:depends("encryption", "psk2")
-		wps:depends("encryption", "psk-mixed")
-	end
-end
-
-return m
diff --git a/modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua b/modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua
deleted file mode 100644
index e8a305882..000000000
--- a/modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua
+++ /dev/null
@@ -1,168 +0,0 @@
--- Copyright 2009 Jo-Philipp Wich <jow@openwrt.org>
--- Licensed to the public under the Apache License 2.0.
-
-local fs   = require "nixio.fs"
-local nw   = require "luci.model.network"
-local fw   = require "luci.model.firewall"
-local uci  = require "luci.model.uci".cursor()
-local http = require "luci.http"
-
-local iw = luci.sys.wifi.getiwinfo(http.formvalue("device"))
-
-local has_firewall = fs.access("/etc/config/firewall")
-
-if not iw then
-	luci.http.redirect(luci.dispatcher.build_url("admin/network/wireless"))
-	return
-end
-
-m = SimpleForm("network", translatef("Joining Network: %q", http.formvalue("join")))
-m.cancel = translate("Back to scan results")
-m.reset = false
-
-function m.on_cancel()
-	local dev = http.formvalue("device")
-	http.redirect(luci.dispatcher.build_url(
-		dev and "admin/network/wireless_join?device=" .. dev
-			or "admin/network/wireless"
-	))
-end
-
-nw.init(uci)
-fw.init(uci)
-
-m.hidden = {
-	device      = http.formvalue("device"),
-	join        = http.formvalue("join"),
-	channel     = http.formvalue("channel"),
-	mode        = http.formvalue("mode"),
-	bssid       = http.formvalue("bssid"),
-	wep         = http.formvalue("wep"),
-	wpa_suites	= http.formvalue("wpa_suites"),
-	wpa_version = http.formvalue("wpa_version")
-}
-
-if iw and iw.mbssid_support then
-	replace = m:field(Flag, "replace", translate("Replace wireless configuration"),
-		translate("Check this option to delete the existing networks from this radio."))
-
-	function replace.cfgvalue() return "0" end
-else
-	replace = m:field(DummyValue, "replace", translate("Replace wireless configuration"))
-	replace.default = translate("The hardware is not multi-SSID capable and the existing " ..
-		"configuration will be replaced if you proceed.")
-
-	function replace.formvalue() return "1" end
-end
-
-if http.formvalue("wep") == "1" then
-	key = m:field(Value, "key", translate("WEP passphrase"),
-		translate("Specify the secret encryption key here."))
-
-	key.password = true
-	key.datatype = "wepkey"
-
-elseif (tonumber(m.hidden.wpa_version) or 0) > 0 and
-	(m.hidden.wpa_suites == "PSK" or m.hidden.wpa_suites == "PSK2")
-then
-	key = m:field(Value, "key", translate("WPA passphrase"),
-		translate("Specify the secret encryption key here."))
-
-	key.password = true
-	key.datatype = "wpakey"
-	--m.hidden.wpa_suite = (tonumber(http.formvalue("wpa_version")) or 0) >= 2 and "psk2" or "psk"
-end
-
-newnet = m:field(Value, "_netname_new", translate("Name of the new network"),
-	translate("The allowed characters are: <code>A-Z</code>, <code>a-z</code>, " ..
-		"<code>0-9</code> and <code>_</code>"
-	))
-
-newnet.default = m.hidden.mode == "Ad-Hoc" and "mesh" or "wwan"
-newnet.datatype = "uciname"
-
-if has_firewall then
-	fwzone = m:field(Value, "_fwzone",
-		translate("Create / Assign firewall-zone"),
-		translate("Choose the firewall zone you want to assign to this interface. Select <em>unspecified</em> to remove the interface from the associated zone or fill out the <em>create</em> field to define a new zone and attach the interface to it."))
-
-	fwzone.template = "cbi/firewall_zonelist"
-	fwzone.default = m.hidden.mode == "Ad-Hoc" and "mesh" or "wan"
-end
-
-function newnet.parse(self, section)
-	local net, zone
-
-	if has_firewall then
-		local value = fwzone:formvalue(section)
-		if value and #value > 0 then
-			zone = fw:get_zone(value) or fw:add_zone(value)
-		end
-	end
-
-	local wdev = nw:get_wifidev(m.hidden.device)
-
-	wdev:set("disabled", false)
-	wdev:set("channel", m.hidden.channel)
-
-	if replace:formvalue(section) then
-		local n
-		for _, n in ipairs(wdev:get_wifinets()) do
-			wdev:del_wifinet(n)
-		end
-	end
-
-	local wconf = {
-		device  = m.hidden.device,
-		ssid    = m.hidden.join,
-		mode    = (m.hidden.mode == "Ad-Hoc" and "adhoc" or "sta")
-	}
-
-	if m.hidden.wep == "1" then
-		wconf.encryption = "wep-open"
-		wconf.key        = "1"
-		wconf.key1       = key and key:formvalue(section) or ""
-	elseif (tonumber(m.hidden.wpa_version) or 0) > 0 then
-		wconf.encryption = (tonumber(m.hidden.wpa_version) or 0) >= 2 and "psk2" or "psk"
-		wconf.key        = key and key:formvalue(section) or ""
-	else
-		wconf.encryption = "none"
-	end
-
-	if wconf.mode == "adhoc" or wconf.mode == "sta" then
-		wconf.bssid = m.hidden.bssid
-	end
-
-	local value = self:formvalue(section)
-	net = nw:add_network(value, { proto = "dhcp" })
-
-	if not net then
-		self.error = { [section] = "missing" }
-	else
-		wconf.network = net:name()
-
-		local wnet = wdev:add_wifinet(wconf)
-		if wnet then
-			if zone then
-				fw:del_network(net:name())
-				zone:add_network(net:name())
-			end
-
-			uci:save("wireless")
-			uci:save("network")
-			uci:save("firewall")
-
-			luci.http.redirect(wnet:adminlink())
-		end
-	end
-end
-
-if has_firewall then
-	function fwzone.cfgvalue(self, section)
-		self.iface = section
-		local z = fw:get_zone_by_network(section)
-		return z and z:name()
-	end
-end
-
-return m
diff --git a/modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua b/modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua
deleted file mode 100644
index 54720d688..000000000
--- a/modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua
+++ /dev/null
@@ -1,153 +0,0 @@
--- Copyright 2018 Jo-Philipp Wich <jo@mein.io>
--- Licensed to the public under the Apache License 2.0.
-
-local fs = require "nixio.fs"
-local utl = require "luci.util"
-local tpl = require "luci.template"
-local ntm = require "luci.model.network"
-
-local has_iwinfo = pcall(require, "iwinfo")
-
-function guess_wifi_hw(dev)
-	local bands = ""
-	local ifname = dev:name()
-	local name, idx = ifname:match("^([a-z]+)(%d+)")
-	idx = tonumber(idx)
-
-	if has_iwinfo then
-		local bl = dev.iwinfo.hwmodelist
-		if bl and next(bl) then
-			if bl.a then bands = bands .. "a" end
-			if bl.b then bands = bands .. "b" end
-			if bl.g then bands = bands .. "g" end
-			if bl.n then bands = bands .. "n" end
-			if bl.ac then bands = bands .. "ac" end
-		end
-
-		local hw = dev.iwinfo.hardware_name
-		if hw then
-			return "%s 802.11%s" %{ hw, bands }
-		end
-	end
-
-	-- wl.o
-	if name == "wl" then
-		local name = translatef("Broadcom 802.11%s Wireless Controller", bands)
-		local nm   = 0
-
-		local fd = nixio.open("/proc/bus/pci/devices", "r")
-		if fd then
-			local ln
-			for ln in fd:linesource() do
-				if ln:match("wl$") then
-					if nm == idx then
-						local version = ln:match("^%S+%s+%S%S%S%S([0-9a-f]+)")
-						name = translatef(
-							"Broadcom BCM%04x 802.11 Wireless Controller",
-							tonumber(version, 16)
-						)
-
-						break
-					else
-						nm = nm + 1
-					end
-				end
-			end
-			fd:close()
-		end
-
-		return name
-
-	-- dunno yet
-	else
-		return translatef("Generic 802.11%s Wireless Controller", bands)
-	end
-end
-
-
-m = Map("wireless", translate("Wireless Overview"))
-m:chain("network")
-m.pageaction = false
-
-if not has_iwinfo then
-	s = m:section(NamedSection, "__warning__")
-
-	function s.render(self)
-		tpl.render_string([[
-			<div class="alert-message warning">
-				<h4><%:Package libiwinfo required!%></h4>
-				<p><%_The <em>libiwinfo-lua</em> package is not installed. You must install this component for working wireless configuration!%></p>
-			</div>
-		]])
-	end
-end
-
-local _, dev, net
-for _, dev in ipairs(ntm:get_wifidevs()) do
-	s = m:section(TypedSection)
-	s.template = "admin_network/wifi_overview"
-	s.wnets = dev:get_wifinets()
-	s.dev = dev
-	s.hw = guess_wifi_hw(dev)
-
-	function s.cfgsections(self)
-		local _, net, sl = nil, nil, { }
-		for _, net in ipairs(self.wnets) do
-			sl[#sl+1] = net:name()
-			self.wnets[net:name()] = net
-		end
-		return sl
-	end
-
-	o = s:option(Value, "__disable__")
-
-	function o.cfgvalue(self, sid)
-		local wnet = self.section.wnets[sid]
-		local wdev = wnet:get_device()
-
-		return ((wnet and wnet:get("disabled") == "1") or
-			    (wdev and wdev:get("disabled") == "1")) and "1" or "0"
-	end
-
-	function o.write(self, sid, value)
-		local wnet = self.section.wnets[sid]
-		local wdev = wnet:get_device()
-
-		if value ~= "1" then
-			wnet:set("disabled", nil)
-			wdev:set("disabled", nil)
-		else
-			wnet:set("disabled", "1")
-		end
-	end
-
-	o.remove = o.write
-
-
-	o = s:option(Value, "__delete__")
-
-	function o.write(self, sid, value)
-		local wnet = self.section.wnets[sid]
-		local nets = wnet:get_networks()
-
-		ntm:del_wifinet(wnet:id())
-
-		local _, net
-		for _, net in ipairs(nets) do
-			if net:is_empty() then
-				ntm:del_network(net:name())
-			end
-		end
-	end
-end
-
-s = m:section(NamedSection, "__assoclist__")
-
-function s.render(self, sid)
-	tpl.render_string([[
-		<h2><%:Associated Stations%></h2>
-		<%+wifi_assoclist%>
-	]])
-end
-
-return m
diff --git a/modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm b/modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm
deleted file mode 100644
index 9d4afd2b2..000000000
--- a/modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm
+++ /dev/null
@@ -1,53 +0,0 @@
-<div class="cbi-section-node">
-	<div class="table">
-		<%
-			for i, net in ipairs(self.netlist) do
-				local z = net[3]
-				local c = z and z:get_color() or "#EEEEEE"
-				local t = z and translate("Part of zone %q") % z:name() or translate("No zone assigned")
-				local disabled = (net[4]:get("auto") == "0")
-				local dynamic = net[4]:is_dynamic()
-		%>
-			<div class="tr cbi-rowstyle-<%=i % 2 + 1%>">
-				<div class="td col-3 center middle">
-					<div class="ifacebox">
-						<div class="ifacebox-head" style="background-color:<%=c%>" title="<%=pcdata(t)%>">
-							<strong><%=net[1]:upper()%></strong>
-						</div>
-						<div class="ifacebox-body" id="<%=net[1]%>-ifc-devices" data-network="<%=net[1]%>">
-							<img src="<%=resource%>/icons/ethernet_disabled.png" style="width:16px; height:16px" /><br />
-							<small>?</small>
-						</div>
-					</div>
-				</div>
-				<div class="td col-5 left middle" id="<%=net[1]%>-ifc-description">
-					<em><%:Collecting data...%></em>
-				</div>
-				<div class="td cbi-section-actions">
-					<div>
-						<input type="button" class="cbi-button cbi-button-neutral" onclick="iface_reconnect('<%=net[1]%>')" title="<%:Reconnect this interface%>" value="<%:Restart%>"<%=ifattr(disabled or dynamic, "disabled", "disabled")%> />
-
-						<% if disabled then %>
-							<input type="hidden" name="cbid.network.<%=net[1]%>.__disable__" value="1" />
-							<input type="submit" name="cbi.apply" class="cbi-button cbi-button-neutral" onclick="this.previousElementSibling.value='0'" title="<%:Reconnect this interface%>" value="<%:Connect%>"<%=ifattr(dynamic, "disabled", "disabled")%> />
-						<% else %>
-							<input type="hidden" name="cbid.network.<%=net[1]%>.__disable__" value="0" />
-							<input type="submit" name="cbi.apply" class="cbi-button cbi-button-neutral" onclick="this.previousElementSibling.value='1'" title="<%:Shutdown this interface%>" value="<%:Stop%>"<%=ifattr(dynamic, "disabled", "disabled")%> />
-						<% end %>
-
-						<input type="button" class="cbi-button cbi-button-action important" onclick="location.href='<%=url("admin/network/network", net[1])%>'" title="<%:Edit this interface%>" value="<%:Edit%>" id="<%=net[1]%>-ifc-edit"<%=ifattr(dynamic, "disabled", "disabled")%> />
-
-						<input type="hidden" name="cbid.network.<%=net[1]%>.__delete__" value="" />
-						<input type="submit" name="cbi.apply" class="cbi-button cbi-button-negative" onclick="iface_delete(event)" value="<%:Delete%>"<%=ifattr(dynamic, "disabled", "disabled")%> />
-					</div>
-				</div>
-			</div>
-		<% end %>
-	</div>
-</div>
-
-<div class="cbi-section-create">
-	<input type="button" class="cbi-button cbi-button-add" value="<%:Add new interface...%>" onclick="location.href='<%=url("admin/network/iface_add")%>'" />
-</div>
-
-<script type="text/javascript" src="<%=resource%>/view/network/network.js"></script>
diff --git a/modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm b/modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm
deleted file mode 100644
index 6e741b419..000000000
--- a/modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm
+++ /dev/null
@@ -1,62 +0,0 @@
-<script type="text/javascript">//<![CDATA[
-	var switches = [ '<%=table.concat(self.switches, "', '")%>' ],
-	    tables = document.querySelectorAll('.cbi-section-table');
-
-	function add_status_row(table) {
-		var first_row = table.querySelector('.cbi-section-table-row');
-		if (first_row.classList.contains('port-status'))
-			return first_row;
-
-		var status_row = first_row.parentNode.insertBefore(
-			E('div', { 'class': first_row.className }), first_row);
-
-		first_row.querySelectorAll('.td').forEach(function(td) {
-			status_row.appendChild(td.cloneNode(false));
-			status_row.lastElementChild.removeAttribute('data-title');
-		});
-
-		status_row.firstElementChild.innerHTML = '<%:Port status:%>';
-		status_row.classList.add('port-status')	;
-
-		return status_row;
-	}
-
-	XHR.poll(-1, '<%=url('admin/network/switch_status')%>/' + switches.join(','), null,
-		function(x, st)
-		{
-			for (var i = 0; i < switches.length; i++)
-			{
-				var ports = st[switches[i]];
-				var tr = add_status_row(tables[i]);
-
-				if (tr && ports && ports.length)
-				{
-					for (var j = 0; j < ports.length; j++)
-					{
-						var th = tr.querySelector('[data-name="%d"]'.format(j));
-
-						if (!th)
-							continue;
-
-						if (ports[j].link)
-						{
-							th.innerHTML = String.format(
-								'<small><img src="<%=resource%>/icons/port_up.png" />' +
-								'<br />%d<%:baseT%><br />%s</small>',
-								ports[j].speed, ports[j].duplex
-									? '<%:full-duplex%>' : '<%:half-duplex%>'
-							);
-						}
-						else
-						{
-							th.innerHTML = String.format(
-								'<small><img src="<%=resource%>/icons/port_down.png" />' +
-								'<br /><%:no link%></small>'
-							);
-						}
-					}
-				}
-			}
-		}
-	);
-//]]></script>
diff --git a/modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm b/modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm
deleted file mode 100644
index 5a61ba099..000000000
--- a/modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm
+++ /dev/null
@@ -1,59 +0,0 @@
-<%#
- Copyright 2009-2015 Jo-Philipp Wich <jow@openwrt.org>
- Licensed to the public under the Apache License 2.0.
--%>
-
-<%-
-
-	local sys = require "luci.sys"
-	local utl = require "luci.util"
-
-	local dev = luci.http.formvalue("device")
-	local iw = luci.sys.wifi.getiwinfo(dev)
-
-	if not iw then
-		luci.http.redirect(luci.dispatcher.build_url("admin/network/wireless"))
-		return
-	end
--%>
-
-<%+header%>
-
-<h2 name="content"><%:Join Network: Wireless Scan%></h2>
-
-<div class="cbi-map">
-	<div class="cbi-section">
-		<div class="table"<%=attr("data-wifi-scan", dev) .. attr("data-wifi-type", iw.type)%>>
-			<div class="tr table-titles">
-				<div class="th col-2 middle center"><%:Signal%></div>
-				<div class="th col-4 middle left"><%:SSID%></div>
-				<div class="th col-2 middle center hide-xs"><%:Channel%></div>
-				<div class="th col-2 middle left hide-xs"><%:Mode%></div>
-				<div class="th col-3 middle left hide-xs"><%:BSSID%></div>
-				<div class="th col-3 middle left"><%:Encryption%></div>
-				<div class="th cbi-section-actions">&#160;</div>
-			</div>
-
-			<div class="tr placeholder">
-				<div class="td">
-					<img src="<%=resource%>/icons/loading.gif" class="middle" />
-					<em><%:Collecting data...%></em>
-				</div>
-			</div>
-		</div>
-	</div>
-</div>
-<div class="cbi-page-actions right">
-	<form class="inline" action="<%=url("admin/network/wireless")%>" method="get">
-		<input class="cbi-button cbi-button-neutral" type="submit" value="<%:Back to overview%>" />
-	</form>
-	<form class="inline" action="<%=url('admin/network/wireless_join')%>" method="post">
-		<input type="hidden" name="token" value="<%=token%>" />
-		<input type="hidden" name="device" value="<%=utl.pcdata(dev)%>" />
-		<input type="button" class="cbi-button cbi-button-action" value="<%:Repeat scan%>" onclick="flush()" />
-	</form>
-</div>
-
-<script type="text/javascript" src="<%=resource%>/view/network/wifi_join.js"></script>
-
-<%+footer%>
diff --git a/modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm b/modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm
deleted file mode 100644
index 89bb404fd..000000000
--- a/modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm
+++ /dev/null
@@ -1,61 +0,0 @@
-<div class="cbi-section-node">
-	<div class="table">
-		<!-- physical device -->
-		<div class="tr cbi-rowstyle-2">
-			<div class="td col-2 center middle">
-				<span class="ifacebadge"><img src="<%=resource%>/icons/wifi_disabled.png" id="<%=self.dev:name()%>-iw-upstate" /> <%=self.dev:name()%></span>
-			</div>
-			<div class="td col-7 left middle">
-				<big><strong><%=self.hw%></strong></big><br />
-				<span id="<%=self.dev:name()%>-iw-devinfo"></span>
-			</div>
-			<div class="td middle cbi-section-actions">
-				<div>
-					<input type="button" class="cbi-button cbi-button-neutral" title="<%:Restart radio interface%>" value="<%:Restart%>" data-radio="<%=self.dev:name()%>" onclick="wifi_restart(event)" />
-					<input type="button" class="cbi-button cbi-button-action important" title="<%:Find and join network%>" value="<%:Scan%>" onclick="cbi_submit(this, 'device', '<%=self.dev:name()%>', '<%=url('admin/network/wireless_join')%>')" />
-					<input type="button" class="cbi-button cbi-button-add" title="<%:Provide new network%>" value="<%:Add%>" onclick="cbi_submit(this, 'device', '<%=self.dev:name()%>', '<%=url('admin/network/wireless_add')%>')" />
-				</div>
-			</div>
-		</div>
-		<!-- /physical device -->
-
-		<!-- network list -->
-		<% if #self.wnets > 0 then %>
-			<% for i, net in ipairs(self.wnets) do local disabled = (self.dev:get("disabled") == "1" or net:get("disabled") == "1") %>
-			<div class="tr cbi-rowstyle-<%=1 + ((i-1) % 2)%>">
-				<div class="td col-2 center middle" id="<%=net:id()%>-iw-signal">
-					<span class="ifacebadge" title="<%:Not associated%>"><img src="<%=resource%>/icons/signal-<%= disabled and "none" or "0" %>.png" /> 0%</span>
-				</div>
-				<div class="td col-7 left middle" id="<%=net:id()%>-iw-status" data-network="<%=net:id()%>" data-disabled="<%= disabled and "true" or "false" %>">
-					<em><%= disabled and translate("Wireless is disabled") or translate("Collecting data...") %></em>
-				</div>
-				<div class="td middle cbi-section-actions">
-					<div>
-						<% if disabled then %>
-							<input name="cbid.wireless.<%=net:name()%>.__disable__" type="hidden" value="1" />
-							<input name="cbi.apply" type="submit" class="cbi-button cbi-button-neutral" title="<%:Enable this network%>" value="<%:Enable%>" onclick="this.previousElementSibling.value='0'" />
-						<% else %>
-							<input name="cbid.wireless.<%=net:name()%>.__disable__" type="hidden" value="0" />
-							<input name="cbi.apply" type="submit" class="cbi-button cbi-button-neutral" title="<%:Disable this network%>" value="<%:Disable%>" onclick="this.previousElementSibling.value='1'" />
-						<% end %>
-
-						<input type="button" class="cbi-button cbi-button-action important" onclick="location.href='<%=net:adminlink()%>'" title="<%:Edit this network%>" value="<%:Edit%>" />
-
-						<input name="cbid.wireless.<%=net:name()%>.__delete__" type="hidden" value="" />
-						<input name="cbi.apply" type="submit" class="cbi-button cbi-button-negative" title="<%:Delete this network%>" value="<%:Remove%>" onclick="wifi_delete(event)" />
-					</div>
-				</div>
-			</div>
-			<% end %>
-		<% else %>
-			<div class="tr placeholder">
-				<div class="td">
-					<em><%:No network configured on this device%></em>
-				</div>
-			</div>
-		<% end %>
-		<!-- /network list -->
-	</div>
-</div>
-
-<script type="text/javascript" src="<%=resource%>/view/network/wireless.js"></script>
diff --git a/modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm b/modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm
deleted file mode 100644
index 93ae2f51f..000000000
--- a/modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm
+++ /dev/null
@@ -1,14 +0,0 @@
-<%+cbi/valueheader%>
-
-<span class="ifacebadge large"<%=attr("data-wifi-status", self.ifname)%>>
-	<small>
-		<img src="<%=resource%>/icons/signal-none.png" title="<%:Not associated%>" />&#160;
-	</small>
-	<span>
-		<em class="spinning"><%:Collecting data...%></em>
-	</span>
-</span>
-
-<script type="text/javascript" src="<%=resource%>/view/network/wifi_status.js"></script>
-
-<%+cbi/valuefooter%>
diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js
index edf7489d4..04a1ab5bd 100644
--- a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js
+++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js
@@ -125,7 +125,7 @@ L.poll(5, L.location(), { status: 1 },
 				_('Signal Attenuation (SATN)'), '%.1f dB / %.1f dB'.format(info.dsl.signal_attenuation_down, info.dsl.signal_attenuation_up),
 				_('Noise Margin (SNR)'), '%.1f dB / %.1f dB'.format(info.dsl.noise_margin_down, info.dsl.noise_margin_up),
 				_('Aggregate Transmit Power(ACTATP)'), '%.1f dB / %.1f dB'.format(info.dsl.actatp_down, info.dsl.actatp_up),
-				_('Forward Error Correction Seconds (FECS)'), '%d / %d'.format(info.dsl.errors_fec_near, info.dsl.errors_fec_far),
+				_('Forward Error Correction Seconds (FECS)'), '%d / %d'.format(info.dsl.errors_fecs_near, info.dsl.errors_fecs_far),
 				_('Errored seconds (ES)'), '%d / %d'.format(info.dsl.errors_es_near, info.dsl.errors_es_far),
 				_('Severely Errored Seconds (SES)'), '%d / %d'.format(info.dsl.errors_ses_near, info.dsl.errors_ses_far),
 				_('Loss of Signal Seconds (LOSS)'), '%d / %d'.format(info.dsl.errors_loss_near, info.dsl.errors_loss_far),
diff --git a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js
new file mode 100644
index 000000000..286155790
--- /dev/null
+++ b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/crontab.js
@@ -0,0 +1,49 @@
+'use strict';
+'require rpc';
+
+return L.view.extend({
+	callFileRead: rpc.declare({
+		object: 'file',
+		method: 'read',
+		params: [ 'path' ],
+		expect: { data: '' }
+	}),
+
+	callFileWrite: rpc.declare({
+		object: 'file',
+		method: 'write',
+		params: [ 'path', 'data' ]
+	}),
+
+	load: function() {
+		return this.callFileRead('/etc/crontabs/root');
+	},
+
+	handleSave: function(ev) {
+		var value = (document.querySelector('textarea').value || '').trim().replace(/\r\n/g, '\n') + '\n';
+
+		return this.callFileWrite('/etc/crontabs/root', value).then(function(rc) {
+			if (rc != 0)
+				throw rpc.getStatusText(rc);
+
+			document.querySelector('textarea').value = value;
+			L.ui.addNotification(null, E('p', _('Contents have been saved.')), 'info');
+
+		}).catch(function(e) {
+			L.ui.addNotification(null, E('p', _('Unable to save contents: %s').format(e)));
+		});
+	},
+
+	render: function(crontab) {
+		return E([
+			E('h2', _('Scheduled Tasks')),
+			E('p', {},
+				_('This is the system crontab in which scheduled tasks can be defined.') +
+				_('<br/>Note: you need to manually restart the cron service if the crontab file was empty before editing.')),
+			E('p', {}, E('textarea', { 'style': 'width:100%', 'rows': 10 }, crontab != null ? crontab : ''))
+		]);
+	},
+
+	handleSaveApply: null,
+	handleReset: null
+});
diff --git a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js
new file mode 100644
index 000000000..7a8b1428d
--- /dev/null
+++ b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js
@@ -0,0 +1,42 @@
+'use strict';
+'require form';
+'require tools.widgets as widgets';
+
+return L.view.extend({
+	render: function() {
+		var m, s, o;
+
+		m = new form.Map('dropbear', _('SSH Access'), _('Dropbear offers <abbr title="Secure Shell">SSH</abbr> network shell access and an integrated <abbr title="Secure Copy">SCP</abbr> server'));
+
+		s = m.section(form.TypedSection, 'dropbear', _('Dropbear Instance'));
+		s.anonymous = true;
+		s.addremove = true;
+		s.addbtntitle = _('Add instance');
+
+		o = s.option(widgets.NetworkSelect, 'Interface', _('Interface'), _('Listen only on the given interface or, if unspecified, on all'));
+		o.nocreate    = true;
+		o.unspecified = true;
+
+		o = s.option(form.Value, 'Port', _('Port'));
+		o.datatype    = 'port';
+		o.placeholder = 22;
+
+		o = s.option(form.Flag, 'PasswordAuth', _('Password authentication'), _('Allow <abbr title="Secure Shell">SSH</abbr> password authentication'));
+		o.enabled  = 'on';
+		o.disabled = 'off';
+		o.default  = o.enabled;
+		o.rmempty  = false;
+
+		o = s.option(form.Flag, 'RootPasswordAuth', _('Allow root logins with password'), _('Allow the <em>root</em> user to login with password'));
+		o.enabled  = 'on';
+		o.disabled = 'off';
+		o.default  = o.enabled;
+
+		o = s.option(form.Flag, 'GatewayPorts', _('Gateway Ports'), _('Allow remote hosts to connect to local SSH forwarded ports'));
+		o.enabled  = 'on';
+		o.disabled = 'off';
+		o.default  = o.disabled;
+
+		return m.render();
+	}
+});
diff --git a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js
index c1109b5d6..8a93aeb8c 100644
--- a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js
+++ b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js
@@ -2,51 +2,33 @@
 'require uci';
 'require rpc';
 'require form';
+'require tools.widgets as widgets';
 
-var callInitAction, callLeds, callUSB, callNetdevs;
-
-callInitAction = rpc.declare({
-	object: 'luci',
-	method: 'initCall',
-	params: [ 'name', 'action' ],
-	expect: { result: false }
-});
+var callLeds, callUSB;
 
 callLeds = rpc.declare({
 	object: 'luci',
-	method: 'leds'
+	method: 'getLEDs',
+	expect: { '': {} }
 });
 
 callUSB = rpc.declare({
 	object: 'luci',
-	method: 'usb'
-});
-
-callNetdevs = rpc.declare({
-	object: 'luci',
-	method: 'ifaddrs',
-	expect: { result: [] },
-	filter: function(res) {
-		var devs = {};
-		for (var i = 0; i < res.length; i++)
-			devs[res[i].name] = true;
-		return Object.keys(devs).sort();
-	}
+	method: 'getUSBDevices',
+	expect: { '': {} }
 });
 
 return L.view.extend({
 	load: function() {
 		return Promise.all([
 			callLeds(),
-			callUSB(),
-			callNetdevs()
+			callUSB()
 		]);
 	},
 
 	render: function(results) {
 		var leds = results[0],
 		    usb = results[1],
-		    netdevs = results[2],
 		    triggers = {},
 		    trigger, m, s, o;
 
@@ -58,9 +40,11 @@ return L.view.extend({
 			_('<abbr title="Light Emitting Diode">LED</abbr> Configuration'),
 			_('Customizes the behaviour of the device <abbr title="Light Emitting Diode">LED</abbr>s if possible.'));
 
-		s = m.section(form.TypedSection, 'led', '');
+		s = m.section(form.GridSection, 'led', '');
 		s.anonymous = true;
 		s.addremove = true;
+		s.sortable = true;
+		s.addbtntitle = _('Add LED action');
 
 		s.option(form.Value, 'name', _('Name'));
 
@@ -71,32 +55,35 @@ return L.view.extend({
 		o.rmempty = false;
 
 		trigger = s.option(form.ListValue, 'trigger', _('Trigger'));
-		Object.keys(triggers).sort().forEach(function(t) { trigger.value(t, t.replace(/-/g, '')) });
 		if (usb.devices && usb.devices.length)
-			trigger.value('usbdev');
+			triggers['usbdev'] = true;
 		if (usb.ports && usb.ports.length)
-			trigger.value('usbport');
+			triggers['usbport'] = true;
+		Object.keys(triggers).sort().forEach(function(t) { trigger.value(t, t.replace(/-/g, '')) });
 
 		o = s.option(form.Value, 'delayon', _('On-State Delay'));
+		o.modalonly = true;
 		o.depends('trigger', 'timer');
 
 		o = s.option(form.Value, 'delayoff', _('Off-State Delay'));
+		o.modalonly = true;
 		o.depends('trigger', 'timer');
 
-		o = s.option(form.ListValue, '_net_dev', _('Device'));
+		o = s.option(widgets.DeviceSelect, '_net_dev', _('Device'));
 		o.rmempty = true;
 		o.ucioption = 'dev';
+		o.modalonly = true;
+		o.noaliases = true;
 		o.depends('trigger', 'netdev');
 		o.remove = function(section_id) {
 			var t = trigger.formvalue(section_id);
 			if (t != 'netdev' && t != 'usbdev')
 				uci.unset('system', section_id, 'dev');
 		};
-		o.value('');
-		netdevs.sort().forEach(function(dev) { o.value(dev) });
 
 		o = s.option(form.MultiValue, 'mode', _('Trigger Mode'));
 		o.rmempty = true;
+		o.modalonly = true;
 		o.depends('trigger', 'netdev');
 		o.value('link', _('Link On'));
 		o.value('tx', _('Transmit'));
@@ -107,6 +94,7 @@ return L.view.extend({
 			o.depends('trigger', 'usbdev');
 			o.rmempty = true;
 			o.ucioption = 'dev';
+			o.modalonly = true;
 			o.remove = function(section_id) {
 				var t = trigger.formvalue(section_id);
 				if (t != 'netdev' && t != 'usbdev')
@@ -122,6 +110,7 @@ return L.view.extend({
 			o = s.option(form.MultiValue, 'port', _('USB Ports'));
 			o.depends('trigger', 'usbport');
 			o.rmempty = true;
+			o.modalonly = true;
 			o.cfgvalue = function(section_id) {
 				var ports = [],
 				    value = uci.get('system', section_id, 'port');
@@ -130,20 +119,28 @@ return L.view.extend({
 					value = String(value || '').split(/\s+/);
 
 				for (var i = 0; i < value.length; i++)
-					if (value[i].match(/^usb(\d+)-port(\d+)$/))
-						ports.push(value[i]);
-					else if (value[i].match(/^(\d+)-(\d+)$/))
+					if (value[i].match(/^(\d+)-(\d+)$/))
 						ports.push('usb%d-port%d'.format(Regexp.$1, Regexp.$2));
+					else
+						ports.push(value[i]);
 
 				return ports;
 			};
 			usb.ports.forEach(function(usbport) {
-				o.value('usb%d-port%d'.format(usbport.hub, usbport.port),
-				        'Hub %d, Port %d'.format(usbport.hub, usbport.port));
+				var dev = (usbport.device && Array.isArray(usb.devices))
+					? usb.devices.filter(function(d) { return d.id == usbport.device })[0] : null;
+
+				var label = _('Port %s').format(usbport.port);
+
+				if (dev)
+					label += ' (%s - %s)'.format(dev.vendor || '?', dev.product || '?');
+
+				o.value(usbport.port, label);
 			});
 		}
 
 		o = s.option(form.Value, 'port_mask', _('Switch Port Mask'));
+		o.modalonly = true;
 		o.depends('trigger', 'switch0');
 		o.depends('trigger', 'switch1');
 
diff --git a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js
new file mode 100644
index 000000000..301ebab33
--- /dev/null
+++ b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js
@@ -0,0 +1,432 @@
+'use strict';
+'require uci';
+'require rpc';
+'require form';
+
+var callBlockDevices, callMountPoints, callBlockDetect, callUmount,
+    callFileRead, callFileStat, callFileExec;
+
+callBlockDevices = rpc.declare({
+	object: 'luci',
+	method: 'getBlockDevices',
+	expect: { '': {} }
+});
+
+callMountPoints = rpc.declare({
+	object: 'luci',
+	method: 'getMountPoints',
+	expect: { result: [] }
+});
+
+callBlockDetect = rpc.declare({
+	object: 'luci',
+	method: 'setBlockDetect',
+	expect: { result: false }
+});
+
+callUmount = rpc.declare({
+	object: 'luci',
+	method: 'setUmount',
+	params: [ 'path' ],
+	expect: { result: false }
+});
+
+callFileRead = rpc.declare({
+	object: 'file',
+	method: 'read',
+	params: [ 'path' ],
+	expect: { data: '' },
+	filter: function(s) {
+		return (s || '').split(/\n/).filter(function(ln) {
+			return ln.match(/\S/) && !ln.match(/^nodev\t/);
+		}).map(function(ln) {
+			return ln.trim();
+		});
+	}
+});
+
+callFileStat = rpc.declare({
+	object: 'file',
+	method: 'stat',
+	params: [ 'path' ],
+	expect: { '': {} },
+	filter: function(st) {
+		return (L.isObject(st) && st.path != null);
+	}
+});
+
+callFileExec = rpc.declare({
+	object: 'file',
+	method: 'exec',
+	params: [ 'command', 'params' ],
+	expect: { code: 255 }
+});
+
+function device_textvalue(devices, section_id) {
+	var v = (uci.get('fstab', section_id, 'uuid') || '').toLowerCase(),
+	    e = Object.keys(devices).filter(function(dev) { return (devices[dev].uuid || '-').toLowerCase() == v })[0];
+
+	if (v) {
+		this.section.devices[section_id] = devices[e];
+
+		if (e && devices[e].size)
+			return E('span', 'UUID: %h (%s, %1024.2mB)'.format(v, devices[e].dev, devices[e].size));
+		else if (e)
+			return E('span', 'UUID: %h (%s)'.format(v, devices[e].dev));
+		else
+			return E('span', 'UUID: %h (<em>%s</em>)'.format(v, _('not present')));
+	}
+
+	v = uci.get('fstab', section_id, 'label');
+	e = Object.keys(devices).filter(function(dev) { return devices[dev].label == v })[0];
+
+	if (v) {
+		this.section.devices[section_id] = this.section.devices[section_id] || devices[e];
+
+		if (e && devices[e].size)
+			return E('span', 'Label: %h (%s, %1024.2mB)'.format(v, devices[e].dev, devices[e].size));
+		else if (e)
+			return E('span', 'Label: %h (%s)'.format(v, devices[e].dev));
+		else
+			return E('span', 'Label: %h (<em>%s</em>)'.format(v, _('not present')));
+	}
+
+	v = uci.get('fstab', section_id, 'device');
+	e = Object.keys(devices).filter(function(dev) { return devices[dev].dev == v })[0];
+
+	if (v) {
+		this.section.devices[section_id] = this.section.devices[section_id] || devices[e];
+
+		if (e && devices[e].size)
+			return E('span', '%h (%1024.2mB)'.format(v, devices[e].size));
+		else if (e)
+			return E('span', '%h'.format(v));
+		else
+			return E('span', '%h (<em>%s</em>)'.format(v, _('not present')));
+	}
+}
+
+return L.view.extend({
+	handleDetect: function(m, ev) {
+		return callBlockDetect()
+			.then(L.bind(uci.unload, uci, 'fstab'))
+			.then(L.bind(m.render, m));
+	},
+
+	handleMountAll: function(m, ev) {
+		return callFileExec('/sbin/block', ['mount'])
+			.then(function(rc) {
+				if (rc != 0)
+					L.ui.addNotification(null, E('p', _('The <em>block mount</em> command failed with code %d').format(rc)));
+			})
+			.then(L.bind(uci.unload, uci, 'fstab'))
+			.then(L.bind(m.render, m));
+	},
+
+	handleUmount: function(m, path, ev) {
+		return callUmount(path)
+			.then(L.bind(uci.unload, uci, 'fstab'))
+			.then(L.bind(m.render, m));
+	},
+
+	load: function() {
+		return Promise.all([
+			callBlockDevices(),
+			callFileRead('/proc/filesystems'),
+			callFileRead('/etc/filesystems'),
+			callFileStat('/usr/sbin/e2fsck'),
+			callFileStat('/usr/sbin/fsck.f2fs'),
+			callFileStat('/usr/sbin/dosfsck'),
+			callFileStat('/usr/bin/btrfsck'),
+			uci.load('fstab')
+		]);
+	},
+
+	render: function(results) {
+		var devices = results[0],
+		    procfs = results[1],
+		    etcfs = results[2],
+		    triggers = {},
+		    trigger, m, s, o;
+
+		var filesystems = procfs.concat(etcfs.filter(function(fs) {
+			return procfs.indexOf(fs) < 0;
+		})).sort();
+
+		var fsck = {
+			ext2: results[3],
+			ext3: results[3],
+			ext4: results[3],
+			f2fs: results[4],
+			vfat: results[5],
+			btrfs: results[6]
+		};
+
+		if (!uci.sections('fstab', 'global').length)
+			uci.add('fstab', 'global');
+
+		m = new form.Map('fstab', _('Mount Points'));
+
+		s = m.section(form.TypedSection, 'global', _('Global Settings'));
+		s.addremove = false;
+		s.anonymous = true;
+
+		o = s.option(form.Button, '_detect', _('Generate Config'), _('Find all currently attached filesystems and swap and replace configuration with defaults based on what was detected'));
+		o.onclick = this.handleDetect.bind(this, m);
+		o.inputstyle = 'reload';
+
+		o = s.option(form.Button, '_mountall', _('Mount attached devices'), _('Attempt to enable configured mount points for attached devices'));
+		o.onclick = this.handleMountAll.bind(this, m);
+		o.inputstyle = 'reload';
+
+		o = s.option(form.Flag, 'anon_swap', _('Anonymous Swap'), _('Mount swap not specifically configured'));
+		o.default = o.disabled;
+		o.rmempty = false;
+
+		o = s.option(form.Flag, 'anon_mount', _('Anonymous Mount'), _('Mount filesystems not specifically configured'));
+		o.default = o.disabled;
+		o.rmempty = false;
+
+		o = s.option(form.Flag, 'auto_swap', _('Automount Swap'), _('Automatically mount swap on hotplug'));
+		o.default = o.enabled;
+		o.rmempty = false;
+
+		o = s.option(form.Flag, 'auto_mount', _('Automount Filesystem'), _('Automatically mount filesystems on hotplug'));
+		o.default = o.enabled;
+		o.rmempty = false;
+
+		o = s.option(form.Flag, 'check_fs', _('Check filesystems before mount'), _('Automatically check filesystem for errors before mounting'));
+		o.default = o.disabled;
+		o.rmempty = false;
+
+
+		// Mount status table
+		o = s.option(form.DummyValue, '_mtab');
+
+		o.load = function(section_id) {
+			return callMountPoints().then(L.bind(function(mounts) {
+				this.mounts = mounts;
+			}, this));
+		};
+
+		o.render = L.bind(function(view, section_id) {
+			var table = E('div', { 'class': 'table' }, [
+				E('div', { 'class': 'tr table-titles' }, [
+					E('div', { 'class': 'th' }, _('Filesystem')),
+					E('div', { 'class': 'th' }, _('Mount Point')),
+					E('div', { 'class': 'th center' }, _('Available')),
+					E('div', { 'class': 'th center' }, _('Used')),
+					E('div', { 'class': 'th' }, _('Unmount'))
+				])
+			]);
+
+			var rows = [];
+
+			for (var i = 0; i < this.mounts.length; i++) {
+				var used = this.mounts[i].size - this.mounts[i].free,
+				    umount = true;
+
+				if (/^\/(overlay|rom|tmp(?:\/.+)?|dev(?:\/.+)?|)$/.test(this.mounts[i].mount))
+					umount = false;
+
+				rows.push([
+					this.mounts[i].device,
+					this.mounts[i].mount,
+					'%1024.2mB / %1024.2mB'.format(this.mounts[i].avail, this.mounts[i].size),
+					'%.2f%% (%1024.2mB)'.format(100 / this.mounts[i].size * used, used),
+					umount ? E('button', {
+						'class': 'btn cbi-button-remove',
+						'click': L.ui.createHandlerFn(view, 'handleUmount', m, this.mounts[i].mount)
+					}, [ _('Unmount') ]) : '-'
+				]);
+			}
+
+			cbi_update_table(table, rows, E('em', _('Unable to obtain mount information')));
+
+			return E([], [ E('h3', _('Mounted file systems')), table ]);
+		}, o, this);
+
+
+		// Mounts
+		s = m.section(form.GridSection, 'mount', _('Mount Points'), _('Mount Points define at which point a memory device will be attached to the filesystem'));
+		s.modaltitle = _('Mount Points - Mount Entry');
+		s.anonymous = true;
+		s.addremove = true;
+		s.sortable  = true;
+		s.devices   = {};
+
+		s.renderHeaderRows = function(/* ... */) {
+			var trEls = form.GridSection.prototype.renderHeaderRows.apply(this, arguments);
+			return trEls.childNodes[0];
+		}
+
+		s.tab('general', _('General Settings'));
+		s.tab('advanced', _('Advanced Settings'));
+
+		o = s.taboption('general', form.Flag, 'enabled', _('Enabled'));
+		o.rmempty  = false;
+		o.editable = true;
+
+		o = s.taboption('general', form.DummyValue, '_device', _('Device'));
+		o.rawhtml   = true;
+		o.modalonly = false;
+		o.write = function() {};
+		o.remove = function() {};
+		o.textvalue = device_textvalue.bind(o, devices);
+
+		o = s.taboption('general', form.Value, 'uuid', _('UUID'), _('If specified, mount the device by its UUID instead of a fixed device node'));
+		o.modalonly = true;
+		o.value('', _('-- match by uuid --'));
+
+		var devs = Object.keys(devices).sort();
+		for (var i = 0; i < devs.length; i++) {
+			var dev = devices[devs[i]];
+			if (dev.uuid && dev.size)
+				o.value(dev.uuid, '%s (%s, %1024.2mB)'.format(dev.uuid, dev.dev, dev.size));
+			else if (dev.uuid)
+				o.value(dev.uuid, '%s (%s)'.format(dev.uuid, dev.dev));
+		}
+
+		o = s.taboption('general', form.Value, 'label', _('Label'), _('If specified, mount the device by the partition label instead of a fixed device node'));
+		o.modalonly = true;
+		o.depends('uuid', '');
+		o.value('', _('-- match by label --'));
+
+		for (var i = 0; i < devs.length; i++) {
+			var dev = devices[devs[i]];
+			if (dev.label && dev.size)
+				o.value(dev.label, '%s (%s, %1024.2mB)'.format(dev.label, dev.dev, dev.size));
+			else if (dev.label)
+				o.value(dev.label, '%s (%s)'.format(dev.label, dev.dev));
+		}
+
+		o = s.taboption('general', form.Value, 'device', _('Device'), _('The device file of the memory or partition (<abbr title="for example">e.g.</abbr> <code>/dev/sda1</code>)'));
+		o.modalonly = true;
+		o.depends({ uuid: '', label: '' });
+
+		for (var i = 0; i < devs.length; i++) {
+			var dev = devices[devs[i]];
+			if (dev.size)
+				o.value(dev.dev, '%s (%1024.2mB)'.format(dev.dev, dev.size));
+			else
+				o.value(dev.dev);
+		}
+
+		o = s.taboption('general', form.Value, 'target', _('Mount point'), _('Specifies the directory the device is attached to'));
+		o.value('/', _('Use as root filesystem (/)'));
+		o.value('/overlay', _('Use as external overlay (/overlay)'));
+		o.rmempty = false;
+
+		o = s.taboption('general', form.DummyValue, '__notice', _('Root preparation'));
+		o.depends('target', '/');
+		o.modalonly = true;
+		o.rawhtml = true;
+		o.default = '' +
+			'<p>%s</p>'.format(_('Make sure to clone the root filesystem using something like the commands below:')) +
+			'<pre>' +
+				'mkdir -p /tmp/introot\n' +
+				'mkdir -p /tmp/extroot\n' +
+				'mount --bind / /tmp/introot\n' +
+				'mount /dev/sda1 /tmp/extroot\n' +
+				'tar -C /tmp/introot -cvf - . | tar -C /tmp/extroot -xf -\n' +
+				'umount /tmp/introot\n' +
+				'umount /tmp/extroot\n' +
+			'</pre>'
+		;
+
+		o = s.taboption('advanced', form.ListValue, 'fstype', _('Filesystem'));
+
+		o.textvalue = function(section_id) {
+			var dev = this.section.devices[section_id],
+			    text = this.cfgvalue(section_id) || 'auto';
+
+			if (dev && dev.type && dev.type != text)
+				text += ' (%s)'.format(dev.type);
+
+			return text;
+		};
+
+		o.value('', 'auto');
+
+		for (var i = 0; i < filesystems.length; i++)
+			o.value(filesystems[i]);
+
+		o = s.taboption('advanced', form.Value, 'options', _('Mount options'), _('See "mount" manpage for details'));
+		o.textvalue = function(section_id) { return this.cfgvalue(section_id) || 'defaults' };
+		o.placeholder = 'defaults';
+
+		s.taboption('advanced', form.Flag, 'enabled_fsck', _('Run filesystem check'), _('Run a filesystem check before mounting the device'));
+
+
+		// Swaps
+		s = m.section(form.GridSection, 'swap', _('SWAP'), _('If your physical memory is insufficient unused data can be temporarily swapped to a swap-device resulting in a higher amount of usable <abbr title="Random Access Memory">RAM</abbr>. Be aware that swapping data is a very slow process as the swap-device cannot be accessed with the high datarates of the <abbr title="Random Access Memory">RAM</abbr>.'));
+		s.modaltitle = _('Mount Points - Swap Entry');
+		s.anonymous = true;
+		s.addremove = true;
+		s.sortable  = true;
+		s.devices   = {};
+
+		s.renderHeaderRows = function(/* ... */) {
+			var trEls = form.GridSection.prototype.renderHeaderRows.apply(this, arguments);
+			trEls.childNodes[0].childNodes[1].style.width = '90%';
+			return trEls.childNodes[0];
+		}
+
+		o = s.option(form.Flag, 'enabled', _('Enabled'));
+		o.rmempty  = false;
+		o.editable = true;
+
+		o = s.option(form.DummyValue, '_device', _('Device'));
+		o.modalonly = false;
+		o.textvalue = device_textvalue.bind(o, devices);
+
+		o = s.option(form.Value, 'uuid', _('UUID'), _('If specified, mount the device by its UUID instead of a fixed device node'));
+		o.modalonly = true;
+		o.value('', _('-- match by uuid --'));
+
+		var devs = Object.keys(devices).sort();
+		for (var i = 0; i < devs.length; i++) {
+			var dev = devices[devs[i]];
+			if (dev.dev.match(/^\/dev\/(mtdblock|ubi|ubiblock)\d/))
+				continue;
+
+			if (dev.uuid && dev.size)
+				o.value(dev.uuid, '%s (%s, %1024.2mB)'.format(dev.uuid, dev.dev, dev.size));
+			else if (dev.uuid)
+				o.value(dev.uuid, '%s (%s)'.format(dev.uuid, dev.dev));
+		}
+
+		o = s.option(form.Value, 'label', _('Label'), _('If specified, mount the device by the partition label instead of a fixed device node'));
+		o.modalonly = true;
+		o.depends('uuid', '');
+		o.value('', _('-- match by label --'));
+
+		for (var i = 0; i < devs.length; i++) {
+			var dev = devices[devs[i]];
+			if (dev.dev.match(/^\/dev\/(mtdblock|ubi|ubiblock)\d/))
+				continue;
+
+			if (dev.label && dev.size)
+				o.value(dev.label, '%s (%s, %1024.2mB)'.format(dev.label, dev.dev, dev.size));
+			else if (dev.label)
+				o.value(dev.label, '%s (%s)'.format(dev.label, dev.dev));
+		}
+
+		o = s.option(form.Value, 'device', _('Device'), _('The device file of the memory or partition (<abbr title="for example">e.g.</abbr> <code>/dev/sda1</code>)'));
+		o.modalonly = true;
+		o.depends({ uuid: '', label: '' });
+
+		for (var i = 0; i < devs.length; i++) {
+			var dev = devices[devs[i]];
+			if (dev.dev.match(/^\/dev\/(mtdblock|ubi|ubiblock)\d/))
+				continue;
+
+			if (dev.size)
+				o.value(dev.dev, '%s (%1024.2mB)'.format(dev.dev, dev.size));
+			else
+				o.value(dev.dev);
+		}
+
+		return m.render();
+	}
+});
diff --git a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js
index 7a79d7e2d..6c5ffa1b2 100644
--- a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js
+++ b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js
@@ -1,31 +1,94 @@
-function submitPassword(ev) {
-	var pw1 = document.body.querySelector('[name="pw1"]'),
-	    pw2 = document.body.querySelector('[name="pw2"]');
-
-	if (!pw1.value.length || !pw2.value.length)
-		return;
-
-	if (pw1.value === pw2.value) {
-		L.showModal(_('Change login password'),
-			E('p', { class: 'spinning' }, _('Changing password…')));
-
-		L.post('admin/system/admin/password/json', { password: pw1.value },
-			function() {
-				showModal(_('Change login password'), [
-					E('div', _('The system password has been successfully changed.')),
-					E('div', { 'class': 'right' },
-						E('div', { class: 'btn', click: L.hideModal }, _('Dismiss')))
-				]);
-
-				pw1.value = pw2.value = '';
-			});
-	}
-	else {
-		L.showModal(_('Change login password'), [
-			E('div', { class: 'alert-message warning' },
-				_('Given password confirmation did not match, password not changed!')),
-			E('div', { 'class': 'right' },
-				E('div', { class: 'btn', click: L.hideModal }, _('Dismiss')))
-		]);
+'use strict';
+'require form';
+'require rpc';
+
+var formData = {
+	password: {
+		pw1: null,
+		pw2: null
 	}
-}
+};
+
+var callSetPassword = rpc.declare({
+	object: 'luci',
+	method: 'setPassword',
+	params: [ 'username', 'password' ],
+	expect: { result: false }
+});
+
+return L.view.extend({
+	checkPassword: function(section_id, value) {
+		var strength = document.querySelector('.cbi-value-description'),
+		    strongRegex = new RegExp("^(?=.{8,})(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])(?=.*\\W).*$", "g"),
+		    mediumRegex = new RegExp("^(?=.{7,})(((?=.*[A-Z])(?=.*[a-z]))|((?=.*[A-Z])(?=.*[0-9]))|((?=.*[a-z])(?=.*[0-9]))).*$", "g"),
+		    enoughRegex = new RegExp("(?=.{6,}).*", "g");
+
+		if (strength && value.length) {
+			if (false == enoughRegex.test(value))
+				strength.innerHTML = '%s: <span style="color:red">%s</span>'.format(_('Password strength'), _('More Characters'));
+			else if (strongRegex.test(value))
+				strength.innerHTML = '%s: <span style="color:green">%s</span>'.format(_('Password strength'), _('Strong'));
+			else if (mediumRegex.test(value))
+				strength.innerHTML = '%s: <span style="color:orange">%s</span>'.format(_('Password strength'), _('Medium'));
+			else
+				strength.innerHTML = '%s: <span style="color:red">%s</span>'.format(_('Password strength'), _('Weak'));
+		}
+
+		return true;
+	},
+
+	render: function() {
+		var m, s, o;
+
+		m = new form.JSONMap(formData, _('Router Password'), _('Changes the administrator password for accessing the device'));
+		s = m.section(form.NamedSection, 'password', 'password');
+
+		o = s.option(form.Value, 'pw1', _('Password'));
+		o.password = true;
+		o.validate = this.checkPassword;
+
+		o = s.option(form.Value, 'pw2', _('Confirmation'), ' ');
+		o.password = true;
+		o.renderWidget = function(/* ... */) {
+			var node = form.Value.prototype.renderWidget.apply(this, arguments);
+
+			node.childNodes[1].addEventListener('keydown', function(ev) {
+				if (ev.keyCode == 13 && !ev.currentTarget.classList.contains('cbi-input-invalid'))
+					document.querySelector('.cbi-button-save').click();
+			});
+
+			return node;
+		};
+
+		return m.render();
+	},
+
+	handleSave: function() {
+		var map = document.querySelector('.cbi-map');
+
+		return L.dom.callClassMethod(map, 'save').then(function() {
+			if (formData.password.pw1 == null || formData.password.pw1.length == 0)
+				return;
+
+			if (formData.password.pw1 != formData.password.pw2) {
+				L.ui.addNotification(null, E('p', _('Given password confirmation did not match, password not changed!')), 'danger');
+				return;
+			}
+
+			return callSetPassword('root', formData.password.pw1).then(function(success) {
+				if (success)
+					L.ui.addNotification(null, E('p', _('The system password has been successfully changed.')), 'info');
+				else
+					L.ui.addNotification(null, E('p', _('Failed to change the system password.')), 'danger');
+
+				formData.password.pw1 = null;
+				formData.password.pw2 = null;
+
+				L.dom.callClassMethod(map, 'render');
+			});
+		});
+	},
+
+	handleSaveApply: null,
+	handleReset: null
+});
diff --git a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js
index d298b3be9..a68cb6b0b 100644
--- a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js
+++ b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js
@@ -1,4 +1,7 @@
-SSHPubkeyDecoder.prototype = {
+'use strict';
+'require rpc';
+
+var SSHPubkeyDecoder = L.Class.singleton({
 	lengthDecode: function(s, off)
 	{
 		var l = (s.charCodeAt(off++) << 24) |
@@ -85,19 +88,29 @@ SSHPubkeyDecoder.prototype = {
 			return null;
 		}
 	}
-};
+});
 
-function SSHPubkeyDecoder() {}
+var callFileRead = rpc.declare({
+	object: 'file',
+	method: 'read',
+	params: [ 'path' ],
+	expect: { data: '' }
+});
+
+var callFileWrite = rpc.declare({
+	object: 'file',
+	method: 'write',
+	params: [ 'path', 'data' ]
+});
 
 function renderKeys(keys) {
-	var list = document.querySelector('.cbi-dynlist[name="sshkeys"]'),
-	    decoder = new SSHPubkeyDecoder();
+	var list = document.querySelector('.cbi-dynlist[name="sshkeys"]');
 
 	while (!matchesElem(list.firstElementChild, '.add-item'))
 		list.removeChild(list.firstElementChild);
 
 	keys.forEach(function(key) {
-		var pubkey = decoder.decode(key);
+		var pubkey = SSHPubkeyDecoder.decode(key);
 		if (pubkey)
 			list.insertBefore(E('div', {
 				class: 'item',
@@ -117,19 +130,16 @@ function renderKeys(keys) {
 }
 
 function saveKeys(keys) {
-	L.showModal(_('Add key'), E('div', { class: 'spinning' }, _('Saving keys…')));
-	L.post('admin/system/admin/sshkeys/json', { keys: JSON.stringify(keys) }, function(xhr, keys) {
-		renderKeys(keys);
-		L.hideModal();
-	});
+	return callFileWrite('/etc/dropbear/authorized_keys', keys.join('\n') + '\n')
+		.then(renderKeys.bind(this, keys))
+		.then(L.ui.hideModal);
 }
 
 function addKey(ev) {
-	var decoder = new SSHPubkeyDecoder(),
-	    list = findParent(ev.target, '.cbi-dynlist'),
+	var list = findParent(ev.target, '.cbi-dynlist'),
 	    input = list.querySelector('input[type="text"]'),
 	    key = input.value.trim(),
-	    pubkey = decoder.decode(key),
+	    pubkey = SSHPubkeyDecoder.decode(key),
 	    keys = [];
 
 	if (!key.length)
@@ -140,21 +150,26 @@ function addKey(ev) {
 	});
 
 	if (keys.indexOf(key) !== -1) {
-		L.showModal(_('Add key'), [
+		L.ui.showModal(_('Add key'), [
 			E('div', { class: 'alert-message warning' }, _('The given SSH public key has already been added.')),
 			E('div', { class: 'right' }, E('div', { class: 'btn', click: L.hideModal }, _('Close')))
 		]);
 	}
 	else if (!pubkey) {
-		L.showModal(_('Add key'), [
+		L.ui.showModal(_('Add key'), [
 			E('div', { class: 'alert-message warning' }, _('The given SSH public key is invalid. Please supply proper public RSA or ECDSA keys.')),
 			E('div', { class: 'right' }, E('div', { class: 'btn', click: L.hideModal }, _('Close')))
 		]);
 	}
 	else {
 		keys.push(key);
-		saveKeys(keys);
 		input.value = '';
+
+		return saveKeys(keys).then(function() {
+			var added = list.querySelector('[data-key="%s"]'.format(key));
+			if (added)
+				added.classList.add('flash');
+		});
 	}
 }
 
@@ -175,7 +190,7 @@ function removeKey(ev) {
 		E('div', { class: 'right' }, [
 			E('div', { class: 'btn', click: L.hideModal }, _('Cancel')),
 			' ',
-			E('div', { class: 'btn danger', click: function(ev) { saveKeys(keys) } }, _('Delete key')),
+			E('div', { class: 'btn danger', click: L.ui.createHandlerFn(this, saveKeys, keys) }, _('Delete key')),
 		])
 	]);
 }
@@ -205,11 +220,67 @@ function dropKey(ev) {
 	ev.preventDefault();
 }
 
-window.addEventListener('dragover', function(ev) { ev.preventDefault() });
-window.addEventListener('drop', function(ev) { ev.preventDefault() });
+function handleWindowDragDropIgnore(ev) {
+	ev.preventDefault()
+}
 
-requestAnimationFrame(function() {
-	L.get('admin/system/admin/sshkeys/json', null, function(xhr, keys) {
-		renderKeys(keys);
-	});
+return L.view.extend({
+	load: function() {
+		return callFileRead('/etc/dropbear/authorized_keys').then(function(data) {
+			return (data || '').split(/\n/).map(function(line) {
+				return line.trim();
+			}).filter(function(line) {
+				return line.match(/^ssh-/) != null;
+			});
+		});
+	},
+
+	render: function(keys) {
+		var list = E('div', { 'class': 'cbi-dynlist', 'dragover': dragKey, 'drop': dropKey }, [
+			E('div', { 'class': 'add-item' }, [
+				E('input', {
+					'class': 'cbi-input-text',
+					'type': 'text',
+					'placeholder': _('Paste or drag SSH key file…') ,
+					'keydown': function(ev) { if (ev.keyCode === 13) addKey(ev) }
+				}),
+				E('button', {
+					'class': 'cbi-button',
+					'click': L.ui.createHandlerFn(this, addKey)
+				}, _('Add key'))
+			])
+		]);
+
+		keys.forEach(L.bind(function(key) {
+			var pubkey = SSHPubkeyDecoder.decode(key);
+			if (pubkey)
+				list.insertBefore(E('div', {
+					class: 'item',
+					click: L.ui.createHandlerFn(this, removeKey),
+					'data-key': key
+				}, [
+					E('strong', pubkey.comment || _('Unnamed key')), E('br'),
+					E('small', [
+						'%s, %s'.format(pubkey.type, pubkey.curve || _('%d Bit').format(pubkey.bits)),
+						E('br'), E('code', pubkey.fprint)
+					])
+				]), list.lastElementChild);
+		}, this));
+
+		if (list.firstElementChild === list.lastElementChild)
+			list.insertBefore(E('p', _('No public keys present yet.')), list.lastElementChild);
+
+		window.addEventListener('dragover', handleWindowDragDropIgnore);
+		window.addEventListener('drop', handleWindowDragDropIgnore);
+
+		return E('div', {}, [
+			E('h2', _('SSH-Keys')),
+			E('div', { 'class': 'cbi-section-descr' }, _('Public keys allow for the passwordless SSH logins with a higher security compared to the use of plain passwords. In order to upload a new key to the device, paste an OpenSSH compatible public key line or drag a <code>.pub</code> file into the input field.')),
+			E('div', { 'class': 'cbi-section-node' }, list)
+		]);
+	},
+
+	handleSaveApply: null,
+	handleSave: null,
+	handleReset: null
 });
diff --git a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js
new file mode 100644
index 000000000..365e6c8ed
--- /dev/null
+++ b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/startup.js
@@ -0,0 +1,147 @@
+'use strict';
+'require rpc';
+
+return L.view.extend({
+	callInitList: rpc.declare({
+		object: 'luci',
+		method: 'getInitList',
+		expect: { '': {} }
+	}),
+
+	callInitAction: rpc.declare({
+		object: 'luci',
+		method: 'setInitAction',
+		params: [ 'name', 'action' ],
+		expect: { result: false }
+	}),
+
+	callFileRead: rpc.declare({
+		object: 'file',
+		method: 'read',
+		params: [ 'path' ],
+		expect: { data: '' }
+	}),
+
+	callFileWrite: rpc.declare({
+		object: 'file',
+		method: 'write',
+		params: [ 'path', 'data' ]
+	}),
+
+	load: function() {
+		return Promise.all([
+			this.callFileRead('/etc/rc.local'),
+			this.callInitList()
+		]);
+	},
+
+	handleAction: function(name, action, ev) {
+		return this.callInitAction(name, action).then(function(success) {
+			if (success != true)
+				throw _('Command failed');
+
+			return true;
+		}).catch(function(e) {
+			L.ui.addNotification(null, E('p', _('Failed to execute "/etc/init.d/%s %s" action: %s').format(name, action, e)));
+		});
+	},
+
+	handleEnableDisable: function(name, isEnabled, ev) {
+		return this.handleAction(name, isEnabled ? 'disable' : 'enable', ev).then(L.bind(function(name, isEnabled, cell) {
+			L.dom.content(cell, this.renderEnableDisable({
+				name: name,
+				enabled: isEnabled
+			}));
+		}, this, name, !isEnabled, ev.currentTarget.parentNode));
+	},
+
+	handleRcLocalSave: function(ev) {
+		var value = (document.querySelector('textarea').value || '').trim().replace(/\r\n/g, '\n') + '\n';
+
+		return this.callFileWrite('/etc/rc.local', value).then(function(rc) {
+			if (rc != 0)
+				throw rpc.getStatusText(rc);
+
+			document.querySelector('textarea').value = value;
+			L.ui.addNotification(null, E('p', _('Contents have been saved.')), 'info');
+		}).catch(function(e) {
+			L.ui.addNotification(null, E('p', _('Unable to save contents: %s').format(e)));
+		});
+	},
+
+	renderEnableDisable: function(init) {
+		return E('button', {
+			class: 'btn cbi-button-%s'.format(init.enabled ? 'positive' : 'negative'),
+			click: L.ui.createHandlerFn(this, 'handleEnableDisable', init.name, init.enabled)
+		}, init.enabled ? _('Enabled') : _('Disabled'));
+	},
+
+	render: function(data) {
+		var rcLocal = data[0],
+		    initList = data[1],
+		    rows = [], list = [];
+
+		var table = E('div', { 'class': 'table' }, [
+			E('div', { 'class': 'tr table-titles' }, [
+				E('div', { 'class': 'th' }, _('Start priority')),
+				E('div', { 'class': 'th' }, _('Initscript')),
+				E('div', { 'class': 'th' }, _('Enable/Disable')),
+				E('div', { 'class': 'th' }, _('Start')),
+				E('div', { 'class': 'th' }, _('Restart')),
+				E('div', { 'class': 'th' }, _('Stop'))
+			])
+		]);
+
+		for (var init in initList)
+			if (initList[init].index < 100)
+				list.push(Object.assign({ name: init }, initList[init]));
+
+		list.sort(function(a, b) {
+			if (a.index != b.index)
+				return a.index - b.index
+
+			return a.name > b.name;
+		});
+
+		for (var i = 0; i < list.length; i++) {
+			rows.push([
+				'%02d'.format(list[i].index),
+				list[i].name,
+				this.renderEnableDisable(list[i]),
+				E('button', { 'class': 'btn cbi-button-action', 'click': L.ui.createHandlerFn(this, 'handleAction', list[i].name, 'start') }, _('Start')),
+				E('button', { 'class': 'btn cbi-button-action', 'click': L.ui.createHandlerFn(this, 'handleAction', list[i].name, 'restart') }, _('Restart')),
+				E('button', { 'class': 'btn cbi-button-action', 'click': L.ui.createHandlerFn(this, 'handleAction', list[i].name, 'stop') }, _('Stop'))
+			]);
+		}
+
+		cbi_update_table(table, rows);
+
+		var view = E('div', {}, [
+			E('h2', _('Startup')),
+			E('div', {}, [
+				E('div', { 'data-tab': 'init', 'data-tab-title': _('Initscripts') }, [
+					E('p', {}, _('You can enable or disable installed init scripts here. Changes will applied after a device reboot.<br /><strong>Warning: If you disable essential init scripts like "network", your device might become inaccessible!</strong>')),
+					table
+				]),
+				E('div', { 'data-tab': 'rc', 'data-tab-title': _('Local Startup') }, [
+					E('p', {}, _('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.')),
+					E('p', {}, E('textarea', { 'style': 'width:100%', 'rows': 20 }, rcLocal != null ? rcLocal : '')),
+					E('div', { 'class': 'cbi-page-actions' }, [
+						E('button', {
+							'class': 'btn cbi-button-save',
+							'click': L.ui.createHandlerFn(this, 'handleRcLocalSave')
+						}, _('Save'))
+					])
+				])
+			])
+		]);
+
+		L.ui.tabs.initTabGroup(view.lastElementChild.childNodes);
+
+		return view;
+	},
+
+	handleSaveApply: null,
+	handleSave: null,
+	handleReset: null
+});
diff --git a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js
index 6db973a8d..ac6586af4 100644
--- a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js
+++ b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js
@@ -8,9 +8,9 @@ var callInitList, callInitAction, callTimezone,
 
 callInitList = rpc.declare({
 	object: 'luci',
-	method: 'initList',
+	method: 'getInitList',
 	params: [ 'name' ],
-	expect: { result: {} },
+	expect: { '': {} },
 	filter: function(res) {
 		for (var k in res)
 			return +res[k].enabled;
@@ -20,7 +20,7 @@ callInitList = rpc.declare({
 
 callInitAction = rpc.declare({
 	object: 'luci',
-	method: 'initCall',
+	method: 'setInitAction',
 	params: [ 'name', 'action' ],
 	expect: { result: false }
 });
@@ -28,52 +28,46 @@ callInitAction = rpc.declare({
 callGetLocaltime = rpc.declare({
 	object: 'luci',
 	method: 'getLocaltime',
-	expect: { localtime: 0 }
+	expect: { result: 0 }
 });
 
 callSetLocaltime = rpc.declare({
 	object: 'luci',
 	method: 'setLocaltime',
 	params: [ 'localtime' ],
-	expect: { localtime: 0 }
+	expect: { result: 0 }
 });
 
 callTimezone = rpc.declare({
 	object: 'luci',
-	method: 'timezone',
-	expect: { result: {} }
+	method: 'getTimezones',
+	expect: { '': {} }
 });
 
 CBILocalTime = form.DummyValue.extend({
 	renderWidget: function(section_id, option_id, cfgvalue) {
 		return E([], [
-			E('span', { 'id': 'localtime' },
-				new Date(cfgvalue * 1000).toLocaleString()),
+			E('span', {}, [
+				E('input', {
+					'id': 'localtime',
+					'type': 'text',
+					'readonly': true,
+					'value': new Date(cfgvalue * 1000).toLocaleString()
+				})
+			]),
 			' ',
 			E('button', {
 				'class': 'cbi-button cbi-button-apply',
-				'click': function() {
-					this.blur();
-					this.classList.add('spinning');
-					this.disabled = true;
-					callSetLocaltime(Math.floor(Date.now() / 1000)).then(L.bind(function() {
-						this.classList.remove('spinning');
-						this.disabled = false;
-					}, this));
-				}
+				'click': L.ui.createHandlerFn(this, function() {
+					return callSetLocaltime(Math.floor(Date.now() / 1000));
+				})
 			}, _('Sync with browser')),
 			' ',
 			this.ntpd_support ? E('button', {
 				'class': 'cbi-button cbi-button-apply',
-				'click': function() {
-					this.blur();
-					this.classList.add('spinning');
-					this.disabled = true;
-					callInitAction('sysntpd', 'restart').then(L.bind(function() {
-						this.classList.remove('spinning');
-						this.disabled = false;
-					}, this));
-				}
+				'click': L.ui.createHandlerFn(this, function() {
+					return callInitAction('sysntpd', 'restart');
+				})
 			}, _('Sync with NTP-Server')) : ''
 		]);
 	},
@@ -83,7 +77,6 @@ return L.view.extend({
 	load: function() {
 		return Promise.all([
 			callInitList('sysntpd'),
-			callInitList('zram'),
 			callTimezone(),
 			callGetLocaltime(),
 			uci.load('luci'),
@@ -92,18 +85,16 @@ return L.view.extend({
 	},
 
 	render: function(rpc_replies) {
-		var ntpd_support = rpc_replies[0],
-		    zram_support = rpc_replies[1],
-		    timezones = rpc_replies[2],
-		    localtime = rpc_replies[3],
-		    ntp_setup, ntp_enabled, m, s, o;
+		var ntpd_enabled = rpc_replies[0],
+		    timezones = rpc_replies[1],
+		    localtime = rpc_replies[2],
+		    m, s, o;
 
 		m = new form.Map('system',
 			_('System'),
 			_('Here you can configure the basic aspects of your device like its hostname or the timezone.'));
 
 		m.chain('luci');
-		m.tabbed = true;
 
 		s = m.section(form.TypedSection, 'system', _('System Properties'));
 		s.anonymous = true;
@@ -120,7 +111,7 @@ return L.view.extend({
 
 		o = s.taboption('general', CBILocalTime, '_systime', _('Local Time'));
 		o.cfgvalue = function() { return localtime };
-		o.ntpd_support = ntpd_support;
+		o.ntpd_support = ntpd_enabled;
 
 		o = s.taboption('general', form.Value, 'hostname', _('Hostname'));
 		o.datatype = 'hostname';
@@ -185,7 +176,7 @@ return L.view.extend({
 		 * Zram Properties
 		 */
 
-		if (zram_support != null) {
+		if (L.hasSystemFeature('zram')) {
 			s.tab('zram', _('ZRam Settings'));
 
 			o = s.taboption('zram', form.Value, 'zram_size_mb', _('ZRam Size'), _('Size of the ZRam device in megabytes'));
@@ -235,7 +226,7 @@ return L.view.extend({
 		 * NTP
 		 */
 
-		if (ntpd_support != null) {
+		if (L.hasSystemFeature('sysntpd')) {
 			var default_servers = [
 				'0.openwrt.pool.ntp.org', '1.openwrt.pool.ntp.org',
 				'2.openwrt.pool.ntp.org', '3.openwrt.pool.ntp.org'
@@ -246,14 +237,14 @@ return L.view.extend({
 			o.ucisection = 'ntp';
 			o.default = o.disabled;
 			o.write = function(section_id, value) {
-				ntpd_support = +value;
+				ntpd_enabled = +value;
 
-				if (ntpd_support && !uci.get('system', 'ntp')) {
+				if (ntpd_enabled && !uci.get('system', 'ntp')) {
 					uci.add('system', 'timeserver', 'ntp');
 					uci.set('system', 'ntp', 'server', default_servers);
 				}
 
-				if (!ntpd_support)
+				if (!ntpd_enabled)
 					uci.set('system', 'ntp', 'enabled', 0);
 				else
 					uci.unset('system', 'ntp', 'enabled');
@@ -261,7 +252,7 @@ return L.view.extend({
 				return callInitAction('sysntpd', 'enable');
 			};
 			o.load = function(section_id) {
-				return (ntpd_support == 1 &&
+				return (ntpd_enabled == 1 &&
 				        uci.get('system', 'ntp') != null &&
 				        uci.get('system', 'ntp', 'enabled') != 0) ? '1' : '0';
 			};
@@ -285,7 +276,7 @@ return L.view.extend({
 		return m.render().then(function(mapEl) {
 			L.Poll.add(function() {
 				return callGetLocaltime().then(function(t) {
-					mapEl.querySelector('#localtime').innerHTML = new Date(t * 1000).toLocaleString();
+					mapEl.querySelector('#localtime').value = new Date(t * 1000).toLocaleString();
 				});
 			});
 
diff --git a/modules/luci-mod-system/luasrc/controller/admin/system.lua b/modules/luci-mod-system/luasrc/controller/admin/system.lua
index d73a1cbdb..d6e1dc781 100644
--- a/modules/luci-mod-system/luasrc/controller/admin/system.lua
+++ b/modules/luci-mod-system/luasrc/controller/admin/system.lua
@@ -8,26 +8,20 @@ function index()
 	local fs = require "nixio.fs"
 
 	entry({"admin", "system", "system"}, view("system/system"), _("System"), 1)
-	entry({"admin", "system", "clock_status"}, post_on({ set = true }, "action_clock_status"))
-	entry({"admin", "system", "ntp_restart"}, call("action_ntp_restart"), nil).leaf = true
 
 	entry({"admin", "system", "admin"}, firstchild(), _("Administration"), 2)
-	entry({"admin", "system", "admin", "password"}, template("admin_system/password"), _("Router Password"), 1)
-	entry({"admin", "system", "admin", "password", "json"}, post("action_password"))
+	entry({"admin", "system", "admin", "password"}, view("system/password"), _("Router Password"), 1)
 
 	if fs.access("/etc/config/dropbear") then
-		entry({"admin", "system", "admin", "dropbear"}, cbi("admin_system/dropbear"), _("SSH Access"), 2)
-		entry({"admin", "system", "admin", "sshkeys"}, template("admin_system/sshkeys"), _("SSH-Keys"), 3)
-		entry({"admin", "system", "admin", "sshkeys", "json"}, post_on({ keys = true }, "action_sshkeys"))
+		entry({"admin", "system", "admin", "dropbear"}, view("system/dropbear"), _("SSH Access"), 2)
+		entry({"admin", "system", "admin", "sshkeys"}, view("system/sshkeys"), _("SSH-Keys"), 3)
 	end
 
-	entry({"admin", "system", "startup"}, form("admin_system/startup"), _("Startup"), 45)
-	entry({"admin", "system", "crontab"}, form("admin_system/crontab"), _("Scheduled Tasks"), 46)
+	entry({"admin", "system", "startup"}, view("system/startup"), _("Startup"), 45)
+	entry({"admin", "system", "crontab"}, view("system/crontab"), _("Scheduled Tasks"), 46)
 
 	if fs.access("/sbin/block") and fs.access("/etc/config/fstab") then
-		entry({"admin", "system", "fstab"}, cbi("admin_system/fstab"), _("Mount Points"), 50)
-		entry({"admin", "system", "fstab", "mount"}, cbi("admin_system/fstab/mount"), nil).leaf = true
-		entry({"admin", "system", "fstab", "swap"},  cbi("admin_system/fstab/swap"),  nil).leaf = true
+		entry({"admin", "system", "mounts"}, view("system/mounts"), _("Mount Points"), 50)
 	end
 
 	local nodes, number = fs.glob("/sys/class/leds/*")
@@ -49,30 +43,6 @@ function index()
 	entry({"admin", "system", "reboot", "call"}, post("action_reboot"))
 end
 
-function action_clock_status()
-	local set = tonumber(luci.http.formvalue("set"))
-	if set ~= nil and set > 0 then
-		local date = os.date("*t", set)
-		if date then
-			luci.sys.call("date -s '%04d-%02d-%02d %02d:%02d:%02d'" %{
-				date.year, date.month, date.day, date.hour, date.min, date.sec
-			})
-			luci.sys.call("/etc/init.d/sysfixtime restart")
-		end
-	end
-
-	luci.http.prepare_content("application/json")
-	luci.http.write_json({ timestring = os.date("%c") })
-end
-
-function action_ntp_restart()
-	if nixio.fs.access("/etc/init.d/sysntpd") then
-		os.execute("/etc/init.d/sysntpd restart")
-	end
-	luci.http.prepare_content("text/plain")
-	luci.http.write("0")
-end
-
 local function image_supported(image)
 	return (os.execute("sysupgrade -T %q >/dev/null" % image) == 0)
 end
@@ -282,67 +252,6 @@ function action_reset()
 	http.redirect(luci.dispatcher.build_url('admin/system/flashops'))
 end
 
-function action_password()
-	local password = luci.http.formvalue("password")
-	if not password then
-		luci.http.status(400, "Bad Request")
-		return
-	end
-
-	luci.http.prepare_content("application/json")
-	luci.http.write_json({ code = luci.sys.user.setpasswd("root", password) })
-end
-
-function action_sshkeys()
-	local keys = luci.http.formvalue("keys")
-	if keys then
-		keys = luci.jsonc.parse(keys)
-		if not keys or type(keys) ~= "table" then
-			luci.http.status(400, "Bad Request")
-			return
-		end
-
-		local fd, err = io.open("/etc/dropbear/authorized_keys", "w")
-		if not fd then
-			luci.http.status(503, err)
-			return
-		end
-
-		local _, k
-		for _, k in ipairs(keys) do
-			if type(k) == "string" and k:match("^%w+%-") then
-				fd:write(k)
-				fd:write("\n")
-			end
-		end
-
-		fd:close()
-	end
-
-	local fd, err = io.open("/etc/dropbear/authorized_keys", "r")
-	if not fd then
-		luci.http.status(503, err)
-		return
-	end
-
-	local rv = {}
-	while true do
-		local ln = fd:read("*l")
-		if not ln then
-			break
-		elseif ln:match("^[%w%-]+%s+[A-Za-z0-9+/=]+$") or
-		       ln:match("^[%w%-]+%s+[A-Za-z0-9+/=]+%s")
-		then
-			rv[#rv+1] = ln
-		end
-	end
-
-	fd:close()
-
-	luci.http.prepare_content("application/json")
-	luci.http.write_json(rv)
-end
-
 function action_reboot()
 	luci.sys.reboot()
 end
diff --git a/modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua b/modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua
deleted file mode 100644
index beb24e7ca..000000000
--- a/modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua
+++ /dev/null
@@ -1,33 +0,0 @@
--- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2008-2013 Jo-Philipp Wich <jow@openwrt.org>
--- Licensed to the public under the Apache License 2.0.
-
-local fs = require "nixio.fs"
-local cronfile = "/etc/crontabs/root" 
-
-f = SimpleForm("crontab", translate("Scheduled Tasks"),
-	translate("This is the system crontab in which scheduled tasks can be defined.") ..
-	translate("<br/>Note: you need to manually restart the cron service if the " ..
-		"crontab file was empty before editing."))
-
-t = f:field(TextValue, "crons")
-f.forcewrite = true
-t.rmempty = true
-t.rows = 10
-function t.cfgvalue()
-	return fs.readfile(cronfile) or ""
-end
-
-function f.handle(self, state, data)
-	if state == FORM_VALID then
-		if data.crons then
-			fs.writefile(cronfile, data.crons:gsub("\r\n", "\n"))
-			luci.sys.call("/usr/bin/crontab %q" % cronfile)
-		else
-			fs.writefile(cronfile, "")
-		end
-	end
-	return true
-end
-
-return f
diff --git a/modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua b/modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua
deleted file mode 100644
index 1a1695d2b..000000000
--- a/modules/luci-mod-system/luasrc/model/cbi/admin_system/dropbear.lua
+++ /dev/null
@@ -1,53 +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.
-
-m = Map("dropbear", translate("SSH Access"),
-	translate("Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"))
-m.apply_on_parse = true
-
-s = m:section(TypedSection, "dropbear", translate("Dropbear Instance"))
-s.anonymous = true
-s.addremove = true
-
-
-ni = s:option(Value, "Interface", translate("Interface"),
-	translate("Listen only on the given interface or, if unspecified, on all"))
-
-ni.template    = "cbi/network_netlist"
-ni.nocreate    = true
-ni.unspecified = true
-
-
-pt = s:option(Value, "Port", translate("Port"),
-	translate("Specifies the listening port of this <em>Dropbear</em> instance"))
-
-pt.datatype = "port"
-pt.default  = 22
-
-
-pa = s:option(Flag, "PasswordAuth", translate("Password authentication"),
-	translate("Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"))
-
-pa.enabled  = "on"
-pa.disabled = "off"
-pa.default  = pa.enabled
-pa.rmempty  = false
-
-
-ra = s:option(Flag, "RootPasswordAuth", translate("Allow root logins with password"),
-	translate("Allow the <em>root</em> user to login with password"))
-
-ra.enabled  = "on"
-ra.disabled = "off"
-ra.default  = ra.enabled
-
-
-gp = s:option(Flag, "GatewayPorts", translate("Gateway ports"),
-	translate("Allow remote hosts to connect to local SSH forwarded ports"))
-
-gp.enabled  = "on"
-gp.disabled = "off"
-gp.default  = gp.disabled
-
-return m
diff --git a/modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua b/modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua
deleted file mode 100644
index 4a31146a0..000000000
--- a/modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua
+++ /dev/null
@@ -1,272 +0,0 @@
--- Copyright 2008 Steven Barth <steven@midlink.org>
--- Licensed to the public under the Apache License 2.0.
-
-require("luci.tools.webadmin")
-
-local fs   = require "nixio.fs"
-local util = require "nixio.util"
-local tp   = require "luci.template.parser"
-
-local block = io.popen("block info", "r")
-local ln, dev, devices = nil, nil, {}
-
-repeat
-	ln = block:read("*l")
-	dev = ln and ln:match("^/dev/(.-):")
-
-	if dev then
-		local e, s, key, val = { }
-
-		for key, val in ln:gmatch([[(%w+)="(.-)"]]) do
-			e[key:lower()] = val
-			devices[val] = e
-		end
-
-		s = tonumber((fs.readfile("/sys/class/block/%s/size" % dev)))
-
-		e.dev  = "/dev/%s" % dev
-		e.size = s and math.floor(s / 2048)
-
-		devices[e.dev] = e
-	end
-until not ln
-
-block:close()
-
-m = Map("fstab", translate("Mount Points"))
-s = m:section(TypedSection, "global", translate("Global Settings"))
-s.addremove = false
-s.anonymous = true
-
-detect = s:option(Button, "block_detect", translate("Generate Config"), translate("Find all currently attached filesystems and swap and replace configuration with defaults based on what was detected"))
-detect.inputstyle = "reload"
-
-detect.write = function(self, section)
-	luci.sys.call("block detect >/etc/config/fstab")
-	luci.http.redirect(luci.dispatcher.build_url("admin/system", "fstab"))
-end
-
-o = s:option(Flag, "anon_swap", translate("Anonymous Swap"), translate("Mount swap not specifically configured"))
-o.default = o.disabled
-o.rmempty = false
-
-o = s:option(Flag, "anon_mount", translate("Anonymous Mount"), translate("Mount filesystems not specifically configured"))
-o.default = o.disabled
-o.rmempty = false
-
-o = s:option(Flag, "auto_swap", translate("Automount Swap"), translate("Automatically mount swap on hotplug"))
-o.default = o.enabled
-o.rmempty = false
-
-o = s:option(Flag, "auto_mount", translate("Automount Filesystem"), translate("Automatically mount filesystems on hotplug"))
-o.default = o.enabled
-o.rmempty = false
-
-o = s:option(Flag, "check_fs", translate("Check filesystems before mount"), translate("Automatically check filesystem for errors before mounting"))
-o.default = o.disabled
-o.rmempty = false
-
-local mounts = luci.sys.mounts()
-local non_system_mounts = {}
-for rawmount, val in pairs(mounts) do
-    if (string.find(val.mountpoint, "/tmp/.jail") == nil) then
-      repeat 
-          val.umount = false
-          if (val.mountpoint == "/") then
-              break
-          elseif (val.mountpoint == "/overlay") then
-              break
-          elseif (val.mountpoint == "/rom") then
-              break
-          elseif (val.mountpoint == "/tmp") then
-              break
-          elseif (val.mountpoint == "/tmp/shm") then
-              break
-          elseif (val.mountpoint == "/tmp/upgrade") then
-              break
-          elseif (val.mountpoint == "/dev") then
-              break
-          end
-          val.umount = true
-      until true
-      non_system_mounts[rawmount] = val       
-   end   
-end
-
-v = m:section(Table, non_system_mounts, translate("Mounted file systems"))
-
-fs = v:option(DummyValue, "fs", translate("Filesystem"))
-
-mp = v:option(DummyValue, "mountpoint", translate("Mount Point"))
-
-avail = v:option(DummyValue, "avail", translate("Available"))
-function avail.cfgvalue(self, section)
-	return luci.tools.webadmin.byte_format(
-		( tonumber(mounts[section].available) or 0 ) * 1024
-	) .. " / " .. luci.tools.webadmin.byte_format(
-		( tonumber(mounts[section].blocks) or 0 ) * 1024
-	)
-end
-
-used = v:option(DummyValue, "used", translate("Used"))
-function used.cfgvalue(self, section)
-	return ( mounts[section].percent or "0%" ) .. " (" ..
-	luci.tools.webadmin.byte_format(
-		( tonumber(mounts[section].used) or 0 ) * 1024
-	) .. ")"
-end
-
-unmount = v:option(Button, "unmount", translate("Unmount"))
-function unmount.cfgvalue(self, section)
-	return non_system_mounts[section].umount
-end
-
-unmount.render = function(self, section, scope)
-	self.title = translate("Unmount")
-	self.inputstyle = "remove"
-	Button.render(self, section, scope)
-end
-
-unmount.write = function(self, section)
-	if non_system_mounts[section].umount then
-		luci.sys.call("/bin/umount '%s'" % luci.util.shellstartsqescape(non_system_mounts[section].mountpoint))
-		return luci.http.redirect(luci.dispatcher.build_url("admin/system", "fstab"))
-        end
-end
-
-mount = m:section(TypedSection, "mount", translate("Mount Points"), translate("Mount Points define at which point a memory device will be attached to the filesystem"))
-mount.anonymous = true
-mount.addremove = true
-mount.template = "cbi/tblsection"
-mount.extedit  = luci.dispatcher.build_url("admin/system/fstab/mount/%s")
-
-mount.create = function(...)
-	local sid = TypedSection.create(...)
-	if sid then
-		luci.http.redirect(mount.extedit % sid)
-		return
-	end
-end
-
-
-mount:option(Flag, "enabled", translate("Enabled")).rmempty = false
-
-dev = mount:option(DummyValue, "device", translate("Device"))
-dev.rawhtml = true
-dev.cfgvalue = function(self, section)
-	local v, e
-
-	v = m.uci:get("fstab", section, "uuid")
-	e = v and devices[v:lower()]
-	if v and e and e.size then
-		return "UUID: %s (%s, %d MB)" %{ tp.pcdata(v), e.dev, e.size }
-	elseif v and e then
-		return "UUID: %s (%s)" %{ tp.pcdata(v), e.dev }
-	elseif v then
-		return "UUID: %s (<em>%s</em>)" %{ tp.pcdata(v), translate("not present") }
-	end
-
-	v = m.uci:get("fstab", section, "label")
-	e = v and devices[v]
-	if v and e and e.size then
-		return "Label: %s (%s, %d MB)" %{ tp.pcdata(v), e.dev, e.size }
-	elseif v and e then
-		return "Label: %s (%s)" %{ tp.pcdata(v), e.dev }
-	elseif v then
-		return "Label: %s (<em>%s</em>)" %{ tp.pcdata(v), translate("not present") }
-	end
-
-	v = Value.cfgvalue(self, section) or "?"
-	e = v and devices[v]
-	if v and e and e.size then
-		return "%s (%d MB)" %{ tp.pcdata(v), e.size }
-	elseif v and e then
-		return tp.pcdata(v)
-	elseif v then
-		return "%s (<em>%s</em>)" %{ tp.pcdata(v), translate("not present") }
-	end
-end
-
-mp = mount:option(DummyValue, "target", translate("Mount Point"))
-mp.cfgvalue = function(self, section)
-	if m.uci:get("fstab", section, "is_rootfs") == "1" then
-		return "/overlay"
-	else
-		return Value.cfgvalue(self, section) or "?"
-	end
-end
-
-fs = mount:option(DummyValue, "fstype", translate("Filesystem"))
-fs.cfgvalue = function(self, section)
-	local v, e
-
-	v = m.uci:get("fstab", section, "uuid")
-	v = v and v:lower() or m.uci:get("fstab", section, "label")
-	v = v or m.uci:get("fstab", section, "device")
-
-	e = v and devices[v]
-
-	return e and e.type or m.uci:get("fstab", section, "fstype") or "?"
-end
-
-op = mount:option(DummyValue, "options", translate("Options"))
-op.cfgvalue = function(self, section)
-	return Value.cfgvalue(self, section) or "defaults"
-end
-
-rf = mount:option(DummyValue, "is_rootfs", translate("Root"))
-rf.cfgvalue = function(self, section)
-	local target = m.uci:get("fstab", section, "target")
-	if target == "/" then
-		return translate("yes")
-	elseif target == "/overlay" then
-		return translate("overlay")
-	else
-		return translate("no")
-	end
-end
-
-ck = mount:option(DummyValue, "enabled_fsck", translate("Check"))
-ck.cfgvalue = function(self, section)
-	return Value.cfgvalue(self, section) == "1"
-		and translate("yes") or translate("no")
-end
-
-
-swap = m:section(TypedSection, "swap", translate("SWAP"), translate("If your physical memory is insufficient unused data can be temporarily swapped to a swap-device resulting in a higher amount of usable <abbr title=\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very slow process as the swap-device cannot be accessed with the high datarates of the <abbr title=\"Random Access Memory\">RAM</abbr>."))
-swap.anonymous = true
-swap.addremove = true
-swap.template = "cbi/tblsection"
-swap.extedit  = luci.dispatcher.build_url("admin/system/fstab/swap/%s")
-
-swap.create = function(...)
-	local sid = TypedSection.create(...)
-	if sid then
-		luci.http.redirect(swap.extedit % sid)
-		return
-	end
-end
-
-
-swap:option(Flag, "enabled", translate("Enabled")).rmempty = false
-
-dev = swap:option(DummyValue, "device", translate("Device"))
-dev.cfgvalue = function(self, section)
-	local v
-
-	v = m.uci:get("fstab", section, "uuid")
-	if v then return "UUID: %s" % v end
-
-	v = m.uci:get("fstab", section, "label")
-	if v then return "Label: %s" % v end
-
-	v = Value.cfgvalue(self, section) or "?"
-	e = v and devices[v]
-	if v and e and e.size then
-		return "%s (%s MB)" % {v, e.size}
-	else
-		return v
-	end
-end
-
-return m
diff --git a/modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua b/modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua
deleted file mode 100644
index f21a2775e..000000000
--- a/modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua
+++ /dev/null
@@ -1,158 +0,0 @@
--- Copyright 2010 Jo-Philipp Wich <jow@openwrt.org>
--- Licensed to the public under the Apache License 2.0.
-
-local fs   = require "nixio.fs"
-local util = require "nixio.util"
-
-local has_fscheck = fs.access("/usr/sbin/e2fsck")
-
-local block = io.popen("block info", "r")
-local ln, dev, devices = nil, nil, {}
-
-repeat
-	ln = block:read("*l")
-	dev = ln and ln:match("^/dev/(.-):")
-
-	if dev then
-		local e, s, key, val = { }
-
-		for key, val in ln:gmatch([[(%w+)="(.-)"]]) do
-			e[key:lower()] = val
-		end
-
-		s = tonumber((fs.readfile("/sys/class/block/%s/size" % dev)))
-
-		e.dev  = "/dev/%s" % dev
-		e.size = s and math.floor(s / 2048)
-
-		devices[#devices+1] = e
-	end
-until not ln
-
-block:close()
-
-
-m = Map("fstab", translate("Mount Points - Mount Entry"))
-m.redirect = luci.dispatcher.build_url("admin/system/fstab")
-
-if not arg[1] or m.uci:get("fstab", arg[1]) ~= "mount" then
-	luci.http.redirect(m.redirect)
-	return
-end
-
-
-
-mount = m:section(NamedSection, arg[1], "mount", translate("Mount Entry"))
-mount.anonymous = true
-mount.addremove = false
-
-mount:tab("general",  translate("General Settings"))
-mount:tab("advanced", translate("Advanced Settings"))
-
-
-mount:taboption("general", Flag, "enabled", translate("Enable this mount")).rmempty = false
-
-
-o = mount:taboption("general", Value, "uuid", translate("UUID"),
-	translate("If specified, mount the device by its UUID instead of a fixed device node"))
-
-o:value("", translate("-- match by uuid --"))
-
-for i, d in ipairs(devices) do
-	if d.uuid and d.size then
-		o:value(d.uuid, "%s (%s, %d MB)" %{ d.uuid, d.dev, d.size })
-	elseif d.uuid then
-		o:value(d.uuid, "%s (%s)" %{ d.uuid, d.dev })
-	end
-end
-
-
-o = mount:taboption("general", Value, "label", translate("Label"),
-	translate("If specified, mount the device by the partition label instead of a fixed device node"))
-
-o:value("", translate("-- match by label --"))
-
-o:depends("uuid", "")
-
-for i, d in ipairs(devices) do
-	if d.label and d.size then
-		o:value(d.label, "%s (%s, %d MB)" %{ d.label, d.dev, d.size })
-	elseif d.label then
-		o:value(d.label, "%s (%s)" %{ d.label, d.dev })
-	end
-end
-
-
-o = mount:taboption("general", Value, "device", translate("Device"),
-	translate("The device file of the memory or partition (<abbr title=\"for example\">e.g.</abbr> <code>/dev/sda1</code>)"))
-
-o:value("", translate("-- match by device --"))
-
-o:depends({ uuid = "", label = "" })
-
-for i, d in ipairs(devices) do
-	if d.size then
-		o:value(d.dev, "%s (%d MB)" %{ d.dev, d.size })
-	else
-		o:value(d.dev)
-	end
-end
-
-
-o = mount:taboption("general", Value, "target", translate("Mount point"),
-	translate("Specifies the directory the device is attached to"))
-
-o:value("/", translate("Use as root filesystem (/)"))
-o:value("/overlay", translate("Use as external overlay (/overlay)"))
-
-
-o = mount:taboption("general", DummyValue, "__notice", translate("Root preparation"))
-o:depends("target", "/")
-o.rawhtml = true
-o.default = [[
-<p>%s</p><pre>mkdir -p /tmp/introot
-mkdir -p /tmp/extroot
-mount --bind / /tmp/introot
-mount /dev/sda1 /tmp/extroot
-tar -C /tmp/introot -cvf - . | tar -C /tmp/extroot -xf -
-umount /tmp/introot
-umount /tmp/extroot</pre>
-]] %{
-	translate("Make sure to clone the root filesystem using something like the commands below:"),
-
-}
-
-
-o = mount:taboption("advanced", Value, "fstype", translate("Filesystem"),
-	translate("The filesystem that was used to format the memory (<abbr title=\"for example\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></samp>)"))
-
-o:value("", "auto")
-
-local fs
-for fs in io.lines("/proc/filesystems") do
-	fs = fs:match("%S+")
-	if fs ~= "nodev" then
-		o:value(fs)
-	end
-end
-
-local ok, lines = pcall(io.lines, "/etc/filesystem")
-if ok then
-	local fs
-	for fs in lines do
-		o:value(fs)
-	end
-end
-
-o = mount:taboption("advanced", Value, "options", translate("Mount options"),
-	translate("See \"mount\" manpage for details"))
-
-o.placeholder = "defaults"
-
-
-if has_fscheck then
-	o = mount:taboption("advanced", Flag, "enabled_fsck", translate("Run filesystem check"),
-		translate("Run a filesystem check before mounting the device"))
-end
-
-return m
diff --git a/modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua b/modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua
deleted file mode 100644
index 82468d5fc..000000000
--- a/modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua
+++ /dev/null
@@ -1,54 +0,0 @@
--- Copyright 2010 Jo-Philipp Wich <jow@openwrt.org>
--- Licensed to the public under the Apache License 2.0.
-
-local fs   = require "nixio.fs"
-local util = require "nixio.util"
-
-local devices = {}
-util.consume((fs.glob("/dev/sd*")), devices)
-util.consume((fs.glob("/dev/hd*")), devices)
-util.consume((fs.glob("/dev/scd*")), devices)
-util.consume((fs.glob("/dev/mmc*")), devices)
-
-local size = {}
-for i, dev in ipairs(devices) do
-	local s = tonumber((fs.readfile("/sys/class/block/%s/size" % dev:sub(6))))
-	size[dev] = s and math.floor(s / 2048)
-end
-
-
-m = Map("fstab", translate("Mount Points - Swap Entry"))
-m.redirect = luci.dispatcher.build_url("admin/system/fstab")
-
-if not arg[1] or m.uci:get("fstab", arg[1]) ~= "swap" then
-	luci.http.redirect(m.redirect)
-	return
-end
-
-
-mount = m:section(NamedSection, arg[1], "swap", translate("Swap Entry"))
-mount.anonymous = true
-mount.addremove = false
-
-mount:tab("general",  translate("General Settings"))
-mount:tab("advanced", translate("Advanced Settings"))
-
-
-mount:taboption("general", Flag, "enabled", translate("Enable this swap")).rmempty = false
-
-
-o = mount:taboption("general", Value, "device", translate("Device"),
-	translate("The device file of the memory or partition (<abbr title=\"for example\">e.g.</abbr> <code>/dev/sda1</code>)"))
-
-for i, d in ipairs(devices) do
-	o:value(d, size[d] and "%s (%s MB)" % {d, size[d]})
-end
-
-o = mount:taboption("advanced", Value, "uuid", translate("UUID"),
-	translate("If specified, mount the device by its UUID instead of a fixed device node"))
-
-o = mount:taboption("advanced", Value, "label", translate("Label"),
-	translate("If specified, mount the device by the partition label instead of a fixed device node"))
-
-
-return m
diff --git a/modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua b/modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua
deleted file mode 100644
index 99ddb0970..000000000
--- a/modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua
+++ /dev/null
@@ -1,104 +0,0 @@
--- Copyright 2008 Steven Barth <steven@midlink.org>
--- Copyright 2010-2012 Jo-Philipp Wich <jow@openwrt.org>
--- Copyright 2010 Manuel Munz <freifunk at somakoma dot de>
--- Licensed to the public under the Apache License 2.0.
-
-local fs  = require "nixio.fs"
-local sys = require "luci.sys"
-
-local inits = { }
-local handled = false
-
-for _, name in ipairs(sys.init.names()) do
-	local index   = sys.init.index(name)
-	local enabled = sys.init.enabled(name)
-
-	if index < 255 then
-		inits["%02i.%s" % { index, name }] = {
-			name    = name,
-			index   = tostring(index),
-			enabled = enabled
-		}
-	end
-end
-
-
-m = SimpleForm("initmgr", translate("Initscripts"), translate("You can enable or disable installed init scripts here. Changes will applied after a device reboot.<br /><strong>Warning: If you disable essential init scripts like \"network\", your device might become inaccessible!</strong>"))
-m.reset = false
-m.submit = false
-
-
-s = m:section(Table, inits)
-
-i = s:option(DummyValue, "index", translate("Start priority"))
-n = s:option(DummyValue, "name", translate("Initscript"))
-
-
-e = s:option(Button, "endisable", translate("Enable/Disable"))
-
-e.render = function(self, section, scope)
-	if inits[section].enabled then
-		self.title = translate("Enabled")
-		self.inputstyle = "save"
-	else
-		self.title = translate("Disabled")
-		self.inputstyle = "reset"
-	end
-
-	Button.render(self, section, scope)
-end
-
-e.write = function(self, section)
-	if inits[section].enabled then
-		handled = true
-		inits[section].enabled = false
-		return sys.init.disable(inits[section].name)
-	else
-		handled = true
-		inits[section].enabled = true
-		return sys.init.enable(inits[section].name)
-	end
-end
-
-
-start = s:option(Button, "start", translate("Start"))
-start.inputstyle = "apply"
-start.write = function(self, section)
-	handled = true
-	sys.call("/etc/init.d/%s %s >/dev/null" %{ inits[section].name, self.option })
-end
-
-restart = s:option(Button, "restart", translate("Restart"))
-restart.inputstyle = "reload"
-restart.write = start.write
-
-stop = s:option(Button, "stop", translate("Stop"))
-stop.inputstyle = "remove"
-stop.write = start.write
-
-
-
-f = SimpleForm("rc", translate("Local Startup"),
-	translate("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."))
-
-t = f:field(TextValue, "rcs")
-t.forcewrite = true
-t.rmempty = true
-t.rows = 20
-
-function t.cfgvalue()
-	return fs.readfile("/etc/rc.local") or ""
-end
-
-function f.handle(self, state, data)
-	if not handled and state == FORM_VALID then
-		if data.rcs then
-			fs.writefile("/etc/rc.local", data.rcs:gsub("\r\n", "\n"))
-		else
-			fs.writefile("/etc/rc.local", "")
-		end
-	end
-	return true
-end
-
-return m, f
diff --git a/modules/luci-mod-system/luasrc/view/admin_system/password.htm b/modules/luci-mod-system/luasrc/view/admin_system/password.htm
deleted file mode 100644
index 6ca02a83c..000000000
--- a/modules/luci-mod-system/luasrc/view/admin_system/password.htm
+++ /dev/null
@@ -1,59 +0,0 @@
-<%+header%>
-
-<input type="password" aria-hidden="true" style="position:absolute; left:-10000px" />
-
-<script type="text/javascript">
-function checkPassword() {
-	var pw1 = document.body.querySelector('[name="pw1"]');
-	var view  = document.getElementById("passstrength");
-
-	var strongRegex = new RegExp("^(?=.{8,})(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])(?=.*\\W).*$", "g");
-	var mediumRegex = new RegExp("^(?=.{7,})(((?=.*[A-Z])(?=.*[a-z]))|((?=.*[A-Z])(?=.*[0-9]))|((?=.*[a-z])(?=.*[0-9]))).*$", "g");
-	var enoughRegex = new RegExp("(?=.{6,}).*", "g");
-	if (false == enoughRegex.test(pw1.value)) {
-		view.innerHTML = '<%:Password strength%>: <span style="color:red"><%:More Characters%></span>';
-	} else if (strongRegex.test(pw1.value)) {
-		view.innerHTML = '<%:Password strength%>: <span style="color:green"><%:Strong%></span>';
-	} else if (mediumRegex.test(pw1.value)) {
-		view.innerHTML = '<%:Password strength%>: <span style="color:orange"><%:Medium%></span>';
-	} else {
-		view.innerHTML = '<%:Password strength%>: <span style="color:red"><%:Weak%></span>';
-	}
-	return true;
-}
-</script>
-
-<div class="cbi-map">
-	<h2><%:Router Password%></h2>
-
-	<div class="cbi-section-descr">
-		<%:Changes the administrator password for accessing the device%>
-	</div>
-
-	<div class="cbi-section-node">
-		<div class="cbi-value">
-			<label class="cbi-value-title" for="image"><%:Password%></label>
-			<div class="cbi-value-field">
-				<input type="password" name="pw1" onkeyup="checkPassword()"/><!--
-				--><button class="cbi-button cbi-button-neutral" title="<%:Reveal/hide password%>" aria-label="<%:Reveal/hide password%>" onclick="var e = this.previousElementSibling; e.type = (e.type === 'password') ? 'text' : 'password'">∗</button>
-			</div>
-		</div>
-
-		<div class="cbi-value">
-			<label class="cbi-value-title" for="image"><%:Confirmation%></label>
-			<div class="cbi-value-field">
-				<input type="password" name="pw2" onkeydown="if (event.keyCode === 13) submitPassword(event)" /><!--
-				--><button class="cbi-button cbi-button-neutral" title="<%:Reveal/hide password%>" aria-label="<%:Reveal/hide password%>" onclick="var e = this.previousElementSibling; e.type = (e.type === 'password') ? 'text' : 'password'">∗</button>
-			<div id="passstrength" class="cbi-value-description"></div>
-			</div>
-		</div>
-	</div>
-</div>
-
-<div class="cbi-page-actions">
-	<button class="btn cbi-button-apply" onclick="submitPassword(event)"><%:Save%></button>
-</div>
-
-<script type="application/javascript" src="<%=resource%>/view/system/password.js"></script>
-
-<%+footer%>
diff --git a/modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm b/modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm
deleted file mode 100644
index ac453f3f6..000000000
--- a/modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm
+++ /dev/null
@@ -1,46 +0,0 @@
-<%+header%>
-
-<style type="text/css">
-	.cbi-dynlist {
-		max-width: 100%;
-	}
-
-	.cbi-dynlist .item > small {
-		display: block;
-		direction: rtl;
-		overflow: hidden;
-		text-align: left;
-	}
-
-	.cbi-dynlist .item > small > code {
-		direction: ltr;
-		white-space: nowrap;
-		unicode-bidi: bidi-override;
-	}
-
-	@media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) {
-		.cbi-dynlist .item > small { direction: ltr }
-	}
-</style>
-
-<div class="cbi-map">
-	<h2><%:SSH-Keys%></h2>
-
-	<div class="cbi-section-descr">
-		<%_Public keys allow for the passwordless SSH logins with a higher security compared to the use of plain passwords. In order to upload a new key to the device, paste an OpenSSH compatible public key line or drag a <code>.pub</code> file into the input field.%>
-	</div>
-
-	<div class="cbi-section-node">
-		<div class="cbi-dynlist" name="sshkeys">
-			<p class="spinning"><%:Loading SSH keys…%></p>
-			<div class="add-item" ondragover="dragKey(event)" ondrop="dropKey(event)">
-				<input class="cbi-input-text" type="text" placeholder="<%:Paste or drag SSH key file…%>" onkeydown="if (event.keyCode === 13) addKey(event)" />
-				<button class="cbi-button" onclick="addKey(event)"><%:Add key%></button>
-			</div>
-		</div>
-	</div>
-</div>
-
-<script type="application/javascript" src="<%=resource%>/view/system/sshkeys.js"></script>
-
-<%+footer%>
diff --git a/protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js b/protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js
new file mode 100644
index 000000000..07bed36c2
--- /dev/null
+++ b/protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js
@@ -0,0 +1,161 @@
+'use strict';
+'require rpc';
+'require uci';
+'require form';
+'require network';
+
+var callFileList = rpc.declare({
+	object: 'file',
+	method: 'list',
+	params: [ 'path' ],
+	expect: { entries: [] },
+	filter: function(list, params) {
+		var rv = [];
+		for (var i = 0; i < list.length; i++)
+			if (list[i].name.match(/^tty[A-Z]/) || list[i].name.match(/^cdc-wdm/) || list[i].name.match(/^[0-9]+$/))
+				rv.push(params.path + list[i].name);
+		return rv.sort();
+	}
+});
+
+network.registerPatternVirtual(/^3g-.+$/);
+
+function write_keepalive(section_id, value) {
+	var f_opt = this.map.lookupOption('_keepalive_failure', section_id),
+	    i_opt = this.map.lookupOption('_keepalive_interval', section_id),
+	    f = (f_opt != null) ? +f_opt[0].formvalue(section_id) : null,
+	    i = (i_opt != null) ? +i_opt[0].formvalue(section_id) : null;
+
+	if (f == null || f == '' || isNaN(f))
+		f = 0;
+
+	if (i == null || i == '' || isNaN(i) || i < 1)
+		i = 1;
+
+	if (f > 0)
+		uci.set('network', section_id, 'keepalive', '%d %d'.format(f, i));
+	else
+		uci.unset('network', section_id, 'keepalive');
+}
+
+return network.registerProtocol('3g', {
+	getI18n: function() {
+		return _('UMTS/GPRS/EV-DO');
+	},
+
+	getIfname: function() {
+		return this._ubus('l3_device') || '3g-%s'.format(this.sid);
+	},
+
+	getOpkgPackage: function() {
+		return 'comgt';
+	},
+
+	isFloating: function() {
+		return true;
+	},
+
+	isVirtual: function() {
+		return true;
+	},
+
+	getDevices: function() {
+		return null;
+	},
+
+	containsDevice: function(ifname) {
+		return (network.getIfnameOf(ifname) == this.getIfname());
+	},
+
+	renderFormOptions: function(s) {
+		var o;
+
+		o = s.taboption('general', form.Value, 'device', _('Modem device'));
+		o.rmempty = false;
+		o.load = function(section_id) {
+			return callFileList('/dev/').then(L.bind(function(devices) {
+				for (var i = 0; i < devices.length; i++)
+					this.value(devices[i]);
+				return callFileList('/dev/tts/');
+			}, this)).then(L.bind(function(devices) {
+				for (var i = 0; i < devices.length; i++)
+					this.value(devices[i]);
+				return form.Value.prototype.load.apply(this, [section_id]);
+			}, this));
+		};
+
+		o = s.taboption('general', form.Value, 'service', _('Service Type'));
+		o.value('', _('-- Please choose --'));
+		o.value('umts', 'UMTS/GPRS');
+		o.value('umts_only', _('UMTS only'));
+		o.value('gprs_only', _('GPRS only'));
+		o.value('evdo', 'CDMA/EV-DO');
+
+		s.taboption('general', form.Value, 'apn', _('APN'));
+		s.taboption('general', form.Value, 'pincode', _('PIN'));
+		s.taboption('general', form.Value, 'username', _('PAP/CHAP username'));
+
+		o = s.taboption('general', form.Value, 'password', _('PAP/CHAP password'));
+		o.password = true;
+
+		o = s.taboption('general', form.Value, 'dialnumber', _('Dial number'));
+		o.placeholder = '*99***1#';
+
+		if (L.hasSystemFeature('ipv6')) {
+			o = s.taboption('advanced', form.ListValue, 'ipv6', _('Obtain IPv6-Address'));
+			o.value('auto', _('Automatic'));
+			o.value('0', _('Disabled'));
+			o.value('1', _('Manual'));
+			o.default = 'auto';
+		}
+
+		o = s.taboption('advanced', form.Value, 'delay', _('Modem init timeout'), _('Maximum amount of seconds to wait for the modem to become ready'));
+		o.placeholder = '10';
+		o.datatype    = 'min(1)';
+
+		o = s.taboption('advanced', form.Flag, 'defaultroute', _('Use default gateway'), _('If unchecked, no default route is configured'));
+		o.default = o.enabled;
+
+		o = s.taboption('advanced', form.Value, 'metric', _('Use gateway metric'));
+		o.placeholder = '0';
+		o.datatype    = 'uinteger';
+		o.depends('defaultroute', '1');
+
+		o = s.taboption('advanced', form.Flag, 'peerdns', _('Use DNS servers advertised by peer'), _('If unchecked, the advertised DNS server addresses are ignored'));
+		o.default = o.enabled;
+
+		o = s.taboption('advanced', form.DynamicList, 'dns', _('Use custom DNS servers'));
+		o.depends('peerdns', '0');
+		o.datatype = 'ipaddr';
+
+		o = s.taboption('advanced', form.Value, '_keepalive_failure', _('LCP echo failure threshold'), _('Presume peer to be dead after given amount of LCP echo failures, use 0 to ignore failures'));
+		o.placeholder = '0';
+		o.datatype    = 'uinteger';
+		o.write       = write_keepalive;
+		o.remove      = write_keepalive;
+		o.cfgvalue = function(section_id) {
+			var v = uci.get('network', section_id, 'keepalive');
+			if (typeof(v) == 'string' && v != '') {
+				var m = v.match(/^(\d+)[ ,]\d+$/);
+				return m ? m[1] : v;
+			}
+		};
+
+		o = s.taboption('advanced', form.Value, '_keepalive_interval', _('LCP echo interval'), _('Send LCP echo requests at the given interval in seconds, only effective in conjunction with failure threshold'));
+		o.placeholder = '5';
+		o.datatype    = 'min(1)';
+		o.write       = write_keepalive;
+		o.remove      = write_keepalive;
+		o.cfgvalue = function(section_id) {
+			var v = uci.get('network', section_id, 'keepalive');
+			if (typeof(v) == 'string' && v != '') {
+				var m = v.match(/^\d+[ ,](\d+)$/);
+				return m ? m[1] : v;
+			}
+		};
+
+		o = s.taboption('advanced', form.Value, 'demand', _('Inactivity timeout'), _('Close inactive connection after the given amount of seconds, use 0 to persist connection'));
+		o.placeholder = '0';
+		o.datatype    = 'uinteger';
+	}
+});
diff --git a/protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua b/protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua
deleted file mode 100644
index 85c5cd604..000000000
--- a/protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua
+++ /dev/null
@@ -1,149 +0,0 @@
--- Copyright 2011 Jo-Philipp Wich <jow@openwrt.org>
--- Licensed to the public under the Apache License 2.0.
-
-local map, section, net = ...
-
-local device, apn, service, pincode, username, password, dialnumber
-local ipv6, delay, defaultroute, metric, peerdns, dns,
-      keepalive_failure, keepalive_interval, demand
-
-
-device = section:taboption("general", Value, "device", translate("Modem device"))
-device.rmempty = false
-
-local device_suggestions = nixio.fs.glob("/dev/tty[A-Z]*")
-	or nixio.fs.glob("/dev/tts/*")
-
-if device_suggestions then
-	local node
-	for node in device_suggestions do
-		device:value(node)
-	end
-end
-
-
-service = section:taboption("general", Value, "service", translate("Service Type"))
-service:value("", translate("-- Please choose --"))
-service:value("umts", "UMTS/GPRS")
-service:value("umts_only", translate("UMTS only"))
-service:value("gprs_only", translate("GPRS only"))
-service:value("evdo", "CDMA/EV-DO")
-
-
-apn = section:taboption("general", Value, "apn", translate("APN"))
-
-
-pincode = section:taboption("general", Value, "pincode", translate("PIN"))
-
-
-username = section:taboption("general", Value, "username", translate("PAP/CHAP username"))
-
-
-password = section:taboption("general", Value, "password", translate("PAP/CHAP password"))
-password.password = true
-
-dialnumber = section:taboption("general", Value, "dialnumber", translate("Dial number"))
-dialnumber.placeholder = "*99***1#"
-
-if luci.model.network:has_ipv6() then
-
-	ipv6 = section:taboption("advanced", ListValue, "ipv6",
-		translate("Obtain IPv6-Address"))
-
-	ipv6:value("auto", translate("Automatic"))
-	ipv6:value("0", translate("Disabled"))
-	ipv6:value("1", translate("Manual"))
-	ipv6.default = "auto"
-
-end
-
-
-delay = section:taboption("advanced", Value, "delay",
-	translate("Modem init timeout"),
-	translate("Maximum amount of seconds to wait for the modem to become ready"))
-
-delay.placeholder = "10"
-delay.datatype    = "min(1)"
-
-
-defaultroute = section:taboption("advanced", Flag, "defaultroute",
-	translate("Use default gateway"),
-	translate("If unchecked, no default route is configured"))
-
-defaultroute.default = defaultroute.enabled
-
-
-metric = section:taboption("advanced", Value, "metric",
-	translate("Use gateway metric"))
-
-metric.placeholder = "0"
-metric.datatype    = "uinteger"
-metric:depends("defaultroute", defaultroute.enabled)
-
-
-peerdns = section:taboption("advanced", Flag, "peerdns",
-	translate("Use DNS servers advertised by peer"),
-	translate("If unchecked, the advertised DNS server addresses are ignored"))
-
-peerdns.default = peerdns.enabled
-
-
-dns = section:taboption("advanced", DynamicList, "dns",
-	translate("Use custom DNS servers"))
-
-dns:depends("peerdns", "")
-dns.datatype = "ipaddr"
-dns.cast     = "string"
-
-
-keepalive_failure = section:taboption("advanced", Value, "_keepalive_failure",
-	translate("LCP echo failure threshold"),
-	translate("Presume peer to be dead after given amount of LCP echo failures, use 0 to ignore failures"))
-
-function keepalive_failure.cfgvalue(self, section)
-	local v = m:get(section, "keepalive")
-	if v and #v > 0 then
-		return tonumber(v:match("^(%d+)[ ,]+%d+") or v)
-	end
-end
-
-function keepalive_failure.write() end
-function keepalive_failure.remove() end
-
-keepalive_failure.placeholder = "0"
-keepalive_failure.datatype    = "uinteger"
-
-
-keepalive_interval = section:taboption("advanced", Value, "_keepalive_interval",
-	translate("LCP echo interval"),
-	translate("Send LCP echo requests at the given interval in seconds, only effective in conjunction with failure threshold"))
-
-function keepalive_interval.cfgvalue(self, section)
-	local v = m:get(section, "keepalive")
-	if v and #v > 0 then
-		return tonumber(v:match("^%d+[ ,]+(%d+)"))
-	end
-end
-
-function keepalive_interval.write(self, section, value)
-	local f = tonumber(keepalive_failure:formvalue(section)) or 0
-	local i = tonumber(value) or 5
-	if i < 1 then i = 1 end
-	if f > 0 then
-		m:set(section, "keepalive", "%d %d" %{ f, i })
-	else
-		m:del(section, "keepalive")
-	end
-end
-
-keepalive_interval.remove      = keepalive_interval.write
-keepalive_interval.placeholder = "5"
-keepalive_interval.datatype    = "min(1)"
-
-
-demand = section:taboption("advanced", Value, "demand",
-	translate("Inactivity timeout"),
-	translate("Close inactive connection after the given amount of seconds, use 0 to persist connection"))
-
-demand.placeholder = "0"
-demand.datatype    = "uinteger"
diff --git a/protocols/luci-proto-3g/luasrc/model/network/proto_3g.lua b/protocols/luci-proto-3g/luasrc/model/network/proto_3g.lua
index b2454838f..60d8e2eba 100644
--- a/protocols/luci-proto-3g/luasrc/model/network/proto_3g.lua
+++ b/protocols/luci-proto-3g/luasrc/model/network/proto_3g.lua
@@ -38,7 +38,7 @@ function proto.get_interfaces(self)
 	return nil
 end
 
-function proto.contains_interface(self, ifname)
+function proto.contains_interface(self, ifc)
 	if self:is_floating() then
 		return (netmod:ifnameof(ifc) == self:ifname())
 	else
diff --git a/protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js b/protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js
new file mode 100644
index 000000000..84396ede0
--- /dev/null
+++ b/protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js
@@ -0,0 +1,48 @@
+'use strict';
+'require form';
+'require network';
+
+return network.registerProtocol('hnet', {
+	getI18n: function() {
+		return _('Automatic Homenet (HNCP)');
+	},
+
+	getOpkgPackage: function() {
+		return 'hnet-full';
+	},
+
+	renderFormOptions: function(s) {
+		var dev = this.getL2Device() || this.getDevice(), o;
+
+		o = s.taboption('general', form.ListValue, 'mode', _('Category'));
+		o.value('auto', _('Automatic'));
+		o.value('external', _('External'));
+		o.value('internal', _('Internal'));
+		o.value('leaf', _('Leaf'));
+		o.value('guest', _('Guest'));
+		o.value('adhoc', _('Ad-Hoc'));
+		o.value('hybrid', _('Hybrid'));
+		o.default = 'auto';
+
+		o = s.taboption('advanced', form.Value, 'ip6assign', _('IPv6 assignment length'), _('Assign a part of given length of every public IPv6-prefix to this interface'));
+		o.datatype = 'max(128)';
+		o.default = '64';
+
+		s.taboption('advanced', form.Value, 'link_id', _('IPv6 assignment hint'), _('Assign prefix parts using this hexadecimal subprefix ID for this interface.'));
+
+		o = s.taboption('advanced', form.Value, 'ip4assign', _('IPv4 assignment length'));
+		o.datatype = 'max(32)';
+		o.default = '24';
+
+		o = s.taboption('advanced', form.Value, 'dnsname', _('DNS-Label / FQDN'));
+		o.default = s.section;
+
+		o = s.taboption('advanced', form.Value, 'macaddr', _('Override MAC address'));
+		o.datatype = 'macaddr';
+		o.placeholder = dev ? (dev.getMAC() || '') : '';
+
+		o = s.taboption('advanced', form.Value, 'mtu', _('Override MTU'));
+		o.datatype = 'max(9200)';
+		o.placeholder = dev ? (dev.getMTU() || '1500') : '1500';
+	}
+});
diff --git a/protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua b/protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua
deleted file mode 100644
index 2ed34faf7..000000000
--- a/protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua
+++ /dev/null
@@ -1,37 +0,0 @@
--- Copyright 2013 Steven Barth <steven@midlink.org>
--- Licensed to the public under the Apache License 2.0.
-
-local map, section, net = ...
-
-local mode = section:taboption("general", ListValue, "mode", translate("Category"))
-mode:value("auto", translate("Automatic"))
-mode:value("external", translate("External"))
-mode:value("internal", translate("Internal"))
-mode:value("leaf", translate("Leaf"))
-mode:value("guest", translate("Guest"))
-mode:value("adhoc", translate("Ad-Hoc"))
-mode:value("hybrid", translate("Hybrid"))
-mode.default = "auto"
-
-
-
-local plen = section:taboption("advanced", Value, "ip6assign", translate("IPv6 assignment length"),
-	translate("Assign a part of given length of every public IPv6-prefix to this interface"))
-plen.datatype = "max(128)"
-plen.default = "64"
-
-section:taboption("advanced", Value, "link_id", translate("IPv6 assignment hint"),
-	translate("Assign prefix parts using this hexadecimal subprefix ID for this interface."))
-
-plen = section:taboption("advanced", Value, "ip4assign", translate("IPv4 assignment length"))
-plen.datatype = "max(32)"
-plen.default = "24"
-
-local o = section:taboption("advanced", Value, "dnsname", translate("DNS-Label / FQDN"))
-o.default = map.name
-
-luci.tools.proto.opt_macaddr(section, ifc, translate("Override MAC address"))
-
-o = section:taboption("advanced", Value, "mtu", translate("Override MTU"))
-o.placeholder = "1500"
-o.datatype    = "max(9200)"
diff --git a/protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js b/protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js
new file mode 100644
index 000000000..7423a0858
--- /dev/null
+++ b/protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js
@@ -0,0 +1,69 @@
+'use strict';
+'require form';
+'require network';
+'require tools.widgets as widgets';
+
+network.registerPatternVirtual(/^ipip-.+$/);
+
+return network.registerProtocol('ipip', {
+	getI18n: function() {
+		return _('IPv4-in-IPv4 (RFC2003)');
+	},
+
+	getIfname: function() {
+		return this._ubus('l3_device') || 'ipip-%s'.format(this.sid);
+	},
+
+	getOpkgPackage: function() {
+		return 'ipip';
+	},
+
+	isFloating: function() {
+		return true;
+	},
+
+	isVirtual: function() {
+		return true;
+	},
+
+	getDevices: function() {
+		return null;
+	},
+
+	containsDevice: function(ifname) {
+		return (network.getIfnameOf(ifname) == this.getIfname());
+	},
+
+	renderFormOptions: function(s) {
+		var o;
+
+		o = s.taboption('general', form.Value, 'peeraddr', _('Remote IPv4 address or FQDN'), _('The IPv4 address or the fully-qualified domain name of the remote tunnel end.'));
+		o.optional = false;
+		o.datatype = 'or(hostname,ip4addr("nomask"))';
+
+		o = s.taboption('general', form.Value, 'ipaddr', _('Local IPv4 address'), _('The local IPv4 address over which the tunnel is created (optional).'));
+		o.optional = true;
+		o.datatype = 'ip4addr("nomask")';
+
+		o = s.taboption('general', widgets.NetworkSelect, 'tunlink', _('Bind interface'), _('Bind the tunnel to this interface (optional).'));
+		o.exclude = s.section;
+		o.nocreate = true;
+		o.optional = true;
+
+		o = s.taboption('advanced', form.Value, 'mtu', _('Override MTU'), _('Specify an MTU (Maximum Transmission Unit) other than the default (1280 bytes).'));
+		o.optional = true;
+		o.placeholder = 1280;
+		o.datatype = 'range(68, 9200)';
+
+		o = s.taboption('advanced', form.Value, 'ttl', _('Override TTL'), _('Specify a TTL (Time to Live) for the encapsulating packet other than the default (64).'));
+		o.optional = true;
+		o.placeholder = 64;
+		o.datatype = 'min(1)';
+
+		o = s.taboption('advanced', form.Value, 'tos', _('Override TOS'), _('Specify a TOS (Type of Service).'));
+		o.optional = true;
+		o.datatype = 'range(0, 255)';
+
+		s.taboption('advanced', form.Flag, 'df', _("Don't Fragment"), _("Enable the DF (Don't Fragment) flag of the encapsulating packets."));
+	}
+});
diff --git a/protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua b/protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua
deleted file mode 100644
index 8817f18d6..000000000
--- a/protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua
+++ /dev/null
@@ -1,34 +0,0 @@
--- Copyright 2016 Roger Pueyo Centelles <roger.pueyo@guifi.net>
--- Licensed to the public under the Apache License 2.0.
-
-local map, section, net = ...
-
-local peeraddr, ipaddr, ttl, tos, df, mtu, tunlink
-
-peeraddr = section:taboption("general", Value, "peeraddr", translate("Remote IPv4 address or FQDN"), translate("The IPv4 address or the fully-qualified domain name of the remote tunnel end."))
-peeraddr.optional = false
-peeraddr.datatype = "or(hostname,ip4addr)"
-
-ipaddr = section:taboption("general", Value, "ipaddr", translate("Local IPv4 address"), translate("The local IPv4 address over which the tunnel is created (optional)."))
-ipaddr.optional = true
-ipaddr.datatype = "ip4addr"
-
-tunlink = section:taboption("general", Value, "tunlink", translate("Bind interface"), translate("Bind the tunnel to this interface (optional)."))
-ipaddr.optional = true
-
-
-mtu = section:taboption("advanced", Value, "mtu", translate("Override MTU"), translate("Specify an MTU (Maximum Transmission Unit) other than the default (1280 bytes)."))
-mtu.optional = true
-mtu.placeholder = 1280
-mtu.datatype = "range(68, 9200)"
-
-ttl = section:taboption("advanced", Value, "ttl", translate("Override TTL"), translate("Specify a TTL (Time to Live) for the encapsulating packet other than the default (64)."))
-ttl.optional = true
-ttl.placeholder = 64
-ttl.datatype = "min(1)"
-
-tos = section:taboption("advanced", Value, "tos", translate("Override TOS"), translate("Specify a TOS (Type of Service)."))
-tos.optional = true
-tos.datatype = "range(0, 255)"
-
-df = section:taboption("advanced", Flag, "df", translate("Don't Fragment"), translate("Enable the DF (Don't Fragment) flag of the encapsulating packets."))
diff --git a/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js b/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js
new file mode 100644
index 000000000..a74708fd0
--- /dev/null
+++ b/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js
@@ -0,0 +1,60 @@
+'use strict';
+'require form';
+'require network';
+'require tools.widgets as widgets';
+
+network.registerPatternVirtual(/^464-.+$/);
+network.registerErrorCode('CLAT_CONFIG_FAILED', _('CLAT configuration failed'));
+
+return network.registerProtocol('464xlat', {
+	getI18n: function() {
+		return _('464XLAT (CLAT)');
+	},
+
+	getIfname: function() {
+		return this._ubus('l3_device') || '464-%s'.format(this.sid);
+	},
+
+	getOpkgPackage: function() {
+		return '464xlat';
+	},
+
+	isFloating: function() {
+		return true;
+	},
+
+	isVirtual: function() {
+		return true;
+	},
+
+	getDevices: function() {
+		return null;
+	},
+
+	containsDevice: function(ifname) {
+		return (network.getIfnameOf(ifname) == this.getIfname());
+	},
+
+	renderFormOptions: function(s) {
+		var o;
+
+		o = s.taboption('general', form.Value, 'ip6prefix', _('NAT64 Prefix'), _('Leave empty to autodetect'));
+		o.datatype = 'cidr6';
+
+		o = s.taboption('advanced', widgets.NetworkSelect, 'tunlink', _('Tunnel Link'));
+		o.nocreate = true;
+		o.exclude  = s.section;
+
+		o = s.taboption('advanced', form.Flag, 'defaultroute', _('Default gateway'), _('If unchecked, no default route is configured'));
+		o.default = o.enabled;
+
+		o = s.taboption('advanced', form.Value, 'metric', _('Use gateway metric'));
+		o.placeholder = '0';
+		o.datatype    = 'uinteger';
+		o.depends('defaultroute', '1');
+
+		o = s.taboption('advanced', form.Value, 'mtu', _('Use MTU on tunnel interface'));
+		o.placeholder = '1280';
+		o.datatype    = 'max(9200)';
+	}
+});
diff --git a/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js b/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js
new file mode 100644
index 000000000..f26ced7b4
--- /dev/null
+++ b/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js
@@ -0,0 +1,101 @@
+'use strict';
+'require uci';
+'require form';
+'require network';
+
+network.registerPatternVirtual(/^6in4-.+$/);
+
+return network.registerProtocol('6in4', {
+	getI18n: function() {
+		return _('IPv6-in-IPv4 (RFC4213)');
+	},
+
+	getIfname: function() {
+		return this._ubus('l3_device') || '6in4-%s'.format(this.sid);
+	},
+
+	getOpkgPackage: function() {
+		return '6in4';
+	},
+
+	isFloating: function() {
+		return true;
+	},
+
+	isVirtual: function() {
+		return true;
+	},
+
+	getDevices: function() {
+		return null;
+	},
+
+	containsDevice: function(ifname) {
+		return (network.getIfnameOf(ifname) == this.getIfname());
+	},
+
+	renderFormOptions: function(s) {
+		var o;
+
+		o = s.taboption('general', form.Value, 'ipaddr', _('Local IPv4 address'), _('Leave empty to use the current WAN address'));
+		o.datatype = 'ip4addr("nomask")';
+		o.load = function(section_id) {
+			return network.getWANNetworks().then(L.bind(function(nets) {
+				if (nets.length)
+					this.placeholder = nets[0].getIPAddr();
+				return form.Value.prototype.load.apply(this, [section_id]);
+			}, this));
+		};
+
+		o = s.taboption('general', form.Value, 'peeraddr', _('Remote IPv4 address'), _('This is usually the address of the nearest PoP operated by the tunnel broker'));
+		o.rmempty  = false;
+		o.datatype = 'ip4addr("nomask")';
+
+		o = s.taboption('general', form.Value, 'ip6addr', _('Local IPv6 address'), _('This is the local endpoint address assigned by the tunnel broker, it usually ends with <code>...:2/64</code>'));
+		o.datatype = 'cidr6';
+
+		o = s.taboption('general', form.DynamicList, 'ip6prefix', _('IPv6 routed prefix'), _('This is the prefix routed to you by the tunnel broker for use by clients'));
+		o.datatype = 'cidr6';
+
+		o = s.taboption('general', form.Flag, '_update', _('Dynamic tunnel'), _('Enable HE.net dynamic endpoint update'));
+		o.enabled  = '1';
+		o.disabled = '0';
+		o.write = function() {};
+		o.remove = function() {};
+		o.cfgvalue = function(section_id) {
+			return !isNaN(+uci.get('network', section_id, 'tunnelid')) ? this.enabled : this.disabled;
+		};
+
+		o = s.taboption('general', form.Value, 'tunnelid', _('Tunnel ID'));
+		o.datatype = 'uinteger';
+		o.depends('_update', '1');
+
+		o = s.taboption('general', form.Value, 'username', _('HE.net username'), _('This is the plain username for logging into the account'));
+		o.depends('_update', '1');
+		o.validate = function(section_id, value) {
+			if (/^[a-fA-F0-9]{32}$/.test(value))
+				return _('The HE.net endpoint update configuration changed, you must now use the plain username instead of the user ID!');
+			return true;
+		};
+
+		o = s.taboption('general', form.Value, 'password', _('HE.net password'), _('This is either the "Update Key" configured for the tunnel or the account password if no update key has been configured'));
+		o.password = true;
+		o.depends('_update', '1');
+
+		o = s.taboption('advanced', form.Flag, 'defaultroute', _('Default gateway'), _('If unchecked, no default route is configured'));
+		o.default = o.enabled;
+
+		o = s.taboption('advanced', form.Value, 'metric', _('Use gateway metric'));
+		o.placeholder = '0';
+		o.datatype    = 'uinteger';
+		o.depends('defaultroute', '1');
+
+		o = s.taboption('advanced', form.Value, 'ttl', _('Use TTL on tunnel interface'));
+		o.placeholder = '64';
+		o.datatype    = 'range(1,255)';
+
+		o = s.taboption('advanced', form.Value, 'mtu', _('Use MTU on tunnel interface'));
+		o.placeholder = '1280';
+		o.datatype    = 'max(9200)';
+	}
+});
diff --git a/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js b/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js
new file mode 100644
index 000000000..6a8f506bc
--- /dev/null
+++ b/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js
@@ -0,0 +1,81 @@
+'use strict';
+'require form';
+'require network';
+
+network.registerPatternVirtual(/^6rd-.+$/);
+
+return network.registerProtocol('6rd', {
+	getI18n: function() {
+		return _('IPv6-over-IPv4 (6rd)');
+	},
+
+	getIfname: function() {
+		return this._ubus('l3_device') || '6rd-%s'.format(this.sid);
+	},
+
+	getOpkgPackage: function() {
+		return '6rd';
+	},
+
+	isFloating: function() {
+		return true;
+	},
+
+	isVirtual: function() {
+		return true;
+	},
+
+	getDevices: function() {
+		return null;
+	},
+
+	containsDevice: function(ifname) {
+		return (network.getIfnameOf(ifname) == this.getIfname());
+	},
+
+	renderFormOptions: function(s) {
+		var o;
+
+		o = s.taboption('general', form.Value, 'ipaddr', _('Local IPv4 address'), _('Leave empty to use the current WAN address'));
+		o.datatype = 'ip4addr("nomask")';
+		o.load = function(section_id) {
+			return network.getWANNetworks().then(L.bind(function(nets) {
+				if (nets.length)
+					this.placeholder = nets[0].getIPAddr();
+				return form.Value.prototype.load.apply(this, [section_id]);
+			}, this));
+		};
+
+		o = s.taboption('general', form.Value, 'peeraddr', _('Remote IPv4 address'), _('This IPv4 address of the relay'));
+		o.rmempty  = false;
+		o.datatype = 'ip4addr("nomask")';
+
+		o = s.taboption('general', form.Value, 'ip6prefix', _('IPv6 prefix'), _('The IPv6 prefix assigned to the provider, usually ends with <code>::</code>'));
+		o.rmempty  = false;
+		o.datatype = 'ip6addr';
+
+		o = s.taboption('general', form.Value, 'ip6prefixlen', _('IPv6 prefix length'), _('The length of the IPv6 prefix in bits'));
+		o.placeholder = '16';
+		o.datatype    = 'range(0,128)';
+
+		o = s.taboption('general', form.Value, 'ip4prefixlen', _('IPv4 prefix length'), _('The length of the IPv4 prefix in bits, the remainder is used in the IPv6 addresses.'));
+		o.placeholder = '0';
+		o.datatype    = 'range(0,32)';
+
+		o = s.taboption('advanced', form.Flag, 'defaultroute', _('Default gateway'), _('If unchecked, no default route is configured'));
+		o.default = o.enabled;
+
+		o = s.taboption('advanced', form.Value, 'metric', _('Use gateway metric'));
+		o.placeholder = '0';
+		o.datatype    = 'uinteger';
+		o.depends('defaultroute', '1');
+
+		o = s.taboption('advanced', form.Value, 'ttl', _('Use TTL on tunnel interface'));
+		o.placeholder = '64';
+		o.datatype    = 'range(1,255)';
+
+		o = s.taboption('advanced', form.Value, 'mtu', _('Use MTU on tunnel interface'));
+		o.placeholder = '1280';
+		o.datatype    = 'max(9200)';
+	}
+});
diff --git a/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js b/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js
new file mode 100644
index 000000000..abfe1c8fc
--- /dev/null
+++ b/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js
@@ -0,0 +1,65 @@
+'use strict';
+'require form';
+'require network';
+
+network.registerPatternVirtual(/^6to4-.+$/);
+
+return network.registerProtocol('6to4', {
+	getI18n: function() {
+		return _('IPv6-over-IPv4 (6to4)');
+	},
+
+	getIfname: function() {
+		return this._ubus('l3_device') || '6to4-%s'.format(this.sid);
+	},
+
+	getOpkgPackage: function() {
+		return '6rd';
+	},
+
+	isFloating: function() {
+		return true;
+	},
+
+	isVirtual: function() {
+		return true;
+	},
+
+	getDevices: function() {
+		return null;
+	},
+
+	containsDevice: function(ifname) {
+		return (network.getIfnameOf(ifname) == this.getIfname());
+	},
+
+	renderFormOptions: function(s) {
+		var o;
+
+		o = s.taboption('general', form.Value, 'ipaddr', _('Local IPv4 address'), _('Leave empty to use the current WAN address'));
+		o.datatype = 'ip4addr("nomask")';
+		o.load = function(section_id) {
+			return network.getWANNetworks().then(L.bind(function(nets) {
+				if (nets.length)
+					this.placeholder = nets[0].getIPAddr();
+				return form.Value.prototype.load.apply(this, [section_id]);
+			}, this));
+		};
+
+		o = s.taboption('advanced', form.Flag, 'defaultroute', _('Default gateway'), _('If unchecked, no default route is configured'));
+		o.default = o.enabled;
+
+		o = s.taboption('advanced', form.Value, 'metric', _('Use gateway metric'));
+		o.placeholder = '0';
+		o.datatype    = 'uinteger';
+		o.depends('defaultroute', '1');
+
+		o = s.taboption('advanced', form.Value, 'ttl', _('Use TTL on tunnel interface'));
+		o.placeholder = '64';
+		o.datatype    = 'range(1,255)';
+
+		o = s.taboption('advanced', form.Value, 'mtu', _('Use MTU on tunnel interface'));
+		o.placeholder = '1280';
+		o.datatype    = 'max(9200)';
+	}
+});
diff --git a/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js b/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js
new file mode 100644
index 000000000..eba58f424
--- /dev/null
+++ b/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js
@@ -0,0 +1,58 @@
+'use strict';
+'require form';
+'require network';
+
+return network.registerProtocol('dhcpv6', {
+	getI18n: function() {
+		return _('DHCPv6 client');
+	},
+
+	getOpkgPackage: function() {
+		return 'odhcp6c';
+	},
+
+	renderFormOptions: function(s) {
+		var dev = this.getL2Device() || this.getDevice(), o;
+
+		o = s.taboption('general', form.ListValue, 'reqaddress', _('Request IPv6-address'));
+		o.value('try');
+		o.value('force');
+		o.value('none', 'disabled');
+		o.default = 'try';
+
+		o = s.taboption('general', form.Value, 'reqprefix', _('Request IPv6-prefix of length'));
+		o.value('auto', _('Automatic'));
+		o.value('no', _('disabled'));
+		o.value('48');
+		o.value('52');
+		o.value('56');
+		o.value('60');
+		o.value('64');
+		o.default = 'auto';
+
+		o = s.taboption('advanced', form.Flag, 'defaultroute', _('Use default gateway'), _('If unchecked, no default route is configured'));
+		o.default = o.enabled;
+
+		o = s.taboption('advanced', form.DynamicList, 'ip6prefix', _('Custom delegated IPv6-prefix'));
+		o.datatype = 'cidr6';
+
+		o = s.taboption('advanced', form.Flag, 'peerdns', _('Use DNS servers advertised by peer'), _('If unchecked, the advertised DNS server addresses are ignored'));
+		o.default = o.enabled;
+
+		o = s.taboption('advanced', form.DynamicList, 'dns', _('Use custom DNS servers'));
+		o.depends('peerdns', '0');
+		o.datatype = 'ipaddr';
+		o.cast     = 'string';
+
+		o = s.taboption('advanced', form.Value, 'clientid', _('Client ID to send when requesting DHCP'));
+		o.datatype  = 'hexstring';
+
+		o = s.taboption('advanced', form.Value, 'macaddr', _('Override MAC address'));
+		o.datatype = 'macaddr';
+		o.placeholder = dev ? (dev.getMAC() || '') : '';
+
+		o = s.taboption('advanced', form.Value, 'mtu', _('Override MTU'));
+		o.placeholder = dev ? (dev.getMTU() || '1500') : '1500';
+		o.datatype    = 'max(9200)';
+	}
+});
diff --git a/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js b/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js
new file mode 100644
index 000000000..fa0e68ddc
--- /dev/null
+++ b/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js
@@ -0,0 +1,79 @@
+'use strict';
+'require form';
+'require network';
+'require tools.widgets as widgets';
+
+network.registerPatternVirtual(/^ds-.+$/);
+network.registerErrorCode('AFTR_DNS_FAIL', _('Unable to resolve AFTR host name'));
+
+return network.registerProtocol('dslite', {
+	getI18n: function() {
+		return _('Dual-Stack Lite (RFC6333)');
+	},
+
+	getIfname: function() {
+		return this._ubus('l3_device') || 'ds-%s'.format(this.sid);
+	},
+
+	getOpkgPackage: function() {
+		return 'ds-lite';
+	},
+
+	isFloating: function() {
+		return true;
+	},
+
+	isVirtual: function() {
+		return true;
+	},
+
+	getDevices: function() {
+		return null;
+	},
+
+	containsDevice: function(ifname) {
+		return (network.getIfnameOf(ifname) == this.getIfname());
+	},
+
+	renderFormOptions: function(s) {
+		var o;
+
+		o = s.taboption('general', form.Value, 'peeraddr', _('DS-Lite AFTR address'));
+		o.rmempty  = false;
+		o.datatype = 'or(hostname,ip6addr("nomask"))';
+
+		o = s.taboption('general', form.Value, 'ip6addr', _('Local IPv6 address'), _('Leave empty to use the current WAN address'));
+		o.datatype = 'ip6addr("nomask")';
+		o.load = function(section_id) {
+			return network.getWAN6Networks().then(L.bind(function(nets) {
+				if (Array.isArray(nets) && nets.length)
+					this.placeholder = nets[0].getIP6Addr();
+				return form.Value.prototype.load.apply(this, [section_id]);
+			}, this));
+		};
+
+		o = s.taboption('advanced', widgets.NetworkSelect, 'tunlink', _('Tunnel Link'));
+		o.nocreate = true;
+		o.exclude  = s.section;
+
+		o = s.taboption('advanced', form.ListValue, 'encaplimit', _('Encapsulation limit'));
+		o.rmempty  = false;
+		o.default  = 'ignore';
+		o.datatype = 'or("ignore",range(0,255))';
+		o.value('ignore', _('ignore'));
+		for (var i = 0; i < 256; i++)
+			o.value(i);
+
+		o = s.taboption('advanced', form.Flag, 'defaultroute', _('Default gateway'), _('If unchecked, no default route is configured'));
+		o.default = o.enabled;
+
+		o = s.taboption('advanced', form.Value, 'metric', _('Use gateway metric'));
+		o.placeholder = '0';
+		o.datatype    = 'uinteger';
+		o.depends('defaultroute', '1');
+
+		o = s.taboption('advanced', form.Value, 'mtu', _('Use MTU on tunnel interface'));
+		o.placeholder = '1280';
+		o.datatype    = 'max(9200)';
+	}
+});
diff --git a/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js b/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js
new file mode 100644
index 000000000..006ebfbf0
--- /dev/null
+++ b/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js
@@ -0,0 +1,96 @@
+'use strict';
+'require form';
+'require network';
+'require tools.widgets as widgets';
+
+network.registerPatternVirtual(/^map-.+$/);
+network.registerErrorCode('INVALID_MAP_RULE', _('MAP rule is invalid'));
+network.registerErrorCode('NO_MATCHING_PD',   _('No matching prefix delegation'));
+network.registerErrorCode('UNSUPPORTED_TYPE', _('Unsupported MAP type'));
+
+return network.registerProtocol('map', {
+	getI18n: function() {
+		return _('MAP / LW4over6');
+	},
+
+	getIfname: function() {
+		return this._ubus('l3_device') || 'map-%s'.format(this.sid);
+	},
+
+	getOpkgPackage: function() {
+		return 'map-t';
+	},
+
+	isFloating: function() {
+		return true;
+	},
+
+	isVirtual: function() {
+		return true;
+	},
+
+	getDevices: function() {
+		return null;
+	},
+
+	containsDevice: function(ifname) {
+		return (network.getIfnameOf(ifname) == this.getIfname());
+	},
+
+	renderFormOptions: function(s) {
+		var o;
+
+		o = s.taboption('general', form.ListValue, 'type', _('Type'));
+		o.value('map-e', 'MAP-E');
+		o.value('map-t', 'MAP-T');
+		o.value('lw4o6', 'LW4over6');
+
+		o = s.taboption('general', form.Value, 'peeraddr', _('BR / DMR / AFTR'));
+		o.rmempty  = false;
+		o.datatype = 'ip6addr';
+
+		o = s.taboption('general', form.Value, 'ipaddr', _('IPv4 prefix'));
+		o.datatype = 'ip4addr';
+
+		o = s.taboption('general', form.Value, 'ip4prefixlen', _('IPv4 prefix length'), _('The length of the IPv4 prefix in bits, the remainder is used in the IPv6 addresses.'));
+		o.placeholder = '32';
+		o.datatype    = 'range(0,32)';
+
+		o = s.taboption('general', form.Value, 'ip6prefix', _('IPv6 prefix'), _('The IPv6 prefix assigned to the provider, usually ends with <code>::</code>'));
+		o.rmempty  = false;
+		o.datatype = 'ip6addr';
+
+		o = s.taboption('general', form.Value, 'ip6prefixlen', _('IPv6 prefix length'), _('The length of the IPv6 prefix in bits'));
+		o.placeholder = '16';
+		o.datatype    = 'range(0,64)';
+
+		o = s.taboption('general', form.Value, 'ealen', _('EA-bits length'));
+		o.datatype = 'range(0,48)';
+
+		o = s.taboption('general', form.Value, 'psidlen', _('PSID-bits length'));
+		o.datatype = 'range(0,16)';
+
+		o = s.taboption('general', form.Value, 'offset', _('PSID offset'));
+		o.datatype = 'range(0,16)';
+
+		o = s.taboption('advanced', widgets.NetworkSelect, 'tunlink', _('Tunnel Link'));
+		o.nocreate = true;
+		o.exclude  = s.section;
+
+		o = s.taboption('advanced', form.Flag, 'defaultroute', _('Default gateway'), _('If unchecked, no default route is configured'));
+		o.default = o.enabled;
+
+		o = s.taboption('advanced', form.Value, 'metric', _('Use gateway metric'));
+		o.placeholder = '0';
+		o.datatype    = 'uinteger';
+		o.depends('defaultroute', '1');
+
+		o = s.taboption('advanced', form.Value, 'ttl', _('Use TTL on tunnel interface'));
+		o.placeholder = '64';
+		o.datatype    = 'range(1,255)';
+
+		o = s.taboption('advanced', form.Value, 'mtu', _('Use MTU on tunnel interface'));
+		o.placeholder = '1280';
+		o.datatype    = 'max(9200)';
+	}
+});
diff --git a/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua
deleted file mode 100644
index 5a37582fa..000000000
--- a/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua
+++ /dev/null
@@ -1,33 +0,0 @@
--- Copyright 2011 Jo-Philipp Wich <jow@openwrt.org>
--- Copyright 2013 Steven Barth <steven@midlink.org>
--- Licensed to the public under the Apache License 2.0.
-
-local map, section, net = ...
-local tunlink, defaultroute, metric, mtu
-
-section:taboption("general", Value, "ip6prefix",
-	translate("NAT64 Prefix"), translate("Leave empty to autodetect"))
-
-tunlink = section:taboption("advanced", DynamicList, "tunlink", translate("Tunnel Link"))
-tunlink.template = "cbi/network_netlist"
-tunlink.nocreate = true
-
-
-defaultroute = section:taboption("advanced", Flag, "defaultroute",
-	translate("Default gateway"),
-	translate("If unchecked, no default route is configured"))
-
-defaultroute.default = defaultroute.enabled
-
-
-metric = section:taboption("advanced", Value, "metric",
-	translate("Use gateway metric"))
-
-metric.placeholder = "0"
-metric.datatype    = "uinteger"
-metric:depends("defaultroute", defaultroute.enabled)
-
-
-mtu = section:taboption("advanced", Value, "mtu", translate("Use MTU on tunnel interface"))
-mtu.placeholder = "1280"
-mtu.datatype    = "max(9200)"
diff --git a/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua
deleted file mode 100644
index 3c9f41f6b..000000000
--- a/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua
+++ /dev/null
@@ -1,102 +0,0 @@
--- Copyright 2011 Jo-Philipp Wich <jow@openwrt.org>
--- Licensed to the public under the Apache License 2.0.
-
-local map, section, net = ...
-
-local ipaddr, peeraddr, ip6addr, tunnelid, username, password
-local defaultroute, metric, ttl, mtu
-
-
-ipaddr = s:taboption("general", Value, "ipaddr",
-	translate("Local IPv4 address"),
-	translate("Leave empty to use the current WAN address"))
-
-ipaddr.datatype = "ip4addr"
-
-
-peeraddr = s:taboption("general", Value, "peeraddr",
-	translate("Remote IPv4 address"),
-	translate("This is usually the address of the nearest PoP operated by the tunnel broker"))
-
-peeraddr.rmempty  = false
-peeraddr.datatype = "ip4addr"
-
-
-ip6addr = s:taboption("general", Value, "ip6addr",
-	translate("Local IPv6 address"),
-	translate("This is the local endpoint address assigned by the tunnel broker, it usually ends with <code>...:2/64</code>"))
-
-ip6addr.datatype = "ip6addr"
-
-
-local ip6prefix = s:taboption("general", Value, "ip6prefix",
-	translate("IPv6 routed prefix"),
-	translate("This is the prefix routed to you by the tunnel broker for use by clients"))
-
-ip6prefix.datatype = "list(ip6addr)"
-
-
-local update = section:taboption("general", Flag, "_update",
-	translate("Dynamic tunnel"),
-	translate("Enable HE.net dynamic endpoint update"))
-
-update.enabled  = "1"
-update.disabled = "0"
-
-function update.write() end
-function update.remove() end
-function update.cfgvalue(self, section)
-	return (tonumber(m:get(section, "tunnelid")) ~= nil)
-		and self.enabled or self.disabled
-end
-
-
-tunnelid = section:taboption("general", Value, "tunnelid", translate("Tunnel ID"))
-tunnelid.datatype = "uinteger"
-tunnelid:depends("_update", update.enabled)
-
-
-username = section:taboption("general", Value, "username",
-	translate("HE.net username"),
-	translate("This is the plain username for logging into the account"))
-
-username:depends("_update", update.enabled)
-username.validate = function(self, val, sid)
-	if type(val) == "string" and #val == 32 and val:match("^[a-fA-F0-9]+$") then
-		return nil, translate("The HE.net endpoint update configuration changed, you must now use the plain username instead of the user ID!")
-	end
-	return val
-end
-
-
-password = section:taboption("general", Value, "password",
-	translate("HE.net password"),
-	translate("This is either the \"Update Key\" configured for the tunnel or the account password if no update key has been configured"))
-
-password.password = true
-password:depends("_update", update.enabled)
-
-
-defaultroute = section:taboption("advanced", Flag, "defaultroute",
-	translate("Default gateway"),
-	translate("If unchecked, no default route is configured"))
-
-defaultroute.default = defaultroute.enabled
-
-
-metric = section:taboption("advanced", Value, "metric",
-	translate("Use gateway metric"))
-
-metric.placeholder = "0"
-metric.datatype    = "uinteger"
-metric:depends("defaultroute", defaultroute.enabled)
-
-
-ttl = section:taboption("advanced", Value, "ttl", translate("Use TTL on tunnel interface"))
-ttl.placeholder = "64"
-ttl.datatype    = "range(1,255)"
-
-
-mtu = section:taboption("advanced", Value, "mtu", translate("Use MTU on tunnel interface"))
-mtu.placeholder = "1280"
-mtu.datatype    = "max(9200)"
diff --git a/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua
deleted file mode 100644
index 708a9c5ad..000000000
--- a/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua
+++ /dev/null
@@ -1,72 +0,0 @@
--- Copyright 2011-2012 Jo-Philipp Wich <jow@openwrt.org>
--- Licensed to the public under the Apache License 2.0.
-
-local map, section, net = ...
-
-local ipaddr, peeraddr, ip6addr, tunnelid, username, password
-local defaultroute, metric, ttl, mtu
-
-
-ipaddr = s:taboption("general", Value, "ipaddr",
-	translate("Local IPv4 address"),
-	translate("Leave empty to use the current WAN address"))
-
-ipaddr.datatype = "ip4addr"
-
-
-peeraddr = s:taboption("general", Value, "peeraddr",
-	translate("Remote IPv4 address"),
-	translate("This IPv4 address of the relay"))
-
-peeraddr.rmempty  = false
-peeraddr.datatype = "ip4addr"
-
-
-ip6addr = s:taboption("general", Value, "ip6prefix",
-	translate("IPv6 prefix"),
-	translate("The IPv6 prefix assigned to the provider, usually ends with <code>::</code>"))
-
-ip6addr.rmempty  = false
-ip6addr.datatype = "ip6addr"
-
-
-ip6prefixlen = s:taboption("general", Value, "ip6prefixlen",
-	translate("IPv6 prefix length"),
-	translate("The length of the IPv6 prefix in bits"))
-
-ip6prefixlen.placeholder = "16"
-ip6prefixlen.datatype    = "range(0,128)"
-
-
-ip6prefixlen = s:taboption("general", Value, "ip4prefixlen",
-	translate("IPv4 prefix length"),
-	translate("The length of the IPv4 prefix in bits, the remainder is used in the IPv6 addresses."))
-
-ip6prefixlen.placeholder = "0"
-ip6prefixlen.datatype    = "range(0,32)"
-
-
-
-defaultroute = section:taboption("advanced", Flag, "defaultroute",
-	translate("Default gateway"),
-	translate("If unchecked, no default route is configured"))
-
-defaultroute.default = defaultroute.enabled
-
-
-metric = section:taboption("advanced", Value, "metric",
-	translate("Use gateway metric"))
-
-metric.placeholder = "0"
-metric.datatype    = "uinteger"
-metric:depends("defaultroute", defaultroute.enabled)
-
-
-ttl = section:taboption("advanced", Value, "ttl", translate("Use TTL on tunnel interface"))
-ttl.placeholder = "64"
-ttl.datatype    = "range(1,255)"
-
-
-mtu = section:taboption("advanced", Value, "mtu", translate("Use MTU on tunnel interface"))
-mtu.placeholder = "1280"
-mtu.datatype    = "max(9200)"
diff --git a/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua
deleted file mode 100644
index 50a706974..000000000
--- a/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua
+++ /dev/null
@@ -1,37 +0,0 @@
--- Copyright 2011 Jo-Philipp Wich <jow@openwrt.org>
--- Licensed to the public under the Apache License 2.0.
-
-local map, section, net = ...
-
-local ipaddr, defaultroute, metric, ttl, mtu
-
-
-ipaddr = section:taboption("general", Value, "ipaddr",
-	translate("Local IPv4 address"),
-	translate("Leave empty to use the current WAN address"))
-
-ipaddr.datatype = "ip4addr"
-
-defaultroute = section:taboption("advanced", Flag, "defaultroute",
-	translate("Use default gateway"),
-	translate("If unchecked, no default route is configured"))
-
-defaultroute.default = defaultroute.enabled
-
-
-metric = section:taboption("advanced", Value, "metric",
-	translate("Use gateway metric"))
-
-metric.placeholder = "0"
-metric.datatype    = "uinteger"
-metric:depends("defaultroute", defaultroute.enabled)
-
-
-ttl = section:taboption("advanced", Value, "ttl", translate("Use TTL on tunnel interface"))
-ttl.placeholder = "64"
-ttl.datatype    = "range(1,255)"
-
-
-mtu = section:taboption("advanced", Value, "mtu", translate("Use MTU on tunnel interface"))
-mtu.placeholder = "1280"
-mtu.datatype    = "max(9200)"
diff --git a/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua
deleted file mode 100644
index 49281ee41..000000000
--- a/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua
+++ /dev/null
@@ -1,58 +0,0 @@
--- Copyright 2013 Steven Barth <steven@midlink.org>
--- Licensed to the public under the Apache License 2.0.
-
-local map, section, net = ...
-
-
-local o = section:taboption("general", ListValue, "reqaddress",
-	translate("Request IPv6-address"))
-o:value("try")
-o:value("force")
-o:value("none", "disabled")
-o.default = "try"
-
-
-o = section:taboption("general", Value, "reqprefix",
-	translate("Request IPv6-prefix of length"))
-o:value("auto", translate("Automatic"))
-o:value("no", translate("disabled"))
-o:value("48")
-o:value("52")
-o:value("56")
-o:value("60")
-o:value("64")
-o.default = "auto"
-
-
-o = section:taboption("advanced", Flag, "defaultroute",
-	translate("Use default gateway"),
-	translate("If unchecked, no default route is configured"))
-o.default = o.enabled
-
-
-o = section:taboption("advanced", Flag, "peerdns",
-	translate("Use DNS servers advertised by peer"),
-	translate("If unchecked, the advertised DNS server addresses are ignored"))
-o.default = o.enabled
-
-
-o = section:taboption("advanced", Value, "ip6prefix",
-	translate("Custom delegated IPv6-prefix"))
-o.dataype = "list(ip6addr)"
-
-
-o = section:taboption("advanced", DynamicList, "dns",
-	translate("Use custom DNS servers"))
-o:depends("peerdns", "")
-o.datatype = "list(ip6addr)"
-o.cast     = "string"
-
-
-o = section:taboption("advanced", Value, "clientid",
-	translate("Client ID to send when requesting DHCP"))
-
-luci.tools.proto.opt_macaddr(section, ifc, translate("Override MAC address"))
-
-o = section:taboption("advanced", Value, "mtu", translate("Override MTU"))
-o.placeholder = "1500"
-o.datatype    = "max(9200)"
diff --git a/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua
deleted file mode 100644
index eca9750ad..000000000
--- a/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua
+++ /dev/null
@@ -1,53 +0,0 @@
--- Copyright 2011 Jo-Philipp Wich <jow@openwrt.org>
--- Copyright 2013 Steven Barth <steven@midlink.org>
--- Licensed to the public under the Apache License 2.0.
-
-local map, section, net = ...
-
-local peeraddr, ip6addr
-local tunlink, defaultroute, metric, ttl, mtu
-
-
-
-
-peeraddr = section:taboption("general", Value, "peeraddr",
-	translate("DS-Lite AFTR address"))
-
-peeraddr.rmempty  = false
-peeraddr.datatype = "or(hostname,ip6addr)"
-
-ip6addr = section:taboption("general", Value, "ip6addr",
-	translate("Local IPv6 address"),
-	translate("Leave empty to use the current WAN address"))
-
-ip6addr.datatype = "ip6addr"
-
-
-tunlink = section:taboption("advanced", DynamicList, "tunlink", translate("Tunnel Link"))
-tunlink.template = "cbi/network_netlist"
-tunlink.nocreate = true
-
-
-defaultroute = section:taboption("advanced", Flag, "defaultroute",
-	translate("Default gateway"),
-	translate("If unchecked, no default route is configured"))
-
-defaultroute.default = defaultroute.enabled
-
-
-metric = section:taboption("advanced", Value, "metric",
-	translate("Use gateway metric"))
-
-metric.placeholder = "0"
-metric.datatype    = "uinteger"
-metric:depends("defaultroute", defaultroute.enabled)
-
-
-ttl = section:taboption("advanced", Value, "ttl", translate("Use TTL on tunnel interface"))
-ttl.placeholder = "64"
-ttl.datatype    = "range(1,255)"
-
-
-mtu = section:taboption("advanced", Value, "mtu", translate("Use MTU on tunnel interface"))
-mtu.placeholder = "1280"
-mtu.datatype    = "max(9200)"
diff --git a/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua
deleted file mode 100644
index 37d4ec901..000000000
--- a/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua
+++ /dev/null
@@ -1,88 +0,0 @@
--- Copyright 2011 Jo-Philipp Wich <jow@openwrt.org>
--- Copyright 2013 Steven Barth <steven@midlink.org>
--- Licensed to the public under the Apache License 2.0.
-
-local map, section, net = ...
-
-local peeraddr, ip6addr
-local tunlink, defaultroute, metric, ttl, mtu
-
-
-maptype = section:taboption("general", ListValue, "type", translate("Type"))
-maptype:value("map-e", "MAP-E")
-maptype:value("map-t", "MAP-T")
-maptype:value("lw4o6", "LW4over6")
-
-
-peeraddr = section:taboption("general", Value, "peeraddr",
-	translate("BR / DMR / AFTR"))
-
-peeraddr.rmempty  = false
-peeraddr.datatype = "ip6addr"
-
-
-ipaddr = section:taboption("general", Value, "ipaddr",
-	translate("IPv4 prefix"))
-ipaddr.datatype = "ip4addr"
-
-
-ip4prefixlen = s:taboption("general", Value, "ip4prefixlen",
-        translate("IPv4 prefix length"),
-        translate("The length of the IPv4 prefix in bits, the remainder is used in the IPv6 addresses."))
-
-ip4prefixlen.placeholder = "32"
-ip4prefixlen.datatype    = "range(0,32)"
-
-ip6addr = s:taboption("general", Value, "ip6prefix",
-        translate("IPv6 prefix"),
-        translate("The IPv6 prefix assigned to the provider, usually ends with <code>::</code>"))
-
-ip6addr.rmempty  = false
-ip6addr.datatype = "ip6addr"
-
-
-ip6prefixlen = s:taboption("general", Value, "ip6prefixlen",
-        translate("IPv6 prefix length"),
-        translate("The length of the IPv6 prefix in bits"))
-
-ip6prefixlen.placeholder = "16"
-ip6prefixlen.datatype    = "range(0,64)"
-
-
-s:taboption("general", Value, "ealen",
-	translate("EA-bits length")).datatype = "range(0,48)"
-
-s:taboption("general", Value, "psidlen",
-	translate("PSID-bits length")).datatype = "range(0,16)"
-
-s:taboption("general", Value, "offset",
-	translate("PSID offset")).datatype = "range(0,16)"
-
-tunlink = section:taboption("advanced", DynamicList, "tunlink", translate("Tunnel Link"))
-tunlink.template = "cbi/network_netlist"
-tunlink.nocreate = true
-
-
-defaultroute = section:taboption("advanced", Flag, "defaultroute",
-	translate("Default gateway"),
-	translate("If unchecked, no default route is configured"))
-
-defaultroute.default = defaultroute.enabled
-
-
-metric = section:taboption("advanced", Value, "metric",
-	translate("Use gateway metric"))
-
-metric.placeholder = "0"
-metric.datatype    = "uinteger"
-metric:depends("defaultroute", defaultroute.enabled)
-
-
-ttl = section:taboption("advanced", Value, "ttl", translate("Use TTL on tunnel interface"))
-ttl.placeholder = "64"
-ttl.datatype    = "range(1,255)"
-
-
-mtu = section:taboption("advanced", Value, "mtu", translate("Use MTU on tunnel interface"))
-mtu.placeholder = "1280"
-mtu.datatype    = "max(9200)"
diff --git a/protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua b/protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua
index 7508e0d4b..0b329d8a9 100644
--- a/protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua
+++ b/protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua
@@ -49,7 +49,7 @@ for _, p in ipairs({"dslite", "map", "464xlat"}) do
 		return nil
 	end
 
-	function proto.contains_interface(self, ifname)
+	function proto.contains_interface(self, ifc)
 		return (netmod:ifnameof(ifc) == self:ifname())
 	end
 end
diff --git a/protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua b/protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua
index 9a4396c5b..2fd0b1195 100644
--- a/protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua
+++ b/protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua
@@ -42,7 +42,7 @@ for _, p in ipairs({"6in4", "6to4", "6rd"}) do
 		return nil
 	end
 
-	function proto.contains_interface(self, ifname)
+	function proto.contains_interface(self, ifc)
 		return (netmod:ifnameof(ifc) == self:ifname())
 	end
 
diff --git a/protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js b/protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js
new file mode 100644
index 000000000..3ab6c01d6
--- /dev/null
+++ b/protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js
@@ -0,0 +1,123 @@
+'use strict';
+'require rpc';
+'require form';
+'require network';
+
+var callFileList = rpc.declare({
+	object: 'file',
+	method: 'list',
+	params: [ 'path' ],
+	expect: { entries: [] },
+	filter: function(list, params) {
+		var rv = [];
+		for (var i = 0; i < list.length; i++)
+			if (list[i].name.match(/^ttyUSB/) || list[i].name.match(/^cdc-wdm/))
+				rv.push(params.path + list[i].name);
+		return rv.sort();
+	}
+});
+
+network.registerPatternVirtual(/^ncm-.+$/);
+network.registerErrorCode('CONFIGURE_FAILED',  _('Configuration failed'));
+network.registerErrorCode('DISCONNECT_FAILED', _('Disconnection attempt failed'));
+network.registerErrorCode('FINALIZE_FAILED',   _('Finalizing failed'));
+network.registerErrorCode('GETINFO_FAILED',    _('Modem information query failed'));
+network.registerErrorCode('INITIALIZE_FAILED', _('Initialization failure'));
+network.registerErrorCode('SETMODE_FAILED',    _('Setting operation mode failed'));
+network.registerErrorCode('UNSUPPORTED_MODEM', _('Unsupported modem'));
+
+return network.registerProtocol('ncm', {
+	getI18n: function() {
+		return _('NCM');
+	},
+
+	getIfname: function() {
+		return this._ubus('l3_device') || 'wan';
+	},
+
+	getOpkgPackage: function() {
+		return 'comgt-ncm';
+	},
+
+	isFloating: function() {
+		return true;
+	},
+
+	isVirtual: function() {
+		return true;
+	},
+
+	getDevices: function() {
+		return null;
+	},
+
+	containsDevice: function(ifname) {
+		return (network.getIfnameOf(ifname) == this.getIfname());
+	},
+
+	renderFormOptions: function(s) {
+		var o;
+
+		o = s.taboption('general', form.Value, 'device', _('Modem device'));
+		o.rmempty = false;
+		o.load = function(section_id) {
+			return callFileList('/dev/').then(L.bind(function(devices) {
+				for (var i = 0; i < devices.length; i++)
+					this.value(devices[i]);
+				return form.Value.prototype.load.apply(this, [section_id]);
+			}, this));
+		};
+
+		o = s.taboption('general', form.Value, 'service', _('Service Type'));
+		o.value('', _('Modem default'));
+		o.value('preferlte', _('Prefer LTE'));
+		o.value('preferumts', _('Prefer UMTS'));
+		o.value('lte', 'LTE');
+		o.value('umts', 'UMTS/GPRS');
+		o.value('gsm', _('GPRS only'));
+		o.value('auto', _('auto'));
+
+		o = s.taboption('general', form.ListValue, 'pdptype', _('IP Protocol'));
+		o.default = 'IP';
+		o.value('IP', _('IPv4'));
+		o.value('IPV4V6', _('IPv4+IPv6'));
+		o.value('IPV6', _('IPv6'));
+
+		s.taboption('general', form.Value, 'apn', _('APN'));
+		s.taboption('general', form.Value, 'pincode', _('PIN'));
+		s.taboption('general', form.Value, 'username', _('PAP/CHAP username'));
+
+		o = s.taboption('general', form.Value, 'password', _('PAP/CHAP password'));
+		o.password = true;
+
+		o = s.taboption('general', form.Value, 'dialnumber', _('Dial number'));
+		o.placeholder = '*99***1#';
+
+		if (L.hasSystemFeature('ipv6')) {
+			o = s.taboption('advanced', form.ListValue, 'ipv6', _('Obtain IPv6-Address'));
+			o.value('auto', _('Automatic'));
+			o.value('0', _('Disabled'));
+			o.value('1', _('Manual'));
+			o.default = 'auto';
+		}
+
+		o = s.taboption('advanced', form.Value, 'delay', _('Modem init timeout'), _('Maximum amount of seconds to wait for the modem to become ready'));
+		o.placeholder = '10';
+		o.datatype    = 'min(1)';
+
+		o = s.taboption('advanced', form.Flag, 'defaultroute', _('Default gateway'), _('If unchecked, no default route is configured'));
+		o.default = o.enabled;
+
+		o = s.taboption('advanced', form.Value, 'metric', _('Use gateway metric'));
+		o.placeholder = '0';
+		o.datatype    = 'uinteger';
+		o.depends('defaultroute', '1');
+
+		o = s.taboption('advanced', form.Flag, 'peerdns', _('Use DNS servers advertised by peer'), _('If unchecked, the advertised DNS server addresses are ignored'));
+		o.default = o.enabled;
+
+		o = s.taboption('advanced', form.DynamicList, 'dns', _('Use custom DNS servers'));
+		o.depends('peerdns', '0');
+		o.datatype = 'ipaddr';
+	}
+});
diff --git a/protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua b/protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua
deleted file mode 100644
index 3fe4ef33a..000000000
--- a/protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua
+++ /dev/null
@@ -1,110 +0,0 @@
---[[
-LuCI - Lua Configuration Interface
-
-Copyright 2015 Cezary Jackiewicz <cezary.jackiewicz@gmail.com>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-]]--
-
-local map, section, net = ...
-
-local device, apn, service, pincode, username, password, dialnum
-local ipv6, delay, defaultroute, metric, peerdns, dns
-
-
-device = section:taboption("general", Value, "device", translate("Modem device"))
-device.rmempty = false
-
-local dev
-for dev in nixio.fs.glob("/dev/ttyUSB*") do
-    device:value(dev)
-end
-for dev in nixio.fs.glob("/dev/cdc-wdm*") do
-    device:value(dev)
-end
-
-mode = section:taboption("general", Value, "mode", translate("Service Type"))
-mode:value("", translate("Modem default"))
-mode:value("preferlte", translate("Prefer LTE"))
-mode:value("preferumts", translate("Prefer UMTS"))
-mode:value("lte", "LTE")
-mode:value("umts", "UMTS/GPRS")
-mode:value("gsm", translate("GPRS only"))
-mode:value("auto", translate("auto"))
-
-
-mode = section:taboption("general", Value, "pdptype", translate("IP Protocol"))
-mode.default = "IP"
-mode:value("IP", translate("IPv4"))
-mode:value("IPV4V6", translate("IPv4+IPv6"))
-mode:value("IPV6", translate("IPv6"))
-
-
-apn = section:taboption("general", Value, "apn", translate("APN"))
-
-
-pincode = section:taboption("general", Value, "pincode", translate("PIN"))
-
-
-username = section:taboption("general", Value, "username", translate("PAP/CHAP username"))
-
-
-password = section:taboption("general", Value, "password", translate("PAP/CHAP password"))
-password.password = true
-
-
-dialnum = section:taboption("general", Value, "dialnum", translate("Dial number"))
-dialnum.placeholder = "*99#"
-
-
-if luci.model.network:has_ipv6() then
-
-	ipv6 = section:taboption("advanced", ListValue, "ipv6")
-	ipv6:value("auto", translate("Automatic"))
-	ipv6:value("0", translate("Disabled"))
-	ipv6:value("1", translate("Manual"))
-	ipv6.default = "auto"
-
-end
-
-
-delay = section:taboption("advanced", Value, "delay",
-	translate("Modem init timeout"),
-	translate("Maximum amount of seconds to wait for the modem to become ready"))
-
-delay.placeholder = "10"
-delay.datatype    = "min(1)"
-
-
-defaultroute = section:taboption("advanced", Flag, "defaultroute",
-	translate("Use default gateway"),
-	translate("If unchecked, no default route is configured"))
-
-defaultroute.default = defaultroute.enabled
-
-metric = section:taboption("advanced", Value, "metric",
-	translate("Use gateway metric"))
-
-metric.placeholder = "0"
-metric.datatype    = "uinteger"
-metric:depends("defaultroute", defaultroute.enabled)
-
-
-peerdns = section:taboption("advanced", Flag, "peerdns",
-	translate("Use DNS servers advertised by peer"),
-	translate("If unchecked, the advertised DNS server addresses are ignored"))
-
-peerdns.default = peerdns.enabled
-
-
-dns = section:taboption("advanced", DynamicList, "dns",
-	translate("Use custom DNS servers"))
-
-dns:depends("peerdns", "")
-dns.datatype = "ipaddr"
-dns.cast     = "string"
-
diff --git a/protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js b/protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js
new file mode 100644
index 000000000..14fc8f6d3
--- /dev/null
+++ b/protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js
@@ -0,0 +1,159 @@
+'use strict';
+'require rpc';
+'require form';
+'require network';
+
+var callGetCertificateFiles = rpc.declare({
+	object: 'luci.openconnect',
+	method: 'getCertificates',
+	params: [ 'interface' ],
+	expect: { '': {} }
+});
+
+var callSetCertificateFiles = rpc.declare({
+	object: 'luci.openconnect',
+	method: 'setCertificates',
+	params: [ 'interface', 'user_certificate', 'user_privatekey', 'ca_certificate' ],
+	expect: { '': {} }
+});
+
+network.registerPatternVirtual(/^vpn-.+$/);
+
+function sanitizeCert(s) {
+	if (typeof(s) != 'string')
+		return null;
+
+	s = s.trim();
+
+	if (s == '')
+		return null;
+
+	s = s.replace(/\r\n?/g, '\n');
+
+	if (!s.match(/\n$/))
+		s += '\n';
+
+	return s;
+}
+
+function validateCert(priv, section_id, value) {
+	var beg = priv ? /^-----BEGIN RSA PRIVATE KEY-----$/ : /^-----BEGIN CERTIFICATE-----$/,
+	    end = priv ? /^-----END RSA PRIVATE KEY-----$/ : /^-----END CERTIFICATE-----$/,
+	    lines = value.trim().split(/[\r\n]/),
+	    start = false,
+	    i;
+
+	for (i = 0; i < lines.length; i++) {
+		if (lines[i].match(beg))
+			start = true;
+		else if (start && !lines[i].match(/^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/))
+			break;
+	}
+
+	if (!start || i < lines.length - 1 || !lines[i].match(end))
+		return _('This does not look like a valid PEM file');
+
+	return true;
+}
+
+return network.registerProtocol('openconnect', {
+	getI18n: function() {
+		return _('OpenConnect (CISCO AnyConnect)');
+	},
+
+	getIfname: function() {
+		return this._ubus('l3_device') || 'vpn-%s'.format(this.sid);
+	},
+
+	getOpkgPackage: function() {
+		return 'openconnect';
+	},
+
+	isFloating: function() {
+		return true;
+	},
+
+	isVirtual: function() {
+		return true;
+	},
+
+	getDevices: function() {
+		return null;
+	},
+
+	containsDevice: function(ifname) {
+		return (network.getIfnameOf(ifname) == this.getIfname());
+	},
+
+	renderFormOptions: function(s) {
+		var dev = this.getDevice().getName(),
+		    certLoadPromise = null,
+		    o;
+
+		o = s.taboption('general', form.Value, 'server', _('VPN Server'));
+		o.datatype = 'host(0)';
+
+		o = s.taboption('general', form.Value, 'port', _('VPN Server port'));
+		o.placeholder = '443';
+		o.datatype    = 'port';
+
+		s.taboption('general', form.Value, 'serverhash', _("VPN Server's certificate SHA1 hash"));
+		s.taboption('general', form.Value, 'authgroup', _('Auth Group'));
+		s.taboption("general", form.Value, "username", _("Username"));
+
+		o = s.taboption('general', form.Value, 'password', _('Password'));
+		o.password = true;
+
+		o = s.taboption('general', form.Value, 'password2', _('Password2'));
+		o.password = true;
+
+		o = s.taboption('general', form.TextValue, 'usercert', _('User certificate (PEM encoded)'));
+		o.rows = 10;
+		o.monospace = true;
+		o.validate = L.bind(validateCert, o, false);
+		o.load = function(section_id) {
+			certLoadPromise = certLoadPromise || callGetCertificateFiles(section_id);
+			return certLoadPromise.then(function(certs) { return certs.user_certificate });
+		};
+		o.write = function(section_id, value) {
+			return callSetCertificateFiles(section_id, sanitizeCert(value), null, null);
+		};
+
+		o = s.taboption('general', form.TextValue, 'userkey', _('User key (PEM encoded)'));
+		o.rows = 10;
+		o.monospace = true;
+		o.validate = L.bind(validateCert, o, true);
+		o.load = function(section_id) {
+			certLoadPromise = certLoadPromise || callGetCertificateFiles(section_id);
+			return certLoadPromise.then(function(certs) { return certs.user_privatekey });
+		};
+		o.write = function(section_id, value) {
+			return callSetCertificateFiles(section_id, null, sanitizeCert(value), null);
+		};
+
+		o = s.taboption('general', form.TextValue, 'ca', _('CA certificate; if empty it will be saved after the first connection.'));
+		o.rows = 10;
+		o.monospace = true;
+		o.validate = L.bind(validateCert, o, false);
+		o.load = function(section_id) {
+			certLoadPromise = certLoadPromise || callGetCertificateFiles(section_id);
+			return certLoadPromise.then(function(certs) { return certs.ca_certificate });
+		};
+		o.write = function(section_id, value) {
+			return callSetCertificateFiles(section_id, null, null, sanitizeCert(value));
+		};
+
+		o = s.taboption('advanced', form.Flag, 'defaultroute', _('Default gateway'), _('If unchecked, no default route is configured'));
+		o.default = o.enabled;
+
+		o = s.taboption('advanced', form.Value, 'metric', _('Use gateway metric'));
+		o.placeholder = '0';
+		o.datatype    = 'uinteger';
+		o.depends('defaultroute', '1');
+
+		o = s.taboption('advanced', form.Value, 'mtu', _('Override MTU'));
+		o.optional = true;
+		o.placeholder = 1406;
+		o.datatype = 'range(68, 9200)';
+	}
+});
diff --git a/protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua b/protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua
deleted file mode 100644
index 5adfccae4..000000000
--- a/protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua
+++ /dev/null
@@ -1,90 +0,0 @@
--- Copyright 2014 Nikos Mavrogiannopoulos <nmav@gnutls.org>
--- Licensed to the public under the Apache License 2.0.
-
-local map, section, net = ...
-
-local server, username, password, cert, ca
-local oc_cert_file, oc_key_file, oc_ca_file
-
-local ifc = net:get_interface():name()
-
-oc_cert_file = "/etc/openconnect/user-cert-" .. ifc .. ".pem"
-oc_key_file = "/etc/openconnect/user-key-" .. ifc .. ".pem"
-oc_ca_file = "/etc/openconnect/ca-" .. ifc .. ".pem"
-
-server = section:taboption("general", Value, "server", translate("VPN Server"))
-server.datatype = "host(0)"
-
-port = section:taboption("general", Value, "port", translate("VPN Server port"))
-port.placeholder = "443"
-port.datatype    = "port"
-
-
-defaultroute = section:taboption("advanced", Flag, "defaultroute",
-	translate("Use default gateway"),
-	translate("If unchecked, no default route is configured"))
-
-defaultroute.default = defaultroute.enabled
-
-
-metric = section:taboption("advanced", Value, "metric",
-	translate("Use gateway metric"))
-
-metric.placeholder = "0"
-metric.datatype    = "uinteger"
-metric:depends("defaultroute", defaultroute.enabled)
-
-section:taboption("general", Value, "serverhash", translate("VPN Server's certificate SHA1 hash"))
-
-section:taboption("general", Value, "authgroup", translate("Auth Group"))
-
-username = section:taboption("general", Value, "username", translate("Username"))
-password = section:taboption("general", Value, "password", translate("Password"))
-password.password = true
-password2 = section:taboption("general", Value, "password2", translate("Password2"))
-password2.password = true
-
-
-cert = section:taboption("advanced", Value, "usercert", translate("User certificate (PEM encoded)"))
-cert.template = "cbi/tvalue"
-cert.rows = 10
-
-function cert.cfgvalue(self, section)
-	return nixio.fs.readfile(oc_cert_file)
-end
-
-function cert.write(self, section, value)
-	value = value:gsub("\r\n?", "\n")
-	nixio.fs.writefile(oc_cert_file, value)
-end
-
-cert = section:taboption("advanced", Value, "userkey", translate("User key (PEM encoded)"))
-cert.template = "cbi/tvalue"
-cert.rows = 10
-
-function cert.cfgvalue(self, section)
-	return nixio.fs.readfile(oc_key_file)
-end
-
-function cert.write(self, section, value)
-	value = value:gsub("\r\n?", "\n")
-	nixio.fs.writefile(oc_key_file, value)
-end
-
-
-ca = section:taboption("advanced", Value, "ca", translate("CA certificate; if empty it will be saved after the first connection."))
-ca.template = "cbi/tvalue"
-ca.rows = 10
-
-function ca.cfgvalue(self, section)
-	return nixio.fs.readfile(oc_ca_file)
-end
-
-function ca.write(self, section, value)
-	value = value:gsub("\r\n?", "\n")
-	nixio.fs.writefile(oc_ca_file, value)
-end
-
-mtu = section:taboption("advanced", Value, "mtu", translate("Override MTU"))
-mtu.placeholder = "1406"
-mtu.datatype    = "max(9200)"
diff --git a/protocols/luci-proto-openconnect/root/usr/libexec/rpcd/luci.openconnect b/protocols/luci-proto-openconnect/root/usr/libexec/rpcd/luci.openconnect
new file mode 100755
index 000000000..9378cc518
--- /dev/null
+++ b/protocols/luci-proto-openconnect/root/usr/libexec/rpcd/luci.openconnect
@@ -0,0 +1,78 @@
+#!/usr/bin/env lua
+
+local json = require "luci.jsonc"
+local fs   = require "nixio.fs"
+
+local function readfile(path)
+	local s = fs.readfile(path)
+	return s and (s:gsub("^%s+", ""):gsub("%s+$", ""))
+end
+
+local function writefile(path, data)
+	local n = fs.writefile(path, data)
+	return (n == #data)
+end
+
+local function parseInput()
+	local parse = json.new()
+	local done, err
+
+	while true do
+		local chunk = io.read(4096)
+		if not chunk then
+			break
+		elseif not done and not err then
+			done, err = parse:parse(chunk)
+		end
+	end
+
+	if not done then
+		print(json.stringify({ error = err or "Incomplete input" }))
+		os.exit(1)
+	end
+
+	return parse:get()
+end
+
+if arg[1] == "list" then
+	print(json.stringify({
+		getCertificates = {
+			interface = "interface"
+		},
+		setCertificates = {
+			interface = "interface",
+			user_certificate = "PEM file data",
+			user_privatekey = "PEM file data",
+			ca_certificate = "PEM file data"
+		}
+	}))
+elseif arg[1] == "call" then
+	local args = parseInput()
+
+	if not args.interface or
+	   type(args.interface) ~= "string" or
+	   not args.interface:match("^[a-zA-Z0-9_]+$")
+	then
+		print(json.stringify({ error = "Invalid interface name" }))
+		os.exit(1)
+	end
+
+	if arg[2] == "getCertificates" then
+		print(json.stringify({
+			user_certificate = readfile(string.format("/etc/openconnect/user-cert-%s.pem", args.interface)),
+			user_privatekey = readfile(string.format("/etc/openconnect/user-key-%s.pem", args.interface)),
+			ca_certificate = readfile(string.format("/etc/openconnect/ca-%s.pem", args.interface))
+		}))
+	elseif arg[2] == "setCertificates" then
+		if args.user_certificate then
+			writefile(string.format("/etc/openconnect/user-cert-%s.pem", args.interface), args.user_certificate)
+		end
+		if args.user_privatekey then
+			writefile(string.format("/etc/openconnect/user-key-%s.pem", args.interface), args.user_privatekey)
+		end
+		if args.ca_certificate then
+			writefile(string.format("/etc/openconnect/ca-%s.pem", args.interface), args.ca_certificate)
+		end
+		print(json.stringify({ result = true }))
+	end
+end
diff --git a/protocols/luci-proto-openconnect/root/usr/share/rpcd/acl.d/luci-openconnect.json b/protocols/luci-proto-openconnect/root/usr/share/rpcd/acl.d/luci-openconnect.json
new file mode 100644
index 000000000..66bc5ac24
--- /dev/null
+++ b/protocols/luci-proto-openconnect/root/usr/share/rpcd/acl.d/luci-openconnect.json
@@ -0,0 +1,17 @@
+{
+	"luci-proto-openconnect": {
+		"description": "Grant access to LuCI OpenConnect procedures",
+		"read": {
+			"ubus": {
+				"luci.openconnect": [ "getCertificates" ]
+			},
+			"uci": [ "network" ]
+		},
+		"write": {
+			"ubus": {
+				"luci.openconnect": [ "setCertificates" ]
+			},
+			"uci": [ "network" ]
+		}
+	}
+}
diff --git a/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js
new file mode 100644
index 000000000..13bb3548a
--- /dev/null
+++ b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js
@@ -0,0 +1,75 @@
+'use strict';
+'require uci';
+'require form';
+'require network';
+
+network.registerPatternVirtual(/^l2tp-.+$/);
+
+return network.registerProtocol('l2tp', {
+	getI18n: function() {
+		return _('L2TP');
+	},
+
+	getIfname: function() {
+		return this._ubus('l3_device') || 'l2tp-%s'.format(this.sid);
+	},
+
+	getOpkgPackage: function() {
+		return 'xl2tpd';
+	},
+
+	isFloating: function() {
+		return true;
+	},
+
+	isVirtual: function() {
+		return true;
+	},
+
+	getDevices: function() {
+		return null;
+	},
+
+	containsDevice: function(ifname) {
+		return (network.getIfnameOf(ifname) == this.getIfname());
+	},
+
+	renderFormOptions: function(s) {
+		var dev = this.getL3Device() || this.getDevice(), o;
+
+		o = s.taboption('general', form.Value, 'server', _('L2TP Server'));
+		o.datatype = 'or(host(1), hostport(1))';
+
+		s.taboption('general', form.Value, 'username', _('PAP/CHAP username'));
+
+		o = s.taboption('general', form.Value, 'password', _('PAP/CHAP password'));
+		o.password = true;
+
+		if (L.hasSystemFeature('ipv6')) {
+			o = s.taboption('advanced', form.ListValue, 'ipv6', _('Obtain IPv6-Address'), _('Enable IPv6 negotiation on the PPP link'));
+			o.value('auto', _('Automatic'));
+			o.value('0', _('Disabled'));
+			o.value('1', _('Manual'));
+			o.default = 'auto';
+		}
+
+		o = s.taboption('advanced', form.Flag, 'defaultroute', _('Use default gateway'), _('If unchecked, no default route is configured'));
+		o.default = o.enabled;
+
+		o = s.taboption('advanced', form.Flag, 'peerdns', _('Use DNS servers advertised by peer'), _('If unchecked, the advertised DNS server addresses are ignored'));
+		o.default = o.enabled;
+
+		o = s.taboption('advanced', form.DynamicList, 'dns', _('Use custom DNS servers'));
+		o.depends('peerdns', '0');
+		o.datatype = 'ipaddr';
+		o.cast     = 'string';
+
+		o = s.taboption('advanced', form.Value, 'metric', _('Use gateway metric'));
+		o.placeholder = '0';
+		o.datatype    = 'uinteger';
+
+		o = s.taboption('advanced', form.Value, 'mtu', _('Override MTU'));
+		o.placeholder = dev ? (dev.getMTU() || '1500') : '1500';
+		o.datatype    = 'max(9200)';
+	}
+});
diff --git a/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js
new file mode 100644
index 000000000..57a7b6a0e
--- /dev/null
+++ b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js
@@ -0,0 +1,149 @@
+'use strict';
+'require rpc';
+'require uci';
+'require form';
+'require network';
+
+var callFileList = rpc.declare({
+	object: 'file',
+	method: 'list',
+	params: [ 'path' ],
+	expect: { entries: [] },
+	filter: function(list, params) {
+		var rv = [];
+		for (var i = 0; i < list.length; i++)
+			if (list[i].name.match(/^tty[A-Z]/) || list[i].name.match(/^cdc-wdm/) || list[i].name.match(/^[0-9]+$/))
+				rv.push(params.path + list[i].name);
+		return rv.sort();
+	}
+});
+
+network.registerPatternVirtual(/^ppp-.+$/);
+
+function write_keepalive(section_id, value) {
+	var f_opt = this.map.lookupOption('_keepalive_failure', section_id),
+	    i_opt = this.map.lookupOption('_keepalive_interval', section_id),
+	    f = (f_opt != null) ? +f_opt[0].formvalue(section_id) : null,
+	    i = (i_opt != null) ? +i_opt[0].formvalue(section_id) : null;
+
+	if (f == null || f == '' || isNaN(f))
+		f = 0;
+
+	if (i == null || i == '' || isNaN(i) || i < 1)
+		i = 1;
+
+	if (f > 0)
+		uci.set('network', section_id, 'keepalive', '%d %d'.format(f, i));
+	else
+		uci.unset('network', section_id, 'keepalive');
+}
+
+return network.registerProtocol('ppp', {
+	getI18n: function() {
+		return _('PPP');
+	},
+
+	getIfname: function() {
+		return this._ubus('l3_device') || 'ppp-%s'.format(this.sid);
+	},
+
+	getOpkgPackage: function() {
+		return 'ppp';
+	},
+
+	isFloating: function() {
+		return true;
+	},
+
+	isVirtual: function() {
+		return true;
+	},
+
+	getDevices: function() {
+		return null;
+	},
+
+	containsDevice: function(ifname) {
+		return (network.getIfnameOf(ifname) == this.getIfname());
+	},
+
+	renderFormOptions: function(s) {
+		var dev = this.getL3Device() || this.getDevice(), o;
+
+		o = s.taboption('general', form.Value, 'device', _('Modem device'));
+		o.rmempty = false;
+		o.load = function(section_id) {
+			return callFileList('/dev/').then(L.bind(function(devices) {
+				for (var i = 0; i < devices.length; i++)
+					this.value(devices[i]);
+				return callFileList('/dev/tts/');
+			}, this)).then(L.bind(function(devices) {
+				for (var i = 0; i < devices.length; i++)
+					this.value(devices[i]);
+				return form.Value.prototype.load.apply(this, [section_id]);
+			}, this));
+		};
+
+		s.taboption('general', form.Value, 'username', _('PAP/CHAP username'));
+
+		o = s.taboption('general', form.Value, 'password', _('PAP/CHAP password'));
+		o.password = true;
+
+		if (L.hasSystemFeature('ipv6')) {
+			o = s.taboption('advanced', form.ListValue, 'ipv6', _('Obtain IPv6-Address'), _('Enable IPv6 negotiation on the PPP link'));
+			o.value('auto', _('Automatic'));
+			o.value('0', _('Disabled'));
+			o.value('1', _('Manual'));
+			o.default = 'auto';
+		}
+
+		o = s.taboption('advanced', form.Flag, 'defaultroute', _('Use default gateway'), _('If unchecked, no default route is configured'));
+		o.default = o.enabled;
+
+		o = s.taboption('advanced', form.Flag, 'peerdns', _('Use DNS servers advertised by peer'), _('If unchecked, the advertised DNS server addresses are ignored'));
+		o.default = o.enabled;
+
+		o = s.taboption('advanced', form.DynamicList, 'dns', _('Use custom DNS servers'));
+		o.depends('peerdns', '0');
+		o.datatype = 'ipaddr';
+		o.cast     = 'string';
+
+		o = s.taboption('advanced', form.Value, 'metric', _('Use gateway metric'));
+		o.placeholder = '0';
+		o.datatype    = 'uinteger';
+
+		o = s.taboption('advanced', form.Value, '_keepalive_failure', _('LCP echo failure threshold'), _('Presume peer to be dead after given amount of LCP echo failures, use 0 to ignore failures'));
+		o.placeholder = '0';
+		o.datatype    = 'uinteger';
+		o.write       = write_keepalive;
+		o.remove      = write_keepalive;
+		o.cfgvalue = function(section_id) {
+			var v = uci.get('network', section_id, 'keepalive');
+			if (typeof(v) == 'string' && v != '') {
+				var m = v.match(/^(\d+)[ ,]\d+$/);
+				return m ? m[1] : v;
+			}
+		};
+
+		o = s.taboption('advanced', form.Value, '_keepalive_interval', _('LCP echo interval'), _('Send LCP echo requests at the given interval in seconds, only effective in conjunction with failure threshold'));
+		o.placeholder = '5';
+		o.datatype    = 'min(1)';
+		o.write       = write_keepalive;
+		o.remove      = write_keepalive;
+		o.cfgvalue = function(section_id) {
+			var v = uci.get('network', section_id, 'keepalive');
+			if (typeof(v) == 'string' && v != '') {
+				var m = v.match(/^\d+[ ,](\d+)$/);
+				return m ? m[1] : v;
+			}
+		};
+
+		o = s.taboption('advanced', form.Value, 'demand', _('Inactivity timeout'), _('Close inactive connection after the given amount of seconds, use 0 to persist connection'));
+		o.placeholder = '0';
+		o.datatype    = 'uinteger';
+
+		o = s.taboption('advanced', form.Value, 'mtu', _('Override MTU'));
+		o.placeholder = dev ? (dev.getMTU() || '1500') : '1500';
+		o.datatype    = 'max(9200)';
+	}
+});
diff --git a/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js
new file mode 100644
index 000000000..483ac9e55
--- /dev/null
+++ b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js
@@ -0,0 +1,136 @@
+'use strict';
+'require uci';
+'require form';
+'require network';
+
+network.registerPatternVirtual(/^pppoa-.+$/);
+
+function write_keepalive(section_id, value) {
+	var f_opt = this.map.lookupOption('_keepalive_failure', section_id),
+	    i_opt = this.map.lookupOption('_keepalive_interval', section_id),
+	    f = (f_opt != null) ? +f_opt[0].formvalue(section_id) : null,
+	    i = (i_opt != null) ? +i_opt[0].formvalue(section_id) : null;
+
+	if (f == null || f == '' || isNaN(f))
+		f = 0;
+
+	if (i == null || i == '' || isNaN(i) || i < 1)
+		i = 1;
+
+	if (f > 0)
+		uci.set('network', section_id, 'keepalive', '%d %d'.format(f, i));
+	else
+		uci.unset('network', section_id, 'keepalive');
+}
+
+return network.registerProtocol('pppoa', {
+	getI18n: function() {
+		return _('PPPoATM');
+	},
+
+	getIfname: function() {
+		return this._ubus('l3_device') || 'pppoa-%s'.format(this.sid);
+	},
+
+	getOpkgPackage: function() {
+		return 'ppp-mod-pppoa';
+	},
+
+	isFloating: function() {
+		return true;
+	},
+
+	isVirtual: function() {
+		return true;
+	},
+
+	getDevices: function() {
+		return null;
+	},
+
+	containsDevice: function(ifname) {
+		return (network.getIfnameOf(ifname) == this.getIfname());
+	},
+
+	renderFormOptions: function(s) {
+		var dev = this.getL3Device() || this.getDevice(), o;
+
+		o = s.taboption('general', form.ListValue, 'encaps', _('PPPoA Encapsulation'));
+		o.value('vc', 'VC-Mux');
+		o.value('llc', 'LLC');
+
+		o = s.taboption('general', form.Value, 'atmdev', _('ATM device number'));
+		o.default  = '0';
+		o.datatype = 'uinteger';
+
+		o = s.taboption('general', form.Value, 'vci', _('ATM Virtual Channel Identifier (VCI)'));
+		o.default  = '35';
+		o.datatype = 'uinteger';
+
+		o = s.taboption('general', form.Value, 'vpi', _('ATM Virtual Path Identifier (VPI)'));
+		o.default  = '8';
+		o.datatype = 'uinteger';
+
+		s.taboption('general', form.Value, 'username', _('PAP/CHAP username'));
+
+		o = s.taboption('general', form.Value, 'password', _('PAP/CHAP password'));
+		o.password = true;
+
+		if (L.hasSystemFeature('ipv6')) {
+			o = s.taboption('advanced', form.ListValue, 'ipv6', _('Obtain IPv6-Address'), _('Enable IPv6 negotiation on the PPP link'));
+			o.value('auto', _('Automatic'));
+			o.value('0', _('Disabled'));
+			o.value('1', _('Manual'));
+			o.default = 'auto';
+		}
+
+		o = s.taboption('advanced', form.Flag, 'defaultroute', _('Use default gateway'), _('If unchecked, no default route is configured'));
+		o.default = o.enabled;
+
+		o = s.taboption('advanced', form.Flag, 'peerdns', _('Use DNS servers advertised by peer'), _('If unchecked, the advertised DNS server addresses are ignored'));
+		o.default = o.enabled;
+
+		o = s.taboption('advanced', form.DynamicList, 'dns', _('Use custom DNS servers'));
+		o.depends('peerdns', '0');
+		o.datatype = 'ipaddr';
+		o.cast     = 'string';
+
+		o = s.taboption('advanced', form.Value, 'metric', _('Use gateway metric'));
+		o.placeholder = '0';
+		o.datatype    = 'uinteger';
+
+		o = s.taboption('advanced', form.Value, '_keepalive_failure', _('LCP echo failure threshold'), _('Presume peer to be dead after given amount of LCP echo failures, use 0 to ignore failures'));
+		o.placeholder = '0';
+		o.datatype    = 'uinteger';
+		o.write       = write_keepalive;
+		o.remove      = write_keepalive;
+		o.cfgvalue = function(section_id) {
+			var v = uci.get('network', section_id, 'keepalive');
+			if (typeof(v) == 'string' && v != '') {
+				var m = v.match(/^(\d+)[ ,]\d+$/);
+				return m ? m[1] : v;
+			}
+		};
+
+		o = s.taboption('advanced', form.Value, '_keepalive_interval', _('LCP echo interval'), _('Send LCP echo requests at the given interval in seconds, only effective in conjunction with failure threshold'));
+		o.placeholder = '5';
+		o.datatype    = 'min(1)';
+		o.write       = write_keepalive;
+		o.remove      = write_keepalive;
+		o.cfgvalue = function(section_id) {
+			var v = uci.get('network', section_id, 'keepalive');
+			if (typeof(v) == 'string' && v != '') {
+				var m = v.match(/^\d+[ ,](\d+)$/);
+				return m ? m[1] : v;
+			}
+		};
+
+		o = s.taboption('advanced', form.Value, 'demand', _('Inactivity timeout'), _('Close inactive connection after the given amount of seconds, use 0 to persist connection'));
+		o.placeholder = '0';
+		o.datatype    = 'uinteger';
+
+		o = s.taboption('advanced', form.Value, 'mtu', _('Override MTU'));
+		o.placeholder = dev ? (dev.getMTU() || '1500') : '1500';
+		o.datatype    = 'max(9200)';
+	}
+});
diff --git a/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js
new file mode 100644
index 000000000..5d71c4337
--- /dev/null
+++ b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js
@@ -0,0 +1,114 @@
+'use strict';
+'require uci';
+'require form';
+'require network';
+
+network.registerPatternVirtual(/^pppoe-.+$/);
+
+function write_keepalive(section_id, value) {
+	var f_opt = this.map.lookupOption('_keepalive_failure', section_id),
+	    i_opt = this.map.lookupOption('_keepalive_interval', section_id),
+	    f = (f_opt != null) ? +f_opt[0].formvalue(section_id) : null,
+	    i = (i_opt != null) ? +i_opt[0].formvalue(section_id) : null;
+
+	if (f == null || f == '' || isNaN(f))
+		f = 0;
+
+	if (i == null || i == '' || isNaN(i) || i < 1)
+		i = 1;
+
+	if (f > 0)
+		uci.set('network', section_id, 'keepalive', '%d %d'.format(f, i));
+	else
+		uci.unset('network', section_id, 'keepalive');
+}
+
+return network.registerProtocol('pppoe', {
+	getI18n: function() {
+		return _('PPPoE');
+	},
+
+	getIfname: function() {
+		return this._ubus('l3_device') || 'pppoe-%s'.format(this.sid);
+	},
+
+	getOpkgPackage: function() {
+		return 'ppp-mod-pppoe';
+	},
+
+	renderFormOptions: function(s) {
+		var dev = this.getL3Device() || this.getDevice(), o;
+
+		s.taboption('general', form.Value, 'username', _('PAP/CHAP username'));
+
+		o = s.taboption('general', form.Value, 'password', _('PAP/CHAP password'));
+		o.password = true;
+
+		o = s.taboption('general', form.Value, 'ac', _('Access Concentrator'), _('Leave empty to autodetect'));
+		o.placeholder = _('auto');
+
+		o = s.taboption('general', form.Value, 'service', _('Service Name'), _('Leave empty to autodetect'));
+		o.placeholder = _('auto');
+
+		if (L.hasSystemFeature('ipv6')) {
+			o = s.taboption('advanced', form.ListValue, 'ipv6', _('Obtain IPv6-Address'), _('Enable IPv6 negotiation on the PPP link'));
+			o.value('auto', _('Automatic'));
+			o.value('0', _('Disabled'));
+			o.value('1', _('Manual'));
+			o.default = 'auto';
+		}
+
+		o = s.taboption('advanced', form.Flag, 'defaultroute', _('Use default gateway'), _('If unchecked, no default route is configured'));
+		o.default = o.enabled;
+
+		o = s.taboption('advanced', form.Flag, 'peerdns', _('Use DNS servers advertised by peer'), _('If unchecked, the advertised DNS server addresses are ignored'));
+		o.default = o.enabled;
+
+		o = s.taboption('advanced', form.DynamicList, 'dns', _('Use custom DNS servers'));
+		o.depends('peerdns', '0');
+		o.datatype = 'ipaddr';
+		o.cast     = 'string';
+
+		o = s.taboption('advanced', form.Value, 'metric', _('Use gateway metric'));
+		o.placeholder = '0';
+		o.datatype    = 'uinteger';
+
+		o = s.taboption('advanced', form.Value, '_keepalive_failure', _('LCP echo failure threshold'), _('Presume peer to be dead after given amount of LCP echo failures, use 0 to ignore failures'));
+		o.placeholder = '0';
+		o.datatype    = 'uinteger';
+		o.write       = write_keepalive;
+		o.remove      = write_keepalive;
+		o.cfgvalue = function(section_id) {
+			var v = uci.get('network', section_id, 'keepalive');
+			if (typeof(v) == 'string' && v != '') {
+				var m = v.match(/^(\d+)[ ,]\d+$/);
+				return m ? m[1] : v;
+			}
+		};
+
+		o = s.taboption('advanced', form.Value, '_keepalive_interval', _('LCP echo interval'), _('Send LCP echo requests at the given interval in seconds, only effective in conjunction with failure threshold'));
+		o.placeholder = '5';
+		o.datatype    = 'min(1)';
+		o.write       = write_keepalive;
+		o.remove      = write_keepalive;
+		o.cfgvalue = function(section_id) {
+			var v = uci.get('network', section_id, 'keepalive');
+			if (typeof(v) == 'string' && v != '') {
+				var m = v.match(/^\d+[ ,](\d+)$/);
+				return m ? m[1] : v;
+			}
+		};
+
+		o = s.taboption('advanced', form.Value, 'host_uniq', _('Host-Uniq tag content'), _('Raw hex-encoded bytes. Leave empty unless your ISP require this'));
+		o.placeholder = _('auto');
+		o.datatype    = 'hexstring';
+
+		o = s.taboption('advanced', form.Value, 'demand', _('Inactivity timeout'), _('Close inactive connection after the given amount of seconds, use 0 to persist connection'));
+		o.placeholder = '0';
+		o.datatype    = 'uinteger';
+
+		o = s.taboption('advanced', form.Value, 'mtu', _('Override MTU'));
+		o.placeholder = dev ? (dev.getMTU() || '1500') : '1500';
+		o.datatype    = 'max(9200)';
+	}
+});
diff --git a/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js
new file mode 100644
index 000000000..006adc1a1
--- /dev/null
+++ b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js
@@ -0,0 +1,123 @@
+'use strict';
+'require uci';
+'require form';
+'require network';
+
+network.registerPatternVirtual(/^pptp-.+$/);
+
+function write_keepalive(section_id, value) {
+	var f_opt = this.map.lookupOption('_keepalive_failure', section_id),
+	    i_opt = this.map.lookupOption('_keepalive_interval', section_id),
+	    f = (f_opt != null) ? +f_opt[0].formvalue(section_id) : null,
+	    i = (i_opt != null) ? +i_opt[0].formvalue(section_id) : null;
+
+	if (f == null || f == '' || isNaN(f))
+		f = 0;
+
+	if (i == null || i == '' || isNaN(i) || i < 1)
+		i = 1;
+
+	if (f > 0)
+		uci.set('network', section_id, 'keepalive', '%d %d'.format(f, i));
+	else
+		uci.unset('network', section_id, 'keepalive');
+}
+
+return network.registerProtocol('pptp', {
+	getI18n: function() {
+		return _('PPtP');
+	},
+
+	getIfname: function() {
+		return this._ubus('l3_device') || 'pptp-%s'.format(this.sid);
+	},
+
+	getOpkgPackage: function() {
+		return 'ppp-mod-pptp';
+	},
+
+	isFloating: function() {
+		return true;
+	},
+
+	isVirtual: function() {
+		return true;
+	},
+
+	getDevices: function() {
+		return null;
+	},
+
+	containsDevice: function(ifname) {
+		return (network.getIfnameOf(ifname) == this.getIfname());
+	},
+
+	renderFormOptions: function(s) {
+		var dev = this.getL3Device() || this.getDevice(), o;
+
+		o = s.taboption('general', form.Value, 'server', _('VPN Server'));
+		o.datatype = 'host(0)';
+
+		s.taboption('general', form.Value, 'username', _('PAP/CHAP username'));
+
+		o = s.taboption('general', form.Value, 'password', _('PAP/CHAP password'));
+		o.password = true;
+
+		if (L.hasSystemFeature('ipv6')) {
+			o = s.taboption('advanced', form.ListValue, 'ipv6', _('Obtain IPv6-Address'), _('Enable IPv6 negotiation on the PPP link'));
+			o.value('auto', _('Automatic'));
+			o.value('0', _('Disabled'));
+			o.value('1', _('Manual'));
+			o.default = 'auto';
+		}
+
+		o = s.taboption('advanced', form.Flag, 'defaultroute', _('Use default gateway'), _('If unchecked, no default route is configured'));
+		o.default = o.enabled;
+
+		o = s.taboption('advanced', form.Flag, 'peerdns', _('Use DNS servers advertised by peer'), _('If unchecked, the advertised DNS server addresses are ignored'));
+		o.default = o.enabled;
+
+		o = s.taboption('advanced', form.DynamicList, 'dns', _('Use custom DNS servers'));
+		o.depends('peerdns', '0');
+		o.datatype = 'ipaddr';
+		o.cast     = 'string';
+
+		o = s.taboption('advanced', form.Value, 'metric', _('Use gateway metric'));
+		o.placeholder = '0';
+		o.datatype    = 'uinteger';
+
+		o = s.taboption('advanced', form.Value, '_keepalive_failure', _('LCP echo failure threshold'), _('Presume peer to be dead after given amount of LCP echo failures, use 0 to ignore failures'));
+		o.placeholder = '0';
+		o.datatype    = 'uinteger';
+		o.write       = write_keepalive;
+		o.remove      = write_keepalive;
+		o.cfgvalue = function(section_id) {
+			var v = uci.get('network', section_id, 'keepalive');
+			if (typeof(v) == 'string' && v != '') {
+				var m = v.match(/^(\d+)[ ,]\d+$/);
+				return m ? m[1] : v;
+			}
+		};
+
+		o = s.taboption('advanced', form.Value, '_keepalive_interval', _('LCP echo interval'), _('Send LCP echo requests at the given interval in seconds, only effective in conjunction with failure threshold'));
+		o.placeholder = '5';
+		o.datatype    = 'min(1)';
+		o.write       = write_keepalive;
+		o.remove      = write_keepalive;
+		o.cfgvalue = function(section_id) {
+			var v = uci.get('network', section_id, 'keepalive');
+			if (typeof(v) == 'string' && v != '') {
+				var m = v.match(/^\d+[ ,](\d+)$/);
+				return m ? m[1] : v;
+			}
+		};
+
+		o = s.taboption('advanced', form.Value, 'demand', _('Inactivity timeout'), _('Close inactive connection after the given amount of seconds, use 0 to persist connection'));
+		o.placeholder = '0';
+		o.datatype    = 'uinteger';
+
+		o = s.taboption('advanced', form.Value, 'mtu', _('Override MTU'));
+		o.placeholder = dev ? (dev.getMTU() || '1500') : '1500';
+		o.datatype    = 'max(9200)';
+	}
+});
diff --git a/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua
deleted file mode 100644
index 604f019ee..000000000
--- a/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua
+++ /dev/null
@@ -1,61 +0,0 @@
--- Copyright 2011 Jo-Philipp Wich <jow@openwrt.org>
--- Licensed to the public under the Apache License 2.0.
-
-local map, section, net = ...
-
-local server, username, password
-local ipv6, defaultroute, metric, peerdns, dns, mtu
-
-
-server = section:taboption("general", Value, "server", translate("L2TP Server"))
-server.datatype = "or(host(1), hostport(1))"
-
-
-username = section:taboption("general", Value, "username", translate("PAP/CHAP username"))
-
-
-password = section:taboption("general", Value, "password", translate("PAP/CHAP password"))
-password.password = true
-
-if luci.model.network:has_ipv6() then
-	ipv6 = section:taboption("advanced", ListValue, "ipv6",
-		translate("Obtain IPv6-Address"),
-		translate("Enable IPv6 negotiation on the PPP link"))
-	ipv6:value("auto", translate("Automatic"))
-	ipv6:value("0", translate("Disabled"))
-	ipv6:value("1", translate("Manual"))
-	ipv6.default = "auto"
-end
-
-defaultroute = section:taboption("advanced", Flag, "defaultroute",
-	translate("Use default gateway"),
-	translate("If unchecked, no default route is configured"))
-
-defaultroute.default = defaultroute.enabled
-
-
-metric = section:taboption("advanced", Value, "metric",
-	translate("Use gateway metric"))
-
-metric.placeholder = "0"
-metric.datatype    = "uinteger"
-metric:depends("defaultroute", defaultroute.enabled)
-
-
-peerdns = section:taboption("advanced", Flag, "peerdns",
-	translate("Use DNS servers advertised by peer"),
-	translate("If unchecked, the advertised DNS server addresses are ignored"))
-
-peerdns.default = peerdns.enabled
-
-
-dns = section:taboption("advanced", DynamicList, "dns",
-	translate("Use custom DNS servers"))
-
-dns:depends("peerdns", "")
-dns.datatype = "ipaddr"
-dns.cast     = "string"
-
-mtu = section:taboption("advanced", Value, "mtu", translate("Override MTU"))
-mtu.placeholder = "1500"
-mtu.datatype    = "max(9200)"
diff --git a/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua
deleted file mode 100644
index 5f468bc14..000000000
--- a/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua
+++ /dev/null
@@ -1,127 +0,0 @@
--- Copyright 2011 Jo-Philipp Wich <jow@openwrt.org>
--- Licensed to the public under the Apache License 2.0.
-
-local map, section, net = ...
-
-local device, username, password
-local ipv6, defaultroute, metric, peerdns, dns,
-	  keepalive_failure, keepalive_interval, demand, mtu
-
-
-device = section:taboption("general", Value, "device", translate("Modem device"))
-device.rmempty = false
-
-local device_suggestions = nixio.fs.glob("/dev/tty*S*")
-	or nixio.fs.glob("/dev/tts/*")
-
-if device_suggestions then
-	local node
-	for node in device_suggestions do
-		device:value(node)
-	end
-end
-
-
-username = section:taboption("general", Value, "username", translate("PAP/CHAP username"))
-
-
-password = section:taboption("general", Value, "password", translate("PAP/CHAP password"))
-password.password = true
-
-
-if luci.model.network:has_ipv6() then
-	ipv6 = section:taboption("advanced", ListValue, "ipv6",
-		translate("Obtain IPv6-Address"),
-		translate("Enable IPv6 negotiation on the PPP link"))
-	ipv6:value("auto", translate("Automatic"))
-	ipv6:value("0", translate("Disabled"))
-	ipv6:value("1", translate("Manual"))
-	ipv6.default = "auto"
-end
-
-
-defaultroute = section:taboption("advanced", Flag, "defaultroute",
-	translate("Use default gateway"),
-	translate("If unchecked, no default route is configured"))
-
-defaultroute.default = defaultroute.enabled
-
-
-metric = section:taboption("advanced", Value, "metric",
-	translate("Use gateway metric"))
-
-metric.placeholder = "0"
-metric.datatype    = "uinteger"
-metric:depends("defaultroute", defaultroute.enabled)
-
-
-peerdns = section:taboption("advanced", Flag, "peerdns",
-	translate("Use DNS servers advertised by peer"),
-	translate("If unchecked, the advertised DNS server addresses are ignored"))
-
-peerdns.default = peerdns.enabled
-
-
-dns = section:taboption("advanced", DynamicList, "dns",
-	translate("Use custom DNS servers"))
-
-dns:depends("peerdns", "")
-dns.datatype = "ipaddr"
-dns.cast     = "string"
-
-
-keepalive_failure = section:taboption("advanced", Value, "_keepalive_failure",
-	translate("LCP echo failure threshold"),
-	translate("Presume peer to be dead after given amount of LCP echo failures, use 0 to ignore failures"))
-
-function keepalive_failure.cfgvalue(self, section)
-	local v = m:get(section, "keepalive")
-	if v and #v > 0 then
-		return tonumber(v:match("^(%d+)[ ,]+%d+") or v)
-	end
-end
-
-keepalive_failure.placeholder = "0"
-keepalive_failure.datatype    = "uinteger"
-
-
-keepalive_interval = section:taboption("advanced", Value, "_keepalive_interval",
-	translate("LCP echo interval"),
-	translate("Send LCP echo requests at the given interval in seconds, only effective in conjunction with failure threshold"))
-
-function keepalive_interval.cfgvalue(self, section)
-	local v = m:get(section, "keepalive")
-	if v and #v > 0 then
-		return tonumber(v:match("^%d+[ ,]+(%d+)"))
-	end
-end
-
-function keepalive_interval.write(self, section, value)
-	local f = tonumber(keepalive_failure:formvalue(section)) or 0
-	local i = tonumber(value) or 5
-	if i < 1 then i = 1 end
-	if f > 0 then
-		m:set(section, "keepalive", "%d %d" %{ f, i })
-	else
-		m:set(section, "keepalive", "0")
-	end
-end
-
-keepalive_interval.remove      = keepalive_interval.write
-keepalive_failure.write        = keepalive_interval.write
-keepalive_failure.remove       = keepalive_interval.write
-keepalive_interval.placeholder = "5"
-keepalive_interval.datatype    = "min(1)"
-
-
-demand = section:taboption("advanced", Value, "demand",
-	translate("Inactivity timeout"),
-	translate("Close inactive connection after the given amount of seconds, use 0 to persist connection"))
-
-demand.placeholder = "0"
-demand.datatype    = "uinteger"
-
-
-mtu = section:taboption("advanced", Value, "mtu", translate("Override MTU"))
-mtu.placeholder = "1500"
-mtu.datatype    = "max(9200)"
diff --git a/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua
deleted file mode 100644
index 004fd7ef6..000000000
--- a/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua
+++ /dev/null
@@ -1,133 +0,0 @@
--- Copyright 2011 Jo-Philipp Wich <jow@openwrt.org>
--- Licensed to the public under the Apache License 2.0.
-
-local map, section, net = ...
-
-local encaps, atmdev, vci, vpi, username, password
-local ipv6, defaultroute, metric, peerdns, dns,
-      keepalive_failure, keepalive_interval, demand, mtu
-
-
-encaps = section:taboption("general", ListValue, "encaps", translate("PPPoA Encapsulation"))
-encaps:value("vc", "VC-Mux")
-encaps:value("llc", "LLC")
-
-
-atmdev = section:taboption("general", Value, "atmdev", translate("ATM device number"))
-atmdev.default  = "0"
-atmdev.datatype = "uinteger"
-
-
-vci = section:taboption("general", Value, "vci", translate("ATM Virtual Channel Identifier (VCI)"))
-vci.default  = "35"
-vci.datatype = "uinteger"
-
-
-vpi = section:taboption("general", Value, "vpi", translate("ATM Virtual Path Identifier (VPI)"))
-vpi.default  = "8"
-vpi.datatype = "uinteger"
-
-
-username = section:taboption("general", Value, "username", translate("PAP/CHAP username"))
-
-
-password = section:taboption("general", Value, "password", translate("PAP/CHAP password"))
-password.password = true
-
-
-if luci.model.network:has_ipv6() then
-	ipv6 = section:taboption("advanced", ListValue, "ipv6",
-		translate("Obtain IPv6-Address"),
-		translate("Enable IPv6 negotiation on the PPP link"))
-	ipv6:value("auto", translate("Automatic"))
-	ipv6:value("0", translate("Disabled"))
-	ipv6:value("1", translate("Manual"))
-	ipv6.default = "auto"
-end
-
-
-defaultroute = section:taboption("advanced", Flag, "defaultroute",
-	translate("Use default gateway"),
-	translate("If unchecked, no default route is configured"))
-
-defaultroute.default = defaultroute.enabled
-
-
-metric = section:taboption("advanced", Value, "metric",
-	translate("Use gateway metric"))
-
-metric.placeholder = "0"
-metric.datatype    = "uinteger"
-metric:depends("defaultroute", defaultroute.enabled)
-
-
-peerdns = section:taboption("advanced", Flag, "peerdns",
-	translate("Use DNS servers advertised by peer"),
-	translate("If unchecked, the advertised DNS server addresses are ignored"))
-
-peerdns.default = peerdns.enabled
-
-
-dns = section:taboption("advanced", DynamicList, "dns",
-	translate("Use custom DNS servers"))
-
-dns:depends("peerdns", "")
-dns.datatype = "ipaddr"
-dns.cast     = "string"
-
-
-keepalive_failure = section:taboption("advanced", Value, "_keepalive_failure",
-	translate("LCP echo failure threshold"),
-	translate("Presume peer to be dead after given amount of LCP echo failures, use 0 to ignore failures"))
-
-function keepalive_failure.cfgvalue(self, section)
-	local v = m:get(section, "keepalive")
-	if v and #v > 0 then
-		return tonumber(v:match("^(%d+)[ ,]+%d+") or v)
-	end
-end
-
-keepalive_failure.placeholder = "0"
-keepalive_failure.datatype    = "uinteger"
-
-
-keepalive_interval = section:taboption("advanced", Value, "_keepalive_interval",
-	translate("LCP echo interval"),
-	translate("Send LCP echo requests at the given interval in seconds, only effective in conjunction with failure threshold"))
-
-function keepalive_interval.cfgvalue(self, section)
-	local v = m:get(section, "keepalive")
-	if v and #v > 0 then
-		return tonumber(v:match("^%d+[ ,]+(%d+)"))
-	end
-end
-
-function keepalive_interval.write(self, section, value)
-	local f = tonumber(keepalive_failure:formvalue(section)) or 0
-	local i = tonumber(value) or 5
-	if i < 1 then i = 1 end
-	if f > 0 then
-		m:set(section, "keepalive", "%d %d" %{ f, i })
-	else
-		m:set(section, "keepalive", "0")
-	end
-end
-
-keepalive_interval.remove      = keepalive_interval.write
-keepalive_failure.write        = keepalive_interval.write
-keepalive_failure.remove       = keepalive_interval.write
-keepalive_interval.placeholder = "5"
-keepalive_interval.datatype    = "min(1)"
-
-
-demand = section:taboption("advanced", Value, "demand",
-	translate("Inactivity timeout"),
-	translate("Close inactive connection after the given amount of seconds, use 0 to persist connection"))
-
-demand.placeholder = "0"
-demand.datatype    = "uinteger"
-
-
-mtu = section:taboption("advanced", Value, "mtu", translate("Override MTU"))
-mtu.placeholder = "1500"
-mtu.datatype    = "max(9200)"
diff --git a/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua
deleted file mode 100644
index 063d8c07e..000000000
--- a/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua
+++ /dev/null
@@ -1,135 +0,0 @@
--- Copyright 2011 Jo-Philipp Wich <jow@openwrt.org>
--- Licensed to the public under the Apache License 2.0.
-
-local map, section, net = ...
-
-local username, password, ac, service
-local ipv6, defaultroute, metric, peerdns, dns,
-      keepalive_failure, keepalive_interval, demand, mtu
-
-
-username = section:taboption("general", Value, "username", translate("PAP/CHAP username"))
-
-
-password = section:taboption("general", Value, "password", translate("PAP/CHAP password"))
-password.password = true
-
-
-ac = section:taboption("general", Value, "ac",
-	translate("Access Concentrator"),
-	translate("Leave empty to autodetect"))
-
-ac.placeholder = translate("auto")
-
-
-service = section:taboption("general", Value, "service",
-	translate("Service Name"),
-	translate("Leave empty to autodetect"))
-
-service.placeholder = translate("auto")
-
-
-if luci.model.network:has_ipv6() then
-	ipv6 = section:taboption("advanced", ListValue, "ipv6",
-		translate("Obtain IPv6-Address"),
-		translate("Enable IPv6 negotiation on the PPP link"))
-	ipv6:value("auto", translate("Automatic"))
-	ipv6:value("0", translate("Disabled"))
-	ipv6:value("1", translate("Manual"))
-	ipv6.default = "auto"
-end
-
-
-defaultroute = section:taboption("advanced", Flag, "defaultroute",
-	translate("Use default gateway"),
-	translate("If unchecked, no default route is configured"))
-
-defaultroute.default = defaultroute.enabled
-
-
-metric = section:taboption("advanced", Value, "metric",
-	translate("Use gateway metric"))
-
-metric.placeholder = "0"
-metric.datatype    = "uinteger"
-metric:depends("defaultroute", defaultroute.enabled)
-
-
-peerdns = section:taboption("advanced", Flag, "peerdns",
-	translate("Use DNS servers advertised by peer"),
-	translate("If unchecked, the advertised DNS server addresses are ignored"))
-
-peerdns.default = peerdns.enabled
-
-
-dns = section:taboption("advanced", DynamicList, "dns",
-	translate("Use custom DNS servers"))
-
-dns:depends("peerdns", "")
-dns.datatype = "ipaddr"
-dns.cast     = "string"
-
-
-keepalive_failure = section:taboption("advanced", Value, "_keepalive_failure",
-	translate("LCP echo failure threshold"),
-	translate("Presume peer to be dead after given amount of LCP echo failures, use 0 to ignore failures"))
-
-function keepalive_failure.cfgvalue(self, section)
-	local v = m:get(section, "keepalive")
-	if v and #v > 0 then
-		return tonumber(v:match("^(%d+)[ ,]+%d+") or v)
-	end
-end
-
-keepalive_failure.placeholder = "0"
-keepalive_failure.datatype    = "uinteger"
-
-
-keepalive_interval = section:taboption("advanced", Value, "_keepalive_interval",
-	translate("LCP echo interval"),
-	translate("Send LCP echo requests at the given interval in seconds, only effective in conjunction with failure threshold"))
-
-function keepalive_interval.cfgvalue(self, section)
-	local v = m:get(section, "keepalive")
-	if v and #v > 0 then
-		return tonumber(v:match("^%d+[ ,]+(%d+)"))
-	end
-end
-
-function keepalive_interval.write(self, section, value)
-	local f = tonumber(keepalive_failure:formvalue(section)) or 0
-	local i = tonumber(value) or 5
-	if i < 1 then i = 1 end
-	if f > 0 then
-		m:set(section, "keepalive", "%d %d" %{ f, i })
-	else
-		m:set(section, "keepalive", "0")
-	end
-end
-
-keepalive_interval.remove      = keepalive_interval.write
-keepalive_failure.write        = keepalive_interval.write
-keepalive_failure.remove       = keepalive_interval.write
-keepalive_interval.placeholder = "5"
-keepalive_interval.datatype    = "min(1)"
-
-
-host_uniq = section:taboption("advanced", Value, "host_uniq",
-	translate("Host-Uniq tag content"),
-	translate("Raw hex-encoded bytes. Leave empty unless your ISP require this"))
-
-host_uniq.placeholder = translate("auto")
-host_uniq.datatype    = "hexstring"
-
-
-demand = section:taboption("advanced", Value, "demand",
-	translate("Inactivity timeout"),
-	translate("Close inactive connection after the given amount of seconds, use 0 to persist connection"))
-
-demand.placeholder = "0"
-demand.datatype    = "uinteger"
-
-
-mtu = section:taboption("advanced", Value, "mtu", translate("Override MTU"))
-mtu.placeholder = "1500"
-mtu.datatype    = "max(9200)"
diff --git a/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua
deleted file mode 100644
index 6a828efe9..000000000
--- a/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua
+++ /dev/null
@@ -1,106 +0,0 @@
--- Copyright 2011-2012 Jo-Philipp Wich <jow@openwrt.org>
--- Licensed to the public under the Apache License 2.0.
-
-local map, section, net = ...
-
-local server, username, password
-local defaultroute, metric, peerdns, dns,
-	keepalive_failure, keepalive_interval, demand, mtu
-
-
-server = section:taboption("general", Value, "server", translate("VPN Server"))
-server.datatype = "host(0)"
-
-
-username = section:taboption("general", Value, "username", translate("PAP/CHAP username"))
-
-
-password = section:taboption("general", Value, "password", translate("PAP/CHAP password"))
-password.password = true
-
-
-defaultroute = section:taboption("advanced", Flag, "defaultroute",
-	translate("Use default gateway"),
-	translate("If unchecked, no default route is configured"))
-
-defaultroute.default = defaultroute.enabled
-
-
-metric = section:taboption("advanced", Value, "metric",
-	translate("Use gateway metric"))
-
-metric.placeholder = "0"
-metric.datatype    = "uinteger"
-metric:depends("defaultroute", defaultroute.enabled)
-
-
-peerdns = section:taboption("advanced", Flag, "peerdns",
-	translate("Use DNS servers advertised by peer"),
-	translate("If unchecked, the advertised DNS server addresses are ignored"))
-
-peerdns.default = peerdns.enabled
-
-
-dns = section:taboption("advanced", DynamicList, "dns",
-	translate("Use custom DNS servers"))
-
-dns:depends("peerdns", "")
-dns.datatype = "ipaddr"
-dns.cast     = "string"
-
-
-keepalive_failure = section:taboption("advanced", Value, "_keepalive_failure",
-	translate("LCP echo failure threshold"),
-	translate("Presume peer to be dead after given amount of LCP echo failures, use 0 to ignore failures"))
-
-function keepalive_failure.cfgvalue(self, section)
-	local v = m:get(section, "keepalive")
-	if v and #v > 0 then
-		return tonumber(v:match("^(%d+)[ ,]+%d+") or v)
-	end
-end
-
-keepalive_failure.placeholder = "0"
-keepalive_failure.datatype    = "uinteger"
-
-
-keepalive_interval = section:taboption("advanced", Value, "_keepalive_interval",
-	translate("LCP echo interval"),
-	translate("Send LCP echo requests at the given interval in seconds, only effective in conjunction with failure threshold"))
-
-function keepalive_interval.cfgvalue(self, section)
-	local v = m:get(section, "keepalive")
-	if v and #v > 0 then
-		return tonumber(v:match("^%d+[ ,]+(%d+)"))
-	end
-end
-
-function keepalive_interval.write(self, section, value)
-	local f = tonumber(keepalive_failure:formvalue(section)) or 0
-	local i = tonumber(value) or 5
-	if i < 1 then i = 1 end
-	if f > 0 then
-		m:set(section, "keepalive", "%d %d" %{ f, i })
-	else
-		m:set(section, "keepalive", "0")
-	end
-end
-
-keepalive_interval.remove      = keepalive_interval.write
-keepalive_failure.write        = keepalive_interval.write
-keepalive_failure.remove       = keepalive_interval.write
-keepalive_interval.placeholder = "5"
-keepalive_interval.datatype    = "min(1)"
-
-
-demand = section:taboption("advanced", Value, "demand",
-	translate("Inactivity timeout"),
-	translate("Close inactive connection after the given amount of seconds, use 0 to persist connection"))
-
-demand.placeholder = "0"
-demand.datatype    = "uinteger"
-
-
-mtu = section:taboption("advanced", Value, "mtu", translate("Override MTU"))
-mtu.placeholder = "1500"
-mtu.datatype    = "max(9200)"
diff --git a/protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js b/protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js
new file mode 100644
index 000000000..ec8e8a152
--- /dev/null
+++ b/protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js
@@ -0,0 +1,142 @@
+'use strict';
+'require uci';
+'require form';
+'require network';
+
+network.registerPatternVirtual(/^pppossh-.+$/);
+
+function write_keepalive(section_id, value) {
+	var f_opt = this.map.lookupOption('_keepalive_failure', section_id),
+	    i_opt = this.map.lookupOption('_keepalive_interval', section_id),
+	    f = (f_opt != null) ? +f_opt[0].formvalue(section_id) : null,
+	    i = (i_opt != null) ? +i_opt[0].formvalue(section_id) : null;
+
+	if (f == null || f == '' || isNaN(f))
+		f = 0;
+
+	if (i == null || i == '' || isNaN(i) || i < 1)
+		i = 1;
+
+	if (f > 0)
+		uci.set('network', section_id, 'keepalive', '%d %d'.format(f, i));
+	else
+		uci.unset('network', section_id, 'keepalive');
+}
+
+return network.registerProtocol('pppossh', {
+	getI18n: function() {
+		return _('PPPoSSH');
+	},
+
+	getIfname: function() {
+		return this._ubus('l3_device') || 'pppossh-%s'.format(this.sid);
+	},
+
+	getOpkgPackage: function() {
+		return 'pppossh';
+	},
+
+	isFloating: function() {
+		return true;
+	},
+
+	isVirtual: function() {
+		return true;
+	},
+
+	getDevices: function() {
+		return null;
+	},
+
+	containsDevice: function(ifname) {
+		return (network.getIfnameOf(ifname) == this.getIfname());
+	},
+
+	renderFormOptions: function(s) {
+		var o;
+
+		o = s.taboption('general', form.Value, 'sshuser', _('SSH username'));
+		o.rmempty = false;
+		o.validate = function(section_id, value) {
+			var id_opt = this.section.children.filter(function(o) { return o.option == 'identity' })[0];
+			if (id_opt && value.length) {
+				var input = this.map.findElement('id', id_opt.cbid(section_id)).querySelector('input[type="text"]');
+				if (input)
+					input.placeholder = (value == 'root' ? '/root' : '/home/' + value) + '/.ssh/id_rsa';
+			}
+			return true;
+		};
+
+		o = s.taboption('general', form.Value, 'server', _('SSH server address'));
+		o.datatype = 'host(0)';
+		o.rmempty = false;
+
+		o = s.taboption('general', form.Value, 'port', _('SSH server port'));
+		o.datatype = 'port';
+		o.optional = true;
+		o.placeholder = 22;
+
+		o = s.taboption('general', form.Value, 'ssh_options', _('Extra SSH command options'));
+		o.optional = true;
+
+		o = s.taboption('general', form.DynamicList, 'identity', _('List of SSH key files for auth'));
+		o.optional = true;
+		o.datatype = 'file';
+
+		o = s.taboption('general', form.Value, 'ipaddr', _('Local IP address to assign'));
+		o.datatype = 'ipaddr("nomask")';
+
+		o = s.taboption('general', form.Value, 'peeraddr', _('Peer IP address to assign'));
+		o.datatype = 'ipaddr("nomask")';
+
+		if (L.hasSystemFeature('ipv6')) {
+			o = s.taboption('advanced', form.Flag, 'ipv6', _('Obtain IPv6-Address'), _('Enable IPv6 negotiation on the PPP link'));
+			o.default = o.disabled;
+		}
+
+		o = s.taboption('advanced', form.Flag, 'defaultroute', _('Use default gateway'), _('If unchecked, no default route is configured'));
+		o.default = o.enabled;
+
+		o = s.taboption('advanced', form.Flag, 'peerdns', _('Use DNS servers advertised by peer'), _('If unchecked, the advertised DNS server addresses are ignored'));
+		o.default = o.enabled;
+
+		o = s.taboption('advanced', form.DynamicList, 'dns', _('Use custom DNS servers'));
+		o.depends('peerdns', '0');
+		o.datatype = 'ipaddr';
+		o.cast     = 'string';
+
+		o = s.taboption('advanced', form.Value, 'metric', _('Use gateway metric'));
+		o.placeholder = '0';
+		o.datatype    = 'uinteger';
+
+		o = s.taboption('advanced', form.Value, '_keepalive_failure', _('LCP echo failure threshold'), _('Presume peer to be dead after given amount of LCP echo failures, use 0 to ignore failures'));
+		o.placeholder = '0';
+		o.datatype    = 'uinteger';
+		o.write       = write_keepalive;
+		o.remove      = write_keepalive;
+		o.cfgvalue = function(section_id) {
+			var v = uci.get('network', section_id, 'keepalive');
+			if (typeof(v) == 'string' && v != '') {
+				var m = v.match(/^(\d+)[ ,]\d+$/);
+				return m ? m[1] : v;
+			}
+		};
+
+		o = s.taboption('advanced', form.Value, '_keepalive_interval', _('LCP echo interval'), _('Send LCP echo requests at the given interval in seconds, only effective in conjunction with failure threshold'));
+		o.placeholder = '5';
+		o.datatype    = 'min(1)';
+		o.write       = write_keepalive;
+		o.remove      = write_keepalive;
+		o.cfgvalue = function(section_id) {
+			var v = uci.get('network', section_id, 'keepalive');
+			if (typeof(v) == 'string' && v != '') {
+				var m = v.match(/^\d+[ ,](\d+)$/);
+				return m ? m[1] : v;
+			}
+		};
+
+		o = s.taboption('advanced', form.Value, 'demand', _('Inactivity timeout'), _('Close inactive connection after the given amount of seconds, use 0 to persist connection'));
+		o.placeholder = '0';
+		o.datatype    = 'uinteger';
+	}
+});
diff --git a/protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua b/protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua
deleted file mode 100644
index e53262b5d..000000000
--- a/protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua
+++ /dev/null
@@ -1,122 +0,0 @@
--- Copyright (C) 2015 Yousong Zhou <yszhou4tech@gmail.com>
--- Licensed to the public under the Apache License 2.0.
-
-local map, section, net = ...
-
-local sshuser, server, port, ssh_options, identity, ipaddr, peeraddr
-
-sshuser = section:taboption("general", Value, "sshuser", translate("SSH username"))
-
-server = section:taboption("general", Value, "server", translate("SSH server address"))
-server.datatype = "host(0)"
-
-port = section:taboption("general", Value, "port", translate("SSH server port"))
-port.datatype = "port"
-port.optional = true
-port.default = 22
-
-ssh_options = section:taboption("general", Value, "ssh_options", translate("Extra SSH command options"))
-ssh_options.optional = true
-
-identity = section:taboption("general", DynamicList, "identity", translate("List of SSH key files for auth"))
-identity.optional = true
-identity.datatype = "file"
-
-ipaddr = section:taboption("general", Value, "ipaddr", translate("Local IP address to assign"))
-ipaddr.datatype = "ipaddr"
-
-peeraddr = section:taboption("general", Value, "peeraddr", translate("Peer IP address to assign"))
-peeraddr.datatype = "ipaddr"
-
-
-local ipv6, defaultroute, metric, peerdns, dns,
-      keepalive_failure, keepalive_interval, demand
-
-if luci.model.network:has_ipv6() then
-        ipv6 = section:taboption("advanced", Flag, "ipv6",
-                translate("Enable IPv6 negotiation on the PPP link"))
-        ipv6.default = ipv6.disabled
-end
-
-
-defaultroute = section:taboption("advanced", Flag, "defaultroute",
-	translate("Use default gateway"),
-	translate("If unchecked, no default route is configured"))
-
-defaultroute.default = defaultroute.enabled
-
-
-metric = section:taboption("advanced", Value, "metric",
-	translate("Use gateway metric"))
-
-metric.placeholder = "0"
-metric.datatype    = "uinteger"
-metric:depends("defaultroute", defaultroute.enabled)
-
-
-peerdns = section:taboption("advanced", Flag, "peerdns",
-	translate("Use DNS servers advertised by peer"),
-	translate("If unchecked, the advertised DNS server addresses are ignored"))
-
-peerdns.default = peerdns.enabled
-
-
-dns = section:taboption("advanced", DynamicList, "dns",
-	translate("Use custom DNS servers"))
-
-dns:depends("peerdns", "")
-dns.datatype = "ipaddr"
-dns.cast     = "string"
-
-
-keepalive_failure = section:taboption("advanced", Value, "_keepalive_failure",
-	translate("LCP echo failure threshold"),
-	translate("Presume peer to be dead after given amount of LCP echo failures, use 0 to ignore failures"))
-
-function keepalive_failure.cfgvalue(self, section)
-	local v = m:get(section, "keepalive")
-	if v and #v > 0 then
-		return tonumber(v:match("^(%d+)[ ,]+%d+") or v)
-	end
-end
-
-function keepalive_failure.write() end
-function keepalive_failure.remove() end
-
-keepalive_failure.placeholder = "0"
-keepalive_failure.datatype    = "uinteger"
-
-
-keepalive_interval = section:taboption("advanced", Value, "_keepalive_interval",
-	translate("LCP echo interval"),
-	translate("Send LCP echo requests at the given interval in seconds, only effective in conjunction with failure threshold"))
-
-function keepalive_interval.cfgvalue(self, section)
-	local v = m:get(section, "keepalive")
-	if v and #v > 0 then
-		return tonumber(v:match("^%d+[ ,]+(%d+)"))
-	end
-end
-
-function keepalive_interval.write(self, section, value)
-	local f = tonumber(keepalive_failure:formvalue(section)) or 0
-	local i = tonumber(value) or 5
-	if i < 1 then i = 1 end
-	if f > 0 then
-		m:set(section, "keepalive", "%d %d" %{ f, i })
-	else
-		m:set(section, "keepalive", "0")
-	end
-end
-
-keepalive_interval.remove      = keepalive_interval.write
-keepalive_interval.placeholder = "5"
-keepalive_interval.datatype    = "min(1)"
-
-
-demand = section:taboption("advanced", Value, "demand",
-	translate("Inactivity timeout"),
-	translate("Close inactive connection after the given amount of seconds, use 0 to persist connection"))
-
-demand.placeholder = "0"
-demand.datatype    = "uinteger"
diff --git a/protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js b/protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js
new file mode 100644
index 000000000..eeda91f6e
--- /dev/null
+++ b/protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js
@@ -0,0 +1,101 @@
+'use strict';
+'require rpc';
+'require form';
+'require network';
+
+var callFileList = rpc.declare({
+	object: 'file',
+	method: 'list',
+	params: [ 'path' ],
+	expect: { entries: [] },
+	filter: function(list, params) {
+		var rv = [];
+		for (var i = 0; i < list.length; i++)
+			if (list[i].name.match(/^cdc-wdm/))
+				rv.push(params.path + list[i].name);
+		return rv.sort();
+	}
+});
+
+network.registerPatternVirtual(/^qmi-.+$/);
+network.registerErrorCode('CALL_FAILED', _('Call failed'));
+network.registerErrorCode('NO_CID',      _('Unable to obtain client ID'));
+network.registerErrorCode('PLMN_FAILED', _('Setting PLMN failed'));
+
+return network.registerProtocol('qmi', {
+	getI18n: function() {
+		return _('QMI Cellular');
+	},
+
+	getIfname: function() {
+		return this._ubus('l3_device') || 'qmi-%s'.format(this.sid);
+	},
+
+	getOpkgPackage: function() {
+		return 'uqmi';
+	},
+
+	isFloating: function() {
+		return true;
+	},
+
+	isVirtual: function() {
+		return true;
+	},
+
+	getDevices: function() {
+		return null;
+	},
+
+	containsDevice: function(ifname) {
+		return (network.getIfnameOf(ifname) == this.getIfname());
+	},
+
+	renderFormOptions: function(s) {
+		var dev = this.getL3Device() || this.getDevice(), o;
+
+		o = s.taboption('general', form.Value, 'device', _('Modem device'));
+		o.rmempty = false;
+		o.load = function(section_id) {
+			return callFileList('/dev/').then(L.bind(function(devices) {
+				for (var i = 0; i < devices.length; i++)
+					this.value(devices[i]);
+				return form.Value.prototype.load.apply(this, [section_id]);
+			}, this));
+		};
+
+		s.taboption('general', form.Value, 'apn', _('APN'));
+		s.taboption('general', form.Value, 'pincode', _('PIN'));
+
+		o = s.taboption('general', form.ListValue, 'auth', _('Authentication Type'));
+		o.value('both', 'PAP/CHAP (both)');
+		o.value('pap', 'PAP');
+		o.value('chap', 'CHAP');
+		o.value('none', 'NONE');
+		o.default = 'none';
+
+		o = s.taboption('general', form.Value, 'username', _('PAP/CHAP username'));
+		o.depends('auth', 'pap');
+		o.depends('auth', 'chap');
+		o.depends('auth', 'both');
+
+		o = s.taboption('general', form.Value, 'password', _('PAP/CHAP password'));
+		o.depends('auth', 'pap');
+		o.depends('auth', 'chap');
+		o.depends('auth', 'both');
+		o.password = true;
+
+		if (L.hasSystemFeature('ipv6')) {
+			o = s.taboption('advanced', form.Flag, 'ipv6', _('Enable IPv6 negotiation'));
+			o.default = o.disabled;
+		}
+
+		o = s.taboption('advanced', form.Value, 'delay', _('Modem init timeout'), _('Maximum amount of seconds to wait for the modem to become ready'));
+		o.placeholder = '10';
+		o.datatype    = 'min(1)';
+
+		o = s.taboption('advanced', form.Value, 'mtu', _('Override MTU'));
+		o.placeholder = dev ? (dev.getMTU() || '1500') : '1500';
+		o.datatype    = 'max(9200)';
+	}
+});
diff --git a/protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua b/protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua
deleted file mode 100644
index 383bc4662..000000000
--- a/protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua
+++ /dev/null
@@ -1,63 +0,0 @@
--- Copyright 2016 David Thornley <david.thornley@touchstargroup.com>
--- Licensed to the public under the Apache License 2.0.
-
-local map, section, net = ...
-
-local device, apn, pincode, username, password
-local auth, ipv6, delay, mtu
-
-
-device = section:taboption("general", Value, "device", translate("Modem device"))
-device.rmempty = false
-
-local device_suggestions = nixio.fs.glob("/dev/cdc-wdm*")
-
-if device_suggestions then
-	local node
-	for node in device_suggestions do
-		device:value(node)
-	end
-end
-
-
-apn = section:taboption("general", Value, "apn", translate("APN"))
-
-
-pincode = section:taboption("general", Value, "pincode", translate("PIN"))
-
-
-auth = section:taboption("general", Value, "auth", translate("Authentication Type"))
-auth:value("both", "PAP/CHAP (both)")
-auth:value("pap", "PAP")
-auth:value("chap", "CHAP")
-auth:value("none", "NONE")
-auth.default = "none"
-
-
-username = section:taboption("general", Value, "username", translate("PAP/CHAP username"))
-username:depends("auth", "pap")
-username:depends("auth", "chap")
-username:depends("auth", "both")
-
-
-password = section:taboption("general", Value, "password", translate("PAP/CHAP password"))
-password:depends("auth", "pap")
-password:depends("auth", "chap")
-password:depends("auth", "both")
-password.password = true
-
-
-if luci.model.network:has_ipv6() then
-    ipv6 = section:taboption("advanced", Flag, "ipv6", translate("Enable IPv6 negotiation"))
-    ipv6.default = ipv6.disabled
-end
-
-delay = section:taboption("advanced", Value, "delay",
-	translate("Modem init timeout"),
-	translate("Maximum amount of seconds to wait for the modem to become ready"))
-delay.placeholder = "10"
-delay.datatype    = "min(1)"
-
-mtu = section:taboption("advanced", Value, "mtu", translate("Override MTU"))
-mtu.placeholder = "1500"
-mtu.datatype    = "max(9200)"
diff --git a/protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js b/protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js
new file mode 100644
index 000000000..b3082276b
--- /dev/null
+++ b/protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js
@@ -0,0 +1,183 @@
+'use strict';
+'require uci';
+'require form';
+'require network';
+'require tools.widgets as widgets';
+
+network.registerPatternVirtual(/^relay-.+$/);
+
+var RelayDevicePrototype = {
+	__init__: function(ifname, network) {
+		this.ifname  = ifname;
+		this.network = network;
+	},
+
+	_aggregateDevices: function(fn, first) {
+		var devices = this.network ? this.network.getDevices() : [],
+		    rv = 0;
+
+		for (var i = 0; i < devices.length; i++) {
+			var v = devices[i][fn].apply(devices[i]);
+
+			if (v != null) {
+				if (first)
+					return v;
+
+				rv += v;
+			}
+		}
+
+		return first ? null : [ rv, devices.length ];
+	},
+
+	getPorts: function() { return this.network ? this.network.getDevices() : [] },
+
+	getType: function() { return 'tunnel' },
+	getTypeI18n: function() { return _('Relay Bridge') },
+
+	getShortName: function() {
+		return '%s "%h"'.format(_('Relay'), this.ifname);
+	},
+
+	isUp: function() {
+		var res = this._aggregateDevices('isUp');
+		return (res[1] > 0 && res[0] == res[1]);
+	},
+
+	getTXBytes: function() { return this._aggregateDevices('getTXBytes')[0] },
+	getRXBytes: function() { return this._aggregateDevices('getRXBytes')[0] },
+	getTXPackets: function() { return this._aggregateDevices('getTXPackets')[0] },
+	getRXPackets: function() { return this._aggregateDevices('getRXPackets')[0] },
+
+	getMAC: function() { return this._aggregateDevices('getMAC', true) },
+
+	getIPAddrs: function() {
+		var ipaddr = this.network ? L.toArray(uci.get('network', this.network.getName(), 'ipaddr'))[0] : null;
+		return (ipaddr != null ? [ ipaddr ] : []);
+	},
+
+	getIP6Addrs: function() { return [] }
+};
+
+return network.registerProtocol('relay', {
+	getI18n: function() {
+		return _('Relay bridge');
+	},
+
+	getIfname: function() {
+		return 'relay-%s'.format(this.sid);
+	},
+
+	getOpkgPackage: function() {
+		return 'relayd';
+	},
+
+	isFloating: function() {
+		return true;
+	},
+
+	isVirtual: function() {
+		return true;
+	},
+
+	containsDevice: function(ifname) {
+		return (network.getIfnameOf(ifname) == this.getIfname());
+	},
+
+	isUp: function() {
+		var dev = this.getDevice();
+		return (dev ? dev.isUp() : false);
+	},
+
+	getDevice: function() {
+		return network.instantiateDevice(this.sid, this, RelayDevicePrototype);
+	},
+
+	getDevices: function() {
+		if (this.devices)
+			return this.devices;
+
+		var networkNames = L.toArray(uci.get('network', this.sid, 'network')),
+		    deviceNames = L.toArray(uci.get('network', this.sid, 'ifname')),
+		    devices = {},
+		    rv = [];
+
+		for (var i = 0; i < networkNames.length; i++) {
+			var net = network.instantiateNetwork(networkNames[i]),
+			    dev = net ? net.getDevice() : null;
+
+			if (dev)
+				devices[dev.getName()] = dev;
+		}
+
+		for (var i = 0; i < deviceNames.length; i++) {
+			var dev = network.getDevice(deviceNames[i]);
+
+			if (dev)
+				devices[dev.getName()] = dev;
+		}
+
+		deviceNames = Object.keys(devices);
+		deviceNames.sort();
+
+		for (var i = 0; i < deviceNames.length; i++)
+			rv.push(devices[deviceNames[i]]);
+
+		this.devices = rv;
+
+		return rv;
+	},
+
+	getUptime: function() {
+		var networkNames = L.toArray(uci.get('network', this.sid, 'network')),
+		    uptime = 0;
+
+		for (var i = 0; i < networkNames.length; i++) {
+			var net = network.instantiateNetwork(networkNames[i]);
+			if (net)
+				uptime = Math.max(uptime, net.getUptime());
+		}
+
+		return uptime;
+	},
+
+	getErrors: function() {
+		return null;
+	},
+
+	renderFormOptions: function(s) {
+		var o;
+
+		o = s.taboption('general', form.Value, 'ipaddr', _('Local IPv4 address'), _('Address to access local relay bridge'));
+		o.datatype = 'ip4addr("nomask")';
+
+		o = s.taboption('general', widgets.NetworkSelect, 'network', _('Relay between networks'));
+		o.exclude = s.section;
+		o.multiple = true;
+		o.nocreate = true;
+		o.nobridges = true;
+		o.novirtual = true;
+
+		o = s.taboption('advanced', form.Flag, 'forward_bcast', _('Forward broadcast traffic'));
+		o.default = o.enabled;
+
+		o = s.taboption('advanced', form.Flag, 'forward_dhcp', _('Forward DHCP traffic'));
+		o.default = o.enabled;
+
+		o = s.taboption('advanced', form.Value, 'gateway', _('Use DHCP gateway'), _('Override the gateway in DHCP responses'));
+		o.datatype = 'ip4addr("nomask")';
+		o.depends('forward_dhcp', '1');
+
+		o = s.taboption('advanced', form.Value, 'expiry', _('Host expiry timeout'), _('Specifies the maximum amount of seconds after which hosts are presumed to be dead'));
+		o.placeholder = '30';
+		o.datatype    = 'min(1)';
+
+		o = s.taboption('advanced', form.Value, 'retry', _('ARP retry threshold'), _('Specifies the maximum amount of failed ARP requests until hosts are presumed to be dead'));
+		o.placeholder = '5';
+		o.datatype    = 'min(1)';
+
+		o = s.taboption('advanced', form.Value, 'table', _('Use routing table'), _('Override the table used for internal routes'));
+		o.placeholder = '16800';
+		o.datatype    = 'range(0,65535)';
+	}
+});
diff --git a/protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua b/protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua
deleted file mode 100644
index 3381d85e4..000000000
--- a/protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua
+++ /dev/null
@@ -1,68 +0,0 @@
--- Copyright 2011 Jo-Philipp Wich <jow@openwrt.org>
--- Licensed to the public under the Apache License 2.0.
-
-local map, section, net = ...
-
-local ipaddr, network
-local forward_bcast, forward_dhcp, gateway, expiry, retry, table
-
-
-ipaddr = section:taboption("general", Value, "ipaddr",
-	translate("Local IPv4 address"),
-	translate("Address to access local relay bridge"))
-
-ipaddr.datatype = "ip4addr"
-
-
-network = s:taboption("general", DynamicList, "network", translate("Relay between networks"))
-network.widget = "checkbox"
-network.exclude = arg[1]
-network.template = "cbi/network_netlist"
-network.nocreate = true
-network.nobridges = true
-network.novirtual = true
-network:depends("proto", "relay")
-
-
-forward_bcast = section:taboption("advanced", Flag, "forward_bcast",
-	translate("Forward broadcast traffic"))
-
-forward_bcast.default = forward_bcast.enabled
-
-
-forward_dhcp = section:taboption("advanced", Flag, "forward_dhcp",
-	translate("Forward DHCP traffic"))
-
-forward_dhcp.default = forward_dhcp.enabled
-
-
-gateway = section:taboption("advanced", Value, "gateway",
-	translate("Use DHCP gateway"),
-	translate("Override the gateway in DHCP responses"))
-
-gateway.datatype = "ip4addr"
-gateway:depends("forward_dhcp", forward_dhcp.enabled)
-
-
-expiry = section:taboption("advanced", Value, "expiry",
-	translate("Host expiry timeout"),
-	translate("Specifies the maximum amount of seconds after which hosts are presumed to be dead"))
-
-expiry.placeholder = "30"
-expiry.datatype    = "min(1)"
-
-
-retry = section:taboption("advanced", Value, "retry",
-	translate("ARP retry threshold"),
-	translate("Specifies the maximum amount of failed ARP requests until hosts are presumed to be dead"))
-
-retry.placeholder = "5"
-retry.datatype    = "min(1)"
-
-
-table = section:taboption("advanced", Value, "table",
-	translate("Use routing table"),
-	translate("Override the table used for internal routes"))
-
-table.placeholder = "16800"
-table.datatype    = "range(0,65535)"
diff --git a/protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js b/protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js
new file mode 100644
index 000000000..87ccc9df1
--- /dev/null
+++ b/protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js
@@ -0,0 +1,111 @@
+'use strict';
+'require form';
+'require network';
+
+network.registerPatternVirtual(/^vpn-.+$/);
+
+return network.registerProtocol('vpnc', {
+	getI18n: function() {
+		return _('VPNC (CISCO 3000 (and others) VPN)');
+	},
+
+	getIfname: function() {
+		return this._ubus('l3_device') || 'vpn-%s'.format(this.sid);
+	},
+
+	getOpkgPackage: function() {
+		return 'vpnc';
+	},
+
+	isFloating: function() {
+		return true;
+	},
+
+	isVirtual: function() {
+		return true;
+	},
+
+	getDevices: function() {
+		return null;
+	},
+
+	containsDevice: function(ifname) {
+		return (network.getIfnameOf(ifname) == this.getIfname());
+	},
+
+	renderFormOptions: function(s) {
+		var o;
+
+		o = s.taboption('general', form.Value, 'server', _('VPN Server'));
+		o.datatype = 'host(0)';
+
+		o = s.taboption('general', form.Value, 'local_addr', _('VPN Local address'));
+		o.placeholder = '0.0.0.0';
+		o.datatype    = 'ipaddr';
+
+		o = s.taboption('general', form.Value, 'local_port', _('VPN Local port'));
+		o.placeholder = '500';
+		o.datatype    = 'port';
+
+		o = s.taboption('general', form.Value, 'interface', _('Output Interface'));
+		o.template = 'cbi/network_netlist';
+
+		o = s.taboption('general', form.Value, 'mtu', _('MTU'));
+		o.datatype = 'uinteger';
+
+		s.taboption('general', form.Value, 'username', _('Username'));
+
+		o = s.taboption('general', form.Value, 'password', _('Password'));
+		o.password = true;
+
+		o = s.taboption('general', form.Value, 'hexpassword', _('Obfuscated Password'));
+		o.password = true;
+
+		s.taboption('general', form.Value, 'authgroup', _('Auth Group'));
+
+		o = s.taboption('general', form.Value, 'passgroup', _('Group Password'));
+		o.password = true;
+
+		o = s.taboption('general', form.Value, 'hexpassgroup', _('Obfuscated Group Password'));
+		o.password= true;
+
+		s.taboption('general', form.Value, 'domain', _('NT Domain'));
+		s.taboption('general', form.Value, 'vendor', _('Vendor'));
+
+		o = s.taboption('general', form.ListValue, 'dh_group', _('IKE DH Group'));
+		o.value('dh2');
+		o.value('dh1');
+		o.value('dh5');
+
+		o = s.taboption('general', form.ListValue, 'pfs', _('Perfect Forward Secrecy'));
+		o.value('server');
+		o.value('nopfs');
+		o.value('dh1');
+		o.value('dh2');
+		o.value('dh5');
+
+		o = s.taboption('general', form.ListValue, 'natt_mode', _('NAT-T Mode'));
+		o.value('natt', _('RFC3947 NAT-T mode'));
+		o.value('none', _('No NAT-T'));
+		o.value('force-natt', _('Force use of NAT-T'));
+		o.value('cisco-udp', _('Cisco UDP encapsulation'));
+
+		o = s.taboption('general', form.Flag, 'enable_no_enc', _('Disable Encryption'), _('If checked, encryption is disabled'));
+		o.default = o.disabled;
+
+		o = s.taboption('general', form.Flag, 'enable_single_des', _('Enable Single DES'), _('If checked, 1DES is enabled'));
+		o.default = o.disabled;
+
+		o = s.taboption('general', form.Value, 'dpd_idle', _('DPD Idle Timeout'));
+		o.datatype = 'uinteger';
+		o.placeholder = '600';
+
+		o = s.taboption('general', form.Value, 'target_network', _('Target network'));
+		o.placeholder = '0.0.0.0/0';
+		o.datatype    = 'network';
+
+		o = s.taboption('general', form.ListValue, 'defaultroute', _('Default Route'), _('Set VPN as Default Route'));
+		o.value('0', _('No'));
+		o.value('1', _('Yes'));
+	}
+});
diff --git a/protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua b/protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua
deleted file mode 100644
index 3d85d02f4..000000000
--- a/protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua
+++ /dev/null
@@ -1,85 +0,0 @@
--- Copyright 2015 Daniel Dickinson <openwrt@daniel.thecshore.com>
--- Licensed to the public under the Apache License 2.0.
-
-local map, section, net = ...
-
-local server, username, password, hexpassword
-local authgroup, interface, passgroup, hexpassgroup
-local domain, vendor, natt_mode, dh_group
-local pfs, enable_single_des, enable_no_enc
-local mtu, local_addr, local_port, dpd_idle
-local auth_mode, target_network, defaultroute
-
-local ifc = net:get_interface():name()
-
-server = section:taboption("general", Value, "server", translate("VPN Server"))
-server.datatype = "host(0)"
-
-port = section:taboption("general", Value, "local_addr", translate("VPN Local address"))
-port.placeholder = "0.0.0.0"
-port.datatype    = "ipaddr"
-
-port = section:taboption("general", Value, "local_port", translate("VPN Local port"))
-port.placeholder = "500"
-port.datatype    = "port"
-
-ifname = section:taboption("general", Value, "interface", translate("Output Interface"))
-ifname.template = "cbi/network_netlist"
-
-mtu = section:taboption("general", Value, "mtu", translate("MTU"))
-mtu.datatype = "uinteger"
-
-username = section:taboption("general", Value, "username", translate("Username"))
-password = section:taboption("general", Value, "password", translate("Password"))
-password.password = true
-hexpassword = section:taboption("general", Value, "hexpassword", translate("Obfuscated Password"))
-hexpassword.password = true
-authroup = section:taboption("general", Value, "authgroup", translate("Auth Group"))
-passgroup = section:taboption("general", Value, "passgroup", translate("Group Password"))
-passgroup.password = true
-hexpassgroup = section:taboption("general", Value, "hexpassgroup", translate("Obfuscated Group Password"))
-hexpassword.password= true
-
-domain = section:taboption("general", Value, "domain", translate("NT Domain"))
-vendor = section:taboption("general", Value, "vendor", translate("Vendor"))
-dh_group = section:taboption("general", ListValue, "dh_group", translate("IKE DH Group"))
-dh_group:value("dh2")
-dh_group:value("dh1")
-dh_group:value("dh5")
-
-pfs = section:taboption("general", ListValue, "pfs", translate("Perfect Forward Secrecy"))
-pfs:value("server")
-pfs:value("nopfs")
-pfs:value("dh1")
-pfs:value("dh2")
-pfs:value("dh5")
-
-natt_mode = section:taboption("general", ListValue, "natt_mode", translate("NAT-T Mode"))
-natt_mode:value("natt", translate("RFC3947 NAT-T mode"))
-natt_mode:value("none", translate("No NAT-T"))
-natt_mode:value("force-natt", translate("Force use of NAT-T"))
-natt_mode:value("cisco-udp", translate("Cisco UDP encapsulation"))
-
-enable_no_enc = section:taboption("general", Flag, "enable_no_enc",
-	translate("Disable Encryption"),
-	translate("If checked, encryption is disabled"))
-enable_no_enc.default = enable_no_enc.disabled
-
-enable_single_des = section:taboption("general", Flag, "enable_single_des",
-	translate("Enable Single DES"),
-	translate("If checked, 1DES is enabled"))
-enable_no_enc.default = enable_single_des.disabled
-
-dpd_idle = section:taboption("general", Value, "dpd_idle", translate("DPD Idle Timeout"))
-dpd_idle.datatype = "uinteger"
-dpd_idle.placeholder = "600"
-
-ifname = section:taboption("general", Value, "target_network", translate("Target network"))
-port.placeholder = "0.0.0.0/0"
-port.datatype    = "network"
-
-defaultroute = section:taboption("general", ListValue, "defaultroute",
-	translate("Default Route"),
-	translate("Set VPN as Default Route"))
-defaultroute:value("0", translate("No"))
-defaultroute:value("1", translate("Yes"))
diff --git a/protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js b/protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js
new file mode 100644
index 000000000..ab76326ee
--- /dev/null
+++ b/protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js
@@ -0,0 +1,140 @@
+'use strict';
+'require form';
+'require network';
+
+function validateBase64(section_id, value) {
+	if (value.length == 0)
+		return true;
+
+	if (value.length != 44 || !value.match(/^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/))
+		return _('Invalid Base64 key string');
+
+	return true;
+}
+
+return network.registerProtocol('wireguard', {
+	getI18n: function() {
+		return _('WireGuard VPN');
+	},
+
+	getIfname: function() {
+		return this._ubus('l3_device') || this.sid;
+	},
+
+	getOpkgPackage: function() {
+		return 'wireguard-tools';
+	},
+
+	isFloating: function() {
+		return true;
+	},
+
+	isVirtual: function() {
+		return true;
+	},
+
+	getDevices: function() {
+		return null;
+	},
+
+	containsDevice: function(ifname) {
+		return (network.getIfnameOf(ifname) == this.getIfname());
+	},
+
+	renderFormOptions: function(s) {
+		var o, ss;
+
+		// -- general ---------------------------------------------------------------------
+
+		o = s.taboption('general', form.Value, 'private_key', _('Private Key'), _('Required. Base64-encoded private key for this interface.'));
+		o.password = true;
+		o.validate = validateBase64;
+		o.rmempty = false;
+
+		o = s.taboption('general', form.Value, 'listen_port', _('Listen Port'), _('Optional. UDP port used for outgoing and incoming packets.'));
+		o.datatype = 'port';
+		o.placeholder = _('random');
+		o.optional = true;
+
+		o = s.taboption('general', form.DynamicList, 'addresses', _('IP Addresses'), _('Recommended. IP addresses of the WireGuard interface.'));
+		o.datatype = 'ipaddr';
+		o.optional = true;
+
+
+		// -- advanced --------------------------------------------------------------------
+
+		o = s.taboption('advanced', form.Value, 'metric', _('Metric'), _('Optional'));
+		o.datatype = 'uinteger';
+		o.placeholder = '0';
+		o.optional = true;
+
+		o = s.taboption('advanced', form.Value, 'mtu', _('MTU'), _('Optional. Maximum Transmission Unit of tunnel interface.'));
+		o.datatype = 'range(1280,1420)';
+		o.placeholder = '1420';
+		o.optional = true;
+
+		o = s.taboption('advanced', form.Value, 'fwmark', _('Firewall Mark'), _('Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, starting with <code>0x</code>.'));
+		o.optional = true;
+		o.validate = function(section_id, value) {
+			if (value.length > 0 && !value.match(/^0x[a-fA-F0-9]{1,4}$/))
+				return _('Invalid hexadecimal value');
+
+			return true;
+		};
+
+
+		// -- peers -----------------------------------------------------------------------
+
+		try {
+			s.tab('peers', _('Peers'), _('Further information about WireGuard interfaces and peers at <a href=\'http://wireguard.com\'>wireguard.com</a>.'));
+		}
+		catch(e) {}
+
+		o = s.taboption('peers', form.SectionValue, '_peers', form.TypedSection, 'wireguard_%s'.format(s.section));
+		o.depends('proto', 'wireguard');
+
+		ss = o.subsection;
+		ss.anonymous = true;
+		ss.addremove = true;
+		ss.addbtntitle = _('Add peer');
+
+		ss.renderSectionPlaceholder = function() {
+			return E([], [
+				E('br'),
+				E('em', _('No peers defined yet'))
+			]);
+		};
+
+		o = ss.option(form.Value, 'description', _('Description'), _('Optional. Description of peer.'));
+		o.placeholder = 'My Peer';
+		o.datatype = 'string';
+		o.optional = true;
+
+		o = ss.option(form.Value, 'public_key', _('Public Key'), _('Required. Base64-encoded public key of peer.'));
+		o.validate = validateBase64;
+		o.rmempty = false;
+
+		o = ss.option(form.Value, 'preshared_key', _('Preshared Key'), _('Optional. Base64-encoded preshared key. Adds in an additional layer of symmetric-key cryptography for post-quantum resistance.'));
+		o.password = true;
+		o.validate = validateBase64;
+		o.optional = true;
+
+		o = ss.option(form.DynamicList, 'allowed_ips', _('Allowed IPs'), _("Required. IP addresses and prefixes that this peer is allowed to use inside the tunnel. Usually the peer's tunnel IP addresses and the networks the peer routes through the tunnel."));
+		o.datatype = 'ipaddr';
+		o.rmempty = false;
+
+		o = ss.option(form.Flag, 'route_allowed_ips', _('Route Allowed IPs'), _('Optional. Create routes for Allowed IPs for this peer.'));
+
+		o = ss.option(form.Value, 'endpoint_host', _('Endpoint Host'), _('Optional. Host of peer. Names are resolved prior to bringing up the interface.'));
+		o.placeholder = 'vpn.example.com';
+		o.datatype = 'host';
+
+		o = ss.option(form.Value, 'endpoint_port', _('Endpoint Port'), _('Optional. Port of peer.'));
+		o.placeholder = '51820';
+		o.datatype = 'port';
+
+		o = ss.option(form.Value, 'persistent_keepalive', _('Persistent Keep Alive'), _('Optional. Seconds between keep alive messages. Default is 0 (disabled). Recommended value if this device is behind a NAT is 25.'));
+		o.datatype = 'range(0,65535)';
+		o.placeholder = '0';
+	}
+});
diff --git a/protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua b/protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua
deleted file mode 100644
index 64e256a51..000000000
--- a/protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua
+++ /dev/null
@@ -1,179 +0,0 @@
--- Copyright 2016-2017 Dan Luedtke <mail@danrl.com>
--- Licensed to the public under the Apache License 2.0.
-
-
-local map, section, net = ...
-local ifname = net:get_interface():name()
-local private_key, listen_port
-local metric, mtu, preshared_key, description
-local peers, public_key, allowed_ips, endpoint, persistent_keepalive
-
-
--- general ---------------------------------------------------------------------
-
-private_key = section:taboption(
-  "general",
-  Value,
-  "private_key",
-  translate("Private Key"),
-  translate("Required. Base64-encoded private key for this interface.")
-)
-private_key.password = true
-private_key.datatype = "and(base64,rangelength(44,44))"
-private_key.optional = false
-
-
-listen_port = section:taboption(
-  "general",
-  Value,
-  "listen_port",
-  translate("Listen Port"),
-  translate("Optional. UDP port used for outgoing and incoming packets.")
-)
-listen_port.datatype = "port"
-listen_port.placeholder = translate("random")
-listen_port.optional = true
-
-addresses = section:taboption(
-  "general",
-  DynamicList,
-  "addresses",
-  translate("IP Addresses"),
-  translate("Recommended. IP addresses of the WireGuard interface.")
-)
-addresses.datatype = "ipaddr"
-addresses.optional = true
-
-
--- advanced --------------------------------------------------------------------
-
-metric = section:taboption(
-  "advanced",
-  Value,
-  "metric",
-  translate("Metric"),
-  translate("Optional")
-)
-metric.datatype = "uinteger"
-metric.placeholder = "0"
-metric.optional = true
-
-
-mtu = section:taboption(
-  "advanced",
-  Value,
-  "mtu",
-  translate("MTU"),
-  translate("Optional. Maximum Transmission Unit of tunnel interface.")
-)
-mtu.datatype = "range(1280,1420)"
-mtu.placeholder = "1420"
-mtu.optional = true
-
-fwmark = section:taboption(
-  "advanced",
-  Value,
-  "fwmark",
-  translate("Firewall Mark"),
-  translate("Optional. 32-bit mark for outgoing encrypted packets. " ..
-            "Enter value in hex, starting with <code>0x</code>.")
-)
-fwmark.datatype = "hex(4)"
-fwmark.optional = true
-
-
--- peers -----------------------------------------------------------------------
-
-peers = map:section(
-  TypedSection,
-  "wireguard_" .. ifname,
-  translate("Peers"),
-  translate("Further information about WireGuard interfaces and peers " ..
-            "at <a href=\"http://wireguard.com\">wireguard.com</a>.")
-)
-peers.template = "cbi/tsection"
-peers.anonymous = true
-peers.addremove = true
-
-
-description = peers:option(
-  Value,
-  "description",
-  translate("Description"),
-  translate("Optional. Description of peer."))
-description.placeholder = "My Peer"
-description.datatype = "string"
-description.optional = true
-
-
-public_key = peers:option(
-  Value,
-  "public_key",
-  translate("Public Key"),
-  translate("Required. Base64-encoded public key of peer.")
-)
-public_key.datatype = "and(base64,rangelength(44,44))"
-public_key.optional = false
-
-
-preshared_key = peers:option(
-  Value,
-  "preshared_key",
-  translate("Preshared Key"),
-  translate("Optional. Base64-encoded preshared key. " ..
-            "Adds in an additional layer of symmetric-key " ..
-            "cryptography for post-quantum resistance.")
-)
-preshared_key.password = true
-preshared_key.datatype = "and(base64,rangelength(44,44))"
-preshared_key.optional = true
-
-
-allowed_ips = peers:option(
-  DynamicList,
-  "allowed_ips",
-  translate("Allowed IPs"),
-  translate("Required. IP addresses and prefixes that this peer is allowed " ..
-            "to use inside the tunnel. Usually the peer's tunnel IP " ..
-            "addresses and the networks the peer routes through the tunnel.")
-)
-allowed_ips.datatype = "ipaddr"
-allowed_ips.optional = false
-
-
-route_allowed_ips = peers:option(
-  Flag,
-  "route_allowed_ips",
-  translate("Route Allowed IPs"),
-  translate("Optional. Create routes for Allowed IPs for this peer.")
-)
-
-
-endpoint_host = peers:option(
-  Value,
-  "endpoint_host",
-  translate("Endpoint Host"),
-  translate("Optional. Host of peer. Names are resolved " ..
-            "prior to bringing up the interface."))
-endpoint_host.placeholder = "vpn.example.com"
-endpoint_host.datatype = "host"
-
-
-endpoint_port = peers:option(
-  Value,
-  "endpoint_port",
-  translate("Endpoint Port"),
-  translate("Optional. Port of peer."))
-endpoint_port.placeholder = "51820"
-endpoint_port.datatype = "port"
-
-
-persistent_keepalive = peers:option(
-  Value,
-  "persistent_keepalive",
-  translate("Persistent Keep Alive"),
-  translate("Optional. Seconds between keep alive messages. " ..
-            "Default is 0 (disabled). Recommended value if " ..
-            "this device is behind a NAT is 25."))
-persistent_keepalive.datatype = "range(0,65535)"
-persistent_keepalive.placeholder = "0"
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 f8f1c1110..7e9c8eb32 100644
--- a/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css
+++ b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css
@@ -99,6 +99,7 @@ input[type="reset"],
 input[type="submit"] {
 	cursor: pointer;
 	-webkit-appearance: button;
+	word-break: break-all;
 }
 
 button[disabled],
@@ -1201,6 +1202,7 @@ footer {
 	flex-basis: 100%;
 	line-height: normal;
 	margin-bottom: .5em;
+	max-width: 100%;
 }
 
 .modal > pre,
@@ -1707,8 +1709,8 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
 
 .alert-message {
 	position: relative;
-	padding: 7px 15px;
-	margin-bottom: 18px;
+	padding: .5em .5em .25em .5em;
+	margin-bottom: .5em;
 	color: #404040;
 	background: linear-gradient(to bottom, #fceec1, #eedc94) repeat-x;
 	text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
@@ -1725,30 +1727,22 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
 	*margin-top: 0;
 }
 
-.alert-message a {
-	font-weight: bold;
-	color: #404040;
-}
-
-.alert-message.danger p a,
-.alert-message.error p a,
-.alert-message.success p a,
-.alert-message.info p a {
-	color: #fff;
-}
-
-.alert-message h5 {
-	line-height: 18px;
-}
-
+.alert-message h4,
+.alert-message h5,
+.alert-message pre,
+.alert-message ul,
+.alert-message li,
 .alert-message p {
-	margin-bottom: 0;
+	color: inherit;
+	border: none;
+	line-height: inherit;
+	background: transparent;
+	padding: 0;
+	margin: .25em 0;
 }
 
-.alert-message div {
-	margin-top: 5px;
-	margin-bottom: 2px;
-	line-height: 28px;
+.alert-message button {
+	margin: .25em 0;
 }
 
 .label {
@@ -2248,3 +2242,110 @@ html body.apply-overlay-active {
 	overflow: visible;
 	transition: opacity .25s ease-in;
 }
+
+.cbi-filebrowser {
+	min-width: 210px;
+	max-width: 100%;
+	border: 1px solid #ccc;
+	border-radius: 3px;
+	display: flex;
+	flex-direction: column;
+	opacity: 0;
+	height: 0;
+	overflow: hidden;
+}
+
+.cbi-filebrowser.open {
+	opacity: 1;
+	height: auto;
+	overflow: visible;
+	transition: opacity .25s ease-in;
+}
+
+.cbi-filebrowser > * {
+	max-width: 100%;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	padding: 0 0 .25em 0;
+	margin: .25em .25em 0px .25em;
+	white-space: nowrap;
+	border-bottom: 1px solid #ccc;
+}
+
+.cbi-filebrowser .cbi-button-positive {
+	margin-right: .25em;
+}
+
+.cbi-filebrowser > div {
+	border-bottom: none;
+}
+
+.cbi-filebrowser > ul > li {
+	display: flex;
+	flex-direction: row;
+}
+
+.cbi-filebrowser > ul > li:hover {
+	background: #f5f5f5;
+}
+
+.cbi-filebrowser > ul > li > div:first-child {
+	flex: 10;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+
+.cbi-filebrowser > ul > li > div:last-child {
+	flex: 3;
+	text-align: right;
+}
+
+.cbi-filebrowser > ul > li > div:last-child > button {
+	padding: .125em .25em;
+	margin: 1px 0 1px .25em;
+}
+
+.cbi-filebrowser .upload {
+	display: flex;
+	flex-direction: row;
+	flex-wrap: wrap;
+	margin: 0 -.125em .25em -.125em;
+	padding: 0 0 .125em 0px;
+	border-bottom: 1px solid #ccc;
+}
+
+.cbi-filebrowser .upload > * {
+	margin: .125em;
+	flex: 1;
+}
+
+.cbi-filebrowser .upload > .btn {
+	flex-basis: 60px;
+}
+
+.cbi-filebrowser .upload > div {
+	flex: 10;
+	min-width: 150px;
+}
+
+.cbi-filebrowser .upload > div > input {
+	width: 100%;
+}
+
+@keyframes fade-in {
+	0% { opacity: 0; }
+	100% { opacity: 1; }
+}
+
+@keyframes fade-out {
+	0% { opacity: 1; }
+	100% { opacity: 0; }
+}
+
+.fade-in {
+	animation: fade-in .4s ease;
+}
+
+.fade-out {
+	animation: fade-out .4s ease;
+}
diff --git a/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/mobile.css b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/mobile.css
index 062d274b7..b8892fbf0 100644
--- a/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/mobile.css
+++ b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/mobile.css
@@ -355,18 +355,24 @@ header h3 a, header .brand {
 		text-overflow: ellipsis;
 	}
 
-	body[data-page="admin-network-wireless"] .td.col-2 {
+	body[data-page="admin-network-wireless"] .td[data-name="_badge"] {
 		max-width: 50px;
+		align-self: center;
 	}
 
-	body[data-page="admin-network-wireless"] .td.col-2 > .ifacebadge {
+	body[data-page="admin-network-wireless"] .td[data-name="_badge"] .ifacebadge {
 		display: flex;
 		align-items: center;
 		flex-direction: column;
 	}
 
-	body[data-page="admin-network-network"] .td.col-3 {
-		min-width: 250px;
+	body[data-page="admin-network-wireless"] .td[data-name="_stat"] {
+		flex-basis: 60%;
+	}
+
+	body[data-page="admin-network-network"] .td.cbi-section-actions::before,
+	body[data-page="admin-network-wireless"] .td.cbi-section-actions::before {
+		content: none !important;
 	}
 }
 
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 d74077853..1d78edf0c 100644
--- a/themes/luci-theme-material/htdocs/luci-static/material/cascade.css
+++ b/themes/luci-theme-material/htdocs/luci-static/material/cascade.css
@@ -214,6 +214,7 @@ input:not(.cbi-button):focus,
 	border-color: var(--main-color);
 }
 
+.cbi-dropdown,
 select[multiple="multiple"] {
 	height: auto;
 }
@@ -401,10 +402,6 @@ header > .fill > .container > #logo > img {
 	margin-top: -.1rem;
 }
 
-body:not(.logged-in) > header > .fill > .container > #logo {
-	display: none;
-}
-
 header > .fill > .container > .brand {
 	font-size: 1.4rem;
 	position: absolute;
@@ -693,6 +690,7 @@ h5 {
 #cbi-network > .cbi-section-node,
 #cbi-wireless > .cbi-section-node,
 #cbi-wireless > #wifi_assoclist_table,
+[data-tab-title],
 [data-page^="admin-system-admin"]:not(.node-main-login) .cbi-map:not(#cbi-dropbear),
 [data-page="admin-system-opkg"] #maincontent > .container {
 	font-family: inherit;
@@ -708,6 +706,16 @@ h5 {
 	box-shadow: 0 2px 2px 0 rgba(0, 0, 0, .16), 0 0 2px 0 rgba(0, 0, 0, .12);
 }
 
+.cbi-modal .cbi-section,
+.cbi-section .cbi-section {
+	padding: 0;
+	box-shadow: none;
+}
+
+.cbi-modal .cbi-tabmenu {
+	margin-left: 0;
+}
+
 .cbi-map-descr,
 .cbi-section-descr {
 	font-size: small;
@@ -745,6 +753,15 @@ fieldset > fieldset,
 	border-bottom: thin solid #eee;
 }
 
+.cbi-section > h3:first-child,
+.cbi-section > h4:first-child,
+.cbi-section > p:first-child,
+[data-tab-title] > h3:first-child,
+[data-tab-title] > h4:first-child,
+[data-tab-title] > p:first-child {
+	padding-top: 1rem;
+}
+
 table {
 	border-spacing: 0;
 	border-collapse: collapse;
@@ -1123,6 +1140,8 @@ td > table > tbody > tr > td,
 	overflow: hidden;
 	height: 0;
 	opacity: 0;
+	margin: 0;
+	padding: 0rem 1rem !important;
 }
 
 [data-tab-active="true"] {
@@ -1130,6 +1149,7 @@ td > table > tbody > tr > td,
 	height: auto;
 	opacity: 1;
 	transition: opacity .25s ease-in;
+	margin: inherit !important;
 }
 
 .cbi-section[id] .cbi-section-remove:nth-of-type(4n+3),
@@ -1599,6 +1619,8 @@ body:not(.Interfaces) .cbi-rowstyle-2:first-child {
 .modal > * {
 	line-height: normal;
 	flex-basis: 100%;
+	margin-bottom: .5em;
+	max-width: 100%;
 }
 
 .modal > pre,
@@ -1655,6 +1677,11 @@ body:not(.Interfaces) .cbi-rowstyle-2:first-child {
 	margin-bottom: 2em;
 }
 
+.modal.cbi-modal {
+	max-width: 90%;
+	max-height: none;
+}
+
 body.modal-overlay-active {
 	overflow: hidden;
 	height: 100vh;
@@ -2824,7 +2851,7 @@ input[name="nslookup"] {
 	}
 
 	#maincontent > .container {
-		margin: 0 1rem 1.5rem 1rem;
+		margin: 0 .5rem 1.5rem .5rem;
 	}
 
 	.main > .main-left > .nav > .slide > .menu,
@@ -2982,6 +3009,22 @@ input[name="nslookup"] {
 	.hide-xs:not([data-title="MAC-Address"]) {
 		display: none;
 	}
+
+	.cbi-modal {
+		padding: .5rem;
+	}
+
+	.cbi-modal .cbi-value {
+		padding: 0 0 .25rem 0;
+	}
+
+	.cbi-modal [data-tab-title] {
+		padding: 0 .25rem !important;
+	}
+
+	[data-tab-title] {
+		padding: 0 .5rem !important;
+	}
 }
 
 @media screen and (min-width: 600px) {
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 7ce195cc9..76eeec05e 100644
--- a/themes/luci-theme-material/luasrc/view/themes/material/header.htm
+++ b/themes/luci-theme-material/luasrc/view/themes/material/header.htm
@@ -186,7 +186,7 @@
 	<div class="fill">
 		<div class="container">
 			<span class="showSide"></span>
-			<a id="logo" href="<%=url("admin/status/overview")%>"><img src="<%=media%>/brand.png" alt="OpenWrt"></a>
+			<a id="logo" href="<% if luci.dispatcher.context.authsession then %><%=url('admin/status/overview')%><% else %>#<% end %>"><img src="<%=media%>/brand.png" alt="OpenWrt"></a>
 			<a class="brand" href="#"><%=boardinfo.hostname or "?"%></a>
 			<div class="status">
 				<span id="xhr_poll_status" style="display:none" onclick="XHR.running() ? XHR.halt() : XHR.run()">
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 d6460532f..fca731cad 100644
--- a/themes/luci-theme-rosy/htdocs/luci-static/rosy/cascade.css
+++ b/themes/luci-theme-rosy/htdocs/luci-static/rosy/cascade.css
@@ -55,6 +55,8 @@
 	line-height: normal;
 	display: table-cell;
 	padding: .5em;
+	word-break: break-all;
+	word-wrap: break-word;
 	text-align: center;
 	vertical-align: middle;
 }
@@ -136,6 +138,7 @@
 
 .col-10 {
 	flex: 10 10 300px !important;
+	width: 60%;
 }
 
 /* dom 元素 */